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 001/248] 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 002/248] 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 003/248] 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 004/248] 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 005/248] 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 006/248] 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 007/248] 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 008/248] 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 009/248] 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 010/248] 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 011/248] 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 012/248] 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 013/248] 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 014/248] 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 015/248] 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 016/248] 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 017/248] 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 018/248] 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 019/248] 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 020/248] 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 021/248] 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 022/248] 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 023/248] 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 024/248] 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 025/248] 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 026/248] 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 027/248] 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 028/248] 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 029/248] 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 030/248] 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 031/248] 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
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

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 032/248] 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 033/248] 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 034/248] 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 035/248] 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 036/248] 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 037/248] 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 038/248] 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 039/248] 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 040/248] 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 041/248] 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 042/248] 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 043/248] 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 044/248] 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 045/248] 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 046/248] 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
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

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 047/248] 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 048/248] 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 049/248] 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 050/248] 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 051/248] 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 052/248] 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 053/248] 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 054/248] 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 055/248] 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 056/248] 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 057/248] 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 058/248] 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 059/248] 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 060/248] 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 061/248] 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 062/248] 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
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

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
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

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
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

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
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

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
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

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
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

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
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

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
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

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
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

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
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

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
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

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
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

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
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

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 063/248] 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
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

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
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

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
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

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
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

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
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

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
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

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
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

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
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

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
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

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
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

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 064/248] 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 065/248] 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 066/248] 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 067/248] 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 068/248] 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 069/248] 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 070/248] 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 071/248] 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 072/248] 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 073/248] 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 074/248] 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 075/248] 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 076/248] 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 077/248] 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 078/248] 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 079/248] 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 080/248] 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 081/248] 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 082/248] 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 083/248] 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 084/248] 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 085/248] 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 086/248] 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 087/248] 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 088/248] 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 089/248] 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 090/248] 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 091/248] 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 092/248] 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 093/248] 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 094/248] 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 095/248] 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 096/248] 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 097/248] 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 098/248] 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 099/248] 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 b6ed61eab2fce2de3653b376bef0eeddd431562a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 21 Oct 2011 15:17:39 +0200
Subject: [PATCH 100/248] pass paramters to file proxies by reference so they
 can be modified

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

diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index 235fc8bf284..7e0722b960e 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -88,11 +88,11 @@ class OC_FileProxy{
 		$operation='pre'.$operation;
 		foreach($proxies as $proxy){
 			if($filepath2){
-				if(!$proxy->$operation($filepath,$filepath2)){
+				if(!$proxy->$operation(&$filepath,&$filepath2)){
 					return false;
 				}
 			}else{
-				if(!$proxy->$operation($filepath)){
+				if(!$proxy->$operation(&$filepath)){
 					return false;
 				}
 			}
-- 
GitLab


From abc749feeb14c49d483135f879195b70ee89654f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 21 Oct 2011 17:01:41 +0200
Subject: [PATCH 101/248] make documentation reflect reality a bit better

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

diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index 7e0722b960e..1fb22bd1139 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, 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, fileatime, filemtime, filectime, file_get_contents, getMimeType, hash, fopen, free_space and search
  */
 
 class OC_FileProxy{
-- 
GitLab


From 3d67cd51c2f42029435343004b3ebe608bcba375 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 21 Oct 2011 17:02:11 +0200
Subject: [PATCH 102/248] encryption proxy wip

---
 apps/files_encryption/appinfo/app.php     |  11 ++
 apps/files_encryption/lib/cryptstream.php | 121 ++++++++++++++++++++++
 apps/files_encryption/lib/proxy.php       |  70 +++++++++++++
 lib/crypt.php                             |  39 +++++--
 lib/fileproxy.php                         |   8 +-
 lib/filestorage/local.php                 |   2 +-
 lib/filesystemview.php                    |   2 +-
 7 files changed, 239 insertions(+), 14 deletions(-)
 create mode 100644 apps/files_encryption/appinfo/app.php
 create mode 100644 apps/files_encryption/lib/cryptstream.php
 create mode 100644 apps/files_encryption/lib/proxy.php

diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
new file mode 100644
index 00000000000..82d2544dd14
--- /dev/null
+++ b/apps/files_encryption/appinfo/app.php
@@ -0,0 +1,11 @@
+<?php
+
+OC::$CLASSPATH['OC_Crypt'] = 'apps/files_encryption/lib/crypt.php';
+OC::$CLASSPATH['OC_CryptStream'] = 'apps/files_encryption/lib/cryptstream.php';
+OC::$CLASSPATH['OC_FileProxy_Encryption'] = 'apps/files_encryption/lib/proxy.php';
+
+OC_FileProxy::register(new OC_FileProxy_Encryption());
+
+OC_Hook::connect('OC_User','post_login','OC_Crypt','loginListener');
+
+stream_wrapper_register('crypt','OC_CryptStream');
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
new file mode 100644
index 00000000000..e4544313f63
--- /dev/null
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @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/>.
+ *
+ */
+
+/**
+ * transparently encrypted filestream
+ */
+
+class OC_CryptStream{
+	private $source;
+
+	public function stream_open($path, $mode, $options, &$opened_path){
+		$path=str_replace('crypt://','',$path);
+		$this->source=OC_FileSystem::fopen($path.'.enc',$mode);
+		if(!is_resource($this->source)){
+			OC_Log::write('files_encryption','failed to open '.$path.'.enc',OC_Log::ERROR);
+		}
+		return is_resource($this->source);
+	}
+	
+	public function stream_seek($offset, $whence=SEEK_SET){
+		fseek($this->source,$offset,$whence);
+	}
+	
+	public function stream_tell(){
+		return ftell($this->source);
+	}
+	
+	public function stream_read($count){
+		$pos=0;
+		$currentPos=ftell($this->source);
+		$offset=$currentPos%8192;
+		fseek($this->source,-$offset,SEEK_CUR);
+		$result='';
+		while($count>$pos){
+			$data=fread($this->source,8192);
+			$pos+=8192;
+			$result.=OC_Crypt::decrypt($data);
+		}
+		return substr($result,$offset,$count);
+	}
+	
+	public function stream_write($data){
+		$length=strlen($data);
+		$written=0;
+		$currentPos=ftell($this->source);
+		if($currentPos%8192!=0){
+			//make sure we always start on a block start
+			fseek($this->source,-($currentPos%8192),SEEK_CUR);
+			$encryptedBlock=fread($this->source,8192);
+			fseek($this->source,-($currentPos%8192),SEEK_CUR);
+			$block=OC_Crypt::decrypt($encryptedBlock);
+			$data=substr($block,0,$currentPos%8192).$data;
+		}
+		while(strlen($data)>0){
+			if(strlen($data)<8192){
+				//fetch the current data in that block and append it to the input so we always write entire blocks
+				$oldPos=ftell($this->source);
+				$encryptedBlock=fread($this->source,8192);
+				fseek($this->source,$oldPos);
+				$block=OC_Crypt::decrypt($encryptedBlock);
+				$data.=substr($block,strlen($data));
+			}
+			$encrypted=OC_Crypt::encrypt(substr($data,0,8192));
+			fwrite($this->source,$encrypted);
+			$data=substr($data,8192);
+		}
+		return $length;
+	}
+
+	public function stream_set_option($option,$arg1,$arg2){
+		switch($option){
+			case STREAM_OPTION_BLOCKING:
+				stream_set_blocking($this->source,$arg1);
+				break;
+			case STREAM_OPTION_READ_TIMEOUT:
+				stream_set_timeout($this->source,$arg1,$arg2);
+				break;
+			case STREAM_OPTION_WRITE_BUFFER:
+				stream_set_write_buffer($this->source,$arg1,$arg2);
+		}
+	}
+
+	public function stream_stat(){
+		return fstat($this->source);
+	}
+	
+	public function stream_lock($mode){
+		flock($this->source,$mode);
+	}
+	
+	public function stream_flush(){
+		return fflush($this->source);
+	}
+
+	public function stream_eof(){
+		return feof($this->source);
+	}
+
+	public function stream_close(){
+		return fclose($this->source);
+	}
+}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
new file mode 100644
index 00000000000..f7a991a344b
--- /dev/null
+++ b/apps/files_encryption/lib/proxy.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+* ownCloud
+*
+* @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/>.
+*
+*/
+
+/**
+ * transparent encryption
+ */
+
+class OC_FileProxy_Encryption extends OC_FileProxy{
+	public function preFile_put_contents($path,&$data){
+		if(substr($path,-4)=='.enc'){
+			OC_Log::write('files_encryption','file put contents',OC_Log::DEBUG);
+			if (is_resource($data)) {
+				$newData='';
+				while(!feof($data)){
+					$block=fread($data,8192);
+					$newData.=OC_Crypt::encrypt($block);
+				}
+				$data=$newData;
+			}else{
+				$data=OC_Crypt::blockEncrypt($data);
+			}
+		}
+	}
+	
+	public function postFile_get_contents($path,$data){
+		if(substr($path,-4)=='.enc'){
+			OC_Log::write('files_encryption','file get contents',OC_Log::DEBUG);
+			return OC_Crypt::blockDecrypt($data);
+		}
+	}
+	
+	public function postFopen($path,&$result){
+		if(substr($path,-4)=='.enc'){
+			OC_Log::write('files_encryption','fopen',OC_Log::DEBUG);
+			fclose($result);
+			$result=fopen('crypt://'.substr($path,0,-4));//remove the .enc extention so we don't catch the fopen request made by cryptstream
+		}
+	}
+	
+	public function preReadFile($path){
+		if(substr($path,-4)=='.enc'){
+			OC_Log::write('files_encryption','readline',OC_Log::DEBUG);
+			$stream=fopen('crypt://'.substr($path,0,-4));
+			while(!feof($stream)){
+				print(fread($stream,8192));
+			}
+			return false;//cancel the original request
+		}
+	}
+}
diff --git a/lib/crypt.php b/lib/crypt.php
index 60020679480..3e6fa05b85d 100644
--- a/lib/crypt.php
+++ b/lib/crypt.php
@@ -113,14 +113,13 @@ class OC_Crypt {
 		return($bf->encrypt($contents));
         }       
 
-
-        /**
-         * @brief encryption of a file
-         * @param $filename
-         * @param $key the encryption key
-         *
-         * This function encrypts a file
-         */
+	/**
+	* @brief encryption of a file
+	* @param $filename
+	* @param $key the encryption key
+	*
+	* This function encrypts a file
+	*/
 	public static function encryptfile( $filename, $key) {
 		$handleread  = fopen($filename, "rb");
 		if($handleread<>FALSE) {
@@ -158,6 +157,30 @@ class OC_Crypt {
 		}
 		fclose($handleread);
 	}
+	
+	/**
+	 * encrypt data in 8192b sized blocks
+	 */
+	public static function blockEncrypt($data){
+		$result='';
+		while(strlen($data)){
+			$result=self::encrypt(substr($data,0,8192));
+			$data=substr($data,8192);
+		}
+		return $result;
+	}
+	
+	/**
+	 * decrypt data in 8192b sized blocks
+	 */
+	public static function blockDecrypt($data){
+		$result='';
+		while(strlen($data)){
+			$result=self::decrypt(substr($data,0,8192));
+			$data=substr($data,8192);
+		}
+		return $result;
+	}
 
 
 
diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index 1fb22bd1139..796fd95cb38 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -83,16 +83,16 @@ class OC_FileProxy{
 		return $proxies;
 	}
 
-	public static function runPreProxies($operation,$filepath,$filepath2=null){
+	public static function runPreProxies($operation,&$filepath,&$filepath2=null){
 		$proxies=self::getProxies($operation,false);
 		$operation='pre'.$operation;
 		foreach($proxies as $proxy){
-			if($filepath2){
-				if(!$proxy->$operation(&$filepath,&$filepath2)){
+			if(!is_null($filepath2)){
+				if($proxy->$operation($filepath,$filepath2)===false){
 					return false;
 				}
 			}else{
-				if(!$proxy->$operation(&$filepath)){
+				if($proxy->$operation($filepath)===false){
 					return false;
 				}
 			}
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index dcb516a3afb..ee4b267bcd4 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -74,7 +74,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function file_get_contents($path){
 		return file_get_contents($this->datadir.$path);
 	}
-	public function file_put_contents($path,$data){
+	public function file_put_contents($path,$data=null){
 		if($return=file_put_contents($this->datadir.$path,$data)){
 		}
 	}
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 91c6cd17720..a78f3f652ad 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -302,7 +302,7 @@ class OC_FilesystemView {
 				}
 			}
 			if($run){
-				if($extraParam){
+				if(!is_null($extraParam)){
 					$result=$storage->$operation($interalPath,$extraParam);
 				}else{
 					$result=$storage->$operation($interalPath);
-- 
GitLab


From 82394f9527817673f3ecbf7e5fd1d4857f0f3fe1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sat, 22 Oct 2011 14:10:51 +0200
Subject: [PATCH 103/248] add option to dissable fileproxies

---
 lib/fileproxy.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index 796fd95cb38..46fc2f49c50 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -39,6 +39,7 @@
 
 class OC_FileProxy{
 	private static $proxies=array();
+	public static $enabled=true;
 	
 	/**
 	 * check if this proxy implments a specific proxy operation
@@ -84,6 +85,9 @@ class OC_FileProxy{
 	}
 
 	public static function runPreProxies($operation,&$filepath,&$filepath2=null){
+		if(!self::$enabled){
+			return true;
+		}
 		$proxies=self::getProxies($operation,false);
 		$operation='pre'.$operation;
 		foreach($proxies as $proxy){
@@ -101,6 +105,9 @@ class OC_FileProxy{
 	}
 
 	public static function runPostProxies($operation,$path,$result){
+		if(!self::$enabled){
+			return $result;
+		}
 		$proxies=self::getProxies($operation,true);
 		$operation='post'.$operation;
 		foreach($proxies as $proxy){
-- 
GitLab


From e2b49541760dabbdfce11bcc8063d31139b6caa3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sat, 22 Oct 2011 14:11:15 +0200
Subject: [PATCH 104/248] simple file encryption wip

---
 apps/files_encryption/lib/cryptstream.php |  7 +++++--
 apps/files_encryption/lib/proxy.php       | 17 +++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index e4544313f63..7fbfeaa7a86 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -29,9 +29,12 @@ class OC_CryptStream{
 
 	public function stream_open($path, $mode, $options, &$opened_path){
 		$path=str_replace('crypt://','',$path);
-		$this->source=OC_FileSystem::fopen($path.'.enc',$mode);
+		OC_Log::write('files_encryption','open encrypted '.$path. ' in '.$mode,OC_Log::DEBUG);
+		OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
+		$this->source=OC_FileSystem::fopen($path,$mode);
+		OC_FileProxy::$enabled=true;
 		if(!is_resource($this->source)){
-			OC_Log::write('files_encryption','failed to open '.$path.'.enc',OC_Log::ERROR);
+			OC_Log::write('files_encryption','failed to open '.$path,OC_Log::ERROR);
 		}
 		return is_resource($this->source);
 	}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index f7a991a344b..053ac786c33 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -28,7 +28,6 @@
 class OC_FileProxy_Encryption extends OC_FileProxy{
 	public function preFile_put_contents($path,&$data){
 		if(substr($path,-4)=='.enc'){
-			OC_Log::write('files_encryption','file put contents',OC_Log::DEBUG);
 			if (is_resource($data)) {
 				$newData='';
 				while(!feof($data)){
@@ -44,27 +43,33 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	
 	public function postFile_get_contents($path,$data){
 		if(substr($path,-4)=='.enc'){
-			OC_Log::write('files_encryption','file get contents',OC_Log::DEBUG);
 			return OC_Crypt::blockDecrypt($data);
 		}
 	}
 	
 	public function postFopen($path,&$result){
 		if(substr($path,-4)=='.enc'){
-			OC_Log::write('files_encryption','fopen',OC_Log::DEBUG);
+			$meta=stream_get_meta_data($result);
 			fclose($result);
-			$result=fopen('crypt://'.substr($path,0,-4));//remove the .enc extention so we don't catch the fopen request made by cryptstream
+			OC_log::write('file_encryption','mode: '.$meta['mode']);
+			$result=fopen('crypt://'.$path,$meta['mode']);
 		}
 	}
 	
 	public function preReadFile($path){
 		if(substr($path,-4)=='.enc'){
-			OC_Log::write('files_encryption','readline',OC_Log::DEBUG);
-			$stream=fopen('crypt://'.substr($path,0,-4));
+			$stream=fopen('crypt://'.$path,'r');
 			while(!feof($stream)){
 				print(fread($stream,8192));
 			}
 			return false;//cancel the original request
 		}
 	}
+	
+	public function postGetMimeType($path,$result){
+		if(substr($path,-4)=='.enc'){
+			return 'text/plain';
+		}
+		return $result;
+	}
 }
-- 
GitLab


From e9af2185625f5012067cd5fe2ee04cee9828f11b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 5 Feb 2012 20:49:32 +0100
Subject: [PATCH 105/248] use streams instead of temporary files for
 cross-storage copy and rename

---
 lib/filesystemview.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index a78f3f652ad..27552d25f2b 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -179,9 +179,13 @@ class OC_FilesystemView {
 					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));
+				}else{
+					$source=$this->fopen($path1,'r');
+					$target=$this->fopen($path2,'w');
+					while (!feof($source)){
+						fwrite($target,fread($source,8192));
+					}
+					$storage1=$this->getStorage($path1);
 					$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));
@@ -207,9 +211,14 @@ class OC_FilesystemView {
 					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));
+				}else{
+					$source=$this->fopen($path1,'r');
+					$target=$this->fopen($path2,'w');
+					if($target and $source){
+						while (!feof($source)){
+							fwrite($target,fread($source,8192));
+						}
+					}
 				}
         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){
-- 
GitLab


From fd4b30ac6f81193cac1e558cc115802717aa88c1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 5 Feb 2012 20:50:35 +0100
Subject: [PATCH 106/248] no post hooks for fopen

---
 lib/filesystemview.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 27552d25f2b..a7003e84f19 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -317,9 +317,11 @@ class OC_FilesystemView {
 					$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));
+				if($operation!='fopen'){//no post hooks for fopen, the file stream is still open
+					foreach($hooks as $hook){
+						if($hook!='read'){
+							OC_Hook::emit( OC_Filesystem::CLASSNAME, 'post_'.$hook, array( OC_Filesystem::signal_param_path => $path));
+						}
 					}
 				}
 				return $result;
-- 
GitLab


From e53e7990c404e3ff2a1b7abad1e4c8ad4f89ee2a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 22 Nov 2011 01:48:08 +0100
Subject: [PATCH 107/248] improve get_temp_dir() implementation

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

diff --git a/lib/base.php b/lib/base.php
index 880645ff79d..5b6ed9bcb1f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -271,6 +271,8 @@ if(!function_exists('get_temp_dir')) {
 			unlink($temp);
 			return dirname($temp);
 		}
+		if( $temp=sys_get_temp_dir())    return $temp;
+		
 		return null;
 	}
 }
-- 
GitLab


From f1cbb9effc7e0672dd9dd6fa810aba36c5749898 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 24 Nov 2011 01:44:54 +0100
Subject: [PATCH 108/248] initial integration of encryption

---
 apps/files_encryption/appinfo/info.xml       | 11 +++
 {lib => apps/files_encryption/lib}/crypt.php | 89 +++++++++++--------
 apps/files_encryption/lib/cryptstream.php    | 49 +++++++++--
 apps/files_encryption/lib/proxy.php          | 91 ++++++++++++++++----
 lib/user.php                                 |  3 +-
 5 files changed, 178 insertions(+), 65 deletions(-)
 create mode 100644 apps/files_encryption/appinfo/info.xml
 rename {lib => apps/files_encryption/lib}/crypt.php (68%)

diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
new file mode 100644
index 00000000000..a8db06aa3db
--- /dev/null
+++ b/apps/files_encryption/appinfo/info.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<info>
+	<id>files_encryption</id>
+	<name>Encryption</name>
+	<description>Server side encryption of files</description>
+	<version>0.1</version>
+	<licence>AGPL</licence>
+	<author>Robin Appelman</author>
+	<require>3</require>
+	<default_enable/>
+</info>
diff --git a/lib/crypt.php b/apps/files_encryption/lib/crypt.php
similarity index 68%
rename from lib/crypt.php
rename to apps/files_encryption/lib/crypt.php
index 3e6fa05b85d..4e7739b1d06 100644
--- a/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -37,20 +37,42 @@ require_once('Crypt_Blowfish/Blowfish.php');
  * This class is for crypting and decrypting
  */
 class OC_Crypt {
+	static private $bf = null;
 
-        static $encription_extension='.encrypted';
+	public static function loginListener($params){
+		self::init($params['uid'],$params['password']);
+	}
 
 	public static function init($login,$password) {
-		$_SESSION['user_password'] = $password;  // save the password as passcode for the encryption
 		if(OC_User::isLoggedIn()){
-			// does key exist?
-			if(!file_exists(OC_Config::getValue( "datadirectory").'/'.$login.'/encryption.key')){
-				OC_Crypt::createkey($_SESSION['user_password']);
+			$view=new OC_FilesystemView('/'.$login);
+			if(!$view->file_exists('/encryption.key')){// does key exist?
+				OC_Crypt::createkey($password);
 			}
+			$key=$view->file_get_contents('/encryption.key');
+			$_SESSION['enckey']=OC_Crypt::decrypt($key, $password);
 		}
 	}
 
-
+	/**
+	 * get the blowfish encryption handeler for a key
+	 * @param string $key (optional)
+	 *
+	 * if the key is left out, the default handeler will be used
+	 */
+	public static function getBlowfish($key=''){
+		if($key){
+			return new Crypt_Blowfish($key);
+		}else{
+			if(!isset($_SESSION['enckey'])){
+				return false;
+			}
+			if(!self::$bf){
+				self::$bf=new Crypt_Blowfish($_SESSION['enckey']);
+			}
+			return self::$bf;
+		}
+	}
 
 	public static function createkey($passcode) {
 		if(OC_User::isLoggedIn()){
@@ -61,57 +83,58 @@ class OC_Crypt {
 			$enckey=OC_Crypt::encrypt($key,$passcode);
 
 			// Write the file
-		        $username=OC_USER::getUser();
-			@file_put_contents(OC_Config::getValue( "datadirectory").'/'.$username.'/encryption.key', $enckey );
+			$username=OC_USER::getUser();
+			OC_FileProxy::$enabled=false;
+			$view=new OC_FilesystemView('/'.$username);
+			$view->file_put_contents('/encryption.key',$enckey);
+			OC_FileProxy::$enabled=true;
 		}
 	}
 
-	public static function changekeypasscode( $newpasscode) {
+	public static function changekeypasscode($oldPassword, $newPassword) {
 		if(OC_User::isLoggedIn()){
-		        $username=OC_USER::getUser();
+			$username=OC_USER::getUser();
+			$view=new OC_FilesystemView('/'.$username);
 
 			// read old key
-			$key=file_get_contents(OC_Config::getValue( "datadirectory").'/'.$username.'/encryption.key');
+			$key=$view->file_get_contents('/encryption.key');
 
 			// decrypt key with old passcode
-			$key=OC_Crypt::decrypt($key, $_SESSION['user_password']);
+			$key=OC_Crypt::decrypt($key, $oldPassword);
 
 			// encrypt again with new passcode
-			$key=OC_Crypt::encrypt($key,$newpassword);
+			$key=OC_Crypt::encrypt($key, $newPassword);
 
 			// store the new key
-			file_put_contents(OC_Config::getValue( "datadirectory").'/'.$username.'/encryption.key', $key );
-
-			 $_SESSION['user_password']=$newpasscode;
+			$view->file_put_contents('/encryption.key', $key );
 		}
 	}
 
 	/**
 	 * @brief encrypts an content
 	 * @param $content the cleartext message you want to encrypt
-	 * @param $key the encryption key
+	 * @param $key the encryption key (optional)
 	 * @returns encrypted content
 	 *
 	 * This function encrypts an content
 	 */
-	public static function encrypt( $content, $key) {
-		$bf = new Crypt_Blowfish($key);
+	public static function encrypt( $content, $key='') {
+		$bf = self::getBlowfish($key);
 		return($bf->encrypt($content));
 	}
 
-
-        /**
-         * @brief decryption of an content
-         * @param $content the cleartext message you want to decrypt
-         * @param $key the encryption key
-         * @returns cleartext content
-         *
-         * This function decrypts an content
-         */
-        public static function decrypt( $content, $key) {
-		$bf = new Crypt_Blowfish($key);
+	/**
+	* @brief decryption of an content
+	* @param $content the cleartext message you want to decrypt
+	* @param $key the encryption key (optional)
+	* @returns cleartext content
+	*
+	* This function decrypts an content
+	*/
+	public static function decrypt( $content, $key='') {
+		$bf = self::getBlowfish($key);
 		return($bf->encrypt($contents));
-        }       
+	}
 
 	/**
 	* @brief encryption of a file
@@ -181,8 +204,4 @@ class OC_Crypt {
 		}
 		return $result;
 	}
-
-
-
-
 }
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 7fbfeaa7a86..00dda7352b3 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -22,19 +22,35 @@
 
 /**
  * transparently encrypted filestream
+ *
+ * you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path,'stream'=>$stream)
+ *   and then fopen('crypt://streams/foo');
  */
 
 class OC_CryptStream{
+	public static $sourceStreams=array();
 	private $source;
+	private $path;
+	private $readBuffer;//for streams that dont support seeking
+	private $meta=array();//header/meta for source stream
 
 	public function stream_open($path, $mode, $options, &$opened_path){
 		$path=str_replace('crypt://','',$path);
-		OC_Log::write('files_encryption','open encrypted '.$path. ' in '.$mode,OC_Log::DEBUG);
-		OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
-		$this->source=OC_FileSystem::fopen($path,$mode);
-		OC_FileProxy::$enabled=true;
-		if(!is_resource($this->source)){
-			OC_Log::write('files_encryption','failed to open '.$path,OC_Log::ERROR);
+		if(dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])){
+			$this->source=self::$sourceStreams[basename($path)]['stream'];
+			$this->path=self::$sourceStreams[basename($path)]['path'];
+		}else{
+			$this->path=$path;
+			OC_Log::write('files_encryption','open encrypted '.$path. ' in '.$mode,OC_Log::DEBUG);
+			OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
+			$this->source=OC_FileSystem::fopen($path,$mode);
+			OC_FileProxy::$enabled=true;
+			if(!is_resource($this->source)){
+				OC_Log::write('files_encryption','failed to open '.$path,OC_Log::ERROR);
+			}
+		}
+		if(is_resource($this->source)){
+			$this->meta=stream_get_meta_data($this->source);
 		}
 		return is_resource($this->source);
 	}
@@ -51,14 +67,26 @@ class OC_CryptStream{
 		$pos=0;
 		$currentPos=ftell($this->source);
 		$offset=$currentPos%8192;
-		fseek($this->source,-$offset,SEEK_CUR);
 		$result='';
+		if($offset>0){
+			if($this->meta['seekable']){
+				fseek($this->source,-$offset,SEEK_CUR);//if seeking isnt supported the internal read buffer will be used
+			}else{
+				$pos=strlen($this->readBuffer);
+				$result=$this->readBuffer;
+			}
+		}
 		while($count>$pos){
 			$data=fread($this->source,8192);
 			$pos+=8192;
-			$result.=OC_Crypt::decrypt($data);
+			if(strlen($data)){
+				$result.=OC_Crypt::decrypt($data);
+			}
 		}
-		return substr($result,$offset,$count);
+		if(!$this->meta['seekable']){
+			$this->readBuffer=substr($result,$count);
+		}
+		return substr($result,0,$count);
 	}
 	
 	public function stream_write($data){
@@ -119,6 +147,9 @@ class OC_CryptStream{
 	}
 
 	public function stream_close(){
+		if(OC_FileCache::inCache($this->path)){
+			OC_FileCache::put($this->path,array('encrypted'=>true));
+		}
 		return fclose($this->source);
 	}
 }
\ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 053ac786c33..173aea785ec 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -26,38 +26,98 @@
  */
 
 class OC_FileProxy_Encryption extends OC_FileProxy{
+	private static $blackList=null; //mimetypes blacklisted from encryption
+	private static $metaData=array(); //metadata cache
+	
+	/**
+	 * check if a file should be encrypted during write
+	 * @param string $path
+	 * @return bool
+	 */
+	private static function shouldEncrypt($path){
+		if(is_null(self::$blackList)){
+			self::$blackList=explode(',',OC_Appconfig::getValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
+		}
+		if(isset(self::$metaData[$path])){
+			$metadata=self::$metaData[$path];
+		}else{
+			$metadata=OC_FileCache::get($path);
+			self::$metaData[$path]=$metadata;
+		}
+		if($metadata['encrypted']){
+			return true;
+		}
+		$extention=substr($path,strrpos($path,'.')+1);
+		if(array_search($extention,self::$blackList)===false){
+			return true;
+		}
+	}
+
+	/**
+	 * check if a file is encrypted
+	 * @param string $path
+	 * @return bool
+	 */
+	private static function isEncrypted($path){
+		if(isset(self::$metaData[$path])){
+			$metadata=self::$metaData[$path];
+		}else{
+			$metadata=OC_FileCache::get($path);
+			self::$metaData[$path]=$metadata;
+		}
+		return (bool)$metadata['encrypted'];
+	}
+	
 	public function preFile_put_contents($path,&$data){
-		if(substr($path,-4)=='.enc'){
+		if(self::shouldEncrypt($path)){
+			$exists=OC_Filesystem::file_exists($path);
+			$target=fopen('crypt://'.$path,'w');
 			if (is_resource($data)) {
-				$newData='';
 				while(!feof($data)){
-					$block=fread($data,8192);
-					$newData.=OC_Crypt::encrypt($block);
+					fwrite($target,fread($data,8192));
 				}
-				$data=$newData;
 			}else{
-				$data=OC_Crypt::blockEncrypt($data);
+				fwrite($target,$data);
 			}
+			//fake the normal hooks
+			OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path));
+			OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path));
+			return false;
 		}
 	}
 	
 	public function postFile_get_contents($path,$data){
-		if(substr($path,-4)=='.enc'){
-			return OC_Crypt::blockDecrypt($data);
+		if(self::isEncrypted($path)){
+			$data=OC_Crypt::blockDecrypt($data);
 		}
+		return $data;
 	}
 	
 	public function postFopen($path,&$result){
-		if(substr($path,-4)=='.enc'){
-			$meta=stream_get_meta_data($result);
+		if(!$result){
+			return $result;
+		}
+		$meta=stream_get_meta_data($result);
+		if(self::isEncrypted($path)){
 			fclose($result);
-			OC_log::write('file_encryption','mode: '.$meta['mode']);
+			$result=fopen('crypt://'.$path,$meta['mode']);
+		}elseif(self::shouldEncrypt($path) and $meta['mode']!='r'){
+			if(OC_Filesystem::file_exists($path)){
+				//first encrypt the target file so we don't end up with a half encrypted file
+				OC_Log::write('files_encryption','Decrypting '.$path.' before writing',OC_Log::DEBUG);
+				if($result){
+					fclose($result);
+				}
+				$tmpFile=OC_Filesystem::toTmpFile($path);
+				OC_Filesystem::fromTmpFile($tmpFile,$path);
+			}
 			$result=fopen('crypt://'.$path,$meta['mode']);
 		}
+		return $result;
 	}
 	
 	public function preReadFile($path){
-		if(substr($path,-4)=='.enc'){
+		if(self::isEncrypted($path)){
 			$stream=fopen('crypt://'.$path,'r');
 			while(!feof($stream)){
 				print(fread($stream,8192));
@@ -65,11 +125,4 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 			return false;//cancel the original request
 		}
 	}
-	
-	public function postGetMimeType($path,$result){
-		if(substr($path,-4)=='.enc'){
-			return 'text/plain';
-		}
-		return $result;
-	}
 }
diff --git a/lib/user.php b/lib/user.php
index 34f44f572e0..aa828de52f5 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -195,8 +195,8 @@ class OC_User {
 		if( $run ){
 			$uid=self::checkPassword( $uid, $password );
 			if($uid){
-				OC_Crypt::init($uid,$password);
 				return self::setUserId($uid);
+				OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid, 'password'=>$password ));
 			}
 		}
 		return false;
@@ -209,7 +209,6 @@ class OC_User {
 	 */
 	public static function setUserId($uid) {
 		$_SESSION['user_id'] = $uid;
-		OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid ));
 		return true;
 	}
 
-- 
GitLab


From 501678f981cf8e320d11cf1a780aefeae1537050 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 5 Feb 2012 21:45:41 +0100
Subject: [PATCH 109/248] always mount the root filesystem, sometimes we need
 the filesystem when not logged in

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

diff --git a/lib/util.php b/lib/util.php
index 1b1e29b6749..3329789de92 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -35,9 +35,9 @@ class OC_Util {
 			$user = OC_User::getUser();
 		}
 
+		//first set up the local "root" storage
+		OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT),'/');
 		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('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT),'/');
 
 			OC::$CONFIG_DATADIRECTORY = $CONFIG_DATADIRECTORY_ROOT."/$user/$root";
 			if( !is_dir( OC::$CONFIG_DATADIRECTORY )){
-- 
GitLab


From b3a974d8bbcd88602a54cf32cd472802583ab4aa Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 5 Feb 2012 21:49:22 +0100
Subject: [PATCH 110/248] only trigger hooks for the default filesystem view

---
 apps/files_encryption/lib/crypt.php | 41 ++++++++++++++---------------
 lib/filesystemview.php              | 22 +++++++++-------
 lib/user.php                        |  3 ++-
 3 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 4e7739b1d06..0a593b98c4b 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -44,19 +44,20 @@ class OC_Crypt {
 	}
 
 	public static function init($login,$password) {
-		if(OC_User::isLoggedIn()){
-			$view=new OC_FilesystemView('/'.$login);
-			if(!$view->file_exists('/encryption.key')){// does key exist?
-				OC_Crypt::createkey($password);
-			}
-			$key=$view->file_get_contents('/encryption.key');
-			$_SESSION['enckey']=OC_Crypt::decrypt($key, $password);
+		$view=new OC_FilesystemView('/'.$login);
+		OC_FileProxy::$enabled=false;
+		if(!$view->file_exists('/encryption.key')){// does key exist?
+			OC_Crypt::createkey($login,$password);
 		}
+		$key=$view->file_get_contents('/encryption.key');
+		OC_FileProxy::$enabled=true;
+		$_SESSION['enckey']=OC_Crypt::decrypt($key, $password);
 	}
 
 	/**
 	 * get the blowfish encryption handeler for a key
 	 * @param string $key (optional)
+	 * @return Crypt_Blowfish
 	 *
 	 * if the key is left out, the default handeler will be used
 	 */
@@ -74,21 +75,19 @@ class OC_Crypt {
 		}
 	}
 
-	public static function createkey($passcode) {
-		if(OC_User::isLoggedIn()){
-			// generate a random key
-			$key=mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999);
+	public static function createkey($username,$passcode) {
+		// generate a random key
+		$key=mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999);
 
-			// encrypt the key with the passcode of the user
-			$enckey=OC_Crypt::encrypt($key,$passcode);
+		// encrypt the key with the passcode of the user
+		$enckey=OC_Crypt::encrypt($key,$passcode);
 
-			// Write the file
-			$username=OC_USER::getUser();
-			OC_FileProxy::$enabled=false;
-			$view=new OC_FilesystemView('/'.$username);
-			$view->file_put_contents('/encryption.key',$enckey);
-			OC_FileProxy::$enabled=true;
-		}
+		// Write the file
+		$proxyEnabled=OC_FileProxy::$enabled;
+		OC_FileProxy::$enabled=false;
+		$view=new OC_FilesystemView('/'.$username);
+		$view->file_put_contents('/encryption.key',$enckey);
+		OC_FileProxy::$enabled=$proxyEnabled;
 	}
 
 	public static function changekeypasscode($oldPassword, $newPassword) {
@@ -133,7 +132,7 @@ class OC_Crypt {
 	*/
 	public static function decrypt( $content, $key='') {
 		$bf = self::getBlowfish($key);
-		return($bf->encrypt($contents));
+		return($bf->decrypt($content));
 	}
 
 	/**
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index a7003e84f19..0ce803be2b1 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -303,11 +303,13 @@ class OC_FilesystemView {
 		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(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()){
+				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){
@@ -317,10 +319,12 @@ class OC_FilesystemView {
 					$result=$storage->$operation($interalPath);
 				}
 				$result=OC_FileProxy::runPostProxies($operation,$path,$result);
-				if($operation!='fopen'){//no post hooks for fopen, the file stream is still open
-					foreach($hooks as $hook){
-						if($hook!='read'){
-							OC_Hook::emit( OC_Filesystem::CLASSNAME, 'post_'.$hook, array( OC_Filesystem::signal_param_path => $path));
+				if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()){
+					if($operation!='fopen'){//no post hooks for fopen, the file stream is still open
+						foreach($hooks as $hook){
+							if($hook!='read'){
+								OC_Hook::emit( OC_Filesystem::CLASSNAME, 'post_'.$hook, array( OC_Filesystem::signal_param_path => $path));
+							}
 						}
 					}
 				}
diff --git a/lib/user.php b/lib/user.php
index aa828de52f5..826215b2289 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -195,8 +195,9 @@ class OC_User {
 		if( $run ){
 			$uid=self::checkPassword( $uid, $password );
 			if($uid){
-				return self::setUserId($uid);
+				self::setUserId($uid);
 				OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid, 'password'=>$password ));
+				return true;
 			}
 		}
 		return false;
-- 
GitLab


From 6658f510986aff0e41fee37319a1b0eefa98a4d0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 5 Feb 2012 23:49:22 +0100
Subject: [PATCH 111/248] provide early file system when using webdav

---
 lib/connector/sabre/auth.php | 1 +
 lib/util.php                 | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index 1e87c7cee08..8964ef7d0de 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -23,6 +23,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	 * @return bool
 	 */
 	protected function validateUserPass($username, $password){
+		OC_Util::setUpFS();//login hooks may need early access to the filesystem
 		if(OC_User::login($username,$password)){
 			OC_Util::setUpFS();
 			return true;
diff --git a/lib/util.php b/lib/util.php
index 3329789de92..18a5db3e4ee 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -8,6 +8,7 @@ class OC_Util {
 	public static $scripts=array();
 	public static $styles=array();
 	public static $headers=array();
+	private static $rootMounted=false;
 	private static $fsSetup=false;
 
 	// Can be set up
@@ -36,7 +37,10 @@ class OC_Util {
 		}
 
 		//first set up the local "root" storage
-		OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT),'/');
+		if(!self::$rootMounted){
+			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT),'/');
+			self::$rootMounted=true;
+		}
 		if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
 
 			OC::$CONFIG_DATADIRECTORY = $CONFIG_DATADIRECTORY_ROOT."/$user/$root";
-- 
GitLab


From 1cffeefa069075054f9c2f676b84ddc02b56232c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 11 Feb 2012 15:48:31 +0100
Subject: [PATCH 112/248] move implementation of from/toTmpFile from the file
 storage to the filesystem

---
 lib/filestorage.php       |  2 --
 lib/filestorage/local.php | 22 ----------------------
 lib/filesystemview.php    | 34 +++++++++++++++-------------------
 3 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/lib/filestorage.php b/lib/filestorage.php
index 4523144f6f4..d420427225b 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -45,8 +45,6 @@ class OC_Filestorage{
 	public function rename($path1,$path2){}
 	public function copy($path1,$path2){}
 	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 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 ee4b267bcd4..de1f83e3e14 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -171,28 +171,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 	}
 
-	public function toTmpFile($path){
-		$tmpFolder=get_temp_dir();
-		$filename=tempnam($tmpFolder,'OC_TEMP_FILE_'.substr($path,strrpos($path,'.')));
-		$fileStats = stat($this->datadir.$path);
-		if(copy($this->datadir.$path,$filename)){
-			touch($filename, $fileStats['mtime'], $fileStats['atime']);
-			return $filename;
-		}else{
-			return false;
-		}
-	}
-
-	public function fromTmpFile($tmpFile,$path){
-		$fileStats = stat($tmpFile);
-		if(rename($tmpFile,$this->datadir.$path)){
-			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
-			return true;
-		}else{
-			return false;
-		}
-	}
-
 	private function delTree($dir) {
 		$dirRelative=$dir;
 		$dir=$this->datadir.$dir;
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 0ce803be2b1..592fd972a78 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -254,29 +254,25 @@ class OC_FilesystemView {
 		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));
+		if(OC_Filesystem::isValidPath($path)){
+			$source=$this->fopen($path,'r');
+			$tmpFile=tempnam(get_temp_dir(),'OC_TMP_').substr($path,strrpos($path,'.'));
+			if($source){
+				return file_put_contents($tmpFile,$source);
+			}
 		}
 	}
 	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;
+		if(OC_Filesystem::isValidPath($path)){
+			$source=fopen($tmpFile,'r');
+			if($source){
+				$this->file_put_contents($path,$source);
+				unlink($tmpFile);
+				return true;
+			}else{
 			}
+		}else{
+			error_log('invalid path');
 		}
 	}
 
-- 
GitLab


From 95459d068e47b83ed13348da3e1d03d062209e41 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 11 Feb 2012 16:06:34 +0100
Subject: [PATCH 113/248] non existing files can never be updated

---
 lib/filecache.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/filecache.php b/lib/filecache.php
index 6ae2f8253db..5d299ff24ee 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -515,6 +515,9 @@ class OC_FileCache{
 			}
 			$view=new OC_FilesystemView($root);
 		}
+		if(!$view->file_exists($path)){
+			return false;
+		}
 		$mtime=$view->filemtime($path);
 		$isDir=$view->is_dir($path);
 		$path=$root.$path;
-- 
GitLab


From 6a8364c3ffeb9d6227f141ae77ba317a1afbfdf6 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 12 Feb 2012 15:56:32 +0100
Subject: [PATCH 114/248] rework the way file_put_contents is handeled

---
 apps/files_encryption/lib/cryptstream.php |  1 +
 apps/files_encryption/lib/proxy.php       | 14 ++++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 00dda7352b3..97e0846187d 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -90,6 +90,7 @@ class OC_CryptStream{
 	}
 	
 	public function stream_write($data){
+		error_log('write to '. $this->path);
 		$length=strlen($data);
 		$written=0;
 		$currentPos=ftell($this->source);
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 173aea785ec..be6ffa4f44d 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -70,19 +70,13 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	
 	public function preFile_put_contents($path,&$data){
 		if(self::shouldEncrypt($path)){
-			$exists=OC_Filesystem::file_exists($path);
-			$target=fopen('crypt://'.$path,'w');
 			if (is_resource($data)) {
-				while(!feof($data)){
-					fwrite($target,fread($data,8192));
-				}
+				$id=md5($path);
+				OC_CryptStream::$sourceStreams[$id]=array('path'=>$path,'stream'=>$data);
+				$data=fopen('crypt://streams/'.$id,'r');
 			}else{
-				fwrite($target,$data);
+				$data=OC_Crypt::blockEncrypt($data);
 			}
-			//fake the normal hooks
-			OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path));
-			OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path));
-			return false;
 		}
 	}
 	
-- 
GitLab


From c121a1a1e7d9ae554005b8438d8ad999cdacc601 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 15 Feb 2012 16:23:00 +0100
Subject: [PATCH 115/248] implement file_put_contents with stream data using
 fopen

---
 apps/files_encryption/lib/proxy.php |  6 +-----
 lib/filesystemview.php              | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index be6ffa4f44d..7974d68d487 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -70,11 +70,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	
 	public function preFile_put_contents($path,&$data){
 		if(self::shouldEncrypt($path)){
-			if (is_resource($data)) {
-				$id=md5($path);
-				OC_CryptStream::$sourceStreams[$id]=array('path'=>$path,'stream'=>$data);
-				$data=fopen('crypt://streams/'.$id,'r');
-			}else{
+			if (!is_resource($data)) {//stream put contents should have been converter to fopen
 				$data=OC_Crypt::blockEncrypt($data);
 			}
 		}
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 592fd972a78..58d5b3af715 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -163,7 +163,21 @@ class OC_FilesystemView {
 		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);
+		if(is_resource($data)){//not having to deal with streams in file_put_contents makes life easier
+			$target=$this->fopen($path,'w');
+			if($target){
+				while(!feof($data)){
+					fwrite($target,fread($data,8192));
+				}
+				fclose($target);
+				fclose($data);
+				return true;
+			}else{
+				return false;
+			}
+		}else{
+			return $this->basicOperation('file_put_contents',$path,array('create','write'),$data);
+		}
 	}
 	public function unlink($path){
 		return $this->basicOperation('unlink',$path,array('delete'));
-- 
GitLab


From 325858e9e239b726a207ac150404863df509935c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 15 Feb 2012 20:19:48 +0100
Subject: [PATCH 116/248] add stream wrapper for in-memory files and dont use
 global variables for the fakedir stream wrapper

---
 apps/files_sharing/sharedstorage.php |   3 +-
 lib/base.php                         |   2 +-
 lib/fakedirstream.php                |  45 ------
 lib/streamwrappers.php               | 223 +++++++++++++++++++++++++++
 4 files changed, 225 insertions(+), 48 deletions(-)
 delete mode 100644 lib/fakedirstream.php
 create mode 100644 lib/streamwrappers.php

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index cb641e68a84..07653fc11b5 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -79,7 +79,6 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		if ($path == "" || $path == "/") {
 			$path = $this->datadir.$path;
 			$sharedItems = OC_Share::getItemsInFolder($path);
-			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
@@ -87,7 +86,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 					$files[] = basename($item['target']);
 				}
 			}
-			$FAKEDIRS['shared'] = $files;
+			OC_FakeDirStream::$dirs['shared']=$files;
 			return opendir('fakedir://shared');
 		} else {
 			$source = $this->getSource($path);
diff --git a/lib/base.php b/lib/base.php
index 5b6ed9bcb1f..94e4907fed2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -279,7 +279,7 @@ if(!function_exists('get_temp_dir')) {
 
 OC::init();
 
-require_once('fakedirstream.php');
+require_once('streamwrappers.php');
 
 
 
diff --git a/lib/fakedirstream.php b/lib/fakedirstream.php
deleted file mode 100644
index fa3e64da62c..00000000000
--- a/lib/fakedirstream.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-global $FAKEDIRS;
-$FAKEDIRS=array();
-
-class fakeDirStream{
-	private $name;
-	private $data;
-	private $index;
-
-	public function dir_opendir($path,$options){
-		global $FAKEDIRS;
-		$url=parse_url($path);
-		$this->name=substr($path,strlen('fakedir://'));
-		$this->index=0;
-		if(isset($FAKEDIRS[$this->name])){
-			$this->data=$FAKEDIRS[$this->name];
-		}else{
-			$this->data=array();
-		}
-		return true;
-	}
-
-	public function dir_readdir(){
-		if($this->index>=count($this->data)){
-			return false;
-		}
-		$filename=$this->data[$this->index];
-		$this->index++;
-		return $filename;
-	}
-
-	public function dir_closedir() {
-		$this->data=false;
-		$this->name='';
-		return true;
-	}
-
-	public function dir_rewinddir() {
-		$this->index=0;
-		return true;
-	}
-}
- 
-stream_wrapper_register("fakedir", "fakeDirStream");
-
diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php
new file mode 100644
index 00000000000..1454a99e8d5
--- /dev/null
+++ b/lib/streamwrappers.php
@@ -0,0 +1,223 @@
+<?php
+global $FAKEDIRS;
+$FAKEDIRS=array();
+
+class OC_FakeDirStream{
+	public static $dirs=array();
+	private $name;
+	private $index;
+
+	public function dir_opendir($path,$options){
+		global $FAKEDIRS;
+		$url=parse_url($path);
+		$this->name=substr($path,strlen('fakedir://'));
+		$this->index=0;
+		if(!isset(self::$dirs[$this->name])){
+			self::$dirs[$this->name]=array();
+		}
+		return true;
+	}
+
+	public function dir_readdir(){
+		if($this->index>=count(self::$dirs[$this->name])){
+			return false;
+		}
+		$filename=self::$dirs[$this->name][$this->index];
+		$this->index++;
+		return $filename;
+	}
+
+	public function dir_closedir() {
+		$this->name='';
+		return true;
+	}
+
+	public function dir_rewinddir() {
+		$this->index=0;
+		return true;
+	}
+}
+
+class OC_StaticStreamWrapper {
+	public $context;
+	protected static $data = array();
+
+	protected $path    = '';
+	protected $pointer = 0;
+	protected $writable = false;
+
+	public function stream_close() {}
+
+	public function stream_eof() {
+		return $this->pointer >= strlen(self::$data[$this->path]);
+	}
+
+	public function stream_flush() {}
+
+	public function stream_open($path, $mode, $options, &$opened_path) {
+		switch ($mode[0]) {
+			case 'r':
+				if (!isset(self::$data[$path])) return false;
+				$this->path = $path;
+				$this->writable = isset($mode[1]) && $mode[1] == '+';
+				break;
+			case 'w':
+				self::$data[$path] = '';
+				$this->path = $path;
+				$this->writable = true;
+				break;
+			case 'a':
+				if (!isset(self::$data[$path])) self::$data[$path] = '';
+				$this->path = $path;
+				$this->writable = true;
+				$this->pointer = strlen(self::$data[$path]);
+				break;
+			case 'x':
+				if (isset(self::$data[$path])) return false;
+				$this->path = $path;
+				$this->writable = true;
+				break;
+			case 'c':
+				if (!isset(self::$data[$path])) self::$data[$path] = '';
+				$this->path = $path;
+				$this->writable = true;
+				break;
+			default:
+				return false;
+		}
+		$opened_path = $this->path;
+		return true;
+	}
+
+	public function stream_read($count) {
+		$bytes = min(strlen(self::$data[$this->path]) - $this->pointer, $count);
+		$data = substr(self::$data[$this->path], $this->pointer, $bytes);
+		$this->pointer += $bytes;
+		return $data;
+	}
+
+	public function stream_seek($offset, $whence = SEEK_SET) {
+		$len = strlen(self::$data[$this->path]);
+		switch ($whence) {
+			case SEEK_SET:
+				if ($offset <= $len) {
+					$this->pointer = $offset;
+					return true;
+				}
+				break;
+			case SEEK_CUR:
+				if ($this->pointer + $offset <= $len) {
+					$this->pointer += $offset;
+					return true;
+				}
+				break;
+			case SEEK_END:
+				if ($len + $offset <= $len) {
+					$this->pointer = $len + $offset;
+					return true;
+				}
+				break;
+		}
+		return false;
+	}
+
+	public function stream_stat() {
+		$size = strlen(self::$data[$this->path]);
+		$time = time();
+		return array(
+			0 => 0,
+			'dev' => 0,
+			1 => 0,
+			'ino' => 0,
+			2 => 0777,
+			'mode' => 0777,
+			3 => 1,
+			'nlink' => 1,
+			4 => 0,
+			'uid' => 0,
+			5 => 0,
+			'gid' => 0,
+			6 => '',
+			'rdev' => '',
+			7 => $size,
+			'size' => $size,
+			8 => $time,
+			'atime' => $time,
+			9 => $time,
+			'mtime' => $time,
+			10 => $time,
+			'ctime' => $time,
+			11 => -1,
+			'blksize' => -1,
+			12 => -1,
+			'blocks' => -1,
+		);
+	}
+
+	public function stream_tell() {
+		return $this->pointer;
+	}
+
+	public function stream_write($data) {
+		if (!$this->writable) return 0;
+		$size = strlen($data);
+		$len = strlen(self::$data[$this->path]);
+		if ($this->stream_eof()) {
+			self::$data[$this->path] .= $data;
+		} else {
+			self::$data[$this->path] = substr_replace(
+				self::$data[$this->path],
+				$data,
+				$this->pointer
+			);
+		}
+		$this->pointer += $size;
+		return $size;
+	}
+
+	public function unlink($path) {
+		if (isset(self::$data[$path])) {
+			unset(self::$data[$path]);
+		}
+		return true;
+	}
+
+	public function url_stat($path) {
+		if (isset(self::$data[$path])) {
+			$size = strlen(self::$data[$path]);
+			$time = time();
+			return array(
+				0 => 0,
+				'dev' => 0,
+				1 => 0,
+				'ino' => 0,
+				2 => 0777,
+				'mode' => 0777,
+				3 => 1,
+				'nlink' => 1,
+				4 => 0,
+				'uid' => 0,
+				5 => 0,
+				'gid' => 0,
+				6 => '',
+				'rdev' => '',
+				7 => $size,
+				'size' => $size,
+				8 => $time,
+				'atime' => $time,
+				9 => $time,
+				'mtime' => $time,
+				10 => $time,
+				'ctime' => $time,
+				11 => -1,
+				'blksize' => -1,
+				12 => -1,
+				'blocks' => -1,
+			);
+		}
+		return false;
+	}
+}
+
+stream_wrapper_register("fakedir", "OC_FakeDirStream");
+stream_wrapper_register('static', 'OC_StaticStreamWrapper');
-- 
GitLab


From d9c7e4c333f858efaaee35d26ea12733d29bd694 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 15 Feb 2012 21:44:58 +0100
Subject: [PATCH 117/248] proper mimetypes for encrypted files

---
 apps/files_encryption/lib/proxy.php |  4 ++
 lib/filestorage/local.php           | 47 ++---------------------
 lib/helper.php                      | 58 +++++++++++++++++++++++++++++
 tests/lib/streamwrappers.php        | 47 +++++++++++++++++++++++
 4 files changed, 112 insertions(+), 44 deletions(-)
 create mode 100644 tests/lib/streamwrappers.php

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 7974d68d487..c53d567ad10 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -115,4 +115,8 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 			return false;//cancel the original request
 		}
 	}
+
+	public function postGetMimeType($path,$mime){
+		return OC_Helper::getMimeType('crypt://'.$path,'w');
+	}
 }
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index de1f83e3e14..6f4f68c503d 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -122,50 +122,9 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		return $return;
 	}
 
-	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";
-			}
-			if($mimeType=='application/octet-stream' and function_exists('finfo_open') and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)){
-				$mimeType =strtolower(finfo_file($finfo,$this->datadir.$fspath));
-				$mimeType=substr($mimeType,0,strpos($mimeType,';'));
-				finfo_close($finfo);
-			}
-			if ($mimeType=='application/octet-stream' && function_exists("mime_content_type")) {
-				// use mime magic extension if available
-				$mimeType = mime_content_type($this->datadir.$fspath);
-			}
-			if ($mimeType=='application/octet-stream' && OC_Helper::canExecute("file")) {
-				// it looks like we have a 'file' command,
-				// lets see it it does have mime support
-				$fspath=str_replace("'","\'",$fspath);
-				$fp = popen("file -i -b '{$this->datadir}$fspath' 2>/dev/null", "r");
-				$reply = fgets($fp);
-				pclose($fp);
-
-				//trim the character set from the end of the response
-				$mimeType=substr($reply,0,strrpos($reply,' '));
-			}
-			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')){
-					self::$mimetypes=include('mimetypes.list.php');
-				}
-				$extention=strtolower(strrchr(basename($fspath), "."));
-				$extention=substr($extention,1);//remove leading .
-				$mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
-			}
-			return $mimeType;
+	public function getMimeType($path){
+		if($this->is_readable($path)){
+			return OC_Helper::getMimeType($this->datadir.$path);
 		}else{
 			return false;
 		}
diff --git a/lib/helper.php b/lib/helper.php
index 2f71bdad2dc..6dea4a6a8cd 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -25,6 +25,8 @@
  * Collection of useful functions
  */
 class OC_Helper {
+	private static $mimetypes=array();
+	
 	/**
 	 * @brief Creates an url
 	 * @param $app app
@@ -267,6 +269,62 @@ class OC_Helper {
 			unlink($dir);
 		}
 	}
+
+	/**
+	 * get the mimetype form a local file
+	 * @param string path
+	 * @return string
+	 * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
+	 */
+	static function getMimeType($path){
+		$isWrapped=(strpos($path,'://')!==false) and (substr($path,0,7)=='file://');
+		$mimeType='application/octet-stream';
+		if ($mimeType=='application/octet-stream') {
+			if(count(self::$mimetypes)>0){
+				self::$mimetypes = include('mimetypes.fixlist.php');
+			}
+			$extention=strtolower(strrchr(basename($path), "."));
+			$extention=substr($extention,1);//remove leading .
+			$mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
+
+		}
+		if (@is_dir($path)) {
+			// directories are easy
+			return "httpd/unix-directory";
+		}
+		if($mimeType=='application/octet-stream' and function_exists('finfo_open') and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)){
+			$info = @strtolower(finfo_file($finfo,$path));
+			if($info){
+				$mimeType=substr($info,0,strpos($info,';'));
+			}
+			finfo_close($finfo);
+		}
+		if (!$isWrapped and $mimeType=='application/octet-stream' && function_exists("mime_content_type")) {
+			// use mime magic extension if available
+			$mimeType = mime_content_type($path);
+		}
+		if (!$isWrapped and $mimeType=='application/octet-stream' && OC_Helper::canExecute("file")) {
+			// it looks like we have a 'file' command,
+			// lets see it it does have mime support
+			$path=str_replace("'","\'",$path);
+			$fp = popen("file -i -b '$path' 2>/dev/null", "r");
+			$reply = fgets($fp);
+			pclose($fp);
+
+			//trim the character set from the end of the response
+			$mimeType=substr($reply,0,strrpos($reply,' '));
+		}
+		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')){
+				self::$mimetypes=include('mimetypes.list.php');
+			}
+			$extention=strtolower(strrchr(basename($path), "."));
+			$extention=substr($extention,1);//remove leading .
+			$mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
+		}
+		return $mimeType;
+	}
 	
 	/**
 	 * @brief Checks $_REQUEST contains a var for the $s key. If so, returns the html-escaped value of this var; otherwise returns the default value provided by $d.
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
new file mode 100644
index 00000000000..c4784a62976
--- /dev/null
+++ b/tests/lib/streamwrappers.php
@@ -0,0 +1,47 @@
+<?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_StreamWrappers extends UnitTestCase {
+	public function testFakeDir(){
+		$items=array('foo','bar');
+		OC_FakeDirStream::$dirs['test']=$items;
+		$dh=opendir('fakedir://test');
+		$result=array();
+		while($file=readdir($dh)){
+			$result[]=$file;
+			$this->assertNotIdentical(false,array_search($file,$items));
+		}
+		$this->assertEqual(count($items),count($result));
+	}
+
+	public function testStaticStream(){
+		$sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
+		$staticFile='static://test';
+		$this->assertFalse(file_exists($staticFile));
+		file_put_contents($staticFile,file_get_contents($sourceFile));
+		$this->assertTrue(file_exists($staticFile));
+		$this->assertEqual(file_get_contents($sourceFile),file_get_contents($staticFile));
+		unlink($staticFile);
+		clearstatcache();
+		$this->assertFalse(file_exists($staticFile));
+	}
+}
\ No newline at end of file
-- 
GitLab


From c20319d37701efb9d32c38dd71880739ca75b33f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 21 Feb 2012 20:48:14 +0100
Subject: [PATCH 118/248] fix incorrect information in the filecache when using
 encryption

---
 apps/files_encryption/lib/cryptstream.php |  5 +--
 apps/files_encryption/lib/proxy.php       | 31 ++++++++++--------
 apps/media/lib_media.php                  |  1 +
 files/ajax/upload.php                     |  3 +-
 lib/filecache.php                         | 40 ++++++++++++++++++++---
 lib/filesystemview.php                    |  6 +++-
 6 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 97e0846187d..86583096f1d 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -90,7 +90,6 @@ class OC_CryptStream{
 	}
 	
 	public function stream_write($data){
-		error_log('write to '. $this->path);
 		$length=strlen($data);
 		$written=0;
 		$currentPos=ftell($this->source);
@@ -148,9 +147,7 @@ class OC_CryptStream{
 	}
 
 	public function stream_close(){
-		if(OC_FileCache::inCache($this->path)){
-			OC_FileCache::put($this->path,array('encrypted'=>true));
-		}
+		OC_FileCache::put($this->path,array('encrypted'=>true));
 		return fclose($this->source);
 	}
 }
\ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index c53d567ad10..ed3907cccfe 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -38,13 +38,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		if(is_null(self::$blackList)){
 			self::$blackList=explode(',',OC_Appconfig::getValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
 		}
-		if(isset(self::$metaData[$path])){
-			$metadata=self::$metaData[$path];
-		}else{
-			$metadata=OC_FileCache::get($path);
-			self::$metaData[$path]=$metadata;
-		}
-		if($metadata['encrypted']){
+		if(self::isEncrypted($path)){
 			return true;
 		}
 		$extention=substr($path,strrpos($path,'.')+1);
@@ -62,7 +56,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		if(isset(self::$metaData[$path])){
 			$metadata=self::$metaData[$path];
 		}else{
-			$metadata=OC_FileCache::get($path);
+			$metadata=OC_FileCache::getCached($path);
 			self::$metaData[$path]=$metadata;
 		}
 		return (bool)$metadata['encrypted'];
@@ -92,14 +86,19 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 			fclose($result);
 			$result=fopen('crypt://'.$path,$meta['mode']);
 		}elseif(self::shouldEncrypt($path) and $meta['mode']!='r'){
-			if(OC_Filesystem::file_exists($path)){
+			if(OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0){
 				//first encrypt the target file so we don't end up with a half encrypted file
 				OC_Log::write('files_encryption','Decrypting '.$path.' before writing',OC_Log::DEBUG);
-				if($result){
-					fclose($result);
+				$tmp=fopen('php://temp');
+				while(!feof($result)){
+					$chunk=fread($result,8192);
+					if($chunk){
+						fwrite($tmp,$chunk);
+					}
 				}
-				$tmpFile=OC_Filesystem::toTmpFile($path);
-				OC_Filesystem::fromTmpFile($tmpFile,$path);
+				fclose($result);
+				OC_Filesystem::file_put_contents($path,$tmp);
+				fclose($tmp);
 			}
 			$result=fopen('crypt://'.$path,$meta['mode']);
 		}
@@ -117,6 +116,10 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	}
 
 	public function postGetMimeType($path,$mime){
-		return OC_Helper::getMimeType('crypt://'.$path,'w');
+		if((!OC_FileCache::inCache($path) and self::shouldEncrypt($path)) or self::isEncrypted($path)){
+			return OC_Helper::getMimeType('crypt://'.$path,'w');
+		}else{
+			return $mime;
+		}
 	}
 }
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 1bcd0f08c80..a2109c151aa 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -56,6 +56,7 @@ class OC_MEDIA{
 	 */
 	public static function updateFile($params){
 		$path=$params['path'];
+		if(!$path) return;
 		require_once 'lib_scanner.php';
 		require_once 'lib_collection.php';
 		//fix a bug where there were multiply '/' in front of the path, it should only be one
diff --git a/files/ajax/upload.php b/files/ajax/upload.php
index 241edc216ff..034b8914607 100644
--- a/files/ajax/upload.php
+++ b/files/ajax/upload.php
@@ -48,7 +48,8 @@ if(strpos($dir,'..') === false){
 	for($i=0;$i<$fileCount;$i++){
 		$target=stripslashes($dir) . $files['name'][$i];
 		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]);
+			$meta=OC_FileCache::getCached($target);
+			$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'],'name'=>$files['name'][$i]);
 		}
 	}
 	OC_JSON::encodedPrint($result);
diff --git a/lib/filecache.php b/lib/filecache.php
index 5d299ff24ee..83eaffb171a 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -28,6 +28,8 @@
  * It will try to keep the data up to date but changes from outside ownCloud can invalidate the cache
  */
 class OC_FileCache{
+	private static $savedData=array();
+	
 	/**
 	 * get the filesystem info from the cache
 	 * @param string path
@@ -93,6 +95,14 @@ class OC_FileCache{
 			self::update($id,$data);
 			return;
 		}
+		if(isset(self::$savedData[$path])){
+			$data=array_merge($data,self::$savedData[$path]);
+			unset(self::$savedData[$path]);
+		}
+		if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
+			self::$savedData[$path]=$data;
+			return;
+		}
 		if(!isset($data['encrypted'])){
 			$data['encrypted']=false;
 		}
@@ -101,9 +111,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,writable) VALUES(?,?,?,?,?,?,?,?,?,?)');
-		$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user,$data['writable']));
-		
+		$query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, size, mtime, ctime, mimetype, mimepart,user,writable,encrypted,versioned) VALUES(?,?,?,?,?,?,?,?,?,?,?,?)');
+		$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user,$data['writable'],$data['encrypted'],$data['versioned']));
 	}
 
 	/**
@@ -323,7 +332,29 @@ class OC_FileCache{
 		}
 		self::increaseSize(dirname($fullPath),$size-$cachedSize);
 	}
-
+	
+	public static function getCached($path,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}else{
+			if($root=='/'){
+				$root='';
+			}
+		}
+		$path=$root.$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)){
+			if(isset(self::$savedData[$path])){
+				$result=array_merge($result,self::$savedData[$path]);
+			}
+			return $result;
+		}else{
+			OC_Log::write('get(): file not found in cache ('.$path.')','core',OC_Log::DEBUG);
+			return false;
+		}
+	}
+	
 	private static function getCachedSize($path,$root){
 		if(!$root){
 			$root=OC_Filesystem::getRoot();
@@ -332,6 +363,7 @@ class OC_FileCache{
 				$root='';
 			}
 		}
+		$path=$root.$path;
 		$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE path=?');
 		$result=$query->execute(array($path));
 		if($row=$result->fetchRow()){
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 58d5b3af715..c4d5ff35142 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -171,6 +171,7 @@ class OC_FilesystemView {
 				}
 				fclose($target);
 				fclose($data);
+				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, array( OC_Filesystem::signal_param_path => $path));
 				return true;
 			}else{
 				return false;
@@ -278,6 +279,9 @@ class OC_FilesystemView {
 	}
 	public function fromTmpFile($tmpFile,$path){
 		if(OC_Filesystem::isValidPath($path)){
+			if(!$tmpFile){
+				debug_print_backtrace();
+			}
 			$source=fopen($tmpFile,'r');
 			if($source){
 				$this->file_put_contents($path,$source);
@@ -286,7 +290,7 @@ class OC_FilesystemView {
 			}else{
 			}
 		}else{
-			error_log('invalid path');
+			return false;
 		}
 	}
 
-- 
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 119/248] 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 120/248] 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 121/248] 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


From ed0c99ef149d63a350c7ffcb87d398b90ed3b0a2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 22 Feb 2012 15:18:22 +0100
Subject: [PATCH 122/248] make sure we always have the encryption key unlocked

---
 apps/files_encryption/appinfo/app.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 82d2544dd14..23f3955aa40 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -9,3 +9,9 @@ OC_FileProxy::register(new OC_FileProxy_Encryption());
 OC_Hook::connect('OC_User','post_login','OC_Crypt','loginListener');
 
 stream_wrapper_register('crypt','OC_CryptStream');
+
+if(!isset($_SESSION['enckey']) and OC_User::isLoggedIn()){//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled)
+	OC_User::logout();
+	header("Location: ".OC::$WEBROOT.'/');
+	exit();
+}
-- 
GitLab


From b3f3b8c23f4f07a4d38e952f4d77827380c34b58 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Tue, 21 Feb 2012 22:31:35 +0100
Subject: [PATCH 123/248] UI problems solved. Bookmarks app updated.

---
 apps/bookmarks/css/bookmarks.css      |  5 ++++-
 apps/bookmarks/js/bookmarks.js        |  3 +++
 apps/bookmarks/templates/list.php     | 10 ++++++----
 apps/bookmarks/templates/settings.php |  2 +-
 apps/contacts/css/contacts.css        |  4 ++--
 apps/contacts/js/contacts.js          |  6 +++---
 apps/gallery/css/styles.css           |  6 +++---
 apps/media/js/collection.js           | 24 +++++++++++++-----------
 apps/media/js/loader.js               |  4 ++--
 apps/media/js/music.js                | 12 +++++-------
 apps/media/js/playlist.js             |  8 ++++----
 apps/media/js/scanner.js              |  8 ++++----
 core/css/styles.css                   |  9 +++++----
 core/js/js.js                         | 22 +++++++++++-----------
 core/templates/layout.user.php        |  4 ++--
 settings/css/settings.css             |  4 ++--
 16 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index 8dfdc8a07b9..499a4e9c53e 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -1,4 +1,7 @@
-#content { overflow: auto; }
+#content { overflow: auto; height: 100%; }
+#firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
+#firstrun small { display: block; font-weight: normal; font-size: 0.5em; }
+#firstrun #selections { font-size:0.8em;  width: 100%; margin: 2em auto auto auto; clear: both; }
 
 .bookmarks_headline {
 	font-size: large;
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index fadbbd5513a..328f88a45d9 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -35,6 +35,7 @@ function getBookmarks() {
 	
 			for(var i in bookmarks.data) {
 				updateBookmarksList(bookmarks.data[i]);
+				$("#firstrun").hide();
 			}
 
 			$('.bookmark_link').click(recordClick);
@@ -71,6 +72,8 @@ function addOrEditBookmark(event) {
 	var tags = encodeEntities($('#bookmark_add_tags').val());
 	var taglist = tags.split(' ');
 	var tagshtml = '';
+	$("#firstrun").hide();
+
 	for ( var i=0, len=taglist.length; i<len; ++i ){
 		tagshtml += '<a class="bookmark_tag" href="?tag=' + encodeURI(taglist[i]) + '">' + taglist[i] + '</a> ';
 	}
diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
index d44a0ecbcdb..bd33fe457fd 100644
--- a/apps/bookmarks/templates/list.php
+++ b/apps/bookmarks/templates/list.php
@@ -21,9 +21,11 @@
 	<p><label class="bookmarks_label"></label><input type="submit" value="<?php echo $l->t('Add bookmark'); ?>" id="bookmark_add_submit" /></p>
 </div>
 <div class="bookmarks_list">
-	<?php echo $l->t('You have no bookmarks'); ?>
 </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 id="firstrun">
+	<?php echo $l->t('You have no bookmarks'); ?>
+	<small><?php echo $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage.'); ?></small>
+	<div id="selections">
+		<a class="button" 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)})();'><?php echo $l->t('Add page to ownCloud'); ?></a>
+	</div>
 </div>
diff --git a/apps/bookmarks/templates/settings.php b/apps/bookmarks/templates/settings.php
index a985ee9d61b..41433d84767 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::linkToAbsolute('bookmarks', 'addBm.php'); ?>?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(){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)})();'><?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/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 384541f3751..b24ec438f24 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -17,8 +17,8 @@
 #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; }
+#firstrun { width: 100%; position: absolute; top: 5em; left: 0; text-align: center; font-weight:bold; font-size:1.5em; color:#777; }
+#firstrun #selections { font-size:0.8em; 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; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 11661320c59..d033e3f21cd 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -8,7 +8,7 @@ String.prototype.strip_tags = function(){
 	tags = this;
 	stripped = tags.replace(/[\<\>]/gi, "");
 	return stripped;
-}
+};
 
 
 Contacts={
@@ -142,7 +142,7 @@ Contacts={
 							}
 					});
 				});
-			}
+			};
 		},
 		loadListHandlers:function() {
 			//$('.add,.delete').hide();
@@ -323,7 +323,7 @@ Contacts={
 					}
 				});
 			},
-			delete:function() {
+			delete: function() {
 				$('#contacts_deletecard').tipsy('hide');
 				$.getJSON('ajax/deletecard.php',{'id':this.id},function(jsondata){
 					if(jsondata.status == 'success'){
diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index c039cd5ec02..da94f9ac9e5 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,8 +1,8 @@
-div#gallery_list { margin: 70pt 20pt 0 20pt; }
+div#gallery_list { margin: 4.5em 2em 0 2em; }
 div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; position: absolute; bottom:0px; text-align: center; overflow: auto; }
-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 { width: 200px; position:relative; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 5px 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_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_decoration { width: 200px; position: absolute; border: 0; height: 20px; top: 5px; 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;}
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 2249acf3cc4..753785f77b0 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -1,3 +1,5 @@
+var initScanned = false;
+
 Collection={
 	artists:[],
 	albums:[],
@@ -68,10 +70,10 @@ Collection={
 					for(var i=0;i<Collection.loadedListeners.length;i++){
 						Collection.loadedListeners[i]();
 					}
-					if(data.songs.length==0){
+					if(data.songs.length==0 && initScanned == false){
 						$('#scan input.start').click();
+						initScanned = true;
 					}
-					
 				}
 			});
 		}
@@ -81,13 +83,11 @@ Collection={
 			Collection.parent.show();
 		}
 		if(!Collection.loaded){
-			Collection.load(Collection.display)
+			Collection.load(Collection.display);
 		}else{
 			if(Collection.parent){
 				Collection.parent.find('tr:not(.template)').remove();
 				var template=Collection.parent.find('tr.template');
-				var lastArtist='';
-				var lastAlbum='';
 				$.each(Collection.artists,function(i,artist){
 					if(artist.name && artist.songs.length>0){
 						var tr=template.clone().removeClass('template');
@@ -108,7 +108,7 @@ Collection={
 							$('tr[data-artist="'+artist.name+'"]').addClass('active');
 						});
 						if(artist.songs.length>1){
-							var expander=$('<a class="expander">&gt;</a>');
+							expander=$('<a class="expander">&gt;</a>');
 							expander.data('expanded',false);
 							expander.click(function(event){
 								var tr=$(this).parent().parent();
@@ -136,10 +136,11 @@ Collection={
 		var first=true;
 		$.each(artist.albums,function(j,album){
 			$.each(album.songs,function(i,song){
+				var newRow;
 				if(first){
 					newRow=tr;
 				}else{
-					var newRow=tr.clone();
+					newRow=tr.clone();
 					newRow.find('td.artist').text('');
 					newRow.find('.expander').remove();
 				}
@@ -221,13 +222,14 @@ Collection={
 		tr.find('td.album-expander a.expander').addClass('expanded');
 		tr.find('td.album-expander a.expander').text('v');
 		$.each(albumData.songs,function(i,song){
+			var newRow;
 			if(i>0){
-				var newRow=tr.clone();
+				newRow=tr.clone();
 				newRow.find('a.expander').remove();
 				newRow.find('td.album a').text('');
 				newRow.find('td.artist a').text('');
 			}else{
-				var newRow=tr;
+				newRow=tr;
 			}
 			newRow.find('td.title a').text(song.name);
 			newRow.find('td.title a').click(function(event){
@@ -339,11 +341,11 @@ Collection={
 			path:song.song_path,
 			playCount:song.song_playcount,
 		};
-		album.songs.push(songData)
+		album.songs.push(songData);
 		artist.songs.push(songData);
 		Collection.songs.push(songData);
 	}
-}
+};
 
 $(document).ready(function(){
 	Collection.parent=$('#collection');
diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
index 055f858ae16..a832180d1e3 100644
--- a/apps/media/js/loader.js
+++ b/apps/media/js/loader.js
@@ -1,7 +1,7 @@
 function musicTypeFromFile(file){
 	var extention=file.substr(file.indexOf('.')+1);
 	if(extention=='ogg'){
-		return 'oga'
+		return 'oga';
 	}
 	//TODO check for more specific cases
 	return extention;
@@ -39,7 +39,7 @@ function loadPlayer(type,ready){
 }
 
 $(document).ready(function() {
-	loadPlayer.done=false
+	loadPlayer.done=false;
 
 // 	FileActions.register('audio','Add to playlist','',addAudio);
 // 	FileActions.register('application/ogg','Add to playlist','',addAudio);
diff --git a/apps/media/js/music.js b/apps/media/js/music.js
index 3373cbac257..1ffe4e10087 100644
--- a/apps/media/js/music.js
+++ b/apps/media/js/music.js
@@ -16,7 +16,7 @@ $(document).ready(function(){
 			PlayList.render();
 		});
 		var button=$('<input type="button" title="'+t('media','Add album to playlist')+'" class="add"></input>');
-		button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')')
+		button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')');
 		button.click(function(event){
 			event.stopPropagation();
 			PlayList.add(media);
@@ -24,7 +24,7 @@ $(document).ready(function(){
 		});
 		row.find('div.name').append(button);
 		button.tipsy({gravity:'n', fade:true, delayIn: 400, live:true});
-	}
+	};
 	Collection.display();
 
 	Collection.load(function(){
@@ -34,11 +34,9 @@ $(document).ready(function(){
 			PlayList.add(song);
 			PlayList.play(0);
 		}
-	})
+	});
 });
 
-
-
 function getUrlVars(){
 	var vars = {}, hash;
 	var hashes = window.location.hash.substr(1).split('&');
@@ -52,8 +50,8 @@ function getUrlVars(){
 function musicTypeFromFile(file){
 	var extention=file.split('.').pop();
 	if(extention=='ogg'){
-		return 'oga'
+		return 'oga';
 	}
 	//TODO check for more specific cases
 	return extention;
-}
\ No newline at end of file
+}
diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js
index 089065989ae..8e9e2a91537 100644
--- a/apps/media/js/playlist.js
+++ b/apps/media/js/playlist.js
@@ -26,19 +26,19 @@ PlayList.render=function(){
 		li.click(function(event){
 			PlayList.play($(this).data('index'));
 		});
-		li.append(img)
+		li.append(img);
 		li.data('index',i);
 		li.addClass('song');
 		PlayList.parent.append(li);
 	}
         $(".jp-playlist-" + PlayList.current).addClass("collection_playing");
-}
+};
 PlayList.getSelected=function(){
 	return $('tbody td.name input:checkbox:checked').parent().parent();
-}
+};
 PlayList.hide=function(){
 	$('#playlist').hide();
-}
+};
 
 $(document).ready(function(){
 	PlayList.parent=$('#leftcontent');
diff --git a/apps/media/js/scanner.js b/apps/media/js/scanner.js
index 0baa9db419a..6c991b60d52 100644
--- a/apps/media/js/scanner.js
+++ b/apps/media/js/scanner.js
@@ -6,7 +6,7 @@ Scanner={
 		$.getJSON(OC.linkTo('media','ajax/api.php')+'?action=find_music',function(songs){
 			Scanner.songsFound=songs.length;
 			if(ready){
-				ready(songs)
+				ready(songs);
 			}
 		});
 	},
@@ -24,13 +24,13 @@ Scanner={
 			Scanner.songsScanned=data.count;
 			$('#scan span.songCount').text(Scanner.songsScanned);
 			var progress=(Scanner.songsScanned/Scanner.songsFound)*100;
-			$('#scanprogressbar').progressbar('value',progress)
+			$('#scanprogressbar').progressbar('value',progress);
 		});
 		Scanner.eventSource.listen('done',function(count){
 			$('#scan input.start').show();
 			$('#scan input.stop').hide();
 			$('#scanprogressbar').hide();
-			Collection.load(Collection.display)
+			Collection.load(Collection.display);
 			if(ready){
 				ready();
 			}
@@ -41,4 +41,4 @@ Scanner={
 		Scanner.close();
 	},
 
-}
+};
diff --git a/core/css/styles.css b/core/css/styles.css
index 53af8b383e3..335b008ffd7 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -3,6 +3,7 @@
  See the COPYING-README file. */
 
 html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; }
+html, body { height: 100%; }
 article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; }
 body { line-height:1.5; }
 table { border-collapse:separate; border-spacing:0; white-space:nowrap; }
@@ -55,11 +56,11 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
 /* CONTENT ------------------------------------------------------------------ */
 #controls { padding: 0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
 #controls .button { display:inline-block; }
-#content { margin:3.5em 0 0 12.5em; }
+#content { top: 3.5em; left: 12.5em; position: absolute; }
 #leftcontent, .leftcontent { position:fixed; overflow: auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
 #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; }
+#rightcontent, .rightcontent { position:fixed; top: 6.4em; left: 32.5em; }
 
 
 /* LOG IN & INSTALLATION ------------------------------------------------------------ */
@@ -113,8 +114,8 @@ table:not(.nostyle) tr { -webkit-transition:background-color 500ms; -moz-transit
 tbody tr:hover, tr:active { background-color:#f8f8f8; }
 
 #body-settings .personalblock, #body-settings .helpblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
-#body-settings .personalblock#quota { position:relative; margin-top:4.5em; padding:0; }
-#body-settings #controls+.helpblock { position:relative; margin-top:7.3em; }
+#body-settings .personalblock#quota { position:relative; padding:0; }
+#body-settings #controls+.helpblock { position:relative; margin-top: 3em; }
 .personalblock > legend { margin-top:2em; }
 
 #quota div, div.jp-play-bar, div.jp-seek-bar { padding:0; background:#e6e6e6; font-weight:normal; white-space:nowrap; -moz-border-radius-bottomleft:.4em; -webkit-border-bottom-left-radius:.4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft:.4em; -webkit-border-top-left-radius:.4em; border-top-left-radius:.4em; }
diff --git a/core/js/js.js b/core/js/js.js
index c6cde3cea95..6da9c29e693 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -13,7 +13,7 @@ function t(app,text){
 			success:function(jsondata){
 				t.cache[app] = jsondata.data;
 			},
-		})
+		});
 
 		// Bad answer ...
 		if( !( app in t.cache )){
@@ -58,7 +58,7 @@ OC={
 		}
 		link+=app;
 		if(type){
-			link+=type+'/'
+			link+=type+'/';
 		}
 		link+=file;
 		return link;
@@ -73,7 +73,7 @@ OC={
 	 */ 
 	imagePath:function(app,file){
 		if(file.indexOf('.')==-1){//if no extention is given, use png or svg depending on browser support
-			file+=(SVGSupport())?'.svg':'.png'
+			file+=(SVGSupport())?'.svg':'.png';
 		}
 		return OC.filePath(app,'img',file);
 	},
@@ -126,7 +126,7 @@ OC={
 			});
 		}
 	}
-}
+};
 OC.search.customResults={};
 OC.search.currentResult=-1;
 OC.search.lastQuery='';
@@ -147,7 +147,7 @@ if(typeof localStorage !='undefined'){
 		getItem:function(name){
 			return JSON.parse(localStorage.getItem(OC.localStorage.namespace+name));
 		}
-	}
+	};
 }else{
 	//dummy localstorage
 	OC.localStorage={
@@ -160,7 +160,7 @@ if(typeof localStorage !='undefined'){
 		getItem:function(name){
 			return null;
 		}
-	}
+	};
 }
 
 /**
@@ -182,7 +182,7 @@ if (!Array.prototype.filter) {
 			}
 		}
 		return res;
-	}
+	};
 }
 /**
  * implement Array.indexOf for browsers without native support
@@ -235,11 +235,11 @@ SVGSupport.checkMimeType=function(){
 			});
 			if(headers["Content-Type"]!='image/svg+xml'){
 				replaceSVG();
-				SVGSupport.checkMimeType.correct=false
+				SVGSupport.checkMimeType.correct=false;
 			}
 		}
 	});
-}
+};
 SVGSupport.checkMimeType.correct=true;
 
 //replace all svg images with png for browser compatibility
@@ -305,11 +305,12 @@ $(document).ready(function(){
 
 	$(window).resize(function () {
 		fillHeight($('#leftcontent'));
+		fillWindow($('#content'));
 		fillWindow($('#rightcontent'));
 	});
 	$(window).trigger('resize');
 	
-	if(!SVGSupport()){//replace all svg images with png images for browser that dont support svg
+	if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
 		replaceSVG();
 	}else{
 		SVGSupport.checkMimeType();
@@ -379,7 +380,6 @@ $(document).ready(function(){
 		}
 	});
 
-	if($('body').attr("id")=="body-user") { $('#settings #expanddiv').hide(); }
 	$('#settings #expand').click(function(event) {
 		$('#settings #expanddiv').slideToggle();
 		event.stopPropagation();
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 64353d4d4f4..c048653cce9 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -44,8 +44,8 @@
 
 			<ul id="settings" class="svg">
 				<img id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
-				<span style="display:none"><?php echo $l->t('Settings');?></span>
-				<div id="expanddiv">
+				<span style="display:none;"><?php echo $l->t('Settings');?></span>
+				<div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
 				<?php foreach($_['settingsnavigation'] as $entry):?>
 					<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
 				<?php endforeach; ?>
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 8d89cee6ec0..a8af839a1e6 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -26,9 +26,9 @@ tr:hover>td.password>span { margin:0; cursor:pointer; }
 tr:hover>td.remove>img, tr:hover>td.password>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
 tr:hover>td.remove>img { float:right; }
 li.selected { background-color:#ddd; }
-#content>table:not(.nostyle) { margin-top:6.5em; }
+#content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
-
+#rightcontent { padding-left: 1em; }
 
 /* APPS */
 li { color:#888; }
-- 
GitLab


From d9914664f651a6be352084b82b2bf6ce6372b228 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Tue, 21 Feb 2012 22:37:59 +0100
Subject: [PATCH 124/248] Text editor display error fixed.

---
 apps/files_texteditor/css/style.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css
index cf24950232f..bc238c1f40f 100644
--- a/apps/files_texteditor/css/style.css
+++ b/apps/files_texteditor/css/style.css
@@ -1,8 +1,7 @@
 #editor{
 	position: absoloute;
 	display: block;
-	top: 80px;
-	left: 160px;
+	top: 2em;
 }
 #editorwrapper{
 	position: absoloute;
-- 
GitLab


From e2d6bf4c63b82573c266fb064dedf076eafd7261 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Tue, 21 Feb 2012 23:08:57 +0100
Subject: [PATCH 125/248] Bookmarklet Window closes itself after submit.

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

diff --git a/apps/bookmarks/js/addBm.js b/apps/bookmarks/js/addBm.js
index 6e13b59bb2e..59735f80ca6 100644
--- a/apps/bookmarks/js/addBm.js
+++ b/apps/bookmarks/js/addBm.js
@@ -10,7 +10,7 @@ function addBookmark(event) {
 		url: 'ajax/addBookmark.php',
 		data: 'url=' + encodeURI(url) + '&title=' + encodeURI(title) + '&tags=' + encodeURI(tags),
 		success: function(data){ 
-			location.href='index.php';
+			window.close();
 		}
 	});
 }
\ No newline at end of file
-- 
GitLab


From fd72f2bd29fad3010ee84c1e5e1f22ae5e159e88 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 22 Feb 2012 16:04:17 +0100
Subject: [PATCH 126/248] Removed redundant code.

---
 apps/bookmarks/addBm.php              |  8 +----
 apps/bookmarks/ajax/addBookmark.php   | 11 ++++---
 apps/bookmarks/ajax/getMeta.php       | 39 ----------------------
 apps/bookmarks/appinfo/app.php        |  2 +-
 apps/bookmarks/appinfo/database.xml   |  8 -----
 apps/bookmarks/appinfo/info.xml       |  4 +--
 apps/bookmarks/js/addBm.js            |  3 +-
 apps/bookmarks/js/bookmarks.js        | 47 ++++-----------------------
 apps/bookmarks/settings.php           |  4 +--
 apps/bookmarks/templates/addBm.php    |  1 -
 apps/bookmarks/templates/list.php     |  2 +-
 apps/bookmarks/templates/settings.php |  2 +-
 12 files changed, 22 insertions(+), 109 deletions(-)
 delete mode 100644 apps/bookmarks/ajax/getMeta.php

diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
index f56022c42c2..d3d6ab0b1a2 100644
--- a/apps/bookmarks/addBm.php
+++ b/apps/bookmarks/addBm.php
@@ -27,8 +27,6 @@ require_once('../../lib/base.php');
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('bookmarks');
 
-require_once('bookmarksHelper.php');
-
 OC_App::setActiveNavigationEntry( 'bookmarks_index' );
 
 OC_Util::addScript('bookmarks','addBm');
@@ -37,10 +35,6 @@ OC_Util::addStyle('bookmarks', 'bookmarks');
 $tmpl = new OC_Template( 'bookmarks', 'addBm', 'user' );
 
 $url = isset($_GET['url']) ? urldecode($_GET['url']) : '';
-$metadata = getURLMetadata($url);
-
-$tmpl->assign('URL', htmlentities($metadata['url'],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->assign('URL', htmlentities($url,ENT_COMPAT,'utf-8'));
 
 $tmpl->printPage();
diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
index 45b16ae5fa6..89446564110 100644
--- a/apps/bookmarks/ajax/addBookmark.php
+++ b/apps/bookmarks/ajax/addBookmark.php
@@ -45,8 +45,13 @@ $query = OC_DB::prepare("
 	(url, title, user_id, public, added, lastmodified)
 	VALUES (?, ?, ?, 0, $_ut, $_ut)
 	");
-	
-	
+
+if(empty($_GET["title"])) {
+	require_once('../bookmarksHelper.php');
+	$metadata = getURLMetadata($_GET["url"]);
+	$_GET["title"] = $metadata['title'];
+}
+
 $params=array(
 	htmlspecialchars_decode($_GET["url"]),
 	htmlspecialchars_decode($_GET["title"]),
@@ -56,7 +61,6 @@ $query->execute($params);
 
 $b_id = OC_DB::insertid('*PREFIX*bookmarks');
 
-
 if($b_id !== false) {
 	$query = OC_DB::prepare("
 		INSERT INTO *PREFIX*bookmarks_tags
@@ -76,4 +80,3 @@ if($b_id !== false) {
 
 	OC_JSON::success(array('data' => $b_id));
 }
-
diff --git a/apps/bookmarks/ajax/getMeta.php b/apps/bookmarks/ajax/getMeta.php
deleted file mode 100644
index ca797315ef4..00000000000
--- a/apps/bookmarks/ajax/getMeta.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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 Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
-require_once('../../../lib/base.php');
-
-// Check if we are a user
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('bookmarks');
-
-// $metadata = array();
-
-require '../bookmarksHelper.php';
-$metadata = getURLMetadata(htmlspecialchars_decode($_GET["url"]));
-
-
-OC_JSON::success(array('data' => $metadata));
diff --git a/apps/bookmarks/appinfo/app.php b/apps/bookmarks/appinfo/app.php
index 479d8ed4767..a1f6139d89b 100644
--- a/apps/bookmarks/appinfo/app.php
+++ b/apps/bookmarks/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* Copyright (c) 2011 Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
+* Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
 * Copyright (c) 2011 Arthur Schiwon <blizzz@arthur-schiwon.de>
 * This file is licensed under the Affero General Public License version 3 or
 * later.
diff --git a/apps/bookmarks/appinfo/database.xml b/apps/bookmarks/appinfo/database.xml
index fca38ad84b2..f2fc68e4b58 100644
--- a/apps/bookmarks/appinfo/database.xml
+++ b/apps/bookmarks/appinfo/database.xml
@@ -75,14 +75,6 @@
 					<sorting>descending</sorting>
 				</field>
 			</index>
-<!--			<index>
-				<name>url</name>
-				<unique>true</unique>
-				<field>
-					<name>url</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>-->
 		</declaration>
 	</table>
 	
diff --git a/apps/bookmarks/appinfo/info.xml b/apps/bookmarks/appinfo/info.xml
index 23aa6c219a9..862ab805a60 100644
--- a/apps/bookmarks/appinfo/info.xml
+++ b/apps/bookmarks/appinfo/info.xml
@@ -3,8 +3,8 @@
 	<id>bookmarks</id>
 	<name>Bookmarks</name>
 	<description>Bookmark manager for ownCloud</description>
-	<version>0.1</version>
+	<version>0.2</version>
 	<licence>AGPL</licence>
-	<author>Arthur Schiwon</author>
+	<author>Arthur Schiwon, Marvin Thomas Rabe</author>
 	<require>2</require>
 </info>
\ No newline at end of file
diff --git a/apps/bookmarks/js/addBm.js b/apps/bookmarks/js/addBm.js
index 59735f80ca6..d64e55e8920 100644
--- a/apps/bookmarks/js/addBm.js
+++ b/apps/bookmarks/js/addBm.js
@@ -4,11 +4,10 @@ $(document).ready(function() {
 
 function addBookmark(event) {
 	var url = $('#bookmark_add_url').val();
-	var title = $('#bookmark_add_title').val();
 	var tags = $('#bookmark_add_tags').val();
 	$.ajax({
 		url: 'ajax/addBookmark.php',
-		data: 'url=' + encodeURI(url) + '&title=' + encodeURI(title) + '&tags=' + encodeURI(tags),
+		data: 'url=' + encodeURI(url) + '&tags=' + encodeURI(tags),
 		success: function(data){ 
 			window.close();
 		}
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 328f88a45d9..6db0969a2bb 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -11,8 +11,6 @@ $(document).ready(function() {
 	$('#bookmark_add_submit').click(addOrEditBookmark);
 	$(window).scroll(updateOnBottom);
 	
-	$('#bookmark_add_url').focusout(getMetadata);
-	
 	$('.bookmarks_list').empty();
 	getBookmarks();
 	
@@ -47,20 +45,6 @@ function getBookmarks() {
 	});	
 }
 
-function getMetadata() {
-	var url = encodeEntities($('#bookmark_add_url').val());
-	$('.loading_meta').css('display','inline');
-	$.ajax({
-		url: 'ajax/getMeta.php',
-		data: 'url=' + encodeURIComponent(url),
-		success: function(pageinfo){
-			$('#bookmark_add_url').val(pageinfo.data.url);
-			$('#bookmark_add_title').val(pageinfo.data.title);
-			$('.loading_meta').css('display','none');
-		}
-	});
-}
-
 // function addBookmark() {
 // Instead of creating editBookmark() function, Converted the one above to
 // addOrEditBookmark() to make .js file more compact.
@@ -86,21 +70,9 @@ function addOrEditBookmark(event) {
 				var bookmark_id = response.data;
 				$('.bookmarks_add').slideToggle(); 
 				$('.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 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>' +
-				'</div>'
-				);
+				$('.bookmarks_list').empty();
+				bookmarks_page = 0;
+				getBookmarks();
 			}
 		});
 	}
@@ -112,15 +84,9 @@ function addOrEditBookmark(event) {
 				$('.bookmarks_add').slideToggle(); 
 				$('.bookmarks_add').children('p').children('.bookmarks_input').val(''); 
 				$('#bookmark_add_id').val('0');
-				
-				var record = $('.bookmark_single[data-id = "' + id + '"]');
-				record.children('.bookmark_url:first').text(url);
-				
-				var record_title = record.children('.bookmark_title:first').children('a:first');
-				record_title.attr('href', url);
-				record_title.text(title);
-				
-				record.children('.bookmark_tags:first').html(tagshtml);
+				$('.bookmarks_list').empty();
+				bookmarks_page = 0;
+				getBookmarks();
 			}
 		});
 	}
@@ -162,6 +128,7 @@ function updateBookmarksList(bookmark) {
 	if(!hasProtocol(bookmark.url)) {
 		bookmark.url = 'http://' + bookmark.url;
 	}
+	if(bookmark.title == '') bookmark.title = bookmark.url;
 	$('.bookmarks_list').append(
 		'<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
 			'<p class="bookmark_actions">' +
diff --git a/apps/bookmarks/settings.php b/apps/bookmarks/settings.php
index 0ace04fa2c8..9d945f64dad 100644
--- a/apps/bookmarks/settings.php
+++ b/apps/bookmarks/settings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2011 Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
+ * Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -8,6 +8,4 @@
 
 $tmpl = new OC_Template( 'bookmarks', 'settings');
 
-//OC_Util::addScript('bookmarks','settings');
-
 return $tmpl->fetchPage();
diff --git a/apps/bookmarks/templates/addBm.php b/apps/bookmarks/templates/addBm.php
index c285c3579c5..9067d3481a3 100644
--- a/apps/bookmarks/templates/addBm.php
+++ b/apps/bookmarks/templates/addBm.php
@@ -1,6 +1,5 @@
 <div class="bookmarks_addBm">
 	<p><label class="bookmarks_label"><?php echo $l->t('Address'); ?></label><input type="text" id="bookmark_add_url" class="bookmarks_input" value="<?php echo $_['URL']; ?>"/></p>
-	<p><label class="bookmarks_label"><?php echo $l->t('Title'); ?></label><input type="text" id="bookmark_add_title" class="bookmarks_input" value="<?php echo $_['TITLE']; ?>" /></p>
 	<p><label class="bookmarks_label"><?php echo $l->t('Tags'); ?></label><input type="text" id="bookmark_add_tags" class="bookmarks_input" /></p>
 	<p><label class="bookmarks_label"> </label><label class="bookmarks_hint"><?php echo $l->t('Hint: Use space to separate tags.'); ?></label></p>
 	<p><label class="bookmarks_label"></label><input type="submit" value="<?php echo $l->t('Add bookmark'); ?>" id="bookmark_add_submit" /></p>
diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
index bd33fe457fd..d772cb905aa 100644
--- a/apps/bookmarks/templates/list.php
+++ b/apps/bookmarks/templates/list.php
@@ -1,6 +1,6 @@
 <?php 
 /**
- * Copyright (c) 2011 Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
+ * Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
  * Copyright (c) 2011 Arthur Schiwon <blizzz@arthur-schiwon.de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
diff --git a/apps/bookmarks/templates/settings.php b/apps/bookmarks/templates/settings.php
index 41433d84767..b787e31f3c5 100644
--- a/apps/bookmarks/templates/settings.php
+++ b/apps/bookmarks/templates/settings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2011 Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
+ * Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
-- 
GitLab


From 6c6b570ff15cfa9da6b1ab8b7e56ef0a82c96086 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Wed, 22 Feb 2012 18:04:21 +0000
Subject: [PATCH 127/248] avoid notice in error log from user_webfinger app

---
 apps/user_webfinger/host-meta.php | 2 +-
 apps/user_webfinger/webfinger.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user_webfinger/host-meta.php b/apps/user_webfinger/host-meta.php
index ceb15f22da4..dbb4377e8c7 100644
--- a/apps/user_webfinger/host-meta.php
+++ b/apps/user_webfinger/host-meta.php
@@ -10,7 +10,7 @@ echo "<";
 ?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:hm="http://host-meta.net/xrd/1.0">
 	<hm:Host xmlns="http://host-meta.net/xrd/1.0"><?php echo $_SERVER['SERVER_NAME'] ?></hm:Host>
-	<Link rel="lrdd" template="http<?php echo ($_SERVER['HTTPS']?'s':''); ?>://<?php echo $_SERVER['SERVER_NAME'] ?>/.well-known/webfinger.php?q={uri}">
+	<Link rel="lrdd" template="http<?php echo (isset($_SERVER['HTTPS'])?'s':''); ?>://<?php echo $_SERVER['SERVER_NAME'] ?>/.well-known/webfinger.php?q={uri}">
 	</Link>
 </XRD>
 
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index d695a833f31..a9537182016 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -22,7 +22,7 @@ if($_GET['q']) {
 if(substr($userName, 0, 5) == 'acct:') {
 	$userName = substr($userName, 5);
 }
-if($_SERVER['HTTPS']) {
+if(isset($_SERVER['HTTPS'])) {
 	$baseAddress = 'https://'.$_SERVER['SERVER_NAME'].'/apps/remoteStorage/';
 } else {
 	$baseAddress = 'http://'.$_SERVER['SERVER_NAME'].'/apps/remoteStorage/';
-- 
GitLab


From 9850820b4276b197433bb64d84ed085cdcd01e0e Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Wed, 22 Feb 2012 18:05:52 +0000
Subject: [PATCH 128/248] BearerAuth and multiple tokens support in
 remoteStorage app

---
 apps/remoteStorage/BearerAuth.php        | 61 ++++++++++++++++++++++++
 apps/remoteStorage/WebDAV.php            |  1 +
 apps/remoteStorage/auth.php              |  4 +-
 apps/remoteStorage/lib_remoteStorage.php | 32 +++++++------
 apps/remoteStorage/oauth_ro_auth.php     |  4 +-
 5 files changed, 84 insertions(+), 18 deletions(-)
 create mode 100644 apps/remoteStorage/BearerAuth.php

diff --git a/apps/remoteStorage/BearerAuth.php b/apps/remoteStorage/BearerAuth.php
new file mode 100644
index 00000000000..ebcf189dfb9
--- /dev/null
+++ b/apps/remoteStorage/BearerAuth.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * HTTP Bearer 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_BearerAuth 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),'bearer')!==0) return false; 
+
+        return explode(':', base64_decode(substr($auth, 7)));
+
+    }
+
+    /**
+     * 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/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/WebDAV.php
index e048d19e8f2..06520b4021b 100644
--- a/apps/remoteStorage/WebDAV.php
+++ b/apps/remoteStorage/WebDAV.php
@@ -33,6 +33,7 @@ require_once('../../lib/base.php');
 OC_Util::checkAppEnabled('remoteStorage');
 require_once('Sabre/autoload.php');
 require_once('lib_remoteStorage.php');
+require_once('BearerAuth.php');
 require_once('oauth_ro_auth.php');
 
 ini_set('default_charset', 'UTF-8');
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index 85421ba3d88..75e0aac419d 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -68,14 +68,14 @@ if(count($pathParts) == 2 && $pathParts[0] == '') {
 		} else if($k=='redirect_uri'){
 			$appUrl=$v;
 		} else if($k=='scope'){
-			$category=$v;
+			$categories=$v;
 		}
 	}
 	$currUser = OC_User::getUser();
 	if($currUser == $ownCloudUser) {
 		if(isset($_POST['allow'])) {
 			//TODO: check if this can be faked by editing the cookie in firebug!
-			$token=OC_remoteStorage::createCategory($appUrl, $category);
+			$token=OC_remoteStorage::createCategories($appUrl, $categories);
 			header('Location: '.$_GET['redirect_uri'].'#access_token='.$token.'&token_type=bearer');
 		} else {
 			echo '<form method="POST"><input name="allow" type="submit" value="Allow this web app to store stuff on your owncloud."></form>';
diff --git a/apps/remoteStorage/lib_remoteStorage.php b/apps/remoteStorage/lib_remoteStorage.php
index 4f19310904e..4f5c9664509 100644
--- a/apps/remoteStorage/lib_remoteStorage.php
+++ b/apps/remoteStorage/lib_remoteStorage.php
@@ -2,11 +2,13 @@
 
 class OC_remoteStorage {
 	public static function getValidTokens($ownCloudUser, $category) {
-		$query=OC_DB::prepare("SELECT token,appUrl FROM *PREFIX*authtoken WHERE user=? AND category=? LIMIT 100");
-		$result=$query->execute(array($ownCloudUser,$category));
+		$query=OC_DB::prepare("SELECT token,appUrl,category FROM *PREFIX*authtoken WHERE user=? LIMIT 100");
+		$result=$query->execute(array($ownCloudUser));
 		$ret = array();
 		while($row=$result->fetchRow()){
-			$ret[$row['token']]=true;
+			if(in_array($category, explode(',', $row['category']))) {
+				$ret[$row['token']]=true;
+			}
 		}
 		return $ret;
 	}
@@ -19,7 +21,7 @@ class OC_remoteStorage {
 		while($row=$result->fetchRow()){
 			$ret[$row['token']] = array(
 				'appUrl' => $row['appurl'],
-				'category' => $row['category'],
+				'categories' => $row['category'],
 			);
 		}
 		return $ret;
@@ -30,21 +32,23 @@ class OC_remoteStorage {
 		$query=OC_DB::prepare("DELETE FROM *PREFIX*authtoken WHERE token=? AND user=?");
 		$result=$query->execute(array($token,$user));
 	}
-	private static function addToken($token, $appUrl, $category){
+	private static function addToken($token, $appUrl, $categories){
 		$user=OC_User::getUser();
 		$query=OC_DB::prepare("INSERT INTO *PREFIX*authtoken (`token`,`appUrl`,`user`,`category`) VALUES(?,?,?,?)");
-		$result=$query->execute(array($token,$appUrl,$user,$category));
+		$result=$query->execute(array($token,$appUrl,$user,$categories));
 	}
-	public static function createCategory($appUrl, $category) {
+	public static function createCategories($appUrl, $categories) {
 		$token=uniqid();
-		self::addToken($token, $appUrl, $category);
-		//TODO: input checking on $category
 		OC_Util::setupFS(OC_User::getUser());
-		$scopePathParts = array('remoteStorage', $category);
-		for($i=0;$i<=count($scopePathParts);$i++){
-			$thisPath = '/'.implode('/', array_slice($scopePathParts, 0, $i));
-			if(!OC_Filesystem::file_exists($thisPath)) {
-				OC_Filesystem::mkdir($thisPath);
+		self::addToken($token, $appUrl, $categories);
+		foreach($categories as $category) {
+			//TODO: input checking on $category
+			$scopePathParts = array('remoteStorage', $category);
+			for($i=0;$i<=count($scopePathParts);$i++){
+				$thisPath = '/'.implode('/', array_slice($scopePathParts, 0, $i));
+				if(!OC_Filesystem::file_exists($thisPath)) {
+					OC_Filesystem::mkdir($thisPath);
+				}
 			}
 		}
 		return base64_encode('remoteStorage:'.$token);
diff --git a/apps/remoteStorage/oauth_ro_auth.php b/apps/remoteStorage/oauth_ro_auth.php
index 5403fbe20c9..d4a55061492 100644
--- a/apps/remoteStorage/oauth_ro_auth.php
+++ b/apps/remoteStorage/oauth_ro_auth.php
@@ -34,7 +34,7 @@ class OC_Connector_Sabre_Auth_ro_oauth extends Sabre_DAV_Auth_Backend_AbstractBa
 		if(in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD', 'OPTIONS'))) {
 			OC_Util::setUpFS();
 			return true;
-		} else if(isset($this->validTokens[$password]) && $this->validTokens[$password] == $username) {
+		} else if(isset($this->validTokens[$password])) {
 			OC_Util::setUpFS();
 			return true;
 		} else {
@@ -47,7 +47,7 @@ die('not getting in with "'.$username.'"/"'.$password.'"!');
 
 	//overwriting this to make it not automatically fail if no auth header is found:
 	public function authenticate(Sabre_DAV_Server $server,$realm) {
-		$auth = new Sabre_HTTP_BasicAuth();
+		$auth = new Sabre_HTTP_BearerAuth();
 		$auth->setHTTPRequest($server->httpRequest);
 		$auth->setHTTPResponse($server->httpResponse);
 		$auth->setRealm($realm);
-- 
GitLab


From 3f87c2cedb271d498f5e198ce90df4948bc032fa Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Wed, 22 Feb 2012 19:05:41 +0000
Subject: [PATCH 129/248] correct header Content-Type: application/xrd+xml

---
 apps/user_webfinger/host-meta.php | 2 +-
 apps/user_webfinger/webfinger.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user_webfinger/host-meta.php b/apps/user_webfinger/host-meta.php
index dbb4377e8c7..ac577cf9a0c 100644
--- a/apps/user_webfinger/host-meta.php
+++ b/apps/user_webfinger/host-meta.php
@@ -4,7 +4,7 @@ if($_SERVER['SCRIPT_NAME'] == '/.well-known/host-meta.php') {
 } else {
 	header('Please-first: activate');
 }
-header("Content-Type: application/xml+xrd");
+header("Content-Type: application/xrd+xml");
 echo "<";
 ?>
 ?xml version="1.0" encoding="UTF-8"?>
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index a9537182016..5c2a24aa070 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -4,7 +4,7 @@ if($_SERVER['SCRIPT_NAME'] == '/.well-known/webfinger.php') {
 } else {
 	header('Please-first: activate');
 }
-// header("Content-Type: application/xml+xrd");
+header("Content-Type: application/xrd+xml");
 
 // calculate the documentroot
 // modified version of the one in lib/base.php that takes the .well-known symlink into account
-- 
GitLab


From 8bfc73c188216f5f0cb21a8c2c30b145435d042b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 22 Feb 2012 21:38:15 +0100
Subject: [PATCH 130/248] some multiselect improvements

---
 core/js/multiselect.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 96fc09a0759..541dddf0f70 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -12,6 +12,11 @@
 			'minWidth': 'default;',
 		};
 		$.extend(settings,options);
+		$.each(this.children(),function(i,option){
+			if($(option).attr('selected') && settings.checked.indexOf($(option).val())==-1){
+				settings.checked.push($(option).val());
+			}
+		});
 		var button=$('<div class="multiselect button"><span>'+settings.title+'</span><span>â–¾</span></div>');
 		var span=$('<span/>');
 		span.append(button);
@@ -46,9 +51,11 @@
 			});
 			button.addClass('active');
 			event.stopPropagation();
-			var options=$(this).parent().next().children().map(function(){return $(this).val();});
+			var options=$(this).parent().next().children();
 			var list=$('<ul class="multiselectoptions"/>').hide().appendTo($(this).parent());
-			function createItem(item,checked){
+			function createItem(element,checked){
+				element=$(element);
+				var item=element.val();
 				var id='ms'+multiSelectId+'-option-'+item;
 				var input=$('<input id="'+id+'" type="checkbox"/>');
 				var label=$('<label for="'+id+'">'+item+'</label>');
@@ -61,6 +68,7 @@
 				input.change(function(){
 					var groupname=$(this).next().text();
 					if($(this).is(':checked')){
+						element.attr('selected','selected');
 						if(settings.oncheck){
 							if(settings.oncheck(groupname)===false){
 								$(this).attr('checked', false);
@@ -70,6 +78,7 @@
 						settings.checked.push(groupname);
 					}else{
 						var index=settings.checked.indexOf(groupname);
+						element.attr('selected',null);
 						if(settings.onuncheck){
 							if(settings.onuncheck(groupname)===false){
 								$(this).attr('checked',true);
@@ -119,11 +128,11 @@
 							var li=$(this).parent();
 							$(this).remove();
 							li.text('+ '+settings.createText);
-							li.before(createItem($(this).val()));
+							li.before(createItem(this));
+							var select=button.parent().next();
+							select.append($('<option selected="selected" value="'+$(this).val()+'">'+$(this).val()+'</option>'));
 							li.prev().children('input').trigger('click');
 							button.parent().data('preventHide',false);
-							var select=button.parent().next();
-							select.append($('<option value="'+$(this).val()+'">'+$(this).val()+'</option>'));
 							if(settings.createCallback){
 								settings.createCallback();
 							}
-- 
GitLab


From 2e05bd69f5b39f449f7e7475d81c27ee2b1f946a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 22 Feb 2012 22:16:33 +0100
Subject: [PATCH 131/248] add javascript bindings for OC_AppConfig

---
 core/ajax/appconfig.php | 35 ++++++++++++++++++++++++++
 core/js/config.js       | 55 +++++++++++++++++++++++++++++++++++++++++
 lib/base.php            |  1 +
 3 files changed, 91 insertions(+)
 create mode 100644 core/ajax/appconfig.php
 create mode 100644 core/js/config.js

diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
new file mode 100644
index 00000000000..50984ac32b9
--- /dev/null
+++ b/core/ajax/appconfig.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * 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();
+$action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
+$result=false;
+switch($action){
+	case 'getValue':
+		$result=OC_Appconfig::getValue($_GET['app'],$_GET['key'],$_GET['default']);
+		break;
+	case 'setValue':
+		$result=OC_Appconfig::setValue($_POST['app'],$_POST['key'],$_POST['value']);
+		break;
+	case 'getApps':
+		$result=OC_Appconfig::getApps();
+		break;
+	case 'getKeys':
+		$result=OC_Appconfig::getKeys($_GET['app']);
+		break;
+	case 'hasKey':
+		$result=OC_Appconfig::hasKey($_GET['app'],$_GET['key']);
+		break;
+	case 'deleteKey':
+		$result=OC_Appconfig::deleteKey($_POST['app'],$_POST['key']);
+		break;
+	case 'deleteApp':
+		$result=OC_Appconfig::deleteApp($_POST['app']);
+		break;
+}
+OC_JSON::success(array('data'=>$result));
diff --git a/core/js/config.js b/core/js/config.js
new file mode 100644
index 00000000000..500fe072a64
--- /dev/null
+++ b/core/js/config.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+OC.AppConfig={
+	url:OC.filePath('core','ajax','appconfig.php'),
+	getCall:function(action,data,callback){
+		data.action=action;
+		$.getJSON(OC.AppConfig.url,data,function(result){
+			if(result.status='success'){
+				if(callback){
+					callback(result.data);
+				}
+			}
+		});
+	},
+	postCall:function(action,data,callback){
+		data.action=action;
+		$.post(OC.AppConfig.url,data,function(result){
+			if(result.status='success'){
+				if(callback){
+					callback(result.data);
+				}
+			}
+		},'json');
+	},
+	getValue:function(app,key,defaultValue,callback){
+		if(typeof defaultValue=='function'){
+			callback=defaultValue;
+			defaultValue=null;
+		}
+		OC.AppConfig.getCall('getValue',{app:app,key:key,default:defaultValue},callback);
+	},
+	setValue:function(app,key,value){
+		OC.AppConfig.postCall('setValue',{app:app,key:key,value:value});
+	},
+	getApps:function(callback){
+		OC.AppConfig.getCall('getApps',{},callback);
+	},
+	getKeys:function(app,callback){
+		OC.AppConfig.getCall('getKeys',{app:app},callback);
+	},
+	hasKey:function(app,key,callback){
+		OC.AppConfig.getCall('hasKey',{app:app,key:key},callback);
+	},
+	deleteKey:function(app,key){
+		OC.AppConfig.postCall('deleteKey',{app:app,key:key});
+	},
+	deleteApp:function(app){
+		OC.AppConfig.postCall('deleteApp',{app:app});
+	},
+}
+//TODO OC.Preferences
diff --git a/lib/base.php b/lib/base.php
index 94e4907fed2..652b1f11bad 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -205,6 +205,7 @@ class OC{
 		OC_Util::addScript( "jquery-tipsy" );
 		OC_Util::addScript( "js" );
 		OC_Util::addScript( "eventsource" );
+		OC_Util::addScript( "config" );
 		//OC_Util::addScript( "multiselect" );
 		OC_Util::addScript('search','result');
 		OC_Util::addStyle( "styles" );
-- 
GitLab


From 814bc2fd2bef739938716ae840a4db0de502422a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 22 Feb 2012 22:20:46 +0100
Subject: [PATCH 132/248] make encryption filetype blacklist configurable

---
 apps/files_encryption/appinfo/app.php        |  2 ++
 apps/files_encryption/js/settings.js         | 19 +++++++++++++++++++
 apps/files_encryption/settings.php           | 16 ++++++++++++++++
 apps/files_encryption/templates/settings.php | 11 +++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 apps/files_encryption/js/settings.js
 create mode 100644 apps/files_encryption/settings.php
 create mode 100644 apps/files_encryption/templates/settings.php

diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 23f3955aa40..68c445d5d77 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -15,3 +15,5 @@ if(!isset($_SESSION['enckey']) and OC_User::isLoggedIn()){//force the user to re
 	header("Location: ".OC::$WEBROOT.'/');
 	exit();
 }
+
+OC_App::registerAdmin('files_encryption', 'settings');
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
new file mode 100644
index 00000000000..adbf0c87245
--- /dev/null
+++ b/apps/files_encryption/js/settings.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+
+$(document).ready(function(){
+	$('#encryption_blacklist').multiSelect({
+		oncheck:blackListChange,
+		onuncheck:blackListChange,
+		createText:'...',
+	});
+	
+	function blackListChange(){
+		var blackList=$('#encryption_blacklist').val().join(',');
+		OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
+	}
+})
\ No newline at end of file
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
new file mode 100644
index 00000000000..396ad1ba78d
--- /dev/null
+++ b/apps/files_encryption/settings.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright (c) 2011 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+$tmpl = new OC_Template( 'files_encryption', 'settings');
+$blackList=explode(',',OC_Appconfig::getValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
+$tmpl->assign('blacklist',$blackList);
+
+OC_Util::addScript('files_encryption','settings');
+OC_Util::addScript('core','multiselect');
+
+return $tmpl->fetchPage();
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
new file mode 100644
index 00000000000..724a03836a8
--- /dev/null
+++ b/apps/files_encryption/templates/settings.php
@@ -0,0 +1,11 @@
+<form id="calendar">
+	<fieldset class="personalblock">
+	<strong><?php echo $l->t('Encryption'); ?></strong>
+		<?php echo $l->t("Exclude the following file types from encryption"); ?>
+		<select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple">
+			<?php foreach($_["blacklist"] as $type): ?>
+				<option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option>
+			<?php endforeach;?>
+		</select>
+	</fieldset>
+</form>
-- 
GitLab


From 70f9936651870ad0768c26f76849fa5e7708eaee Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Wed, 22 Feb 2012 16:38:05 -0500
Subject: [PATCH 133/248] sharing code between the two bookmarklets

---
 apps/bookmarks/css/bookmarks.css         | 15 +--------------
 apps/bookmarks/templates/bookmarklet.php |  8 ++++++++
 apps/bookmarks/templates/list.php        |  6 ++++--
 apps/bookmarks/templates/settings.php    |  7 +++++--
 4 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 apps/bookmarks/templates/bookmarklet.php

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index 499a4e9c53e..7203078ffda 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -1,7 +1,7 @@
 #content { overflow: auto; height: 100%; }
 #firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
 #firstrun small { display: block; font-weight: normal; font-size: 0.5em; }
-#firstrun #selections { font-size:0.8em;  width: 100%; margin: 2em auto auto auto; clear: both; }
+#firstrun #selections { font-size:0.8em;  font-weight: normal; width: 100%; margin: 2em auto auto auto; clear: both; }
 
 .bookmarks_headline {
 	font-size: large;
@@ -87,16 +87,3 @@
 	display: none;
 	margin-left: 5px;
 }
-
-#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/bookmarklet.php b/apps/bookmarks/templates/bookmarklet.php
new file mode 100644
index 00000000000..eaae21d1ce4
--- /dev/null
+++ b/apps/bookmarks/templates/bookmarklet.php
@@ -0,0 +1,8 @@
+<?php
+
+function createBookmarklet() {
+	  $l = new OC_L10N('bookmarks');
+	  echo "<em>" .$l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage:') . "</em>&nbsp;";
+	  echo "<a style='background-color:#eee;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('" . 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)})();\">";
+	  echo $l->t('Add page to ownCloud') . "</a>";
+} 
diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
index d772cb905aa..ae63d4dc6fd 100644
--- a/apps/bookmarks/templates/list.php
+++ b/apps/bookmarks/templates/list.php
@@ -24,8 +24,10 @@
 </div>
 <div id="firstrun">
 	<?php echo $l->t('You have no bookmarks'); ?>
-	<small><?php echo $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage.'); ?></small>
 	<div id="selections">
-		<a class="button" 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)})();'><?php echo $l->t('Add page to ownCloud'); ?></a>
+	<?php
+	  require_once('bookmarklet.php');
+	  createBookmarklet(); 
+	?>
 	</div>
 </div>
diff --git a/apps/bookmarks/templates/settings.php b/apps/bookmarks/templates/settings.php
index b787e31f3c5..31edf7478bf 100644
--- a/apps/bookmarks/templates/settings.php
+++ b/apps/bookmarks/templates/settings.php
@@ -8,7 +8,10 @@
 ?>
 <form id="bookmarks">
 		<fieldset class="personalblock">
-			<span class="bold"><?php echo $l->t('Bookmarklet:');?></span>&nbsp;<a class="bookmarks_addBml" 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)})();'><?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 />
+			<span class="bold"><?php echo $l->t('Bookmarklet <br />');?></span>
+			<?php
+			    require_once('bookmarklet.php');
+			    createBookmarklet(); 
+			?>
 		</fieldset>
 </form>
-- 
GitLab


From 5387820a3b81b35521063bb142dd1492a87ef470 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 22 Feb 2012 23:08:50 +0100
Subject: [PATCH 134/248] changed look of bookmarklet

---
 apps/bookmarks/css/bookmarks.css         | 2 +-
 apps/bookmarks/templates/bookmarklet.php | 8 ++++----
 apps/bookmarks/templates/list.php        | 8 +++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index 7203078ffda..fedd2af7c4c 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -1,6 +1,6 @@
 #content { overflow: auto; height: 100%; }
 #firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
-#firstrun small { display: block; font-weight: normal; font-size: 0.5em; }
+#firstrun small { display: block; font-weight: normal; font-size: 0.5em; margin-bottom: 1.5em; }
 #firstrun #selections { font-size:0.8em;  font-weight: normal; width: 100%; margin: 2em auto auto auto; clear: both; }
 
 .bookmarks_headline {
diff --git a/apps/bookmarks/templates/bookmarklet.php b/apps/bookmarks/templates/bookmarklet.php
index eaae21d1ce4..5719603da5f 100644
--- a/apps/bookmarks/templates/bookmarklet.php
+++ b/apps/bookmarks/templates/bookmarklet.php
@@ -1,8 +1,8 @@
 <?php
 
 function createBookmarklet() {
-	  $l = new OC_L10N('bookmarks');
-	  echo "<em>" .$l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage:') . "</em>&nbsp;";
-	  echo "<a style='background-color:#eee;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('" . 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)})();\">";
-	  echo $l->t('Add page to ownCloud') . "</a>";
+	$l = new OC_L10N('bookmarks');
+	echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage:') . '</small>'
+	. '<a class="button" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open(\'' . OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location),\'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);})();">'
+	. $l->t('Add page to ownCloud') . '</a>';
 } 
diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
index ae63d4dc6fd..46577d16832 100644
--- a/apps/bookmarks/templates/list.php
+++ b/apps/bookmarks/templates/list.php
@@ -23,11 +23,9 @@
 <div class="bookmarks_list">
 </div>
 <div id="firstrun">
-	<?php echo $l->t('You have no bookmarks'); ?>
-	<div id="selections">
 	<?php
-	  require_once('bookmarklet.php');
-	  createBookmarklet(); 
+		echo $l->t('You have no bookmarks');
+		require_once('bookmarklet.php');
+		createBookmarklet(); 
 	?>
-	</div>
 </div>
-- 
GitLab


From 3988ec2813c88fdd8a5caf5bb2a04a60868b18cc Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 22 Feb 2012 23:22:17 +0100
Subject: [PATCH 135/248] Updated bookmark form

---
 apps/bookmarks/css/bookmarks.css  |  7 +------
 apps/bookmarks/js/bookmarks.js    | 18 +++---------------
 apps/bookmarks/templates/list.php | 13 ++++---------
 settings/templates/users.php      | 11 +++++------
 4 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index fedd2af7c4c..12ccf938b55 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -15,11 +15,6 @@
 	padding: 0.5ex;
 }
 
-.bookmarks_add {
-	display: none;
-	margin-top: 45px;
-}
-
 .bookmarks_list {
 	margin-top: 36px;
 }
@@ -35,7 +30,7 @@
 }
 
 .bookmarks_input {
-	width: 20em;
+	width: 8em;
 }
 
 .bookmark_actions {
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 6db0969a2bb..166024eabde 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -3,11 +3,7 @@ var bookmarks_loading = false;
 
 var bookmarks_sorting = 'bookmarks_sorting_recent';
 
-$(document).ready(function() {
-	$('.bookmarks_addBtn').click(function(event){
-		$('.bookmarks_add').slideToggle();
-	});
-	
+$(document).ready(function() {	
 	$('#bookmark_add_submit').click(addOrEditBookmark);
 	$(window).scroll(updateOnBottom);
 	
@@ -55,21 +51,14 @@ function addOrEditBookmark(event) {
 	var title = encodeEntities($('#bookmark_add_title').val());
 	var tags = encodeEntities($('#bookmark_add_tags').val());
 	var taglist = tags.split(' ');
-	var tagshtml = '';
 	$("#firstrun").hide();
-
-	for ( var i=0, len=taglist.length; i<len; ++i ){
-		tagshtml += '<a class="bookmark_tag" href="?tag=' + encodeURI(taglist[i]) + '">' + taglist[i] + '</a> ';
-	}
 	
 	if (id == 0) {
 		$.ajax({
 			url: 'ajax/addBookmark.php',
 			data: 'url=' + encodeURI(url) + '&title=' + encodeURI(title) + '&tags=' + encodeURI(tags),
 			success: function(response){ 
-				var bookmark_id = response.data;
-				$('.bookmarks_add').slideToggle(); 
-				$('.bookmarks_add').children('p').children('.bookmarks_input').val(''); 
+				$('.bookmarks_input').val(''); 
 				$('.bookmarks_list').empty();
 				bookmarks_page = 0;
 				getBookmarks();
@@ -81,8 +70,7 @@ function addOrEditBookmark(event) {
 			url: 'ajax/editBookmark.php',
 			data: 'id=' + id + '&url=' + encodeURI(url) + '&title=' + encodeURI(title) + '&tags=' + encodeURI(tags),
 			success: function(){ 
-				$('.bookmarks_add').slideToggle(); 
-				$('.bookmarks_add').children('p').children('.bookmarks_input').val(''); 
+				$('.bookmarks_input').val('');
 				$('#bookmark_add_id').val('0');
 				$('.bookmarks_list').empty();
 				bookmarks_page = 0;
diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
index 46577d16832..b3849069fee 100644
--- a/apps/bookmarks/templates/list.php
+++ b/apps/bookmarks/templates/list.php
@@ -9,16 +9,11 @@
 ?>
 <input type="hidden" id="bookmarkFilterTag" value="<?php if(isset($_GET['tag'])) echo htmlentities($_GET['tag']); ?>" />
 <div id="controls">
-	<input type="button" class="bookmarks_addBtn" value="<?php echo $l->t('Add bookmark'); ?>"/>
-</div>
-<div class="bookmarks_add">
 	<input type="hidden" id="bookmark_add_id" value="0" />
-	<p><label class="bookmarks_label"><?php echo $l->t('Address'); ?></label><input type="text" id="bookmark_add_url" class="bookmarks_input" /></p>
-	<p><label class="bookmarks_label"><?php echo $l->t('Title'); ?></label><input type="text" id="bookmark_add_title" class="bookmarks_input" />
-       <img class="loading_meta" src="<?php echo OC_Helper::imagePath('core', 'loading.gif'); ?>" /></p>
-	<p><label class="bookmarks_label"><?php echo $l->t('Tags'); ?></label><input type="text" id="bookmark_add_tags" class="bookmarks_input" /></p>
-	<p><label class="bookmarks_label"> </label><label class="bookmarks_hint"><?php echo $l->t('Hint: Use space to separate tags.'); ?></label></p>
-	<p><label class="bookmarks_label"></label><input type="submit" value="<?php echo $l->t('Add bookmark'); ?>" id="bookmark_add_submit" /></p>
+	<input type="text" id="bookmark_add_url" placeholder="<?php echo $l->t('Address'); ?>" class="bookmarks_input" />
+	<input type="text" id="bookmark_add_title" placeholder="<?php echo $l->t('Title'); ?>" class="bookmarks_input" />
+	<input type="text" id="bookmark_add_tags" placeholder="<?php echo $l->t('Tags'); ?>" class="bookmarks_input" />
+	<input type="submit" value="<?php echo $l->t('Add bookmark'); ?>" id="bookmark_add_submit" />
 </div>
 <div class="bookmarks_list">
 </div>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index bcc4d65fe43..fde4cfb9aed 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -12,15 +12,14 @@ foreach($_["groups"] as $group) {
 
 <div id="controls">
 	<form id="newuser">
-		<th class="name"><input id="newusername" placeholder="<?php echo $l->t('Name')?>" /></th>
-		<th class="password"><input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" /></th>
-		<th class="groups"><select id="newusergroups" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
+		<input id="newusername" placeholder="<?php echo $l->t('Name')?>" />
+		<input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" />
+		<select id="newusergroups" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
 		<?php foreach($_["groups"] as $group): ?>
 			<option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
 		<?php endforeach;?>
-		</select></th>
-		<th class="quota"></th>
-		<th><input type="submit" value="<?php echo $l->t('Create')?>" /></th>
+		</select>
+		<input type="submit" value="<?php echo $l->t('Create')?>" />
 	</form>
 </div>
 
-- 
GitLab


From 996e6cf419cc9ebecb9c8985e444ee1ba17e9395 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 22 Feb 2012 23:28:36 +0100
Subject: [PATCH 136/248] No bookmarks message will now show up if all
 bookmarks are delted

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

diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 166024eabde..2b8dbc3d6d4 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -9,7 +9,6 @@ $(document).ready(function() {
 	
 	$('.bookmarks_list').empty();
 	getBookmarks();
-	
 });
 
 function getBookmarks() {
@@ -50,7 +49,6 @@ function addOrEditBookmark(event) {
 	var url = encodeEntities($('#bookmark_add_url').val());
 	var title = encodeEntities($('#bookmark_add_title').val());
 	var tags = encodeEntities($('#bookmark_add_tags').val());
-	var taglist = tags.split(' ');
 	$("#firstrun").hide();
 	
 	if (id == 0) {
@@ -86,7 +84,12 @@ function delBookmark(event) {
 	$.ajax({
 		url: 'ajax/delBookmark.php',
 		data: 'url=' + encodeURI($(this).parent().parent().children('.bookmark_url:first').text()),
-		success: function(data){ record.animate({ opacity: 'hide' }, 'fast'); }
+		success: function(data){
+			record.remove();
+			if($('.bookmarks_list').is(':empty')) {
+				$("#firstrun").show();
+			}
+		}
 	});
 }
 
-- 
GitLab


From 77493e8d704c5a9c986b453583f966cb976409c9 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 22 Feb 2012 23:52:56 +0100
Subject: [PATCH 137/248] Changed bookmarklet to read later widget

---
 apps/bookmarks/addBm.php                 | 13 ++----
 apps/bookmarks/ajax/addBookmark.php      | 53 ++----------------------
 apps/bookmarks/bookmarksHelper.php       | 52 +++++++++++++++++++++++
 apps/bookmarks/css/bookmarks.css         |  1 +
 apps/bookmarks/templates/addBm.php       | 17 +++++---
 apps/bookmarks/templates/bookmarklet.php |  4 +-
 6 files changed, 72 insertions(+), 68 deletions(-)

diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
index d3d6ab0b1a2..0225a7aa7b3 100644
--- a/apps/bookmarks/addBm.php
+++ b/apps/bookmarks/addBm.php
@@ -27,14 +27,7 @@ require_once('../../lib/base.php');
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('bookmarks');
 
-OC_App::setActiveNavigationEntry( 'bookmarks_index' );
+require_once('bookmarksHelper.php');
+addBookmark($_GET['url']);
 
-OC_Util::addScript('bookmarks','addBm');
-OC_Util::addStyle('bookmarks', 'bookmarks');
-
-$tmpl = new OC_Template( 'bookmarks', 'addBm', 'user' );
-
-$url = isset($_GET['url']) ? urldecode($_GET['url']) : '';
-$tmpl->assign('URL', htmlentities($url,ENT_COMPAT,'utf-8'));
-
-$tmpl->printPage();
+include 'templates/addBm.php';
diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
index 89446564110..8cda7f0f060 100644
--- a/apps/bookmarks/ajax/addBookmark.php
+++ b/apps/bookmarks/ajax/addBookmark.php
@@ -30,53 +30,6 @@ require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('bookmarks');
 
-$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
-if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
-	$_ut = "strftime('%s','now')";
-} elseif($CONFIG_DBTYPE == 'pgsql') {
-	$_ut = 'date_part(\'epoch\',now())::integer';
-} else {
-	$_ut = "UNIX_TIMESTAMP()";
-}
-
-//FIXME: Detect when user adds a known URL
-$query = OC_DB::prepare("
-	INSERT INTO *PREFIX*bookmarks
-	(url, title, user_id, public, added, lastmodified)
-	VALUES (?, ?, ?, 0, $_ut, $_ut)
-	");
-
-if(empty($_GET["title"])) {
-	require_once('../bookmarksHelper.php');
-	$metadata = getURLMetadata($_GET["url"]);
-	$_GET["title"] = $metadata['title'];
-}
-
-$params=array(
-	htmlspecialchars_decode($_GET["url"]),
-	htmlspecialchars_decode($_GET["title"]),
-	OC_User::getUser()
-	);
-$query->execute($params);
-
-$b_id = OC_DB::insertid('*PREFIX*bookmarks');
-
-if($b_id !== false) {
-	$query = OC_DB::prepare("
-		INSERT INTO *PREFIX*bookmarks_tags
-		(bookmark_id, tag)
-		VALUES (?, ?)
-		");
-		
-	$tags = explode(' ', urldecode($_GET["tags"]));
-	foreach ($tags as $tag) {
-		if(empty($tag)) {
-			//avoid saving blankspaces
-			continue;
-		}
-		$params = array($b_id, trim($tag));
-	    $query->execute($params);
-	}
-
-	OC_JSON::success(array('data' => $b_id));
-}
+require_once('../bookmarksHelper.php');
+$id = addBookmark($_GET['url'], $_GET['title'], $_GET['tags']);
+OC_JSON::success(array('data' => $id));
\ No newline at end of file
diff --git a/apps/bookmarks/bookmarksHelper.php b/apps/bookmarks/bookmarksHelper.php
index ac512fbc241..8def7401e2f 100644
--- a/apps/bookmarks/bookmarksHelper.php
+++ b/apps/bookmarks/bookmarksHelper.php
@@ -70,3 +70,55 @@ function getURLMetadata($url) {
 
 	return $metadata;
 }
+
+function addBookmark($url, $title='', $tags='') {
+	$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
+	if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
+		$_ut = "strftime('%s','now')";
+	} elseif($CONFIG_DBTYPE == 'pgsql') {
+		$_ut = 'date_part(\'epoch\',now())::integer';
+	} else {
+		$_ut = "UNIX_TIMESTAMP()";
+	}
+	
+	//FIXME: Detect when user adds a known URL
+	$query = OC_DB::prepare("
+		INSERT INTO *PREFIX*bookmarks
+		(url, title, user_id, public, added, lastmodified)
+		VALUES (?, ?, ?, 0, $_ut, $_ut)
+		");
+	
+	if(empty($title)) {
+		$metadata = getURLMetadata($url);
+		$title = $metadata['title'];
+	}
+	
+	$params=array(
+	htmlspecialchars_decode($url),
+	htmlspecialchars_decode($title),
+	OC_User::getUser()
+	);
+	$query->execute($params);
+	
+	$b_id = OC_DB::insertid('*PREFIX*bookmarks');
+	
+	if($b_id !== false) {
+		$query = OC_DB::prepare("
+			INSERT INTO *PREFIX*bookmarks_tags
+			(bookmark_id, tag)
+			VALUES (?, ?)
+			");
+	
+		$tags = explode(' ', urldecode($tags));
+		foreach ($tags as $tag) {
+			if(empty($tag)) {
+				//avoid saving blankspaces
+				continue;
+			}
+			$params = array($b_id, trim($tag));
+			$query->execute($params);
+		}
+	
+		return $b_id;
+	}
+}
\ No newline at end of file
diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index 12ccf938b55..b1139f2c346 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -1,6 +1,7 @@
 #content { overflow: auto; height: 100%; }
 #firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
 #firstrun small { display: block; font-weight: normal; font-size: 0.5em; margin-bottom: 1.5em; }
+#firstrun .button { font-size: 0.7em; }
 #firstrun #selections { font-size:0.8em;  font-weight: normal; width: 100%; margin: 2em auto auto auto; clear: both; }
 
 .bookmarks_headline {
diff --git a/apps/bookmarks/templates/addBm.php b/apps/bookmarks/templates/addBm.php
index 9067d3481a3..dbe673f53a8 100644
--- a/apps/bookmarks/templates/addBm.php
+++ b/apps/bookmarks/templates/addBm.php
@@ -1,6 +1,11 @@
-<div class="bookmarks_addBm">
-	<p><label class="bookmarks_label"><?php echo $l->t('Address'); ?></label><input type="text" id="bookmark_add_url" class="bookmarks_input" value="<?php echo $_['URL']; ?>"/></p>
-	<p><label class="bookmarks_label"><?php echo $l->t('Tags'); ?></label><input type="text" id="bookmark_add_tags" class="bookmarks_input" /></p>
-	<p><label class="bookmarks_label"> </label><label class="bookmarks_hint"><?php echo $l->t('Hint: Use space to separate tags.'); ?></label></p>
-	<p><label class="bookmarks_label"></label><input type="submit" value="<?php echo $l->t('Add bookmark'); ?>" id="bookmark_add_submit" /></p>
-</div>
+<!DOCTYPE html>  
+<html lang="en">  
+  <head>  
+    <meta charset="utf-8">  
+    <title>Read later - ownCloud</title>  
+    <link rel="stylesheet" href="css/readlater.css">  
+  </head>
+  <body>
+  	<div class="message"><h1>Saved!</h1></div>
+  </body>  
+</html>  
\ No newline at end of file
diff --git a/apps/bookmarks/templates/bookmarklet.php b/apps/bookmarks/templates/bookmarklet.php
index 5719603da5f..23779477cb6 100644
--- a/apps/bookmarks/templates/bookmarklet.php
+++ b/apps/bookmarks/templates/bookmarklet.php
@@ -3,6 +3,6 @@
 function createBookmarklet() {
 	$l = new OC_L10N('bookmarks');
 	echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage:') . '</small>'
-	. '<a class="button" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open(\'' . OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location),\'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);})();">'
-	. $l->t('Add page to ownCloud') . '</a>';
+	. '<a class="button" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open(\'' . OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location),\'bkmk_popup\',\'left=\'+((a.screenX||a.screenLeft)+10)+\',top=\'+((a.screenY||a.screenTop)+10)+\',height=230px,width=230px,resizable=1,alwaysRaised=1\');a.setTimeout(function(){d.focus()},300);})();">'
+	. $l->t('Read later') . '</a>';
 } 
-- 
GitLab


From 358fd1c0241d1f8c21637490350c0eac6b29c230 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 22 Feb 2012 23:53:54 +0100
Subject: [PATCH 138/248] Changed text

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

diff --git a/apps/bookmarks/templates/bookmarklet.php b/apps/bookmarks/templates/bookmarklet.php
index 23779477cb6..3d8bbcc7b31 100644
--- a/apps/bookmarks/templates/bookmarklet.php
+++ b/apps/bookmarks/templates/bookmarklet.php
@@ -2,7 +2,7 @@
 
 function createBookmarklet() {
 	$l = new OC_L10N('bookmarks');
-	echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage:') . '</small>'
+	echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:') . '</small>'
 	. '<a class="button" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open(\'' . OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location),\'bkmk_popup\',\'left=\'+((a.screenX||a.screenLeft)+10)+\',top=\'+((a.screenY||a.screenTop)+10)+\',height=230px,width=230px,resizable=1,alwaysRaised=1\');a.setTimeout(function(){d.focus()},300);})();">'
 	. $l->t('Read later') . '</a>';
 } 
-- 
GitLab


From 196d6196895e7128d9cd79ac861fdc65c7b54c09 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 22 Feb 2012 23:58:38 +0100
Subject: [PATCH 139/248] Little bookmark improvement

---
 apps/bookmarks/js/bookmarks.js    | 3 +++
 apps/bookmarks/templates/list.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 2b8dbc3d6d4..17688615df8 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -30,6 +30,9 @@ function getBookmarks() {
 				updateBookmarksList(bookmarks.data[i]);
 				$("#firstrun").hide();
 			}
+			if($('.bookmarks_list').is(':empty')) {
+				$("#firstrun").show();
+			}
 
 			$('.bookmark_link').click(recordClick);
 			$('.bookmark_delete').click(delBookmark);
diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
index b3849069fee..1abdbb7f838 100644
--- a/apps/bookmarks/templates/list.php
+++ b/apps/bookmarks/templates/list.php
@@ -17,7 +17,7 @@
 </div>
 <div class="bookmarks_list">
 </div>
-<div id="firstrun">
+<div id="firstrun" style="display: none;">
 	<?php
 		echo $l->t('You have no bookmarks');
 		require_once('bookmarklet.php');
-- 
GitLab


From a62e109e8cafe710f7bf47c86815e34106852285 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Thu, 23 Feb 2012 15:37:38 +0100
Subject: [PATCH 140/248] =?UTF-8?q?make=20the=20location=20of=20the=203rdp?=
 =?UTF-8?q?arty=20folder=20flexible.=20It=C2=B4s=20automatically=20search?=
 =?UTF-8?q?=20in=20the=20owncloud=20folder=20and=20in=20the=20parent=20fol?=
 =?UTF-8?q?der.=20override=20with=20an=20option=20in=20config.php=20is=20a?=
 =?UTF-8?q?lso=20possible?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/calendar/ajax/events.php |  2 +-
 config/config.sample.php      |  2 ++
 lib/base.php                  | 33 ++++++++++++++++++++++++++++++++-
 lib/template.php              | 22 +++++++++++++++++++---
 4 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 7734129bd95..1436f634316 100755
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -7,7 +7,7 @@
  */
 
 require_once ('../../../lib/base.php');
-require_once('../../../3rdparty/when/When.php');
+require_once('when/When.php');
 
 function create_return_event($event, $vevent){
 	$return_event = array();
diff --git a/config/config.sample.php b/config/config.sample.php
index cd525358713..52067374555 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -13,6 +13,8 @@ $CONFIG = array(
 "forcessl" => false,
 "enablebackup" => false,
 "theme" => "",
+"3rdpartyroot" => "",
+"3rdpartyurl" => "",
 // "datadirectory" => ""
 );
 ?>
diff --git a/lib/base.php b/lib/base.php
index 880645ff79d..a95c9d2b21a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -54,6 +54,14 @@ class OC{
 	 * the folder that stores the data for the root filesystem (e.g. /srv/http/owncloud/data)
 	 */
 	public static $CONFIG_DATADIRECTORY_ROOT = '';
+	/**
+	 * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty)
+	 */
+	public static $THIRDPARTYROOT = '';
+	/**
+	 * the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty)
+	 */
+	public static $THIRDPARTYWEBROOT = '';
 
 	/**
 	 * SPL autoload
@@ -138,12 +146,35 @@ class OC{
 		}
 		OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
 
+
 		if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){
 			OC::$WEBROOT='/'.OC::$WEBROOT;
 		}
 
+		// search the 3rdparty folder
+		if(OC_Config::getValue('3rdpartyroot', '')<>'' and OC_Config::getValue('3rdpartyurl', '')<>''){
+			OC::$THIRDPARTYROOT=OC_Config::getValue('3rdpartyroot', '');
+			OC::$THIRDPARTYWEBROOT=OC_Config::getValue('3rdpartyurl', '');
+		}elseif(file_exists(OC::$SERVERROOT.'/3rdparty')){
+			OC::$THIRDPARTYROOT=OC::$SERVERROOT;
+			OC::$THIRDPARTYWEBROOT=OC::$WEBROOT;
+		}elseif(file_exists(OC::$SERVERROOT.'/../3rdparty')){
+			$url_tmp=explode('/',OC::$WEBROOT);	
+			$length=count($url_tmp);
+			unset($url_tmp[$length-1]); 
+			OC::$THIRDPARTYWEBROOT=implode('/',$url_tmp);
+			$root_tmp=explode('/',OC::$SERVERROOT);	
+			$length=count($root_tmp);
+			unset($root_tmp[$length-1]); 
+			OC::$THIRDPARTYROOT=implode('/',$root_tmp);
+		}else{
+			echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
+			exit;
+		}
+
+
 		// 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);
+		set_include_path(OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.OC::$SERVERROOT.'/config'.PATH_SEPARATOR.OC::$THIRDPARTYROOT.'/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') {
diff --git a/lib/template.php b/lib/template.php
index d991759fbcd..5fe2eb7d6c7 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -346,31 +346,41 @@ class OC_Template{
 
 			// 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."/themes/$theme/apps/$script$fext.js" )){
+				// Is it in 3rd party?
+				if(is_file(OC::$THIRDPARTYROOT."/$script.js" )){
+					$page->append( "jsfiles", OC::$THIRDPARTYWEBROOT."/$script.js" );
+
+				// Is it in apps and overwritten by the theme?
+				}elseif(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" );
 
+				// Is it part of an app?
 				}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" );
 
+				// Is it in the owncloud root but overwritten by the theme?
 				}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" );
-
+	
+				// Is it in the owncloud root ?
 				}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" );
 
+				// Is in core but overwritten by a theme?
 				}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" );
 
+				// Is it in core?
 				}elseif(is_file(OC::$SERVERROOT."/core/$script$fext.js" )){
 					$page->append( "jsfiles", OC::$WEBROOT."/core/$script$fext.js" );
 				}else{
@@ -380,14 +390,20 @@ class OC_Template{
 			}
 			// Add the css files
 			foreach(OC_Util::$styles as $style){
-				if(is_file(OC::$SERVERROOT."/apps/$style$fext.css" )){
+				// is it in 3rdparty?
+				if(is_file(OC::$THIRDPARTYROOT."/$style.css" )){
+					$page->append( "cssfiles", OC::$THIRDPARTYWEBROOT."/$style.css" );
+				// or in apps?
+				}elseif(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" );
+				// or in the owncloud root?
 				}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" );
+				// or in core ?	
 				}elseif(is_file(OC::$SERVERROOT."/core/$style$fext.css" )){
 					$page->append( "cssfiles", OC::$WEBROOT."/core/$style$fext.css" );
 				}else{
-- 
GitLab


From 3e756407a0e2cd2da68a59b0ea50acd72fe4d415 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 23 Feb 2012 18:23:09 +0100
Subject: [PATCH 141/248] check if the tempfile was created successfully

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

diff --git a/lib/db.php b/lib/db.php
index 9d3c20e0145..4c17cd0dbd1 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -318,6 +318,9 @@ class OC_DB {
 		
 		// Make changes and save them to a temporary file
 		$file2 = tempnam( get_temp_dir(), 'oc_db_scheme_' );
+		if($file2 == ''){
+			die('could not create tempfile in get_temp_dir() - aborting');
+		}
 		$content = str_replace( '*dbname*', $CONFIG_DBNAME, $content );
 		$content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
 		if( $CONFIG_DBTYPE == 'pgsql' ){ //mysql support it too but sqlite doesn't
-- 
GitLab


From a02d5d1a3dc4ddbfda3927b19881dba2b41279c1 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Thu, 23 Feb 2012 19:28:01 +0100
Subject: [PATCH 142/248] log typo fix

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

diff --git a/lib/filecache.php b/lib/filecache.php
index 6ae2f8253db..faadddfb37e 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -266,7 +266,7 @@ class OC_FileCache{
 		if(is_array($result)){
 			return $result['id'];
 		}else{
-			OC_Log::write('getFieldId(): file not found in cache ('.$path.')','core',OC_Log::DEBUG);
+      OC_Log::write('getFileId(): file not found in cache ('.$path.')','core',OC_Log::DEBUG);
 			return -1;
 		}
 	}
-- 
GitLab


From ce4fe9e7cbc4fbbdc8141b90231bb824198b4aaa Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Thu, 23 Feb 2012 20:35:48 +0100
Subject: [PATCH 143/248] Editor fixed.

---
 apps/bookmarks/addBm.php            | 2 +-
 apps/bookmarks/js/bookmarks.js      | 6 +++---
 apps/files_texteditor/css/style.css | 5 +++--
 apps/files_texteditor/js/editor.js  | 5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
index 0225a7aa7b3..861b677222d 100644
--- a/apps/bookmarks/addBm.php
+++ b/apps/bookmarks/addBm.php
@@ -28,6 +28,6 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('bookmarks');
 
 require_once('bookmarksHelper.php');
-addBookmark($_GET['url']);
+addBookmark($_GET['url'], '', 'Read-Later');
 
 include 'templates/addBm.php';
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 17688615df8..7317a154a76 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -126,12 +126,12 @@ function updateBookmarksList(bookmark) {
 	$('.bookmarks_list').append(
 		'<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
 			'<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>' +
+				'<span class="bookmark_delete">' +
+					'<img class="svg" src="'+OC.imagePath('core', 'actions/delete')+'" title="Delete">' +
+				'</span>&nbsp;' +
 			'</p>' +
 			'<p class="bookmark_title">'+
 				'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css
index bc238c1f40f..e260ab0dd46 100644
--- a/apps/files_texteditor/css/style.css
+++ b/apps/files_texteditor/css/style.css
@@ -1,7 +1,8 @@
 #editor{
-	position: absoloute;
+	position: fixed;
 	display: block;
-	top: 2em;
+	top: 6.5em;
+	left: 12.5em;
 }
 #editorwrapper{
 	position: absoloute;
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 7473d532304..e45652b6ef3 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -172,6 +172,7 @@ function giveEditorFocus(){
 function showFileEditor(dir,filename){
 	if(!editorIsShown()){
 		// Loads the file editor and display it.
+		$('#content').append('<div id="editor"></div>');
 		var data = $.getJSON(
 			OC.filePath('files_texteditor','ajax','loadfile.php'),
 			{file:filename,dir:dir},
@@ -273,10 +274,10 @@ $(document).ready(function(){
 			var dir=text.substr(0,text.length-file.length-1);
 			showFileEditor(dir,file);
 		});
-	}
+	};
 	// Binds the file save and close editor events, and gotoline button
 	bindControlEvents();
-	
+	$('#editor').remove();
 	// Binds the save keyboard shortcut events
 	//$(document).unbind('keydown').bind('keydown',checkForSaveKeyPress);
 });
-- 
GitLab


From e188b96596f7562e73b2974e640ff77b3e165629 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Mon, 20 Feb 2012 11:25:42 +0100
Subject: [PATCH 144/248] remove old ajax files

---
 apps/calendar/ajax/activation.php           |  19 --
 apps/calendar/ajax/choosecalendar.php       |  15 --
 apps/calendar/ajax/createcalendar.php       |  37 ---
 apps/calendar/ajax/deletecalendar.php       |  21 --
 apps/calendar/ajax/deleteevent.php          |  19 --
 apps/calendar/ajax/editcalendar.php         |  20 --
 apps/calendar/ajax/editevent.php            |  33 ---
 apps/calendar/ajax/editeventform.php        | 258 --------------------
 apps/calendar/ajax/gettimezonedetection.php |  11 -
 apps/calendar/ajax/guesstimezone.php        |  48 ----
 apps/calendar/ajax/importdialog.php         |  17 --
 apps/calendar/ajax/moveevent.php            |  43 ----
 apps/calendar/ajax/newcalendar.php          |  24 --
 apps/calendar/ajax/newevent.php             |  27 --
 apps/calendar/ajax/neweventform.php         |  76 ------
 apps/calendar/ajax/resizeevent.php          |  32 ---
 apps/calendar/ajax/settimeformat.php        |  17 --
 apps/calendar/ajax/settimezone.php          |  27 --
 apps/calendar/ajax/timeformat.php           |  12 -
 apps/calendar/ajax/timezonedetection.php    |  17 --
 apps/calendar/ajax/updatecalendar.php       |  46 ----
 21 files changed, 819 deletions(-)
 delete mode 100644 apps/calendar/ajax/activation.php
 delete mode 100644 apps/calendar/ajax/choosecalendar.php
 delete mode 100644 apps/calendar/ajax/createcalendar.php
 delete mode 100644 apps/calendar/ajax/deletecalendar.php
 delete mode 100644 apps/calendar/ajax/deleteevent.php
 delete mode 100644 apps/calendar/ajax/editcalendar.php
 delete mode 100644 apps/calendar/ajax/editevent.php
 delete mode 100644 apps/calendar/ajax/editeventform.php
 delete mode 100644 apps/calendar/ajax/gettimezonedetection.php
 delete mode 100755 apps/calendar/ajax/guesstimezone.php
 delete mode 100644 apps/calendar/ajax/importdialog.php
 delete mode 100644 apps/calendar/ajax/moveevent.php
 delete mode 100644 apps/calendar/ajax/newcalendar.php
 delete mode 100644 apps/calendar/ajax/newevent.php
 delete mode 100644 apps/calendar/ajax/neweventform.php
 delete mode 100644 apps/calendar/ajax/resizeevent.php
 delete mode 100644 apps/calendar/ajax/settimeformat.php
 delete mode 100644 apps/calendar/ajax/settimezone.php
 delete mode 100644 apps/calendar/ajax/timeformat.php
 delete mode 100644 apps/calendar/ajax/timezonedetection.php
 delete mode 100644 apps/calendar/ajax/updatecalendar.php

diff --git a/apps/calendar/ajax/activation.php b/apps/calendar/ajax/activation.php
deleted file mode 100644
index ada2e44547b..00000000000
--- a/apps/calendar/ajax/activation.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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");
-OC_JSON::checkLoggedIn();
-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_App::getCalendar($calendarid);
-OC_JSON::success(array(
-	'active' => $calendar['active'],
-	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
diff --git a/apps/calendar/ajax/choosecalendar.php b/apps/calendar/ajax/choosecalendar.php
deleted file mode 100644
index 9281c8edbdc..00000000000
--- a/apps/calendar/ajax/choosecalendar.php
+++ /dev/null
@@ -1,15 +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');
-$l10n = new OC_L10N('calendar');
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-$output = new OC_TEMPLATE("calendar", "part.choosecalendar");
-$output -> printpage();
-?>
diff --git a/apps/calendar/ajax/createcalendar.php b/apps/calendar/ajax/createcalendar.php
deleted file mode 100644
index 8d7b12f9b89..00000000000
--- a/apps/calendar/ajax/createcalendar.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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');
-
-// Check if we are a user
-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, strip_tags($_POST['name']), 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
-OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
-
-$calendar = OC_Calendar_Calendar::find($calendarid);
-$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
-$tmpl->assign('calendar', $calendar);
-OC_JSON::success(array(
-	'page' => $tmpl->fetchPage(),
-	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
diff --git a/apps/calendar/ajax/deletecalendar.php b/apps/calendar/ajax/deletecalendar.php
deleted file mode 100644
index 901cbbfcb08..00000000000
--- a/apps/calendar/ajax/deletecalendar.php
+++ /dev/null
@@ -1,21 +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();
-OC_JSON::checkAppEnabled('calendar');
-
-$cal = $_POST["calendarid"];
-$calendar = OC_Calendar_App::getCalendar($cal);
-$del = OC_Calendar_Calendar::deleteCalendar($cal);
-if($del == true){
-	OC_JSON::success();
-}else{
-	OC_JSON::error(array('error'=>'dberror'));
-}
-?> 
diff --git a/apps/calendar/ajax/deleteevent.php b/apps/calendar/ajax/deleteevent.php
deleted file mode 100644
index b25a5af1a29..00000000000
--- a/apps/calendar/ajax/deleteevent.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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('calendar');
-
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-$id = $_POST['id'];
-$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
deleted file mode 100644
index 7aeb5bbe305..00000000000
--- a/apps/calendar/ajax/editcalendar.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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');
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = OC_Calendar_App::getCalendar($_GET['calendarid']);
-$tmpl = new OC_Template("calendar", "part.editcalendar");
-$tmpl->assign('new', false);
-$tmpl->assign('calendarcolor_options', $calendarcolor_options);
-$tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
-?>
diff --git a/apps/calendar/ajax/editevent.php b/apps/calendar/ajax/editevent.php
deleted file mode 100644
index 5a487da1758..00000000000
--- a/apps/calendar/ajax/editevent.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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');
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-$errarr = OC_Calendar_Object::validateRequest($_POST);
-if($errarr){
-	//show validate errors
-	OC_JSON::error($errarr);
-	exit;
-}else{
-	$id = $_POST['id'];
-	$cal = $_POST['calendar'];
-	$data = OC_Calendar_App::getEventObject($id);
-	$vcalendar = OC_VObject::parse($data['calendardata']);
-
-	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);
-	}
-	OC_JSON::success();
-}
-?>
diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
deleted file mode 100644
index 19f6a80a167..00000000000
--- a/apps/calendar/ajax/editeventform.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?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');
-
-if(!OC_USER::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
-OC_JSON::checkAppEnabled('calendar');
-
-$id = $_GET['id'];
-$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()) {
-	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 = '';
-		$dtend->getDateTime()->modify('-1 day');
-		$enddate = $dtend->getDateTime()->format('d-m-Y');
-		$endtime = '';
-		$allday = true;
-		break;
-}
-
-$summary = $vevent->getAsString('SUMMARY');
-$location = $vevent->getAsString('LOCATION');
-$categories = $vevent->getAsArray('CATEGORIES');
-$description = $vevent->getAsString('DESCRIPTION');
-foreach($categories as $category){
-	if (!in_array($category, $category_options)){
-		array_unshift($category_options, $category);
-	}
-}
-$last_modified = $vevent->__get('LAST-MODIFIED');
-if ($last_modified){
-	$lastmodified = $last_modified->getDateTime()->format('U');
-}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($byday_day) == 3){
-					$repeat['weekofmonth'] = substr($byday_day , 0, 1);
-					$repeat['weekdays'][] = substr($byday_day , 1, 2);
-				}elseif(strlen($byday_day) == 4){
-					$repeat['weekofmonth'] = 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)){
-		$repeat['end'] = 'count';
-		$repeat['count'] = $rrulearr['COUNT'];
-	}elseif(array_key_exists('UNTIL', $rrulearr)){
-		$repeat['end'] = 'date';
-		$endbydate_day = substr($rrulearr['UNTIL'], 6, 2);
-		$endbydate_month = substr($rrulearr['UNTIL'], 4, 2);
-		$endbydate_year = substr($rrulearr['UNTIL'], 0, 4);
-		$repeat['date'] = $endbydate_day . '-' .  $endbydate_month . '-' . $endbydate_year;
-	}else{
-		$repeat['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_;
-	}
-}else{
-	$repeat['repeat'] = 'doesnotrepeat';
-}
-
-$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);
-$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);
-$tmpl->assign('categories', $categories);
-$tmpl->assign('calendar', $data['calendarid']);
-$tmpl->assign('allday', $allday);
-$tmpl->assign('startdate', $startdate);
-$tmpl->assign('starttime', $starttime);
-$tmpl->assign('enddate', $enddate);
-$tmpl->assign('endtime', $endtime);
-$tmpl->assign('description', $description);
-
-$tmpl->assign('repeat', $repeat['repeat']);
-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']);
-}
-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();
-
-?>
diff --git a/apps/calendar/ajax/gettimezonedetection.php b/apps/calendar/ajax/gettimezonedetection.php
deleted file mode 100644
index ae58370712d..00000000000
--- a/apps/calendar/ajax/gettimezonedetection.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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
deleted file mode 100755
index 41aea26985f..00000000000
--- a/apps/calendar/ajax/guesstimezone.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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.
- */
-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'];
-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']);
-	OC_JSON::success($message);
-}else{
-	OC_JSON::error();
-}
-
-?>
diff --git a/apps/calendar/ajax/importdialog.php b/apps/calendar/ajax/importdialog.php
deleted file mode 100644
index f6b8453fc22..00000000000
--- a/apps/calendar/ajax/importdialog.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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('calendar');
-$l10n = new OC_L10N('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/ajax/moveevent.php b/apps/calendar/ajax/moveevent.php
deleted file mode 100644
index f2256d4eee6..00000000000
--- a/apps/calendar/ajax/moveevent.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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');
-OC_JSON::checkLoggedIn();
-
-$id = $_POST['id'];
-
-$vcalendar = OC_Calendar_App::getVCalendar($id);
-$vevent = $vcalendar->VEVENT;
-
-$allday = $_POST['allDay'];
-$delta = new DateInterval('P0D');
-$delta->d = $_POST['dayDelta'];
-$delta->i = $_POST['minuteDelta'];
-
-OC_Calendar_App::isNotModified($vevent, $_POST['lastmodified']);
-
-$dtstart = $vevent->DTSTART;
-$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-$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);
-}
-if (!$allday && $start_type == Sabre_VObject_Element_DateTime::DATE){
-	$start_type = $end_type = Sabre_VObject_Element_DateTime::LOCALTZ;
-}
-$dtstart->setDateTime($dtstart->getDateTime()->add($delta), $start_type);
-$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
-unset($vevent->DURATION);
-
-$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());
-$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OC_JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
diff --git a/apps/calendar/ajax/newcalendar.php b/apps/calendar/ajax/newcalendar.php
deleted file mode 100644
index af3ba4fbbea..00000000000
--- a/apps/calendar/ajax/newcalendar.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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('calendar');
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = array(
-	'id' => 'new',
-	'displayname' => '',
-	'calendarcolor' => '',
-);
-$tmpl = new OC_Template('calendar', 'part.editcalendar');
-$tmpl->assign('new', true);
-$tmpl->assign('calendarcolor_options', $calendarcolor_options);
-$tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
-?>
diff --git a/apps/calendar/ajax/newevent.php b/apps/calendar/ajax/newevent.php
deleted file mode 100644
index c7c4d29943a..00000000000
--- a/apps/calendar/ajax/newevent.php
+++ /dev/null
@@ -1,27 +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');
-
-$l10n = new OC_L10N('calendar');
-
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-$errarr = OC_Calendar_Object::validateRequest($_POST);
-if($errarr){
-	//show validate errors
-	OC_JSON::error($errarr);
-	exit;
-}else{
-	$cal = $_POST['calendar'];
-	$vcalendar = OC_Calendar_Object::createVCalendarFromRequest($_POST);
-	$result = OC_Calendar_Object::add($cal, $vcalendar->serialize());
-	OC_JSON::success();
-}
-?>
diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php
deleted file mode 100644
index 3870c879b0e..00000000000
--- a/apps/calendar/ajax/neweventform.php
+++ /dev/null
@@ -1,76 +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');
-
-if(!OC_USER::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
-OC_JSON::checkAppEnabled('calendar');
-
-if (!isset($_POST['start'])){
-	OC_JSON::error();
-	die;
-}
-$start = $_POST['start'];
-$end = $_POST['end'];
-$allday = $_POST['allday'];
-
-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', date_default_timezone_get());
-$start->setTimezone(new DateTimeZone($timezone));
-$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', 'bydate');
-$tmpl->printpage();
-?>
diff --git a/apps/calendar/ajax/resizeevent.php b/apps/calendar/ajax/resizeevent.php
deleted file mode 100644
index 68347906529..00000000000
--- a/apps/calendar/ajax/resizeevent.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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');
-OC_JSON::checkLoggedIn();
-
-$id = $_POST['id'];
-
-$vcalendar = OC_Calendar_App::getVCalendar($id);
-$vevent = $vcalendar->VEVENT;
-
-$delta = new DateInterval('P0D');
-$delta->d = $_POST['dayDelta'];
-$delta->i = $_POST['minuteDelta'];
-
-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);
-
-$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());
-$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OC_JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
diff --git a/apps/calendar/ajax/settimeformat.php b/apps/calendar/ajax/settimeformat.php
deleted file mode 100644
index 7805120ba5e..00000000000
--- a/apps/calendar/ajax/settimeformat.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["timeformat"])){
-	OC_Preferences::setValue(OC_User::getUser(), 'calendar', 'timeformat', $_POST["timeformat"]);
-	OC_JSON::success();
-}else{
-	OC_JSON::error();
-}
-?> 
- 
diff --git a/apps/calendar/ajax/settimezone.php b/apps/calendar/ajax/settimezone.php
deleted file mode 100644
index c726a11471d..00000000000
--- a/apps/calendar/ajax/settimezone.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
- */
-
-// Init owncloud
-require_once('../../../lib/base.php');
-
-$l=new OC_L10N('calendar');
-
-// Check if we are a user
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-// Get data
-if( isset( $_POST['timezone'] ) ){
-	$timezone=$_POST['timezone'];
-	OC_Preferences::setValue( OC_User::getUser(), 'calendar', 'timezone', $timezone );
-	OC_JSON::success(array('data' => array( 'message' => $l->t('Timezone changed') )));
-}else{
-	OC_JSON::error(array('data' => array( 'message' => $l->t('Invalid request') )));
-}
-
-?>
diff --git a/apps/calendar/ajax/timeformat.php b/apps/calendar/ajax/timeformat.php
deleted file mode 100644
index 3533adcf8e0..00000000000
--- a/apps/calendar/ajax/timeformat.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();
-$timeformat = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'timeformat', "24");
-OC_JSON::encodedPrint(array("timeformat" => $timeformat));
-?> 
diff --git a/apps/calendar/ajax/timezonedetection.php b/apps/calendar/ajax/timezonedetection.php
deleted file mode 100644
index 77e4c4f6ebe..00000000000
--- a/apps/calendar/ajax/timezonedetection.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/ajax/updatecalendar.php b/apps/calendar/ajax/updatecalendar.php
deleted file mode 100644
index 20c225d8a29..00000000000
--- a/apps/calendar/ajax/updatecalendar.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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');
-
-// Check if we are a user
-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'];
-$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, $calendarcolor);
-OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
-
-$calendar = OC_Calendar_App::getCalendar($calendarid);
-$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
-$tmpl->assign('calendar', $calendar);
-OC_JSON::success(array(
-	'page' => $tmpl->fetchPage(),
-	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
-- 
GitLab


From b7de1850a00b91be34af062957df73424c95469b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Mon, 20 Feb 2012 11:26:22 +0100
Subject: [PATCH 145/248] add moved files to clean up ajax folder

---
 apps/calendar/ajax/calendar/activation.php    |  19 ++
 apps/calendar/ajax/calendar/delete.php        |  21 ++
 apps/calendar/ajax/calendar/edit.form.php     |  20 ++
 apps/calendar/ajax/calendar/edit.php          |  20 ++
 apps/calendar/ajax/calendar/new.form.php      |  24 ++
 apps/calendar/ajax/calendar/new.php           |  37 +++
 apps/calendar/ajax/calendar/overview.php      |  15 ++
 .../calendar/ajax/calendar/updatecalendar.php |  38 +++
 apps/calendar/ajax/event/delete.php           |  19 ++
 apps/calendar/ajax/event/edit.form.php        | 248 ++++++++++++++++++
 apps/calendar/ajax/event/edit.php             |  33 +++
 apps/calendar/ajax/event/move.php             |  43 +++
 apps/calendar/ajax/event/new.form.php         |  76 ++++++
 apps/calendar/ajax/event/new.php              |  27 ++
 apps/calendar/ajax/event/resize.php           |  32 +++
 apps/calendar/ajax/import/dialog.php          |  17 ++
 apps/calendar/ajax/import/import.php          | 120 +++++++++
 .../ajax/settings/gettimezonedetection.php    |  11 +
 apps/calendar/ajax/settings/guesstimezone.php |  48 ++++
 apps/calendar/ajax/settings/settimeformat.php |  17 ++
 apps/calendar/ajax/settings/settimezone.php   |  27 ++
 apps/calendar/ajax/settings/timeformat.php    |  12 +
 .../ajax/settings/timezonedetection.php       |  17 ++
 apps/calendar/ajax/share/changepermission.php |  40 +++
 apps/calendar/ajax/share/dropdown.php         |  18 ++
 apps/calendar/ajax/share/share.php            |  51 ++++
 apps/calendar/ajax/share/unshare.php          |  44 ++++
 27 files changed, 1094 insertions(+)
 create mode 100644 apps/calendar/ajax/calendar/activation.php
 create mode 100644 apps/calendar/ajax/calendar/delete.php
 create mode 100644 apps/calendar/ajax/calendar/edit.form.php
 create mode 100644 apps/calendar/ajax/calendar/edit.php
 create mode 100644 apps/calendar/ajax/calendar/new.form.php
 create mode 100644 apps/calendar/ajax/calendar/new.php
 create mode 100644 apps/calendar/ajax/calendar/overview.php
 create mode 100644 apps/calendar/ajax/calendar/updatecalendar.php
 create mode 100644 apps/calendar/ajax/event/delete.php
 create mode 100644 apps/calendar/ajax/event/edit.form.php
 create mode 100644 apps/calendar/ajax/event/edit.php
 create mode 100644 apps/calendar/ajax/event/move.php
 create mode 100644 apps/calendar/ajax/event/new.form.php
 create mode 100644 apps/calendar/ajax/event/new.php
 create mode 100644 apps/calendar/ajax/event/resize.php
 create mode 100644 apps/calendar/ajax/import/dialog.php
 create mode 100644 apps/calendar/ajax/import/import.php
 create mode 100644 apps/calendar/ajax/settings/gettimezonedetection.php
 create mode 100755 apps/calendar/ajax/settings/guesstimezone.php
 create mode 100644 apps/calendar/ajax/settings/settimeformat.php
 create mode 100644 apps/calendar/ajax/settings/settimezone.php
 create mode 100644 apps/calendar/ajax/settings/timeformat.php
 create mode 100644 apps/calendar/ajax/settings/timezonedetection.php
 create mode 100644 apps/calendar/ajax/share/changepermission.php
 create mode 100644 apps/calendar/ajax/share/dropdown.php
 create mode 100644 apps/calendar/ajax/share/share.php
 create mode 100644 apps/calendar/ajax/share/unshare.php

diff --git a/apps/calendar/ajax/calendar/activation.php b/apps/calendar/ajax/calendar/activation.php
new file mode 100644
index 00000000000..7677d85aff3
--- /dev/null
+++ b/apps/calendar/ajax/calendar/activation.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');
+OC_JSON::checkLoggedIn();
+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_App::getCalendar($calendarid);
+OC_JSON::success(array(
+	'active' => $calendar['active'],
+	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
+));
diff --git a/apps/calendar/ajax/calendar/delete.php b/apps/calendar/ajax/calendar/delete.php
new file mode 100644
index 00000000000..a2f5311731c
--- /dev/null
+++ b/apps/calendar/ajax/calendar/delete.php
@@ -0,0 +1,21 @@
+<?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();
+OC_JSON::checkAppEnabled('calendar');
+
+$cal = $_POST["calendarid"];
+$calendar = OC_Calendar_App::getCalendar($cal);
+$del = OC_Calendar_Calendar::deleteCalendar($cal);
+if($del == true){
+	OC_JSON::success();
+}else{
+	OC_JSON::error(array('error'=>'dberror'));
+}
+?> 
diff --git a/apps/calendar/ajax/calendar/edit.form.php b/apps/calendar/ajax/calendar/edit.form.php
new file mode 100644
index 00000000000..8922b3eba4e
--- /dev/null
+++ b/apps/calendar/ajax/calendar/edit.form.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');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+
+$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
+$calendar = OC_Calendar_App::getCalendar($_GET['calendarid']);
+$tmpl = new OC_Template("calendar", "part.editcalendar");
+$tmpl->assign('new', false);
+$tmpl->assign('calendarcolor_options', $calendarcolor_options);
+$tmpl->assign('calendar', $calendar);
+$tmpl->printPage();
+?>
diff --git a/apps/calendar/ajax/calendar/edit.php b/apps/calendar/ajax/calendar/edit.php
new file mode 100644
index 00000000000..8922b3eba4e
--- /dev/null
+++ b/apps/calendar/ajax/calendar/edit.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');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+
+$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
+$calendar = OC_Calendar_App::getCalendar($_GET['calendarid']);
+$tmpl = new OC_Template("calendar", "part.editcalendar");
+$tmpl->assign('new', false);
+$tmpl->assign('calendarcolor_options', $calendarcolor_options);
+$tmpl->assign('calendar', $calendar);
+$tmpl->printPage();
+?>
diff --git a/apps/calendar/ajax/calendar/new.form.php b/apps/calendar/ajax/calendar/new.form.php
new file mode 100644
index 00000000000..6e7423cbe92
--- /dev/null
+++ b/apps/calendar/ajax/calendar/new.form.php
@@ -0,0 +1,24 @@
+<?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('calendar');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
+$calendar = array(
+	'id' => 'new',
+	'displayname' => '',
+	'calendarcolor' => '',
+);
+$tmpl = new OC_Template('calendar', 'part.editcalendar');
+$tmpl->assign('new', true);
+$tmpl->assign('calendarcolor_options', $calendarcolor_options);
+$tmpl->assign('calendar', $calendar);
+$tmpl->printPage();
+?>
diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php
new file mode 100644
index 00000000000..228e6247724
--- /dev/null
+++ b/apps/calendar/ajax/calendar/new.php
@@ -0,0 +1,37 @@
+<?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');
+
+// Check if we are a user
+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, strip_tags($_POST['name']), 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
+OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
+
+$calendar = OC_Calendar_Calendar::find($calendarid);
+$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
+$tmpl->assign('calendar', $calendar);
+OC_JSON::success(array(
+	'page' => $tmpl->fetchPage(),
+	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
+));
diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php
new file mode 100644
index 00000000000..2f73f5d0710
--- /dev/null
+++ b/apps/calendar/ajax/calendar/overview.php
@@ -0,0 +1,15 @@
+<?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');
+$l10n = new OC_L10N('calendar');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+$output = new OC_TEMPLATE("calendar", "part.choosecalendar");
+$output -> printpage();
+?>
diff --git a/apps/calendar/ajax/calendar/updatecalendar.php b/apps/calendar/ajax/calendar/updatecalendar.php
new file mode 100644
index 00000000000..f400c8c14b4
--- /dev/null
+++ b/apps/calendar/ajax/calendar/updatecalendar.php
@@ -0,0 +1,38 @@
+<?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');
+
+// Check if we are a user
+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, strip_tags($_POST['name']), null, null, null, $_POST['color']);
+OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
+
+$calendar = OC_Calendar_App::getCalendar($calendarid);
+$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
+$tmpl->assign('calendar', $calendar);
+OC_JSON::success(array(
+	'page' => $tmpl->fetchPage(),
+	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
+));
diff --git a/apps/calendar/ajax/event/delete.php b/apps/calendar/ajax/event/delete.php
new file mode 100644
index 00000000000..862dec6bf5b
--- /dev/null
+++ b/apps/calendar/ajax/event/delete.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('calendar');
+
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+
+$id = $_POST['id'];
+$event_object = OC_Calendar_App::getEventObject($id);
+$result = OC_Calendar_Object::delete($id);
+OC_JSON::success();
+?> 
diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php
new file mode 100644
index 00000000000..837edbbbf05
--- /dev/null
+++ b/apps/calendar/ajax/event/edit.form.php
@@ -0,0 +1,248 @@
+<?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');
+
+if(!OC_USER::isLoggedIn()) {
+	die('<script type="text/javascript">document.location = oc_webroot;</script>');
+}
+OC_JSON::checkAppEnabled('calendar');
+
+$id = $_GET['id'];
+$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()) {
+	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 = '';
+		$dtend->getDateTime()->modify('-1 day');
+		$enddate = $dtend->getDateTime()->format('d-m-Y');
+		$endtime = '';
+		$allday = true;
+		break;
+}
+
+$summary = $vevent->getAsString('SUMMARY');
+$location = $vevent->getAsString('LOCATION');
+$categories = $vevent->getAsArray('CATEGORIES');
+$description = $vevent->getAsString('DESCRIPTION');
+foreach($categories as $category){
+	if (!in_array($category, $category_options)){
+		array_unshift($category_options, $category);
+	}
+}
+$last_modified = $vevent->__get('LAST-MODIFIED');
+if ($last_modified){
+	$lastmodified = $last_modified->getDateTime()->format('U');
+}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($byday_day) == 3){
+					$repeat['weekofmonth'] = substr($byday_day , 0, 1);
+					$repeat['weekdays'][] = substr($byday_day , 1, 2);
+				}elseif(strlen($byday_day) == 4){
+					$repeat['weekofmonth'] = 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)){
+		$repeat['end'] = 'count';
+		$repeat['count'] = $rrulearr['COUNT'];
+	}elseif(array_key_exists('UNTIL', $rrulearr)){
+		$repeat['end'] = 'date';
+		$endbydate_day = substr($rrulearr['UNTIL'], 6, 2);
+		$endbydate_month = substr($rrulearr['UNTIL'], 4, 2);
+		$endbydate_year = substr($rrulearr['UNTIL'], 0, 4);
+		$repeat['date'] = $endbydate_day . '-' .  $endbydate_month . '-' . $endbydate_year;
+	}else{
+		$repeat['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_;
+	}
+}else{
+	$repeat['repeat'] = 'doesnotrepeat';
+}
+
+$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);
+$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);
+$tmpl->assign('categories', $categories);
+$tmpl->assign('calendar', $data['calendarid']);
+$tmpl->assign('allday', $allday);
+$tmpl->assign('startdate', $startdate);
+$tmpl->assign('starttime', $starttime);
+$tmpl->assign('enddate', $enddate);
+$tmpl->assign('endtime', $endtime);
+$tmpl->assign('description', $description);
+
+$tmpl->assign('repeat', $repeat['repeat']);
+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
diff --git a/apps/calendar/ajax/event/edit.php b/apps/calendar/ajax/event/edit.php
new file mode 100644
index 00000000000..64daffddef0
--- /dev/null
+++ b/apps/calendar/ajax/event/edit.php
@@ -0,0 +1,33 @@
+<?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');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+
+$errarr = OC_Calendar_Object::validateRequest($_POST);
+if($errarr){
+	//show validate errors
+	OC_JSON::error($errarr);
+	exit;
+}else{
+	$id = $_POST['id'];
+	$cal = $_POST['calendar'];
+	$data = OC_Calendar_App::getEventObject($id);
+	$vcalendar = OC_VObject::parse($data['calendardata']);
+
+	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);
+	}
+	OC_JSON::success();
+}
+?>
diff --git a/apps/calendar/ajax/event/move.php b/apps/calendar/ajax/event/move.php
new file mode 100644
index 00000000000..8150fdbaa32
--- /dev/null
+++ b/apps/calendar/ajax/event/move.php
@@ -0,0 +1,43 @@
+<?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');
+OC_JSON::checkLoggedIn();
+
+$id = $_POST['id'];
+
+$vcalendar = OC_Calendar_App::getVCalendar($id);
+$vevent = $vcalendar->VEVENT;
+
+$allday = $_POST['allDay'];
+$delta = new DateInterval('P0D');
+$delta->d = $_POST['dayDelta'];
+$delta->i = $_POST['minuteDelta'];
+
+OC_Calendar_App::isNotModified($vevent, $_POST['lastmodified']);
+
+$dtstart = $vevent->DTSTART;
+$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
+$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);
+}
+if (!$allday && $start_type == Sabre_VObject_Element_DateTime::DATE){
+	$start_type = $end_type = Sabre_VObject_Element_DateTime::LOCALTZ;
+}
+$dtstart->setDateTime($dtstart->getDateTime()->add($delta), $start_type);
+$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
+unset($vevent->DURATION);
+
+$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());
+$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
+OC_JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php
new file mode 100644
index 00000000000..c19928a727e
--- /dev/null
+++ b/apps/calendar/ajax/event/new.form.php
@@ -0,0 +1,76 @@
+<?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');
+
+if(!OC_USER::isLoggedIn()) {
+	die('<script type="text/javascript">document.location = oc_webroot;</script>');
+}
+OC_JSON::checkAppEnabled('calendar');
+
+if (!isset($_POST['start'])){
+	OC_JSON::error();
+	die;
+}
+$start = $_POST['start'];
+$end = $_POST['end'];
+$allday = $_POST['allday'];
+
+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', date_default_timezone_get());
+$start->setTimezone(new DateTimeZone($timezone));
+$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', 'bydate');
+$tmpl->printpage();
+?>
diff --git a/apps/calendar/ajax/event/new.php b/apps/calendar/ajax/event/new.php
new file mode 100644
index 00000000000..59fda79da73
--- /dev/null
+++ b/apps/calendar/ajax/event/new.php
@@ -0,0 +1,27 @@
+<?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');
+
+$l10n = new OC_L10N('calendar');
+
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+
+$errarr = OC_Calendar_Object::validateRequest($_POST);
+if($errarr){
+	//show validate errors
+	OC_JSON::error($errarr);
+	exit;
+}else{
+	$cal = $_POST['calendar'];
+	$vcalendar = OC_Calendar_Object::createVCalendarFromRequest($_POST);
+	$result = OC_Calendar_Object::add($cal, $vcalendar->serialize());
+	OC_JSON::success();
+}
+?>
diff --git a/apps/calendar/ajax/event/resize.php b/apps/calendar/ajax/event/resize.php
new file mode 100644
index 00000000000..aa2d420e77d
--- /dev/null
+++ b/apps/calendar/ajax/event/resize.php
@@ -0,0 +1,32 @@
+<?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');
+OC_JSON::checkLoggedIn();
+
+$id = $_POST['id'];
+
+$vcalendar = OC_Calendar_App::getVCalendar($id);
+$vevent = $vcalendar->VEVENT;
+
+$delta = new DateInterval('P0D');
+$delta->d = $_POST['dayDelta'];
+$delta->i = $_POST['minuteDelta'];
+
+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);
+
+$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());
+$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
+OC_JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php
new file mode 100644
index 00000000000..2e002092150
--- /dev/null
+++ b/apps/calendar/ajax/import/dialog.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('calendar');
+$l10n = new OC_L10N('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/ajax/import/import.php b/apps/calendar/ajax/import/import.php
new file mode 100644
index 00000000000..96d7af48341
--- /dev/null
+++ b/apps/calendar/ajax/import/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 = OC::$SERVERROOT . '/apps/calendar/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);
+}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($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_Calendar_Object::add($id, $file);
+}else{
+	foreach($importready as $import){
+		OC_Calendar_Object::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/calendar/ajax/settings/gettimezonedetection.php b/apps/calendar/ajax/settings/gettimezonedetection.php
new file mode 100644
index 00000000000..11255fe8ef3
--- /dev/null
+++ b/apps/calendar/ajax/settings/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/settings/guesstimezone.php b/apps/calendar/ajax/settings/guesstimezone.php
new file mode 100755
index 00000000000..cfa92e1aee8
--- /dev/null
+++ b/apps/calendar/ajax/settings/guesstimezone.php
@@ -0,0 +1,48 @@
+<?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.
+ */
+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'];
+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']);
+	OC_JSON::success($message);
+}else{
+	OC_JSON::error();
+}
+
+?>
diff --git a/apps/calendar/ajax/settings/settimeformat.php b/apps/calendar/ajax/settings/settimeformat.php
new file mode 100644
index 00000000000..8f65447065c
--- /dev/null
+++ b/apps/calendar/ajax/settings/settimeformat.php
@@ -0,0 +1,17 @@
+<?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["timeformat"])){
+	OC_Preferences::setValue(OC_User::getUser(), 'calendar', 'timeformat', $_POST["timeformat"]);
+	OC_JSON::success();
+}else{
+	OC_JSON::error();
+}
+?> 
+ 
diff --git a/apps/calendar/ajax/settings/settimezone.php b/apps/calendar/ajax/settings/settimezone.php
new file mode 100644
index 00000000000..c639753fe2f
--- /dev/null
+++ b/apps/calendar/ajax/settings/settimezone.php
@@ -0,0 +1,27 @@
+<?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.
+ */
+
+// Init owncloud
+require_once('../../../../lib/base.php');
+
+$l=new OC_L10N('calendar');
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+
+// Get data
+if( isset( $_POST['timezone'] ) ){
+	$timezone=$_POST['timezone'];
+	OC_Preferences::setValue( OC_User::getUser(), 'calendar', 'timezone', $timezone );
+	OC_JSON::success(array('data' => array( 'message' => $l->t('Timezone changed') )));
+}else{
+	OC_JSON::error(array('data' => array( 'message' => $l->t('Invalid request') )));
+}
+
+?>
diff --git a/apps/calendar/ajax/settings/timeformat.php b/apps/calendar/ajax/settings/timeformat.php
new file mode 100644
index 00000000000..e0dbe8d3cd7
--- /dev/null
+++ b/apps/calendar/ajax/settings/timeformat.php
@@ -0,0 +1,12 @@
+<?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();
+$timeformat = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'timeformat', "24");
+OC_JSON::encodedPrint(array("timeformat" => $timeformat));
+?> 
diff --git a/apps/calendar/ajax/settings/timezonedetection.php b/apps/calendar/ajax/settings/timezonedetection.php
new file mode 100644
index 00000000000..f67bab901e7
--- /dev/null
+++ b/apps/calendar/ajax/settings/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/ajax/share/changepermission.php b/apps/calendar/ajax/share/changepermission.php
new file mode 100644
index 00000000000..d91f87b613f
--- /dev/null
+++ b/apps/calendar/ajax/share/changepermission.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.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');
+$id = strip_tags($_GET['id']);
+$idtype = strip_tags($_GET['idtype']);
+$permission = (int) strip_tags($_GET['permission']);
+switch($idtype){
+	case 'calendar':
+	case 'event':
+		break;
+	default:
+		OC_JSON::error(array('message'=>'unexspected parameter'));
+		exit;
+}
+$sharewith = $_GET['sharewith'];
+$sharetype = strip_tags($_GET['sharetype']);
+switch($sharetype){
+	case 'user':
+	case 'group':
+	case 'public':
+		break;
+	default:
+		OC_JSON::error(array('message'=>'unexspected parameter'));
+		exit;
+}
+if($sharetype == 'user' && !OC_User::userExists($sharewith)){
+	OC_JSON::error(array('message'=>'user not found'));
+	exit;
+}
+if($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
+	OC_JSON::error(array('message'=>'group not found'));
+	exit;
+}
+$success = OC_Calendar_Share::changepermission($sharewith, $sharetype, $id, $permission, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::Event));
+OC_JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/share/dropdown.php b/apps/calendar/ajax/share/dropdown.php
new file mode 100644
index 00000000000..eb396d38fd9
--- /dev/null
+++ b/apps/calendar/ajax/share/dropdown.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.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');
+$user = OC_USER::getUser();
+$calid = $_GET['calid'];
+$calendar = OC_Calendar_Calendar::find($calid);
+if($calendar['userid'] != $user){
+	OC_JSON::error();
+	exit;
+}
+$tmpl = new OC_Template('calendar', 'share.dropdown');
+$tmpl->assign('calid', $calid);
+$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php
new file mode 100644
index 00000000000..d892727701a
--- /dev/null
+++ b/apps/calendar/ajax/share/share.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.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');
+$id = strip_tags($_GET['id']);
+$idtype = strip_tags($_GET['idtype']);
+switch($idtype){
+	case 'calendar':
+	case 'event':
+		break;
+	default:
+		OC_JSON::error(array('message'=>'unexspected parameter'));
+		exit;
+}
+$sharewith = $_GET['sharewith'];
+$sharetype = strip_tags($_GET['sharetype']);
+switch($sharetype){
+	case 'user':
+	case 'group':
+	case 'public':
+		break;
+	default:
+		OC_JSON::error(array('message'=>'unexspected parameter'));
+		exit;
+}
+if($sharetype == 'user' && !OC_User::userExists($sharewith)){
+	OC_JSON::error(array('message'=>'user not found'));
+	exit;
+}
+if($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
+	OC_JSON::error(array('message'=>'group not found'));
+	exit;
+}
+if($sharetype == 'user' && OC_User::getUser() == $sharewith){
+	OC_JSON::error(array('meesage'=>'you can not share with yourself'));
+}
+$success = OC_Calendar_Share::share(OC_User::getUser(), $sharewith, $sharetype, $id, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::Event));
+if($success){
+	if($sharetype == 'public'){
+		OC_JSON::success(array('message'=>$success));
+	}else{
+		OC_JSON::success(array('message'=>'shared'));
+	}
+}else{
+	OC_JSON::error(array('message'=>'can not share'));
+	exit;
+}
\ No newline at end of file
diff --git a/apps/calendar/ajax/share/unshare.php b/apps/calendar/ajax/share/unshare.php
new file mode 100644
index 00000000000..ec3150a89aa
--- /dev/null
+++ b/apps/calendar/ajax/share/unshare.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.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');
+$id = strip_tags($_GET['id']);
+$idtype = strip_tags($_GET['idtype']);
+switch($idtype){
+	case 'calendar':
+	case 'event':
+		break;
+	default:
+		OC_JSON::error(array('message'=>'unexspected parameter'));
+		exit;
+}
+$sharewith = $_GET['sharewith'];
+$sharetype = strip_tags($_GET['sharetype']);
+switch($sharetype){
+	case 'user':
+	case 'group':
+	case 'public':
+		break;
+	default:
+		OC_JSON::error(array('message'=>'unexspected parameter'));
+		exit;
+}
+if($sharetype == 'user' && !OC_User::userExists($sharewith)){
+	OC_JSON::error(array('message'=>'user not found'));
+	exit;
+}
+if($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
+	OC_JSON::error(array('message'=>'group not found'));
+	exit;
+}
+$success = OC_Calendar_Share::unshare(OC_User::getUser(), $sharewith, $sharetype, $id, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::Event));
+if($success){
+	OC_JSON::success();
+}else{
+	OC_JSON::error(array('message'=>'can not unshare'));
+	exit;
+}
\ No newline at end of file
-- 
GitLab


From 8cd102721450ce02f41a07bf3473fb9a0582f054 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Mon, 20 Feb 2012 11:26:43 +0100
Subject: [PATCH 146/248] better var name in changeview.php

---
 apps/calendar/ajax/changeview.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php
index ef05c7cd496..ae48b229b16 100644
--- a/apps/calendar/ajax/changeview.php
+++ b/apps/calendar/ajax/changeview.php
@@ -9,7 +9,16 @@
 require_once ("../../../lib/base.php");
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
-$currentview = $_GET["v"];
-OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", $currentview);
+$view = $_GET['v'];
+switch($view){
+	case 'agendaWeek':
+	case 'month';
+	case 'list':
+		break;
+	default:
+		OC_JSON::error(array('message'=>'unexspected parameter: ' . $view));
+		exit;
+}
+OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'currentview', $view);
 OC_JSON::success();
 ?>
-- 
GitLab


From cfa284bfa868a44b7f4a348fb579a00c361531f1 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Mon, 20 Feb 2012 11:27:25 +0100
Subject: [PATCH 147/248] update js files for new ajax pathes

---
 apps/calendar/js/calendar.js | 22 +++++++++++-----------
 apps/calendar/js/geo.js      |  2 +-
 apps/calendar/js/loader.js   |  6 +++---
 apps/calendar/js/settings.js | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index ba8e293819a..84b76a3c88f 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -69,7 +69,7 @@ Calendar={
 				$('#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);
+				$('#dialog_holder').load(OC.filePath('calendar', 'ajax/event', 'new.form.php'), {start:start, end:end, allday:allday?1:0}, Calendar.UI.startEventDialog);
 			}
 		},
 		editEvent:function(calEvent, jsEvent, view){
@@ -79,7 +79,7 @@ Calendar={
 				$('#event').dialog('destroy').remove();
 			}else{
 				Calendar.UI.loading(true);
-				$('#dialog_holder').load(OC.filePath('calendar', 'ajax', 'editeventform.php') + '?id=' + id, Calendar.UI.startEventDialog);
+				$('#dialog_holder').load(OC.filePath('calendar', 'ajax/event', 'edit.form.php') + '?id=' + id, Calendar.UI.startEventDialog);
 			}
 		},
 		submitDeleteEventForm:function(url){
@@ -141,7 +141,7 @@ 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},
+			$.post(OC.filePath('calendar', 'ajax/event', 'move.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'){
@@ -156,7 +156,7 @@ 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},
+			$.post(OC.filePath('calendar', 'ajax/event', 'resize.php'), { id: event.id, dayDelta: dayDelta, minuteDelta: minuteDelta, lastmodified: event.lastmodified},
 			function(data) {
 				Calendar.UI.loading(false);
 				if (data.status == 'success'){
@@ -373,7 +373,7 @@ Calendar={
 					$('#choosecalendar_dialog').dialog('moveToTop');
 				}else{
 					Calendar.UI.loading(true);
-					$('#dialog_holder').load(OC.filePath('calendar', 'ajax', 'choosecalendar.php'), function(){
+					$('#dialog_holder').load(OC.filePath('calendar', 'ajax/calendar', 'overview.php'), function(){
 						$('#choosecalendar_dialog').dialog({
 							width : 600,
 							close : function(event, ui) {
@@ -387,7 +387,7 @@ Calendar={
 			activation:function(checkbox, calendarid)
 			{
 				Calendar.UI.loading(true);
-				$.post(OC.filePath('calendar', 'ajax', 'activation.php'), { calendarid: calendarid, active: checkbox.checked?1:0 },
+				$.post(OC.filePath('calendar', 'ajax/calendar', 'activation.php'), { calendarid: calendarid, active: checkbox.checked?1:0 },
 				  function(data) {
 					Calendar.UI.loading(false);
 					if (data.status == 'success'){
@@ -402,13 +402,13 @@ Calendar={
 			},
 			newCalendar:function(object){
 				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('calendar', 'ajax', 'newcalendar.php'),
+					.load(OC.filePath('calendar', 'ajax/calendar', 'new.form.php'),
 						function(){Calendar.UI.Calendar.colorPicker(this)});
 				$(object).closest('tr').after(tr).hide();
 			},
 			edit:function(object, calendarid){
 				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('calendar', 'ajax', 'editcalendar.php') + "?calendarid="+calendarid,
+					.load(OC.filePath('calendar', 'ajax/calendar', 'edit.form.php') + "?calendarid="+calendarid,
 						function(){Calendar.UI.Calendar.colorPicker(this)});
 				$(object).closest('tr').after(tr).hide();
 			},
@@ -417,7 +417,7 @@ Calendar={
 				if(check == false){
 					return false;
 				}else{
-					$.post(OC.filePath('calendar', 'ajax', 'deletecalendar.php'), { calendarid: calid},
+					$.post(OC.filePath('calendar', 'ajax/calendar', 'delete.php'), { calendarid: calid},
 					  function(data) {
 						if (data.status == 'success'){
 							var url = 'ajax/events.php?calendar_id='+calid;
@@ -442,9 +442,9 @@ Calendar={
 				
 				var url;
 				if (calendarid == 'new'){
-					url = OC.filePath('calendar', 'ajax', 'createcalendar.php');
+					url = OC.filePath('calendar', 'ajax/calendar', 'new.php');
 				}else{
-					url = OC.filePath('calendar', 'ajax', 'updatecalendar.php');
+					url = OC.filePath('calendar', 'ajax/calendar', 'update.php');
 				}
 				$.post(url, { id: calendarid, name: displayname, active: active, description: description, color: calendarcolor },
 					function(data){
diff --git a/apps/calendar/js/geo.js b/apps/calendar/js/geo.js
index ae6a971e938..c9cc5dd0955 100755
--- a/apps/calendar/js/geo.js
+++ b/apps/calendar/js/geo.js
@@ -6,7 +6,7 @@
  */
 if (navigator.geolocation) { 
 	navigator.geolocation.getCurrentPosition(function(position) {
-		$.getJSON(OC.filePath('calendar', 'ajax', 'guesstimezone.php?lat=' + position.coords.latitude + '&long=' + position.coords.longitude + ''),
+		$.getJSON(OC.filePath('calendar', 'ajax/settings', 'guesstimezone.php?lat=' + position.coords.latitude + '&long=' + position.coords.longitude + ''),
 		function(data){
 			if (data.status == 'success' && typeof(data.message) != 'undefined'){
 				$('#notification').html(data.message);
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index 4e483f9864e..54003879759 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -8,7 +8,7 @@ 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},	function(){Calendar_Import.initdialog(filename);});
+		$('#calendar_import').load(OC.filePath('calendar', 'ajax/import', 'dialog.php'), {filename:filename, path:path},	function(){Calendar_Import.initdialog(filename);});
 	},
 	initdialog: function(filename){
 		$('#calendar_import_dialog').dialog({
@@ -68,7 +68,7 @@ Calendar_Import={
 			if(percent < 100){
 				window.setTimeout('Calendar_Import.getimportstatus(\'' + progressfile + '\')', 500);
 			}else{
-				$('#import_done').css('display', 'block');
+				$('#import_done').css('display', 'block');
 			}
 		});
 	}
@@ -78,4 +78,4 @@ $(document).ready(function(){
 		FileActions.register('text/calendar','importcal', '', Calendar_Import.importdialog); 
 		FileActions.setDefault('text/calendar','importcal');
 	};
-});
\ No newline at end of file
+});
diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
index 73300885565..fcbfc423db3 100644
--- a/apps/calendar/js/settings.js
+++ b/apps/calendar/js/settings.js
@@ -3,7 +3,7 @@ $(document).ready(function(){
 		OC.msg.startSaving('#calendar .msg')
 		// Serialize the data
 		var post = $( '#timezone' ).serialize();
-		$.post( OC.filePath('calendar', 'ajax', 'settimezone.php'), post, function(data){
+		$.post( OC.filePath('calendar', 'ajax/settings', 'settimezone.php'), post, function(data){
 			//OC.msg.finishedSaving('#calendar .msg', data);
 		});
 		return false;
@@ -11,7 +11,7 @@ $(document).ready(function(){
 	$('#timezone').chosen();
 	$('#timeformat').change( function(){
 		var data = $('#timeformat').serialize();
-		$.post( OC.filePath('calendar', 'ajax', 'settimeformat.php'), data, function(data){
+		$.post( OC.filePath('calendar', 'ajax/settings', 'settimeformat.php'), data, function(data){
 			if(data == 'error'){
 				console.log('saving timeformat failed');
 			}
@@ -19,15 +19,15 @@ $(document).ready(function(){
 	});
 	$('#timezonedetection').change( function(){
 		var post = $('#timezonedetection').serialize();
-		$.post( OC.filePath('calendar', 'ajax', 'timezonedetection.php'), post, function(data){
+		$.post( OC.filePath('calendar', 'ajax/settings', 'timezonedetection.php'), post, function(data){
 			
 		});
 	});
-	$.getJSON(OC.filePath('calendar', 'ajax', 'timeformat.php'), function(jsondata, status) {
+	$.getJSON(OC.filePath('calendar', 'ajax/settings', 'timeformat.php'), function(jsondata, status) {
 		$('#' + jsondata.timeformat).attr('selected',true);
 		$('#timeformat').chosen();
 	});
-	$.getJSON(OC.filePath('calendar', 'ajax', 'gettimezonedetection.php'), function(jsondata, status){
+	$.getJSON(OC.filePath('calendar', 'ajax/settings', 'gettimezonedetection.php'), function(jsondata, status){
 		if(jsondata.detection == 'true'){
 			$('#timezonedetection').attr('checked', 'checked');
 		}
-- 
GitLab


From 319e93f7fb78da57769f307fe86b87ab9c208d6b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Mon, 20 Feb 2012 11:52:19 +0100
Subject: [PATCH 148/248] change pathes in calendar/templates/* files to make
 them work with the new folder structure in /calendar/ajax

---
 apps/calendar/templates/part.editevent.php | 2 +-
 apps/calendar/templates/part.newevent.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/templates/part.editevent.php b/apps/calendar/templates/part.editevent.php
index b3acfc4a072..7631d298bef 100644
--- a/apps/calendar/templates/part.editevent.php
+++ b/apps/calendar/templates/part.editevent.php
@@ -5,7 +5,7 @@
 <?php echo $this->inc("part.eventform"); ?>
 	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
 	<span id="actions">
-		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('ajax/editevent.php');">
+		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('ajax/events/edit.php');">
 		<input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('ajax/deleteevent.php');">
 		<input type="button" class="submit" style="float: right;" name="export" value="<?php echo $l->t("Export");?>" onclick="window.location='export.php?eventid=<?php echo $_['id'] ?>';">
 	</span>
diff --git a/apps/calendar/templates/part.newevent.php b/apps/calendar/templates/part.newevent.php
index b1e2a5eab84..85cce802876 100644
--- a/apps/calendar/templates/part.newevent.php
+++ b/apps/calendar/templates/part.newevent.php
@@ -3,7 +3,7 @@
 <?php echo $this->inc("part.eventform"); ?>
 	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
 	<span id="actions">
-		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('ajax/newevent.php');">
+		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('ajax/events/new.php');">
 	</span>
 	</form>
 </div>
-- 
GitLab


From f285790fa1532bce20c122b11657b00d6066970e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Tue, 21 Feb 2012 19:16:14 +0100
Subject: [PATCH 149/248] change links in the event form for the new ajax
 folders

---
 apps/calendar/templates/part.editevent.php | 4 ++--
 apps/calendar/templates/part.newevent.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/templates/part.editevent.php b/apps/calendar/templates/part.editevent.php
index 7631d298bef..6e319e1b4e0 100644
--- a/apps/calendar/templates/part.editevent.php
+++ b/apps/calendar/templates/part.editevent.php
@@ -5,8 +5,8 @@
 <?php echo $this->inc("part.eventform"); ?>
 	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
 	<span id="actions">
-		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('ajax/events/edit.php');">
-		<input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('ajax/deleteevent.php');">
+		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('ajax/event/edit.php');">
+		<input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('ajax/event/delete.php');">
 		<input type="button" class="submit" style="float: right;" name="export" value="<?php echo $l->t("Export");?>" onclick="window.location='export.php?eventid=<?php echo $_['id'] ?>';">
 	</span>
 	</form>
diff --git a/apps/calendar/templates/part.newevent.php b/apps/calendar/templates/part.newevent.php
index 85cce802876..11416260344 100644
--- a/apps/calendar/templates/part.newevent.php
+++ b/apps/calendar/templates/part.newevent.php
@@ -3,7 +3,7 @@
 <?php echo $this->inc("part.eventform"); ?>
 	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
 	<span id="actions">
-		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('ajax/events/new.php');">
+		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('ajax/event/new.php');">
 	</span>
 	</form>
 </div>
-- 
GitLab


From b1fb325d4815b4f4537f6a0dbe4a1eb4f5b3c360 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Tue, 21 Feb 2012 19:42:48 +0100
Subject: [PATCH 150/248] rename updatecalendar to update

---
 apps/calendar/ajax/calendar/{updatecalendar.php => update.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename apps/calendar/ajax/calendar/{updatecalendar.php => update.php} (100%)

diff --git a/apps/calendar/ajax/calendar/updatecalendar.php b/apps/calendar/ajax/calendar/update.php
similarity index 100%
rename from apps/calendar/ajax/calendar/updatecalendar.php
rename to apps/calendar/ajax/calendar/update.php
-- 
GitLab


From 7c738a1384d34c7bf3044b35ed59f990ea5ae44b Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Thu, 23 Feb 2012 22:20:15 +0100
Subject: [PATCH 151/248] Sharing dropdown width fixed.

---
 apps/files_sharing/css/sharing.css | 3 ++-
 apps/files_sharing/js/share.js     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/css/sharing.css b/apps/files_sharing/css/sharing.css
index 0759af2c274..db59a3d340b 100644
--- a/apps/files_sharing/css/sharing.css
+++ b/apps/files_sharing/css/sharing.css
@@ -5,4 +5,5 @@
 #shared_list { padding:0.5em; list-style-type: none; }
 #public { border-top:1px solid #ddd; padding-top:0.5em; }
 a.unshare { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; opacity:.5; }
-a.unshare:hover { opacity:1; }
\ No newline at end of file
+a.unshare:hover { opacity:1; }
+#share_with { width: 16em; }
\ No newline at end of file
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index d01a07447a6..fc9e17c25c7 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -174,7 +174,7 @@ $(document).ready(function() {
 function createDropdown(filename, files) {
 	var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
 	html += '<div id="private">';
-	html += '<select data-placeholder="User or Group" style="width:220px;" id="share_with" class="chzen-select">';
+	html += '<select data-placeholder="User or Group" id="share_with" class="chzen-select">';
 	html += '<option value=""></option>';
 	html += '</select>';
 	html += '<ul id="shared_list"></ul>';
-- 
GitLab


From 9df193f051c683fe69f9451ba07c4d34d480b76f Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Thu, 23 Feb 2012 22:26:31 +0100
Subject: [PATCH 152/248] Calendar selection only available if there are more
 than one.

---
 apps/calendar/templates/part.eventform.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php
index 49214aca77c..8a8f420f846 100644
--- a/apps/calendar/templates/part.eventform.php
+++ b/apps/calendar/templates/part.eventform.php
@@ -17,6 +17,7 @@
 					?>
 				</select>
 			</td>
+			<?php if(count($_['calendar_options']) > 1) { ?>
 			<th width="75px">&nbsp;&nbsp;&nbsp;<?php echo $l->t("Calendar");?>:</th>
 			<td>
 				<select style="width:140px;" name="calendar">
@@ -26,6 +27,12 @@
 					?>
 				</select>
 			</td>
+			<?php } else { ?>
+			<th width="75px">&nbsp;</th>
+			<td>
+				<input type="hidden" name="calendar" value="<?php echo $_['calendar_options'][0]['id'] ?>">
+			</td>
+			<?php } ?>
 		</tr>
 	</table>
 	<hr>
-- 
GitLab


From ca874a3ad776c9fd22c7bcbad81f493cfc551661 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 24 Feb 2012 14:18:09 +0100
Subject: [PATCH 153/248] remove limit from configvalue for long config values

---
 db_structure.xml | 12 ++++++------
 lib/util.php     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index 8e59a59c6e5..1d459b75fda 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -31,12 +31,12 @@
 
    <field>
     <name>configvalue</name>
-    <type>text</type>
-    <default></default>
+    <type>clob</type>
     <notnull>true</notnull>
-    <length>255</length>
    </field>
 
+
+
   </declaration>
 
  </table>
@@ -55,7 +55,7 @@
 	   <notnull>true</notnull>
 	   <length>4</length>
    </field>
-   
+
    <field>
     <name>path</name>
     <type>text</type>
@@ -90,7 +90,7 @@
 	   <notnull>true</notnull>
 	   <length>64</length>
    </field>
-   
+
    <field>
     <name>size</name>
     <type>integer</type>
@@ -522,7 +522,7 @@
   </declaration>
 
  </table>
- 
+
  <table>
 
   <name>*dbprefix*properties</name>
diff --git a/lib/util.php b/lib/util.php
index 1b1e29b6749..05caeca0e3e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -62,7 +62,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(3,00,1);
+		return array(3,00,2);
 	}
 
 	/**
-- 
GitLab


From e039015ca1d600a227b4cd0665192f3e22f3d1f2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 24 Feb 2012 13:02:19 +0100
Subject: [PATCH 154/248] prevent errors when a user backends gives an invalid
 result

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

diff --git a/lib/user.php b/lib/user.php
index 34f44f572e0..0746fcc6eb4 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -321,7 +321,10 @@ class OC_User {
 		$users=array();
 		foreach(self::$_usedBackends as $backend){
 			if($backend->implementsActions(OC_USER_BACKEND_GET_USERS)){
-				$users=array_merge($users,$backend->getUsers());
+				$backendUsers=$backend->getUsers();
+				if(is_array($backendUsers)){
+					$users=array_merge($users,$backendUsers);
+				}
 			}
 		}
 		return $users;
-- 
GitLab


From 9f5bce81b037624099012038f1ebfeb94d3317fd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 24 Feb 2012 14:10:19 +0100
Subject: [PATCH 155/248] add a default user quota

---
 lib/fileproxy/quota.php    | 30 ++++++++++++++++++++++++++++--
 settings/ajax/setquota.php | 10 ++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 94a49176ee6..9e4c2d0643e 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -26,11 +26,37 @@
  */
 
 class OC_FileProxy_Quota extends OC_FileProxy{
+	private $userQuota=-1;
+	
+	/**
+	 * get the quota for the current user
+	 * @return int
+	 */
+	private function getQuota(){
+		if($this->userQuota!=-1){
+			return $this->userQuota;
+		}
+		$userQuota=OC_Preferences::getValue(OC_User::getUser(),'files','quota','default');
+		if($userQuota=='default'){
+			$userQuota=OC_AppConfig::getValue('files','default_quota','none');
+		}
+		if($userQuota=='none'){
+			$this->userQuota=0;
+		}else{
+			$this->userQuota=OC_Helper::computerFileSize($userQuota);
+		}
+		return $this->userQuota;
+		
+	}
+	
+	/**
+	 * get the free space in the users home folder
+	 * @return int
+	 */
 	private function getFreeSpace(){
 		$rootInfo=OC_FileCache::get('');
 		$usedSpace=$rootInfo['size'];
-		$totalSpace=OC_Preferences::getValue(OC_User::getUser(),'files','quota',0);
-		$totalSpace=OC_Helper::computerFileSize($totalSpace);
+		$totalSpace=$this->getQuota();
 		if($totalSpace==0){
 			return 0;
 		}
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index d4e3c58ac11..7bfc65102c1 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -8,8 +8,14 @@ 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);
+$quota=$_POST["quota"];
+if($quota!='none' and $quota!='default'){
+	$quota= OC_Helper::computerFileSize($quota);
+	$quota=OC_Helper::humanFileSize($quota);
+}
+if($quota==0){
+	$quota='default';
+}
 
 // Return Success story
 OC_Preferences::setValue($username,'files','quota',$quota);
-- 
GitLab


From 4230e217af16b400cf6eba26c2333ee4ea1f884c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 24 Feb 2012 14:38:40 +0100
Subject: [PATCH 156/248] new config widget for user quota

---
 settings/ajax/setquota.php   |   9 +--
 settings/css/settings.css    |   3 +
 settings/js/users.js         | 105 +++++++++++++++++++++++------------
 settings/templates/users.php |  14 ++++-
 settings/users.php           |   8 ++-
 5 files changed, 94 insertions(+), 45 deletions(-)

diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 7bfc65102c1..e66513e54cc 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -11,10 +11,11 @@ $username = $_POST["username"];
 $quota=$_POST["quota"];
 if($quota!='none' and $quota!='default'){
 	$quota= OC_Helper::computerFileSize($quota);
-	$quota=OC_Helper::humanFileSize($quota);
-}
-if($quota==0){
-	$quota='default';
+	if($quota==0){
+		$quota='default';
+	}else{
+		$quota=OC_Helper::humanFileSize($quota);
+	}
 }
 
 // Return Success story
diff --git a/settings/css/settings.css b/settings/css/settings.css
index a8af839a1e6..b80d7da82c6 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -29,6 +29,9 @@ li.selected { background-color:#ddd; }
 #content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
 #rightcontent { padding-left: 1em; }
+td.quota { position:relative }
+select.quota { position:absolute; left:0px; top:0px; width:10em; }
+input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }
 
 /* APPS */
 li { color:#888; }
diff --git a/settings/js/users.js b/settings/js/users.js
index c9b1d855db0..bfc00138e0e 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -5,6 +5,18 @@
  */
 
 $(document).ready(function(){
+	function setQuota(uid,quota,ready){
+		$.post(
+			OC.filePath('settings','ajax','setquota.php'),
+			{username:uid,quota:quota},
+			function(result){
+				if(ready){
+					ready(result.data.quota);
+				}
+			}
+		);
+	}
+	
 	function applyMultiplySelect(element){
 		var checked=[];
 		var user=element.data('username');
@@ -82,48 +94,63 @@ $(document).ready(function(){
 	$('td.password').live('click',function(event){
 		$(this).children('img').click();
 	});
-
-	$('td.quota>img').live('click',function(event){
-		event.stopPropagation();
-		var img=$(this);
-		var uid=img.parent().parent().data('uid');
-		var input=$('<input>');
-		var quota=img.parent().children('span').text();
-		if(quota=='None'){
-			quota='';
+	
+	$('select.quota').live('change',function(){
+		var select=$(this);
+		var uid=$(this).parent().parent().data('uid');
+		var quota=$(this).val();
+		var other=$(this).next();
+		if(quota!='other'){
+			other.hide();
+			select.data('previous',quota);
+			setQuota(uid,quota);
+		}else{
+			other.show();
+			other.focus();
 		}
-		input.val(quota);
-		img.css('display','none');
-		img.parent().children('span').replaceWith(input);
-		input.focus();
-		input.keypress(function(event) {
-			if(event.keyCode == 13) {
-				$(this).parent().attr('data-quota',$(this).val());
-				if($(this).val().length>0){
-					$.post(
-						OC.filePath('settings','ajax','setquota.php'),
-						{username:uid,quota:$(this).val()},
-						function(result){
-							img.parent().children('span').text(result.data.quota)
-							$(this).parent().attr('data-quota',result.data.quota);
-						}
-					);
-					input.blur();
+	});
+	$('select.quota').each(function(i,select){
+		$(select).data('previous',$(select).val());
+	})
+	
+	$('input.quota-other').live('change',function(){
+		var uid=$(this).parent().parent().data('uid');
+		var quota=$(this).val();
+		var select=$(this).prev();
+		var other=$(this);
+		if(quota){
+			setQuota(uid,quota,function(quota){
+				select.children().attr('selected',null);
+				var existingOption=select.children().filter(function(i,option){
+					return ($(option).val()==quota);
+				});
+				if(existingOption.length){
+					existingOption.attr('selected','selected');
 				}else{
-					input.blur();
+					var option=$('<option/>');
+					option.attr('selected','selected').attr('value',quota).text(quota);
+					select.children().last().before(option);
 				}
-			}
-		});
-		input.blur(function(){
-			var quota=$(this).parent().attr('data-quota');
-			$(this).replaceWith($('<span>'+quota+'</span>'));
-			img.css('display','');
-		});
-	});
-	$('td.quota').live('click',function(event){
-		$(this).children('img').click();
+				select.val(quota);
+				other.val(null);
+				other.hide();
+			});
+		}else{
+			var previous=select.data('previous');
+			select.children().attr('selected',null);
+			select.children().each(function(i,option){
+				if($(option).val()==previous){
+					$(option).attr('selected','selected');
+				}
+			});
+			other.hide();
+		}
 	});
 	
+	$('input.quota-other').live('blur',function(){
+		$(this).change();
+	})
+	
 	$('#newuser').submit(function(event){
 		event.preventDefault();
 		var username=$('#newusername').val();
@@ -166,5 +193,9 @@ $(document).ready(function(){
 		}
 		applyMultiplySelect(select);
 		$('#content table tbody').last().after(tr);
+		
+		tr.find('select.quota option').attr('selected',null);
+		tr.find('select.quota option').first().attr('selected','selected');
+		tr.find('select.quota').data('previous','default');
 	});
 });
diff --git a/settings/templates/users.php b/settings/templates/users.php
index fde4cfb9aed..4d75b7a06db 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -48,9 +48,17 @@ foreach($_["groups"] as $group) {
 					<?php endforeach;?>
 				</select>
 			</td>
-			<td class="quota" data-quota="<?php echo $user['quota']?>">
-				<span><?php echo ($user['quota']>0)?$user['quota']:'None';?></span>
-				<img class="svg action" src="<?php echo image_path('core','actions/rename.svg')?>" alt="set new password" title="set quota" />
+			<td class="quota">
+				<select class='quota'>
+					<?php foreach($_['quota_preset'] as $preset):?>
+						<option <?php if($user['quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
+					<?php endforeach;?>
+					<?php if(array_search($user['quota'],$_['quota_preset'])===false):?>
+						<option selected="selected" value='<?php echo $user['quota'];?>'><?php echo $user['quota'];?></option>
+					<?php endif;?>
+					<option value='other'><?php echo $l->t('Other');?>...</option>
+				</select>
+				<input class='quota-other'></input>
 			</td>
 			<td class="remove">
 				<?php if($user['name']!=OC_User::getUser()):?>
diff --git a/settings/users.php b/settings/users.php
index e5dcc049481..1ae75752115 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -18,17 +18,23 @@ $users = array();
 $groups = array();
 
 foreach( OC_User::getUsers() as $i ){
-	$users[] = array( "name" => $i, "groups" => join( ", ", OC_Group::getUserGroups( $i ) ),'quota'=>OC_Preferences::getValue($i,'files','quota',0));
+	$users[] = array( "name" => $i, "groups" => join( ", ", OC_Group::getUserGroups( $i ) ),'quota'=>OC_Preferences::getValue($i,'files','quota','default'));
 }
 
 foreach( OC_Group::getGroups() as $i ){
 	// Do some more work here soon
 	$groups[] = array( "name" => $i );
 }
+$quotaPreset=OC_Appconfig::getValue('files','quota_preset','default,none,1 GB, 5 GB, 10 GB');
+$quotaPreset=explode(',',$quotaPreset);
+foreach($quotaPreset as &$preset){
+	$preset=trim($preset);
+}
 
 $tmpl = new OC_Template( "settings", "users", "user" );
 $tmpl->assign( "users", $users );
 $tmpl->assign( "groups", $groups );
+$tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->printPage();
 
 ?>
-- 
GitLab


From 0d3181b6d1fc8b2af1b222cae29fff89a0754797 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 24 Feb 2012 21:19:23 +0100
Subject: [PATCH 157/248] add configure option for default quota

---
 settings/ajax/setquota.php   | 11 +++++++++--
 settings/css/settings.css    |  4 +++-
 settings/templates/users.php | 15 +++++++++++++++
 settings/users.php           |  3 +++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index e66513e54cc..dc87625a05d 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -5,7 +5,7 @@ require_once('../../lib/base.php');
 
 OC_JSON::checkAdminUser();
 
-$username = $_POST["username"];
+$username = isset($_POST["username"])?$_POST["username"]:'';
 
 //make sure the quota is in the expected format
 $quota=$_POST["quota"];
@@ -19,7 +19,14 @@ if($quota!='none' and $quota!='default'){
 }
 
 // Return Success story
-OC_Preferences::setValue($username,'files','quota',$quota);
+if($username){
+	OC_Preferences::setValue($username,'files','quota',$quota);
+}else{//set the default quota when no username is specified
+	if($quota=='default'){//'default' as default quota makes no sense
+		$quota='none';
+	}
+	OC_Appconfig::setValue('files','default_quota',$quota);
+}
 OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>$quota)));
 
 ?>
diff --git a/settings/css/settings.css b/settings/css/settings.css
index b80d7da82c6..39d811ae10c 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -30,8 +30,10 @@ li.selected { background-color:#ddd; }
 table:not(.nostyle) { width:100%; }
 #rightcontent { padding-left: 1em; }
 td.quota { position:relative }
-select.quota { position:absolute; left:0px; top:0px; width:10em; }
+div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
+select.quota { position:absolute; left:0; top:0; width:10em; }
 input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }
+div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
 
 /* APPS */
 li { color:#888; }
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 4d75b7a06db..a23a5bafe61 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -21,6 +21,21 @@ foreach($_["groups"] as $group) {
 		</select>
 		<input type="submit" value="<?php echo $l->t('Create')?>" />
 	</form>
+	<div class="quota">
+		<span><?php echo $l->t('Default Quota');?>:</span>
+		<select class='quota'>
+			<?php foreach($_['quota_preset'] as $preset):?>
+				<?php if($preset!='default'):?>
+					<option <?php if($_['default_quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
+				<?php endif;?>
+			<?php endforeach;?>
+			<?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
+				<option selected="selected" value='<?php echo $_['default_quota'];?>'><?php echo $_['default_quota'];?></option>
+			<?php endif;?>
+			<option value='other'><?php echo $l->t('Other');?>...</option>
+		</select>
+		<input class='quota-other'></input>
+	</div>
 </div>
 
 <table data-groups="<?php echo implode(', ',$allGroups);?>">
diff --git a/settings/users.php b/settings/users.php
index 1ae75752115..96515a90ce4 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -31,10 +31,13 @@ foreach($quotaPreset as &$preset){
 	$preset=trim($preset);
 }
 
+$defaultQuota=OC_Appconfig::getValue('files','default_quota','none');
+
 $tmpl = new OC_Template( "settings", "users", "user" );
 $tmpl->assign( "users", $users );
 $tmpl->assign( "groups", $groups );
 $tmpl->assign( 'quota_preset', $quotaPreset);
+$tmpl->assign( 'default_quota', $defaultQuota);
 $tmpl->printPage();
 
 ?>
-- 
GitLab


From 9dcf29ff514222b652e642d358b10d375c30dbb5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 24 Feb 2012 21:30:27 +0100
Subject: [PATCH 158/248] fix bug in group mangement

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

diff --git a/lib/group/database.php b/lib/group/database.php
index f35f61434f0..1afd4b5fe4c 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -130,7 +130,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * removes the user from a group.
 	 */
 	public static function removeFromGroup( $uid, $gid ){
-		$query = OC_DB::prepare( "DELETE FROM `*PREFIX*group_user` WHERE `uid` = ? AND `gid` = ?" );
+		$query = OC_DB::prepare( "DELETE FROM *PREFIX*group_user WHERE uid = ? AND gid = ?" );
 		$result = $query->execute( array( $uid, $gid ));
 
 		return true;
diff --git a/settings/js/users.js b/settings/js/users.js
index bfc00138e0e..26e7ff24452 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -184,7 +184,13 @@ $(document).ready(function(){
 		select.data('username',username);
 		select.data('userGroups',groups.join(', '));
 		tr.find('td.groups').empty();
-		$.each($('#content table').data('groups').split(', '),function(i,group){
+		var allGroups=$('#content table').data('groups').split(', ');
+		for(var i=0;i<groups.length;i++){
+			if(allGroups.indexOf(groups[i])==-1){
+				allGroups.push(groups[i]);
+			}
+		}
+		$.each(allGroups,function(i,group){
 			select.append($('<option value="'+group+'">'+group+'</option>'));
 		});
 		tr.find('td.groups').append(select);
-- 
GitLab


From 11cb45bd432b6b7521f43f53e91dbec1537193cd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 24 Feb 2012 22:56:13 +0100
Subject: [PATCH 159/248] slight change to select style

---
 core/css/styles.css       | 4 ++--
 settings/css/settings.css | 1 +
 settings/js/users.js      | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 335b008ffd7..b14c8fb9caf 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -40,8 +40,8 @@ input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,
 input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active,
 .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active { background-color:#fff; color:#333; opacity:1; }
 
-input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, .pager li a { width:auto; padding:.4em; 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; }
-input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, input[type="button"]:focus, .button:hover { background:#fff; color:#333; }
+input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { width:auto; padding:.4em; 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; }
+input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover { background:#fff; color:#333; }
 input[type="checkbox"] { width:auto; }
 #quota { cursor:default; }
 
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 39d811ae10c..7a5873bb4d2 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -34,6 +34,7 @@ div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
 select.quota { position:absolute; left:0; top:0; width:10em; }
 input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }
 div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
+select.quota.active { background: #fff; }
 
 /* APPS */
 li { color:#888; }
diff --git a/settings/js/users.js b/settings/js/users.js
index 26e7ff24452..eed93d3b303 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -106,6 +106,7 @@ $(document).ready(function(){
 			setQuota(uid,quota);
 		}else{
 			other.show();
+			select.addClass('active');
 			other.focus();
 		}
 	});
@@ -132,6 +133,7 @@ $(document).ready(function(){
 					select.children().last().before(option);
 				}
 				select.val(quota);
+				select.removeClass('active');
 				other.val(null);
 				other.hide();
 			});
@@ -143,6 +145,7 @@ $(document).ready(function(){
 					$(option).attr('selected','selected');
 				}
 			});
+			select.removeClass('active');
 			other.hide();
 		}
 	});
-- 
GitLab


From 66f4f06dd99906283e963cd7afa720f6ffe40220 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 24 Feb 2012 23:12:14 +0100
Subject: [PATCH 160/248] if a deleted file is uploaded, finish the delete
 first

otherwise the upload will fail because the file still exists on the server, the old file will be deleted and neither the old or new file will be left
---
 files/js/files.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/files/js/files.js b/files/js/files.js
index bebcf4e97a4..9f1f5368df0 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -166,6 +166,7 @@ $(document).ready(function() {
 
 	$('.file_upload_start').live('change',function(){
 		var form=$(this).closest('form');
+		var that=this;
 		var uploadId=form.attr('data-upload-id');
 		var files=this.files;
 		var target=form.children('iframe');
@@ -173,6 +174,12 @@ $(document).ready(function() {
 		if(files){
 			for(var i=0;i<files.length;i++){
 				totalSize+=files[i].size;
+				if(FileList.deleteFiles && FileList.deleteFiles.indexOf(files[i].name)!=-1){//finish delete if we are uploading a deleted file
+					FileList.finishDelete(function(){
+						$(that).change();
+					});
+					return;
+				}
 			}
 		}
 		if(totalSize>$('#max_upload').val()){
-- 
GitLab


From 7988541476f00b7569aea0790af5d2d773f93ae8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 24 Feb 2012 23:16:56 +0100
Subject: [PATCH 161/248] cleanup pdfviewer app name

---
 apps/files_pdfviewer/appinfo/info.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_pdfviewer/appinfo/info.xml b/apps/files_pdfviewer/appinfo/info.xml
index 86a6c3f22f7..f133f1900d7 100755
--- a/apps/files_pdfviewer/appinfo/info.xml
+++ b/apps/files_pdfviewer/appinfo/info.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> 
 <info>
 	<id>files_pdfviewer</id>
-	<name>PDF viewer (pdfjs-based)</name>
+	<name>PDF Viewer</name>
+	<description>Inline PDF viewer (pdfjs-based)</description>
 	<version>0.1</version>
 	<licence>GPL</licence>
 	<author>Joan Creus</author>
-- 
GitLab


From 3cf81cadd5535b0516d73fe3de8ee91f330b4a6f Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 25 Feb 2012 10:03:17 +0100
Subject: [PATCH 162/248] gallery thumbnail creation fix

---
 apps/gallery/lib/photo.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 4eb313bfc33..872ecc9488a 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -69,7 +69,6 @@ class OC_Gallery_Photo {
 	public static function getThumbnail($image_name) {
 		$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);
-- 
GitLab


From 862f824d6475606f2d6e1d332680bd5141d74934 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 22 Feb 2012 21:38:15 +0100
Subject: [PATCH 163/248] some multiselect improvements

---
 core/js/multiselect.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 96fc09a0759..541dddf0f70 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -12,6 +12,11 @@
 			'minWidth': 'default;',
 		};
 		$.extend(settings,options);
+		$.each(this.children(),function(i,option){
+			if($(option).attr('selected') && settings.checked.indexOf($(option).val())==-1){
+				settings.checked.push($(option).val());
+			}
+		});
 		var button=$('<div class="multiselect button"><span>'+settings.title+'</span><span>â–¾</span></div>');
 		var span=$('<span/>');
 		span.append(button);
@@ -46,9 +51,11 @@
 			});
 			button.addClass('active');
 			event.stopPropagation();
-			var options=$(this).parent().next().children().map(function(){return $(this).val();});
+			var options=$(this).parent().next().children();
 			var list=$('<ul class="multiselectoptions"/>').hide().appendTo($(this).parent());
-			function createItem(item,checked){
+			function createItem(element,checked){
+				element=$(element);
+				var item=element.val();
 				var id='ms'+multiSelectId+'-option-'+item;
 				var input=$('<input id="'+id+'" type="checkbox"/>');
 				var label=$('<label for="'+id+'">'+item+'</label>');
@@ -61,6 +68,7 @@
 				input.change(function(){
 					var groupname=$(this).next().text();
 					if($(this).is(':checked')){
+						element.attr('selected','selected');
 						if(settings.oncheck){
 							if(settings.oncheck(groupname)===false){
 								$(this).attr('checked', false);
@@ -70,6 +78,7 @@
 						settings.checked.push(groupname);
 					}else{
 						var index=settings.checked.indexOf(groupname);
+						element.attr('selected',null);
 						if(settings.onuncheck){
 							if(settings.onuncheck(groupname)===false){
 								$(this).attr('checked',true);
@@ -119,11 +128,11 @@
 							var li=$(this).parent();
 							$(this).remove();
 							li.text('+ '+settings.createText);
-							li.before(createItem($(this).val()));
+							li.before(createItem(this));
+							var select=button.parent().next();
+							select.append($('<option selected="selected" value="'+$(this).val()+'">'+$(this).val()+'</option>'));
 							li.prev().children('input').trigger('click');
 							button.parent().data('preventHide',false);
-							var select=button.parent().next();
-							select.append($('<option value="'+$(this).val()+'">'+$(this).val()+'</option>'));
 							if(settings.createCallback){
 								settings.createCallback();
 							}
-- 
GitLab


From 8b93a9a237603185501d0e24e9c08705168fc553 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 22 Feb 2012 22:16:33 +0100
Subject: [PATCH 164/248] add javascript bindings for OC_AppConfig

---
 core/ajax/appconfig.php | 35 ++++++++++++++++++++++++++
 core/js/config.js       | 55 +++++++++++++++++++++++++++++++++++++++++
 lib/base.php            |  1 +
 3 files changed, 91 insertions(+)
 create mode 100644 core/ajax/appconfig.php
 create mode 100644 core/js/config.js

diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
new file mode 100644
index 00000000000..50984ac32b9
--- /dev/null
+++ b/core/ajax/appconfig.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * 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();
+$action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
+$result=false;
+switch($action){
+	case 'getValue':
+		$result=OC_Appconfig::getValue($_GET['app'],$_GET['key'],$_GET['default']);
+		break;
+	case 'setValue':
+		$result=OC_Appconfig::setValue($_POST['app'],$_POST['key'],$_POST['value']);
+		break;
+	case 'getApps':
+		$result=OC_Appconfig::getApps();
+		break;
+	case 'getKeys':
+		$result=OC_Appconfig::getKeys($_GET['app']);
+		break;
+	case 'hasKey':
+		$result=OC_Appconfig::hasKey($_GET['app'],$_GET['key']);
+		break;
+	case 'deleteKey':
+		$result=OC_Appconfig::deleteKey($_POST['app'],$_POST['key']);
+		break;
+	case 'deleteApp':
+		$result=OC_Appconfig::deleteApp($_POST['app']);
+		break;
+}
+OC_JSON::success(array('data'=>$result));
diff --git a/core/js/config.js b/core/js/config.js
new file mode 100644
index 00000000000..500fe072a64
--- /dev/null
+++ b/core/js/config.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+OC.AppConfig={
+	url:OC.filePath('core','ajax','appconfig.php'),
+	getCall:function(action,data,callback){
+		data.action=action;
+		$.getJSON(OC.AppConfig.url,data,function(result){
+			if(result.status='success'){
+				if(callback){
+					callback(result.data);
+				}
+			}
+		});
+	},
+	postCall:function(action,data,callback){
+		data.action=action;
+		$.post(OC.AppConfig.url,data,function(result){
+			if(result.status='success'){
+				if(callback){
+					callback(result.data);
+				}
+			}
+		},'json');
+	},
+	getValue:function(app,key,defaultValue,callback){
+		if(typeof defaultValue=='function'){
+			callback=defaultValue;
+			defaultValue=null;
+		}
+		OC.AppConfig.getCall('getValue',{app:app,key:key,default:defaultValue},callback);
+	},
+	setValue:function(app,key,value){
+		OC.AppConfig.postCall('setValue',{app:app,key:key,value:value});
+	},
+	getApps:function(callback){
+		OC.AppConfig.getCall('getApps',{},callback);
+	},
+	getKeys:function(app,callback){
+		OC.AppConfig.getCall('getKeys',{app:app},callback);
+	},
+	hasKey:function(app,key,callback){
+		OC.AppConfig.getCall('hasKey',{app:app,key:key},callback);
+	},
+	deleteKey:function(app,key){
+		OC.AppConfig.postCall('deleteKey',{app:app,key:key});
+	},
+	deleteApp:function(app){
+		OC.AppConfig.postCall('deleteApp',{app:app});
+	},
+}
+//TODO OC.Preferences
diff --git a/lib/base.php b/lib/base.php
index a95c9d2b21a..342bdc6768e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -236,6 +236,7 @@ class OC{
 		OC_Util::addScript( "jquery-tipsy" );
 		OC_Util::addScript( "js" );
 		OC_Util::addScript( "eventsource" );
+		OC_Util::addScript( "config" );
 		//OC_Util::addScript( "multiselect" );
 		OC_Util::addScript('search','result');
 		OC_Util::addStyle( "styles" );
-- 
GitLab


From dda79a90cf50f98c1dc4c98401be8707b7103346 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 25 Feb 2012 16:51:59 +0100
Subject: [PATCH 165/248] don't limit ourselfs to 32bit integers

---
 db_structure.xml | 12 ++++++------
 lib/util.php     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index 1d459b75fda..bdbb16759db 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -53,7 +53,7 @@
 	   <type>integer</type>
 	   <default>0</default>
 	   <notnull>true</notnull>
-	   <length>4</length>
+	   <length>8</length>
    </field>
 
    <field>
@@ -70,7 +70,7 @@
 	   <default>
 	   </default>
 	   <notnull>true</notnull>
-	   <length>4</length>
+	   <length>8</length>
    </field>
 
    <field>
@@ -96,7 +96,7 @@
     <type>integer</type>
     <default></default>
     <notnull>true</notnull>
-    <length>4</length>
+    <length>8</length>
    </field>
 
    <field>
@@ -105,7 +105,7 @@
 	   <default>
 	   </default>
 	   <notnull>true</notnull>
-	   <length>4</length>
+	   <length>8</length>
    </field>
 
    <field>
@@ -114,7 +114,7 @@
 	   <default>
 	   </default>
 	   <notnull>true</notnull>
-	   <length>4</length>
+	   <length>8</length>
    </field>
 
    <field>
@@ -291,7 +291,7 @@
     <type>integer</type>
     <default></default>
     <notnull>false</notnull>
-    <length>4</length>
+    <length>8</length>
    </field>
 
    <field>
diff --git a/lib/util.php b/lib/util.php
index 05caeca0e3e..d1487931db8 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -62,7 +62,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(3,00,2);
+		return array(3,00,3);
 	}
 
 	/**
-- 
GitLab


From 4f627c428eb64fae307ea293e8093e345d742edc Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 25 Feb 2012 20:27:16 +0100
Subject: [PATCH 166/248] some more error reporting during filesystem scan

---
 3rdparty/MDB2/Driver/mysql.php |  2 +-
 lib/db.php                     | 25 ++++++++++++++++++++++---
 lib/filecache.php              | 24 +++++++++++++++++++-----
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/3rdparty/MDB2/Driver/mysql.php b/3rdparty/MDB2/Driver/mysql.php
index b9b46c0d762..2cec1e9c033 100644
--- a/3rdparty/MDB2/Driver/mysql.php
+++ b/3rdparty/MDB2/Driver/mysql.php
@@ -794,7 +794,7 @@ class MDB2_Driver_mysql extends MDB2_Driver_Common
             ? 'mysql_query' : 'mysql_unbuffered_query';
         $result = @$function($query, $connection);
         if (!$result) {
-            $err =& $this->raiseError(null, null, null,
+            $err =$this->raiseError(null, null, null,
                 'Could not execute statement', __FUNCTION__);
             return $err;
         }
diff --git a/lib/db.php b/lib/db.php
index 4c17cd0dbd1..02eac7cac9a 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -508,6 +508,21 @@ class OC_DB {
 		self::$connection->commit();
 		self::$inTransaction=false;
 	}
+
+	/**
+	 * check if a result is an error, works with MDB2 and PDOException
+	 * @param mixed $result
+	 * @return bool
+	 */
+	public static function isError($result){
+		if(!$result){
+			return true;
+		}elseif(self::$backend==self::BACKEND_MDB2 and PEAR::isError($result)){
+			return true;
+		}else{
+			return false;
+		}
+	}
 }
 
 /**
@@ -527,11 +542,15 @@ class PDOStatementWrapper{
 	public function execute($input=array()){
 		$this->lastArguments=$input;
 		if(count($input)>0){
-			$this->statement->execute($input);
+			$result=$this->statement->execute($input);
 		}else{
-			$this->statement->execute();
+			$result=$this->statement->execute();
+		}
+		if($result){
+			return $this;
+		}else{
+			return false;
 		}
-		return $this;
 	}
 	
 	/**
diff --git a/lib/filecache.php b/lib/filecache.php
index faadddfb37e..cabad329b12 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -102,8 +102,10 @@ 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,writable) VALUES(?,?,?,?,?,?,?,?,?,?)');
-		$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user,$data['writable']));
-		
+		$result=$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user,$data['writable']));
+		if(OC_DB::isError($result)){
+			OC_Log::write('files','error while writing file('.$path.') to cache',OC_Log::ERROR);
+		}
 	}
 
 	/**
@@ -128,7 +130,10 @@ class OC_FileCache{
 		
 		$sql = 'UPDATE *PREFIX*fscache SET '.implode(' , ',$queryParts).' WHERE id=?';
 		$query=OC_DB::prepare($sql);
-		$query->execute($arguments);
+		$result=$query->execute($arguments);
+		if(OC_DB::isError($result)){
+			OC_Log::write('files','error while updating file('.$path.') in cache',OC_Log::ERROR);
+		}
 	}
 
 	/**
@@ -262,11 +267,20 @@ class OC_FileCache{
 	 */
 	private static function getFileId($path){
 		$query=OC_DB::prepare('SELECT id FROM *PREFIX*fscache WHERE path=?');
-		$result=$query->execute(array($path))->fetchRow();
+		if(OC_DB::isError($query)){
+			OC_Log::write('files','error while getting file id of '.$path,OC_Log::ERROR);
+			return -1;
+		}
+		$result=$query->execute(array($path));
+		if(OC_DB::isError($result)){
+			OC_Log::write('files','error while getting file id of '.$path,OC_Log::ERROR);
+			return -1;
+		}
+		$result=$result->fetchRow();
 		if(is_array($result)){
 			return $result['id'];
 		}else{
-      OC_Log::write('getFileId(): file not found in cache ('.$path.')','core',OC_Log::DEBUG);
+			OC_Log::write('getFileId(): file not found in cache ('.$path.')','core',OC_Log::DEBUG);
 			return -1;
 		}
 	}
-- 
GitLab


From 8fe5251029c9e3c711660abcb58c7e60f6b88f97 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 25 Feb 2012 20:37:51 +0100
Subject: [PATCH 167/248] unicode chars in gallery name fix

---
 apps/gallery/ajax/galleryOp.php | 3 ++-
 apps/gallery/ajax/getAlbums.php | 2 +-
 apps/gallery/js/albums.js       | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 5ac6d295108..f07814056a3 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -41,7 +41,8 @@ function handleRemove($name) {
 
 function handleGetThumbnails($albumname) {
   OC_Response::enableCaching(3600 * 24); // 24 hour
-  $thumbnail = OC::$CONFIG_DATADIRECTORY.'/../gallery/'.$albumname.'.png';
+  error_log(htmlentities($albumname));
+  $thumbnail = OC::$CONFIG_DATADIRECTORY.'/../gallery/'.urldecode($albumname).'.png';
   header('Content-Type: '.OC_Image::getMimeTypeForFile($thumbnail));
   OC_Response::sendFile($thumbnail);
 }
diff --git a/apps/gallery/ajax/getAlbums.php b/apps/gallery/ajax/getAlbums.php
index 9e9c6ef496c..be87af2abd3 100644
--- a/apps/gallery/ajax/getAlbums.php
+++ b/apps/gallery/ajax/getAlbums.php
@@ -33,7 +33,7 @@ while ($r = $result->fetchRow()) {
   $album_name = $r['album_name'];
   $tmp_res = OC_Gallery_Photo::find($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');
+  $a[] = array('name' => utf8_encode($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/js/albums.js b/apps/gallery/js/albums.js
index 987412f28e0..adecd24cc75 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -54,9 +54,9 @@ Albums={
 		  event.preventDefault();
 		  galleryRemove(event.data.name);
     });
-    $("a.view", local).attr('href','?view='+escape(a.name));
-	  $('h1',local).text(a.name);
-	  $(".gallery_album_cover", local).attr('title',a.name);
+    $("a.view", local).attr('href','?view='+decodeURIComponent(escape(a.name)));
+    $('h1',local).text(decodeURIComponent(escape(a.name)));
+    $(".gallery_album_cover", local).attr('title',decodeURIComponent(escape(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='+escape(a.name)+'")');
-- 
GitLab


From 820f2f27f6ba0509b43b70eb61204355acfeb30f Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Sat, 25 Feb 2012 21:59:58 +0000
Subject: [PATCH 168/248] security hardening in remoteStorage app

---
 apps/remoteStorage/WebDAV.php        |  8 ++++++--
 apps/remoteStorage/auth.php          |  3 ++-
 apps/remoteStorage/oauth_ro_auth.php | 23 +++++++++++++----------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/WebDAV.php
index 06520b4021b..cad465181a9 100644
--- a/apps/remoteStorage/WebDAV.php
+++ b/apps/remoteStorage/WebDAV.php
@@ -69,7 +69,10 @@ if(count($pathParts) >= 3 && $pathParts[0] == '') {
 	$server->setBaseUri(OC::$WEBROOT."/apps/remoteStorage/WebDAV.php/$ownCloudUser");
 
 	// Auth backend
-	$authBackend = new OC_Connector_Sabre_Auth_ro_oauth(OC_remoteStorage::getValidTokens($ownCloudUser, $category));
+	$authBackend = new OC_Connector_Sabre_Auth_ro_oauth(
+      OC_remoteStorage::getValidTokens($ownCloudUser, $category),
+      $category
+      );
 
 	$authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud');//should use $validTokens here
 	$server->addPlugin($authPlugin);
@@ -82,5 +85,6 @@ if(count($pathParts) >= 3 && $pathParts[0] == '') {
 	// And off we go!
 	$server->exec();
 } else {
-	die('not the right address format '.var_export($pathParts, true));
+	//die('not the right address format '.var_export($pathParts, true));
+	die('not the right address format');
 }
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index 75e0aac419d..cc40e895e01 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -96,5 +96,6 @@ if(count($pathParts) == 2 && $pathParts[0] == '') {
 			.'<form method="POST"><input name="allow" type="submit" value="Click here"></form>');
 	}
 } else {
-	die('please use auth.php/username?params. '.var_export($pathParts, true));
+	//die('please use auth.php/username?params. '.var_export($pathParts, true));
+	die('please use auth.php/username?params.');
 }
diff --git a/apps/remoteStorage/oauth_ro_auth.php b/apps/remoteStorage/oauth_ro_auth.php
index d4a55061492..085a5469920 100644
--- a/apps/remoteStorage/oauth_ro_auth.php
+++ b/apps/remoteStorage/oauth_ro_auth.php
@@ -16,9 +16,10 @@
 
 class OC_Connector_Sabre_Auth_ro_oauth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	private $validTokens;
-
-	public function __construct($validTokensArg) {
+  private $category;
+	public function __construct($validTokensArg, $categoryArg) {
 		$this->validTokens = $validTokensArg;
+    $this->category = $categoryArg;
 	}
 
 	/**
@@ -31,16 +32,16 @@ class OC_Connector_Sabre_Auth_ro_oauth extends Sabre_DAV_Auth_Backend_AbstractBa
 	 */
 	protected function validateUserPass($username, $password){
 		//always give read-only:
-		if(in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD', 'OPTIONS'))) {
-			OC_Util::setUpFS();
-			return true;
-		} else if(isset($this->validTokens[$password])) {
+		if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS') 
+		    || (isset($this->validTokens[$password]))
+        || (($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
+        ) {
 			OC_Util::setUpFS();
 			return true;
 		} else {
-var_export($_SERVER);
-var_export($this->validTokens);
-die('not getting in with "'.$username.'"/"'.$password.'"!');
+      //var_export($_SERVER);
+      //var_export($this->validTokens);
+      //die('not getting in with "'.$username.'"/"'.$password.'"!');
 			return false;	
 		}
 	}
@@ -53,7 +54,9 @@ die('not getting in with "'.$username.'"/"'.$password.'"!');
 		$auth->setRealm($realm);
 		$userpass = $auth->getUserPass();
 		if (!$userpass) {
-			if(in_array($_SERVER['REQUEST_METHOD'], array('OPTIONS'))) {
+			if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS')
+	        ||(($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
+          ) {
 				$userpass = array('', '');
 			} else {
 				$auth->requireLogin();
-- 
GitLab


From 28650191c36e610c7d1335272e304e59ebe371bb Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Sat, 25 Feb 2012 22:01:04 +0000
Subject: [PATCH 169/248] bump up version and update license

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

diff --git a/apps/remoteStorage/appinfo/info.xml b/apps/remoteStorage/appinfo/info.xml
index 8179ca99112..5f061da258c 100644
--- a/apps/remoteStorage/appinfo/info.xml
+++ b/apps/remoteStorage/appinfo/info.xml
@@ -3,8 +3,8 @@
 	<id>remoteStorage</id>
 	<name>remoteStorage compatibility</name>
 	<description>Enables your users to use ownCloud as their remote storage for unhosted applications.</description>
-	<version>0.2</version>
-	<licence>AGPL</licence>
+	<version>0.3</version>
+	<licence>AGPL or MIT</licence>
 	<author>Michiel de Jong</author>
 	<require>2</require>
 </info>
-- 
GitLab


From 42735429dac1bfdb9dca403f9abc97313acd8d3d Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Sat, 25 Feb 2012 22:03:14 +0000
Subject: [PATCH 170/248] bump up version and update license

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

diff --git a/apps/user_webfinger/appinfo/info.xml b/apps/user_webfinger/appinfo/info.xml
index a4071dae172..55cf2cf2201 100644
--- a/apps/user_webfinger/appinfo/info.xml
+++ b/apps/user_webfinger/appinfo/info.xml
@@ -3,8 +3,8 @@
 	<id>user_webfinger</id>
 	<name>Webfinger</name>
 	<description>Provide WebFinger for all users so they get a user address like user@owncloudinstance which can be used for unhosted applications. If you don't run ownCloud in the root of your domain, for instance if you run it on example.com/owncloud/, then make sure you link example.com/.well-known/ to example.com/owncloud/apps/user_webfinger/ - by running something like "ln -s /var/www/owncloud/apps/user_webfinger /var/www/.well-known". Only enable this app if you run this ownCloud installation on a public web address, not if you run it on an intranet or on localhost.</description>
-	<version>0.1</version>
-	<licence>AGPL</licence>
+	<version>0.2</version>
+	<licence>AGPL or MIT</licence>
 	<author>Michiel de Jong</author>
 	<require>2</require>
 </info>
-- 
GitLab


From a7d7597d552ce41aa7f9d77c751b9160224cf96a Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Sat, 25 Feb 2012 23:15:31 +0000
Subject: [PATCH 171/248] fix type error in dir creation for categories

---
 apps/remoteStorage/appinfo/info.xml      | 2 +-
 apps/remoteStorage/lib_remoteStorage.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/remoteStorage/appinfo/info.xml b/apps/remoteStorage/appinfo/info.xml
index 5f061da258c..1fc146aac73 100644
--- a/apps/remoteStorage/appinfo/info.xml
+++ b/apps/remoteStorage/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>remoteStorage</id>
 	<name>remoteStorage compatibility</name>
 	<description>Enables your users to use ownCloud as their remote storage for unhosted applications.</description>
-	<version>0.3</version>
+	<version>0.4</version>
 	<licence>AGPL or MIT</licence>
 	<author>Michiel de Jong</author>
 	<require>2</require>
diff --git a/apps/remoteStorage/lib_remoteStorage.php b/apps/remoteStorage/lib_remoteStorage.php
index 4f5c9664509..a9b73516aad 100644
--- a/apps/remoteStorage/lib_remoteStorage.php
+++ b/apps/remoteStorage/lib_remoteStorage.php
@@ -41,7 +41,7 @@ class OC_remoteStorage {
 		$token=uniqid();
 		OC_Util::setupFS(OC_User::getUser());
 		self::addToken($token, $appUrl, $categories);
-		foreach($categories as $category) {
+		foreach(explode(',', $categories) as $category) {
 			//TODO: input checking on $category
 			$scopePathParts = array('remoteStorage', $category);
 			for($i=0;$i<=count($scopePathParts);$i++){
-- 
GitLab


From 797e921b9aa25f832718a3c44cfcb936f96c49df Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 25 Feb 2012 21:19:32 +0100
Subject: [PATCH 172/248] improve log browsing

---
 core/js/js.js              | 33 +++++++++++++++++++++++++++
 files/js/files.js          | 33 ---------------------------
 lib/log.php                | 26 ++++++++++++---------
 settings/ajax/getlog.php   | 17 ++++++++++++++
 settings/ajax/setquota.php |  5 +++++
 settings/css/settings.css  |  3 +++
 settings/js/log.js         | 46 ++++++++++++++++++++++++++++++++++++++
 settings/log.php           |  5 ++++-
 settings/templates/log.php |  5 +++--
 9 files changed, 126 insertions(+), 47 deletions(-)
 create mode 100644 settings/ajax/getlog.php
 create mode 100644 settings/js/log.js

diff --git a/core/js/js.js b/core/js/js.js
index 6da9c29e693..076fbf04c78 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -444,4 +444,37 @@ $.fn.filterAttr = function(attr_name, attr_value) {
    return this.filter(function() { return $(this).attr(attr_name) === attr_value; });
 };
 
+function humanFileSize(bytes){
+	if( bytes < 1024 ){
+		return bytes+' B';
+	}
+	bytes = Math.round(bytes / 1024, 1 );
+	if( bytes < 1024 ){
+		return bytes+' kB';
+	}
+	bytes = Math.round( bytes / 1024, 1 );
+	if( bytes < 1024 ){
+		return bytes+' MB';
+	}
+	
+	// Wow, heavy duty for owncloud
+	bytes = Math.round( bytes / 1024, 1 );
+	return bytes+' GB';
+}
 
+function simpleFileSize(bytes) {
+	mbytes = Math.round(bytes/(1024*1024/10))/10;
+	if(bytes == 0) { return '0'; }
+	else if(mbytes < 0.1) { return '< 0.1'; }
+	else if(mbytes > 1000) { return '> 1000'; }
+	else { return mbytes.toFixed(1); }
+}
+
+function formatDate(date){
+	if(typeof date=='number'){
+		date=new Date(date);
+	}
+	var monthNames = [ t('files','January'), t('files','February'), t('files','March'), t('files','April'), t('files','May'), t('files','June'),
+	t('files','July'), t('files','August'), t('files','September'), t('files','October'), t('files','November'), t('files','December') ];
+	return monthNames[date.getMonth()]+' '+date.getDate()+', '+date.getFullYear()+', '+((date.getHours()<10)?'0':'')+date.getHours()+':'+date.getMinutes();
+}
diff --git a/files/js/files.js b/files/js/files.js
index 9f1f5368df0..f5dc40ad45d 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -387,39 +387,6 @@ function updateBreadcrumb(breadcrumbHtml) {
 	$('p.nav').empty().html(breadcrumbHtml);
 }
 
-function humanFileSize(bytes){
-	if( bytes < 1024 ){
-		return bytes+' B';
-	}
-	bytes = Math.round(bytes / 1024, 1 );
-	if( bytes < 1024 ){
-		return bytes+' kB';
-	}
-	bytes = Math.round( bytes / 1024, 1 );
-	if( bytes < 1024 ){
-		return bytes+' MB';
-	}
-	
-	// Wow, heavy duty for owncloud
-	bytes = Math.round( bytes / 1024, 1 );
-	return bytes+' GB';
-}
-
-function simpleFileSize(bytes) {
-	mbytes = Math.round(bytes/(1024*1024/10))/10;
-	if(bytes == 0) { return '0'; }
-	else if(mbytes < 0.1) { return '< 0.1'; }
-	else if(mbytes > 1000) { return '> 1000'; }
-	else { return mbytes.toFixed(1); }
-}
-
-function formatDate(date){
-	var monthNames = [ t('files','January'), t('files','February'), t('files','March'), t('files','April'), t('files','May'), t('files','June'),
-	t('files','July'), t('files','August'), t('files','September'), t('files','October'), t('files','November'), t('files','December') ];
-	return monthNames[date.getMonth()]+' '+date.getDate()+', '+date.getFullYear()+', '+((date.getHours()<10)?'0':'')+date.getHours()+':'+date.getMinutes();
-}
-
-
 //options for file drag/dropp
 var dragOptions={
 	distance: 20, revert: 'invalid', opacity: 0.7,
diff --git a/lib/log.php b/lib/log.php
index 446ddd48848..4e450a027f5 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991@gmail.com
+ * @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
@@ -50,25 +50,29 @@ class OC_Log{
 			fclose($fh);
 		}
 	}
-	
-	public static function getEntries(){
+
+	/**
+	 * get entries from the log in reverse chronological order
+	 * @param int limit
+	 * @param int offset
+	 * @return array
+	 */
+	public static function getEntries($limit=50,$offset=0){
 		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
 		$logFile=OC_Config::getValue( "logfile", $datadir.'/owncloud.log' );
 		$entries=array();
 		if(!file_exists($logFile)){
 			return array();
 		}
-		$fh=fopen($logFile,'r');
-		if($fh === false){ // Unable to read log file!
+		$contents=file($logFile);
+		if(!$contents){//error while reading log
 			return array();
 		}
-		while(!feof($fh)){
-			$line=fgets($fh);
-			if($line){
-				$entries[]=json_decode($line);
-			}
+		$end=max(count($contents)-$offset-1,0);
+		$start=max($end-$limit,0);
+		for($i=$end;$i>$start;$i--){
+			$entries[]=json_decode($contents[$i]);
 		}
-		fclose($fh);
 		return $entries;
 	}
 }
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
new file mode 100644
index 00000000000..600ebefcece
--- /dev/null
+++ b/settings/ajax/getlog.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright (c) 2012, Robin Appelman <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+// Init owncloud
+require_once('../../lib/base.php');
+
+OC_JSON::checkAdminUser();
+
+$count=(isset($_GET['count']))?$_GET['count']:50;
+$offset=(isset($_GET['offset']))?$_GET['offset']:0;
+
+$entries=OC_Log::getEntries($count,$offset);
+OC_JSON::success(array("data" => $entries));
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index dc87625a05d..f59017600ac 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright (c) 2012, Robin Appelman <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
 
 // Init owncloud
 require_once('../../lib/base.php');
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 7a5873bb4d2..e80de0f1ad2 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -40,3 +40,6 @@ select.quota.active { background: #fff; }
 li { color:#888; }
 li.active { color:#000; }
 span.version { margin-left:3em; color:#ddd; }
+
+/* LOF */
+#log { white-space:normal; }
\ No newline at end of file
diff --git a/settings/js/log.js b/settings/js/log.js
new file mode 100644
index 00000000000..3814d9c10bf
--- /dev/null
+++ b/settings/js/log.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2012, Robin Appelman <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+OC.Log={
+	levels:['Debug','Info','Warning','Error','Fatal'],
+	loaded:50,//are initially loaded
+	getMore:function(){
+		$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded},function(result){
+			if(result.status=='success'){
+				OC.Log.addEntries(result.data);
+			}
+		});
+		OC.Log.loaded+=50;
+	},
+	addEntries:function(entries){
+		for(var i=0;i<entries.length;i++){
+			var entry=entries[i];
+			var row=$('<tr/>');
+			var levelTd=$('<td/>');
+			levelTd.text(OC.Log.levels[entry.level]);
+			row.append(levelTd);
+			
+			var appTd=$('<td/>');
+			appTd.text(entry.app);
+			row.append(appTd);
+			
+			var messageTd=$('<td/>');
+			messageTd.text(entry.message);
+			row.append(messageTd);
+			
+			var timeTd=$('<td/>');
+			timeTd.text(formatDate(entry.time));
+			row.append(timeTd);
+			$('#log').append(row);
+		}
+	}
+}
+
+$(document).ready(function(){
+	$('#moreLog').click(function(){
+		OC.Log.getMore();
+	})
+});
diff --git a/settings/log.php b/settings/log.php
index 21303c2170f..946f2b6f8e5 100644
--- a/settings/log.php
+++ b/settings/log.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991@gmail.com
+ * @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
@@ -30,6 +30,9 @@ OC_App::setActiveNavigationEntry( "core_log" );
 
 $entries=OC_Log::getEntries();
 
+OC_Util::addScript('settings','log');
+OC_Util::addStyle('settings','settings');
+
 function compareEntries($a,$b){
 	return $b->time - $a->time;
 }
diff --git a/settings/templates/log.php b/settings/templates/log.php
index bcf5258f5f5..da5defc320e 100644
--- a/settings/templates/log.php
+++ b/settings/templates/log.php
@@ -9,7 +9,7 @@ $levels=array('Debug','Info','Warning','Error','Fatal');
 <div id="controls">
 	
 </div>
-<table>
+<table id='log'>
 	<?php foreach($_['entries'] as $entry):?>
 		<tr>
 			<td>
@@ -26,4 +26,5 @@ $levels=array('Debug','Info','Warning','Error','Fatal');
 			</td>
 		</tr>
 	<?php endforeach;?>
-</table>
\ No newline at end of file
+</table>
+<input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
-- 
GitLab


From a5e892505e494b906f942aa3ac1d6489f73a5f05 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 03:10:01 +0100
Subject: [PATCH 173/248] more robust png fallback

---
 core/js/js.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index 076fbf04c78..4b5062eb1a6 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -252,16 +252,22 @@ function replaceSVG(){
 	$('.svg').each(function(index,element){
 		element=$(element);
 		var background=element.css('background-image');
-		if(background && background!='none'){
-			background=background.substr(0,background.length-4)+'png)';
-			element.css('background-image',background);
+		if(background){
+			var i=background.lastIndexOf('.svg');
+			if(i>=0){
+				background=background.substr(0,i)+'.png'+background.substr(i+4);
+				element.css('background-image',background);
+			}
 		}
 		element.find('*').each(function(index,element) {
 			element=$(element);
 			var background=element.css('background-image');
-			if(background && background!='none'){
-				background=background.substr(0,background.length-4)+'png)';
-				element.css('background-image',background);
+			if(background){
+				var i=background.lastIndexOf('.svg');
+				if(i>=0){
+					background=background.substr(0,i)+'.png'+background.substr(i+4);
+					element.css('background-image',background);
+				}
 			}
 		});
 	});
-- 
GitLab


From ff9111847f6646a35a7197c0c956559972a7bccb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 03:24:00 +0100
Subject: [PATCH 174/248] additional error codes for file upload

---
 files/ajax/upload.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/files/ajax/upload.php b/files/ajax/upload.php
index 241edc216ff..67611fb893e 100644
--- a/files/ajax/upload.php
+++ b/files/ajax/upload.php
@@ -16,12 +16,13 @@ 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").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")
+			UPLOAD_ERR_OK=>$l->t("There is no error, the file uploaded with success"),
+			UPLOAD_ERR_INI_SIZE=>$l->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
+			UPLOAD_ERR_FORM_SIZE=>$l->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
+			UPLOAD_ERR_PARTIAL=>$l->t("The uploaded file was only partially uploaded"),
+			UPLOAD_ERR_NO_FILE=>$l->t("No file was uploaded"),
+			UPLOAD_ERR_NO_TMP_DIR=>$l->t("Missing a temporary folder"),
+			UPLOAD_ERR_CANT_WRITE=>$l->t('Failed to write to disk'),
 		);
 		OC_JSON::error(array("data" => array( "message" => $errors[$error] )));
 		exit();
-- 
GitLab


From fe0832746b8b084f36706e296896a3a7e56e98cb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 03:31:04 +0100
Subject: [PATCH 175/248] intval() of a number seems unnecessary

and it could cause 32bit integer overflow issues
---
 lib/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helper.php b/lib/helper.php
index 2f71bdad2dc..80074a21b97 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -194,7 +194,7 @@ class OC_Helper {
 			$bytes *= $bytes_array[$matches[1]];
 		}
 
-		$bytes = intval(round($bytes, 2));
+		$bytes = round($bytes, 2);
 
 		return $bytes; 
 	}
-- 
GitLab


From 0b19af5e10ea83400e114c8b2d4252fb8d50cc33 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 03:42:15 +0100
Subject: [PATCH 176/248] application/ogg is music to

---
 apps/media/ajax/api.php    | 5 ++++-
 apps/media/lib_scanner.php | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index bb4502690b5..9d9c14deb17 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -120,7 +120,10 @@ if($arguments['action']){
 			OC_Filesystem::readfile($arguments['path']);
 			exit;
 		case 'find_music':
-			OC_JSON::encodedPrint(OC_FileCache::searchByMime('audio'));
+			$music=OC_FileCache::searchByMime('audio');
+			$ogg=OC_FileCache::searchByMime('application','ogg');
+			$music=array_merge($music,$ogg);
+			OC_JSON::encodedPrint($music);
 			exit;
 	}
 }
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index ea594ee8e3c..39658b27ba9 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -38,6 +38,8 @@ class OC_MEDIA_SCANNER{
 	 */
 	public static function scanCollection($eventSource=null){
 		$music=OC_FileCache::searchByMime('audio');
+		$ogg=OC_FileCache::searchByMime('application','ogg');
+		$music=array_merge($music,$ogg);
 		$eventSource->send('count',count($music));
 		$songs=0;
 		foreach($music as $file){
-- 
GitLab


From c8c3b8a63ea1c4763e1a5197487f0ae3506339c1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 03:54:21 +0100
Subject: [PATCH 177/248] chunked implementation for readfile

prevents memory issues when downloading large files
---
 apps/files_sharing/sharedstorage.php | 8 --------
 lib/filestorage.php                  | 1 -
 lib/filestorage/local.php            | 3 ---
 lib/filestoragecommon.php            | 8 --------
 lib/filesystemview.php               | 9 ++++++++-
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index cb641e68a84..0e110da30b1 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -281,14 +281,6 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		}
 	}
 	
-	public function readfile($path) {
-		$source = $this->getSource($path);
-		if ($source) {
-			$storage = OC_Filesystem::getStorage($source);
-			return $storage->readfile($this->getInternalPath($source));
-		}	
-	}
-	
 	public function filectime($path) {
 		if ($path == "" || $path == "/") {
 			$ctime = 0; 
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 4523144f6f4..989f5b311f3 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -36,7 +36,6 @@ class OC_Filestorage{
 	public function is_readable($path){}
 	public function is_writable($path){}
 	public function file_exists($path){}
-	public function readfile($path){}
 	public function filectime($path){}
 	public function filemtime($path){}
 	public function file_get_contents($path){}
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index dcb516a3afb..243fdd3ba6b 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -52,9 +52,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function file_exists($path){
 		return file_exists($this->datadir.$path);
 	}
-	public function readfile($path){
-		return readfile($this->datadir.$path);
-	}
 	public function filectime($path){
 		return filectime($this->datadir.$path);
 	}
diff --git a/lib/filestoragecommon.php b/lib/filestoragecommon.php
index f522d15c4e9..45ad11fcde8 100644
--- a/lib/filestoragecommon.php
+++ b/lib/filestoragecommon.php
@@ -37,14 +37,6 @@ class OC_Filestorage_Common extends OC_Filestorage {
 	public function is_readable($path){}
 	public function is_writable($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'];
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 91c6cd17720..ab254cc512f 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -136,7 +136,14 @@ class OC_FilesystemView {
 		return $this->basicOperation('filesize',$path);
 	}
 	public function readfile($path){
-		return $this->basicOperation('readfile',$path,array('read'));
+		$handle=$this->fopen($path,'r');
+		$chunkSize = 1024*1024;// 1 MB chunks
+		while (!feof($handle)) {
+			echo fread($handle, $chunkSize);
+			@ob_flush();
+			flush(); 
+		}
+		return $this->filesize($path);
 	}
 	public function is_readable($path){
 		return $this->basicOperation('is_readable',$path);
-- 
GitLab


From 0af31a532818012e9db50aa7f2ec061c0924aa4d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 03:56:45 +0100
Subject: [PATCH 178/248] missed one is_writeable

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

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 0e110da30b1..457966a96e2 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -58,7 +58,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	}
 	
 	public function mkdir($path) {
-		if ($path == "" || $path == "/" || !$this->is_writeable($path)) {
+		if ($path == "" || $path == "/" || !$this->is_writable($path)) {
 			return false; 
 		} else {
 			$source = $this->getSource($path);
-- 
GitLab


From 6c501f90bb3bf61edbe507b9864146d1642a328b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 04:09:48 +0100
Subject: [PATCH 179/248] hopefully a fix for webroot detection

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

diff --git a/lib/base.php b/lib/base.php
index 342bdc6768e..404f3dd7f91 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -143,6 +143,13 @@ class OC{
 		$scriptName=$_SERVER["SCRIPT_NAME"];
 		if(substr($scriptName,-1)=='/'){
 			$scriptName.='index.php';
+			//make sure suburi follows the same rules as scriptName
+			if(substr(OC::$SUBURI,-9)!='index.php'){
+				if(substr(OC::$SUBURI,-1)!='/'){
+					OC::$SUBURI=OC::$SUBURI.'/';
+				}
+				OC::$SUBURI=OC::$SUBURI.'index.php';
+			}
 		}
 		OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
 
-- 
GitLab


From 92c7b2717d4cff555ac8037b2b7dc5c59a79f493 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 26 Feb 2012 13:45:20 +0100
Subject: [PATCH 180/248] add OC_Geo class

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

diff --git a/lib/geo.php b/lib/geo.php
new file mode 100644
index 00000000000..a967ab28a96
--- /dev/null
+++ b/lib/geo.php
@@ -0,0 +1,31 @@
+<?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.
+ */
+class OC_Geo{
+	/*
+	 * @brief returns the closest timezone to coordinates
+	 * @param (string) $latitude - Latitude
+	 * @param (string) $longitude - Longitude
+	 * @return (string) $timezone - closest timezone
+	 */
+	public static function timezone($latitude, $longitude){	
+		$alltimezones = DateTimeZone::listIdentifiers();
+		$variances = array();
+		//calculate for all timezones the system know
+		foreach($alltimezones as $timezone){
+			$datetimezoneobj = new DateTimeZone($timezone);
+			$locationinformations = $datetimezoneobj->getLocation();
+			$latitudeoftimezone = $locationinformations['latitude'];
+			$longitudeoftimezone = $locationinformations['longitude'];
+			$variances[abs($latitudeoftimezone - $latitude) + abs($longitudeoftimezone - $longitude)] = $timezone;
+		}
+		//sort array and return the timezone with the smallest difference
+		ksort($variances);
+		reset($variances);
+		return current($variances);
+	}
+}
\ No newline at end of file
-- 
GitLab


From 89865cb8a0ca668f628e6e3e6a43bca7e72eab63 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 26 Feb 2012 13:45:51 +0100
Subject: [PATCH 181/248] stop using 3rdparty services for timezone detection

---
 apps/calendar/ajax/settings/guesstimezone.php | 45 +++++--------------
 apps/calendar/js/geo.js                       |  1 -
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/apps/calendar/ajax/settings/guesstimezone.php b/apps/calendar/ajax/settings/guesstimezone.php
index cfa92e1aee8..d45a70e1ce3 100755
--- a/apps/calendar/ajax/settings/guesstimezone.php
+++ b/apps/calendar/ajax/settings/guesstimezone.php
@@ -5,44 +5,23 @@
  * 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'];
-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')){
+$lng = $_GET['long'];
+
+$timezone =  OC_Geo::timezone($lat, $lng);
+
+if($timezone == 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']);
-	OC_JSON::success($message);
-}else{
-	OC_JSON::error();
-}
-
-?>
+OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'timezone', $timezone);
+$message = array('message'=> $l->t('New Timezone:') . $timezone);
+OC_JSON::success($message);
+?>
\ No newline at end of file
diff --git a/apps/calendar/js/geo.js b/apps/calendar/js/geo.js
index c9cc5dd0955..7018c6298a2 100755
--- a/apps/calendar/js/geo.js
+++ b/apps/calendar/js/geo.js
@@ -10,7 +10,6 @@ if (navigator.geolocation) {
 		function(data){
 			if (data.status == 'success' && typeof(data.message) != 'undefined'){
 				$('#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 62cd89da14608f4b390c42fe732130ffe8a432fc Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 13:49:51 +0100
Subject: [PATCH 182/248] improved password hashing based one phpass

old passwords are automatically upgraded on login
---
 3rdparty/phpass/PasswordHash.php  | 253 ++++++++++++++++++++++++++++++
 3rdparty/phpass/c/Makefile        |  21 +++
 3rdparty/phpass/c/crypt_private.c | 106 +++++++++++++
 3rdparty/phpass/test.php          |  72 +++++++++
 lib/user/database.php             |  49 +++++-
 5 files changed, 494 insertions(+), 7 deletions(-)
 create mode 100644 3rdparty/phpass/PasswordHash.php
 create mode 100644 3rdparty/phpass/c/Makefile
 create mode 100644 3rdparty/phpass/c/crypt_private.c
 create mode 100644 3rdparty/phpass/test.php

diff --git a/3rdparty/phpass/PasswordHash.php b/3rdparty/phpass/PasswordHash.php
new file mode 100644
index 00000000000..12958c7f19e
--- /dev/null
+++ b/3rdparty/phpass/PasswordHash.php
@@ -0,0 +1,253 @@
+<?php
+#
+# Portable PHP password hashing framework.
+#
+# Version 0.3 / genuine.
+#
+# Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
+# the public domain.  Revised in subsequent years, still public domain.
+#
+# There's absolutely no warranty.
+#
+# The homepage URL for this framework is:
+#
+#	http://www.openwall.com/phpass/
+#
+# Please be sure to update the Version line if you edit this file in any way.
+# It is suggested that you leave the main version number intact, but indicate
+# your project name (after the slash) and add your own revision information.
+#
+# Please do not change the "private" password hashing method implemented in
+# here, thereby making your hashes incompatible.  However, if you must, please
+# change the hash type identifier (the "$P$") to something different.
+#
+# Obviously, since this code is in the public domain, the above are not
+# requirements (there can be none), but merely suggestions.
+#
+class PasswordHash {
+	var $itoa64;
+	var $iteration_count_log2;
+	var $portable_hashes;
+	var $random_state;
+
+	function PasswordHash($iteration_count_log2, $portable_hashes)
+	{
+		$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+
+		if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
+			$iteration_count_log2 = 8;
+		$this->iteration_count_log2 = $iteration_count_log2;
+
+		$this->portable_hashes = $portable_hashes;
+
+		$this->random_state = microtime();
+		if (function_exists('getmypid'))
+			$this->random_state .= getmypid();
+	}
+
+	function get_random_bytes($count)
+	{
+		$output = '';
+		if (is_readable('/dev/urandom') &&
+		    ($fh = @fopen('/dev/urandom', 'rb'))) {
+			$output = fread($fh, $count);
+			fclose($fh);
+		}
+
+		if (strlen($output) < $count) {
+			$output = '';
+			for ($i = 0; $i < $count; $i += 16) {
+				$this->random_state =
+				    md5(microtime() . $this->random_state);
+				$output .=
+				    pack('H*', md5($this->random_state));
+			}
+			$output = substr($output, 0, $count);
+		}
+
+		return $output;
+	}
+
+	function encode64($input, $count)
+	{
+		$output = '';
+		$i = 0;
+		do {
+			$value = ord($input[$i++]);
+			$output .= $this->itoa64[$value & 0x3f];
+			if ($i < $count)
+				$value |= ord($input[$i]) << 8;
+			$output .= $this->itoa64[($value >> 6) & 0x3f];
+			if ($i++ >= $count)
+				break;
+			if ($i < $count)
+				$value |= ord($input[$i]) << 16;
+			$output .= $this->itoa64[($value >> 12) & 0x3f];
+			if ($i++ >= $count)
+				break;
+			$output .= $this->itoa64[($value >> 18) & 0x3f];
+		} while ($i < $count);
+
+		return $output;
+	}
+
+	function gensalt_private($input)
+	{
+		$output = '$P$';
+		$output .= $this->itoa64[min($this->iteration_count_log2 +
+			((PHP_VERSION >= '5') ? 5 : 3), 30)];
+		$output .= $this->encode64($input, 6);
+
+		return $output;
+	}
+
+	function crypt_private($password, $setting)
+	{
+		$output = '*0';
+		if (substr($setting, 0, 2) == $output)
+			$output = '*1';
+
+		$id = substr($setting, 0, 3);
+		# We use "$P$", phpBB3 uses "$H$" for the same thing
+		if ($id != '$P$' && $id != '$H$')
+			return $output;
+
+		$count_log2 = strpos($this->itoa64, $setting[3]);
+		if ($count_log2 < 7 || $count_log2 > 30)
+			return $output;
+
+		$count = 1 << $count_log2;
+
+		$salt = substr($setting, 4, 8);
+		if (strlen($salt) != 8)
+			return $output;
+
+		# We're kind of forced to use MD5 here since it's the only
+		# cryptographic primitive available in all versions of PHP
+		# currently in use.  To implement our own low-level crypto
+		# in PHP would result in much worse performance and
+		# consequently in lower iteration counts and hashes that are
+		# quicker to crack (by non-PHP code).
+		if (PHP_VERSION >= '5') {
+			$hash = md5($salt . $password, TRUE);
+			do {
+				$hash = md5($hash . $password, TRUE);
+			} while (--$count);
+		} else {
+			$hash = pack('H*', md5($salt . $password));
+			do {
+				$hash = pack('H*', md5($hash . $password));
+			} while (--$count);
+		}
+
+		$output = substr($setting, 0, 12);
+		$output .= $this->encode64($hash, 16);
+
+		return $output;
+	}
+
+	function gensalt_extended($input)
+	{
+		$count_log2 = min($this->iteration_count_log2 + 8, 24);
+		# This should be odd to not reveal weak DES keys, and the
+		# maximum valid value is (2**24 - 1) which is odd anyway.
+		$count = (1 << $count_log2) - 1;
+
+		$output = '_';
+		$output .= $this->itoa64[$count & 0x3f];
+		$output .= $this->itoa64[($count >> 6) & 0x3f];
+		$output .= $this->itoa64[($count >> 12) & 0x3f];
+		$output .= $this->itoa64[($count >> 18) & 0x3f];
+
+		$output .= $this->encode64($input, 3);
+
+		return $output;
+	}
+
+	function gensalt_blowfish($input)
+	{
+		# This one needs to use a different order of characters and a
+		# different encoding scheme from the one in encode64() above.
+		# We care because the last character in our encoded string will
+		# only represent 2 bits.  While two known implementations of
+		# bcrypt will happily accept and correct a salt string which
+		# has the 4 unused bits set to non-zero, we do not want to take
+		# chances and we also do not want to waste an additional byte
+		# of entropy.
+		$itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+		$output = '$2a$';
+		$output .= chr(ord('0') + $this->iteration_count_log2 / 10);
+		$output .= chr(ord('0') + $this->iteration_count_log2 % 10);
+		$output .= '$';
+
+		$i = 0;
+		do {
+			$c1 = ord($input[$i++]);
+			$output .= $itoa64[$c1 >> 2];
+			$c1 = ($c1 & 0x03) << 4;
+			if ($i >= 16) {
+				$output .= $itoa64[$c1];
+				break;
+			}
+
+			$c2 = ord($input[$i++]);
+			$c1 |= $c2 >> 4;
+			$output .= $itoa64[$c1];
+			$c1 = ($c2 & 0x0f) << 2;
+
+			$c2 = ord($input[$i++]);
+			$c1 |= $c2 >> 6;
+			$output .= $itoa64[$c1];
+			$output .= $itoa64[$c2 & 0x3f];
+		} while (1);
+
+		return $output;
+	}
+
+	function HashPassword($password)
+	{
+		$random = '';
+
+		if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
+			$random = $this->get_random_bytes(16);
+			$hash =
+			    crypt($password, $this->gensalt_blowfish($random));
+			if (strlen($hash) == 60)
+				return $hash;
+		}
+
+		if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
+			if (strlen($random) < 3)
+				$random = $this->get_random_bytes(3);
+			$hash =
+			    crypt($password, $this->gensalt_extended($random));
+			if (strlen($hash) == 20)
+				return $hash;
+		}
+
+		if (strlen($random) < 6)
+			$random = $this->get_random_bytes(6);
+		$hash =
+		    $this->crypt_private($password,
+		    $this->gensalt_private($random));
+		if (strlen($hash) == 34)
+			return $hash;
+
+		# Returning '*' on error is safe here, but would _not_ be safe
+		# in a crypt(3)-like function used _both_ for generating new
+		# hashes and for validating passwords against existing hashes.
+		return '*';
+	}
+
+	function CheckPassword($password, $stored_hash)
+	{
+		$hash = $this->crypt_private($password, $stored_hash);
+		if ($hash[0] == '*')
+			$hash = crypt($password, $stored_hash);
+
+		return $hash == $stored_hash;
+	}
+}
+
+?>
diff --git a/3rdparty/phpass/c/Makefile b/3rdparty/phpass/c/Makefile
new file mode 100644
index 00000000000..fe48917f7f5
--- /dev/null
+++ b/3rdparty/phpass/c/Makefile
@@ -0,0 +1,21 @@
+#
+# Written by Solar Designer and placed in the public domain.
+# See crypt_private.c for more information.
+#
+CC = gcc
+LD = $(CC)
+RM = rm -f
+CFLAGS = -Wall -O2 -fomit-frame-pointer -funroll-loops
+LDFLAGS = -s
+LIBS = -lcrypto
+
+all: crypt_private-test
+
+crypt_private-test: crypt_private-test.o
+	$(LD) $(LDFLAGS) $(LIBS) crypt_private-test.o -o $@
+
+crypt_private-test.o: crypt_private.c
+	$(CC) -c $(CFLAGS) crypt_private.c -DTEST -o $@
+
+clean:
+	$(RM) crypt_private-test*
diff --git a/3rdparty/phpass/c/crypt_private.c b/3rdparty/phpass/c/crypt_private.c
new file mode 100644
index 00000000000..6abc05bc1de
--- /dev/null
+++ b/3rdparty/phpass/c/crypt_private.c
@@ -0,0 +1,106 @@
+/*
+ * This code exists for the sole purpose to serve as another implementation
+ * of the "private" password hashing method implemened in PasswordHash.php
+ * and thus to confirm that these password hashes are indeed calculated as
+ * intended.
+ *
+ * Other uses of this code are discouraged.  There are much better password
+ * hashing algorithms available to C programmers; one of those is bcrypt:
+ *
+ *	http://www.openwall.com/crypt/
+ *
+ * Written by Solar Designer <solar at openwall.com> in 2005 and placed in
+ * the public domain.
+ *
+ * There's absolutely no warranty.
+ */
+
+#include <string.h>
+#include <openssl/md5.h>
+
+#ifdef TEST
+#include <stdio.h>
+#endif
+
+static char *itoa64 =
+	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+static void encode64(char *dst, char *src, int count)
+{
+	int i, value;
+
+	i = 0;
+	do {
+		value = (unsigned char)src[i++];
+		*dst++ = itoa64[value & 0x3f];
+		if (i < count)
+			value |= (unsigned char)src[i] << 8;
+		*dst++ = itoa64[(value >> 6) & 0x3f];
+		if (i++ >= count)
+			break;
+		if (i < count)
+			value |= (unsigned char)src[i] << 16;
+		*dst++ = itoa64[(value >> 12) & 0x3f];
+		if (i++ >= count)
+			break;
+		*dst++ = itoa64[(value >> 18) & 0x3f];
+	} while (i < count);
+}
+
+char *crypt_private(char *password, char *setting)
+{
+	static char output[35];
+	MD5_CTX ctx;
+	char hash[MD5_DIGEST_LENGTH];
+	char *p, *salt;
+	int count_log2, length, count;
+
+	strcpy(output, "*0");
+	if (!strncmp(setting, output, 2))
+		output[1] = '1';
+
+	if (strncmp(setting, "$P$", 3))
+		return output;
+
+	p = strchr(itoa64, setting[3]);
+	if (!p)
+		return output;
+	count_log2 = p - itoa64;
+	if (count_log2 < 7 || count_log2 > 30)
+		return output;
+
+	salt = setting + 4;
+	if (strlen(salt) < 8)
+		return output;
+
+	length = strlen(password);
+
+	MD5_Init(&ctx);
+	MD5_Update(&ctx, salt, 8);
+	MD5_Update(&ctx, password, length);
+	MD5_Final(hash, &ctx);
+
+	count = 1 << count_log2;
+	do {
+		MD5_Init(&ctx);
+		MD5_Update(&ctx, hash, MD5_DIGEST_LENGTH);
+		MD5_Update(&ctx, password, length);
+		MD5_Final(hash, &ctx);
+	} while (--count);
+
+	memcpy(output, setting, 12);
+	encode64(&output[12], hash, MD5_DIGEST_LENGTH);
+
+	return output;
+}
+
+#ifdef TEST
+int main(int argc, char **argv)
+{
+	if (argc != 3) return 1;
+
+	puts(crypt_private(argv[1], argv[2]));
+
+	return 0;
+}
+#endif
diff --git a/3rdparty/phpass/test.php b/3rdparty/phpass/test.php
new file mode 100644
index 00000000000..2f4a41c8c31
--- /dev/null
+++ b/3rdparty/phpass/test.php
@@ -0,0 +1,72 @@
+<?php
+#
+# This is a test program for the portable PHP password hashing framework.
+#
+# Written by Solar Designer and placed in the public domain.
+# See PasswordHash.php for more information.
+#
+
+require 'PasswordHash.php';
+
+header('Content-type: text/plain');
+
+$ok = 0;
+
+# Try to use stronger but system-specific hashes, with a possible fallback to
+# the weaker portable hashes.
+$t_hasher = new PasswordHash(8, FALSE);
+
+$correct = 'test12345';
+$hash = $t_hasher->HashPassword($correct);
+
+print 'Hash: ' . $hash . "\n";
+
+$check = $t_hasher->CheckPassword($correct, $hash);
+if ($check) $ok++;
+print "Check correct: '" . $check . "' (should be '1')\n";
+
+$wrong = 'test12346';
+$check = $t_hasher->CheckPassword($wrong, $hash);
+if (!$check) $ok++;
+print "Check wrong: '" . $check . "' (should be '0' or '')\n";
+
+unset($t_hasher);
+
+# Force the use of weaker portable hashes.
+$t_hasher = new PasswordHash(8, TRUE);
+
+$hash = $t_hasher->HashPassword($correct);
+
+print 'Hash: ' . $hash . "\n";
+
+$check = $t_hasher->CheckPassword($correct, $hash);
+if ($check) $ok++;
+print "Check correct: '" . $check . "' (should be '1')\n";
+
+$check = $t_hasher->CheckPassword($wrong, $hash);
+if (!$check) $ok++;
+print "Check wrong: '" . $check . "' (should be '0' or '')\n";
+
+# A correct portable hash for 'test12345'.
+# Please note the use of single quotes to ensure that the dollar signs will
+# be interpreted literally.  Of course, a real application making use of the
+# framework won't store password hashes within a PHP source file anyway.
+# We only do this for testing.
+$hash = '$P$9IQRaTwmfeRo7ud9Fh4E2PdI0S3r.L0';
+
+print 'Hash: ' . $hash . "\n";
+
+$check = $t_hasher->CheckPassword($correct, $hash);
+if ($check) $ok++;
+print "Check correct: '" . $check . "' (should be '1')\n";
+
+$check = $t_hasher->CheckPassword($wrong, $hash);
+if (!$check) $ok++;
+print "Check wrong: '" . $check . "' (should be '0' or '')\n";
+
+if ($ok == 6)
+	print "All tests have PASSED\n";
+else
+	print "Some tests have FAILED\n";
+
+?>
diff --git a/lib/user/database.php b/lib/user/database.php
index 452709c1fb9..3eade276dd9 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -33,12 +33,28 @@
  *
  */
 
+require_once 'phpass/PasswordHash.php';
+
 /**
  * Class for user management in a SQL Database (e.g. MySQL, SQLite)
  */
 class OC_User_Database extends OC_User_Backend {
 	static private $userGroupCache=array();
+	/**
+	 * @var PasswordHash
+	 */
+	static private $hasher=null;
+	
+	private function getHasher(){
+		if(!self::$hasher){
+			//we don't want to use DES based crypt(), since it doesn't return a has with a recognisable prefix
+			$forcePortable=(CRYPT_BLOWFISH!=1);
+			self::$hasher=new PasswordHash(8,$forcePortable);
+		}
+		return self::$hasher;
 
+	}
+	
 	/**
 	 * @brief Create a new user
 	 * @param $uid The username of the user to create
@@ -51,10 +67,11 @@ class OC_User_Database extends OC_User_Backend {
 	public function createUser( $uid, $password ){
 		if( $this->userExists($uid) ){
 			return false;
-		}
-		else{
+		}else{
+			$hasher=$this->getHasher();
+			$hash = $hasher->HashPassword($password);
 			$query = OC_DB::prepare( "INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )" );
-			$result = $query->execute( array( $uid, sha1( $password )));
+			$result = $query->execute( array( $uid, $hash));
 
 			return $result ? true : false;
 		}
@@ -84,8 +101,10 @@ class OC_User_Database extends OC_User_Backend {
 	 */
 	public function setPassword( $uid, $password ){
 		if( $this->userExists($uid) ){
+			$hasher=$this->getHasher();
+			$hash = $hasher->HashPassword($password);
 			$query = OC_DB::prepare( "UPDATE *PREFIX*users SET password = ? WHERE uid = ?" );
-			$result = $query->execute( array( sha1( $password ), $uid ));
+			$result = $query->execute( array( $hash, $uid ));
 
 			return true;
 		}
@@ -103,12 +122,28 @@ class OC_User_Database extends OC_User_Backend {
 	 * Check if the password is correct without logging in the user
 	 */
 	public function checkPassword( $uid, $password ){
-		$query = OC_DB::prepare( "SELECT uid FROM *PREFIX*users WHERE uid LIKE ? AND password = ?" );
-		$result = $query->execute( array( $uid, sha1( $password )));
+		$query = OC_DB::prepare( "SELECT uid, password FROM *PREFIX*users WHERE uid LIKE ?" );
+		$result = $query->execute( array( $uid));
 
 		$row=$result->fetchRow();
 		if($row){
-			return $row['uid'];
+			$storedHash=$row['password'];
+			if (substr($storedHash,0,1)=='$'){//the new phpass based hashing
+				$hasher=$this->getHasher();
+				if($hasher->CheckPassword($password, $storedHash)){
+					return $row['uid'];
+				}else{
+					return false;
+				}
+			}else{//old sha1 based hashing
+				if(sha1($password)==$storedHash){
+					//upgrade to new hashing
+					$this->setPassword($row['uid'],$password);
+					return $row['uid'];
+				}else{
+					return false;
+				}
+			}
 		}else{
 			return false;
 		}
-- 
GitLab


From 3d0d47957e65a72e17d33a924c9c4efcd5088ed2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 14:03:53 +0100
Subject: [PATCH 183/248] improved humanFileSize for js

---
 core/js/js.js | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index 4b5062eb1a6..0f8122b3d1e 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -450,22 +450,18 @@ $.fn.filterAttr = function(attr_name, attr_value) {
    return this.filter(function() { return $(this).attr(attr_name) === attr_value; });
 };
 
-function humanFileSize(bytes){
-	if( bytes < 1024 ){
-		return bytes+' B';
+function humanFileSize(size) {
+	humanList = ['B', 'kB', 'MB', 'GB', 'TB'];
+	// Calculate Log with base 1024: size = 1024 ** order
+	order = Math.floor(Math.log(size) / Math.log(1024));
+	// Stay in range of the byte sizes that are defined
+	order = Math.min(humanList.length, order);
+	readableFormat = humanList[order];
+	relativeSize = (size / Math.pow(1024, order)).toFixed(1);
+	if(relativeSize.substr(relativeSize.length-2,2)=='.0'){
+		relativeSize=relativeSize.substr(0,relativeSize.length-2);
 	}
-	bytes = Math.round(bytes / 1024, 1 );
-	if( bytes < 1024 ){
-		return bytes+' kB';
-	}
-	bytes = Math.round( bytes / 1024, 1 );
-	if( bytes < 1024 ){
-		return bytes+' MB';
-	}
-	
-	// Wow, heavy duty for owncloud
-	bytes = Math.round( bytes / 1024, 1 );
-	return bytes+' GB';
+	return relativeSize + ' ' + readableFormat;
 }
 
 function simpleFileSize(bytes) {
-- 
GitLab


From ff0a542e48aa5fe3adf557f17b0a9383a79bf586 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 15:32:45 +0100
Subject: [PATCH 184/248] always set encrypted flag when overwriting a file we
 should encrypt

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

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 5c83171dda2..bd98b98bbad 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -66,6 +66,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		if(self::shouldEncrypt($path)){
 			if (!is_resource($data)) {//stream put contents should have been converter to fopen
 				$data=OC_Crypt::blockEncrypt($data);
+				OC_FileCache::put($path,array('encrypted'=>true));
 			}
 		}
 	}
@@ -85,7 +86,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		if(self::isEncrypted($path)){
 			fclose($result);
 			$result=fopen('crypt://'.$path,$meta['mode']);
-		}elseif(self::shouldEncrypt($path) and $meta['mode']!='r'){
+		}elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb'){
 			if(OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0){
 				//first encrypt the target file so we don't end up with a half encrypted file
 				OC_Log::write('files_encryption','Decrypting '.$path.' before writing',OC_Log::DEBUG);
-- 
GitLab


From 857535403c7cdd489ec8f658b973c60ebb27e824 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 15:32:58 +0100
Subject: [PATCH 185/248] add more valid fopen modes

---
 lib/filesystemview.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index ba1490dd276..0c530677f54 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -255,18 +255,26 @@ class OC_FilesystemView {
 		$hooks=array();
 		switch($mode){
 			case 'r':
+			case 'rb':
 				$hooks[]='read';
 				break;
 			case 'r+':
+			case 'rb+':
 			case 'w+':
+			case 'wb+':
 			case 'x+':
+			case 'xb+':
 			case 'a+':
+			case 'ab+':
 				$hooks[]='read';
 				$hooks[]='write';
 				break;
 			case 'w':
+			case 'wb':
 			case 'x':
+			case 'xb':
 			case 'a':
+			case 'ab':
 				$hooks[]='write';
 				break;
 			default:
-- 
GitLab


From 01fcc080bb5c280147d53bd6eee14655f5fefe87 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 15:56:47 +0100
Subject: [PATCH 186/248] dont set the encryption flag for existing
 non-encrypted files

---
 apps/files_encryption/lib/proxy.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index bd98b98bbad..c1c26d7754f 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -107,10 +107,9 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	}
 
 	public function postGetMimeType($path,$mime){
-		if((!OC_FileCache::inCache($path) and self::shouldEncrypt($path)) or self::isEncrypted($path)){
-			return OC_Helper::getMimeType('crypt://'.$path,'w');
-		}else{
-			return $mime;
+		if(self::isEncrypted($path)){
+			$mime=OC_Helper::getMimeType('crypt://'.$path,'w');
 		}
+		return $mime;
 	}
 }
-- 
GitLab


From 8148480cfe2ca263f493d042866a809a45ee05af Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 16:49:57 +0100
Subject: [PATCH 187/248] dont enable encryption on default

---
 apps/files_encryption/appinfo/info.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index a8db06aa3db..053044aaed2 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -7,5 +7,4 @@
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
 	<require>3</require>
-	<default_enable/>
 </info>
-- 
GitLab


From ab96fa67c886d8ba2a4e930930f8e7a7b95e9cfa Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Sun, 26 Feb 2012 18:26:41 +0100
Subject: [PATCH 188/248] first part of the abstraction work of the apps
 folder. more to come

---
 apps/calendar/ajax/import/import.php |  4 +-
 apps/calendar/caldav.php             |  2 +-
 apps/contacts/carddav.php            |  2 +-
 apps/remoteStorage/WebDAV.php        |  2 +-
 lib/app.php                          | 18 +++---
 lib/base.php                         | 27 ++++++++-
 lib/helper.php                       |  8 +--
 lib/installer.php                    | 18 +++---
 lib/l10n.php                         |  4 +-
 lib/template.php                     | 82 ++++++++++++++--------------
 10 files changed, 96 insertions(+), 71 deletions(-)

diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index 96d7af48341..c0797f6e425 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -11,7 +11,7 @@ require_once('../../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
 $nl = "\n";
-$progressfile = OC::$SERVERROOT . '/apps/calendar/import_tmp/' . md5(session_id()) . '.txt';
+$progressfile = OC::$APPSROOT . '/apps/calendar/import_tmp/' . md5(session_id()) . '.txt';
 if(is_writable('import_tmp/')){
 	$progressfopen = fopen($progressfile, 'w');
 	fwrite($progressfopen, '10');
@@ -117,4 +117,4 @@ sleep(3);
 if(is_writable('import_tmp/')){
 	unlink($progressfile);
 }
-OC_JSON::success();
\ No newline at end of file
+OC_JSON::success();
diff --git a/apps/calendar/caldav.php b/apps/calendar/caldav.php
index db0b35da118..e0925c54ee7 100644
--- a/apps/calendar/caldav.php
+++ b/apps/calendar/caldav.php
@@ -25,7 +25,7 @@ $nodes = array(
 
 // Fire up server
 $server = new Sabre_DAV_Server($nodes);
-$server->setBaseUri(OC::$WEBROOT.'/apps/calendar/caldav.php');
+$server->setBaseUri(OC::$APPSROOT.'/apps/calendar/caldav.php');
 // Add plugins
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
 $server->addPlugin(new Sabre_CalDAV_Plugin());
diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php
index a2bf492e206..c09ff80b99c 100644
--- a/apps/contacts/carddav.php
+++ b/apps/contacts/carddav.php
@@ -39,7 +39,7 @@ $nodes = array(
 
 // Fire up server
 $server = new Sabre_DAV_Server($nodes);
-$server->setBaseUri(OC::$WEBROOT.'/apps/contacts/carddav.php');
+$server->setBaseUri(OC::$APPSROOT.'/apps/contacts/carddav.php');
 // Add plugins
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
 $server->addPlugin(new Sabre_CardDAV_Plugin());
diff --git a/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/WebDAV.php
index cad465181a9..3a463a21a5c 100644
--- a/apps/remoteStorage/WebDAV.php
+++ b/apps/remoteStorage/WebDAV.php
@@ -66,7 +66,7 @@ if(count($pathParts) >= 3 && $pathParts[0] == '') {
 	$server = new Sabre_DAV_Server($publicDir);
 
 	// Path to our script
-	$server->setBaseUri(OC::$WEBROOT."/apps/remoteStorage/WebDAV.php/$ownCloudUser");
+	$server->setBaseUri(OC::$APPSROOT."/apps/remoteStorage/WebDAV.php/$ownCloudUser");
 
 	// Auth backend
 	$authBackend = new OC_Connector_Sabre_Auth_ro_oauth(
diff --git a/lib/app.php b/lib/app.php
index 1879a89cee3..696b35485bd 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -58,8 +58,8 @@ class OC_App{
 		$apps = OC_Appconfig::getApps();
 		foreach( $apps as $app ){
 			if( self::isEnabled( $app )){
-				if(is_file(OC::$SERVERROOT.'/apps/'.$app.'/appinfo/app.php')){
-					require( 'apps/'.$app.'/appinfo/app.php' );
+				if(is_file(OC::$APPSROOT.'/apps/'.$app.'/appinfo/app.php')){
+					require( $app.'/appinfo/app.php' );
 				}
 			}
 		}
@@ -268,7 +268,7 @@ class OC_App{
 		if(is_file($appid)){
 			$file=$appid;
 		}else{
-			$file=OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/info.xml';
+			$file=OC::$APPSROOT.'/apps/'.$appid.'/appinfo/info.xml';
 			if(!is_file($file)){
 				return array();
 			}
@@ -363,9 +363,9 @@ class OC_App{
 	 */
 	public static function getAllApps(){
 		$apps=array();
-		$dh=opendir(OC::$SERVERROOT.'/apps');
+		$dh=opendir(OC::$APPSROOT.'/apps');
 		while($file=readdir($dh)){
-			if(is_file(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/app.php')){
+			if(is_file(OC::$APPSROOT.'/apps/'.$file.'/appinfo/app.php')){
 				$apps[]=$file;
 			}
 		}
@@ -396,11 +396,11 @@ class OC_App{
 	 * @param string appid
 	 */
 	public static function updateApp($appid){
-		if(file_exists(OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/database.xml')){
-			OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/database.xml');
+		if(file_exists(OC::$APPSROOT.'/apps/'.$appid.'/appinfo/database.xml')){
+			OC_DB::updateDbFromStructure(OC::$APPSROOT.'/apps/'.$appid.'/appinfo/database.xml');
 		}
-		if(file_exists(OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/update.php')){
-			include OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/update.php';
+		if(file_exists(OC::$APPSROOT.'/apps/'.$appid.'/appinfo/update.php')){
+			include OC::$APPSROOT.'/apps/'.$appid.'/appinfo/update.php';
 		}
 	}
 
diff --git a/lib/base.php b/lib/base.php
index ee1a86399ac..32dcfd78258 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -62,6 +62,14 @@ class OC{
 	 * the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty)
 	 */
 	public static $THIRDPARTYWEBROOT = '';
+        /**
+         * The installation path of the apps folder on the server (e.g. /srv/http/owncloud)
+         */
+        public static $APPSROOT = '';
+        /**
+         * the root path of the apps folder for http requests (e.g. owncloud)
+         */
+        public static $APPSWEBROOT = '';
 
 	/**
 	 * SPL autoload
@@ -179,9 +187,26 @@ class OC{
 			exit;
 		}
 
+                // search the apps folder
+                if(file_exists(OC::$SERVERROOT.'/apps')){
+                        OC::$APPSROOT=OC::$SERVERROOT;
+                        OC::$APPSWEBROOT=OC::$WEBROOT;
+                }elseif(file_exists(OC::$SERVERROOT.'/../apps')){
+                        $url_tmp=explode('/',OC::$WEBROOT);
+                        $length=count($url_tmp);
+                        unset($url_tmp[$length-1]);
+                        OC::$APPSWEBROOT=implode('/',$url_tmp);
+                        $root_tmp=explode('/',OC::$SERVERROOT);
+                        $length=count($root_tmp);
+                        unset($root_tmp[$length-1]);
+                        OC::$APPSROOT=implode('/',$root_tmp);
+                }else{
+                        echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
+                        exit;
+                }
 
 		// set the right include path
-		set_include_path(OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.OC::$SERVERROOT.'/config'.PATH_SEPARATOR.OC::$THIRDPARTYROOT.'/3rdparty'.PATH_SEPARATOR.get_include_path().PATH_SEPARATOR.OC::$SERVERROOT);
+		set_include_path(OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.OC::$SERVERROOT.'/config'.PATH_SEPARATOR.OC::$THIRDPARTYROOT.'/3rdparty'.PATH_SEPARATOR.OC::$APPSROOT.PATH_SEPARATOR.OC::$APPSROOT.'/apps'.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') {
diff --git a/lib/helper.php b/lib/helper.php
index 8cf94f81b0b..60af4e376b1 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -39,8 +39,8 @@ class OC_Helper {
 		if( $app != '' ){
 			$app .= '/';
 			// Check if the app is in the app folder
-			if( file_exists( OC::$SERVERROOT . '/apps/'. $app.$file )){
-				$urlLinkTo =  OC::$WEBROOT . '/apps/' . $app . $file;
+			if( file_exists( OC::$APPSROOT . '/apps/'. $app.$file )){
+				$urlLinkTo =  OC::$APPSWEBROOT . '/apps/' . $app . $file;
 			}
 			else{
 				$urlLinkTo =  OC::$WEBROOT . '/' . $app . $file;
@@ -89,8 +89,8 @@ class OC_Helper {
                 // 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( file_exists( OC::$APPSROOT."/apps/$app/img/$image" )){
+                        return OC::$APPSWEBROOT."/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" )){
diff --git a/lib/installer.php b/lib/installer.php
index b2f817e702f..2cc7555f0d6 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -103,7 +103,7 @@ class OC_Installer{
 			return false;
 		}
 		$info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml');
-		$basedir=OC::$SERVERROOT.'/apps/'.$info['id'];
+		$basedir=OC::$APPSROOT.'/apps/'.$info['id'];
 		
 		//check if an app with the same id is already installed
 		if(self::isInstalled( $info['id'] )){
@@ -244,10 +244,10 @@ class OC_Installer{
 	 * If $enabled is false, apps are installed as disabled.
 	 */
 	public static function installShippedApps(){
-		$dir = opendir( OC::$SERVERROOT."/apps" );
+		$dir = opendir( OC::$APPSROOT."/apps" );
 		while( false !== ( $filename = readdir( $dir ))){
-			if( substr( $filename, 0, 1 ) != '.' and is_dir(OC::$SERVERROOT."/apps/$filename") ){
-				if( file_exists( OC::$SERVERROOT."/apps/$filename/appinfo/app.php" )){
+			if( substr( $filename, 0, 1 ) != '.' and is_dir(OC::$APPSROOT."/apps/$filename") ){
+				if( file_exists( OC::$APPSROOT."/apps/$filename/appinfo/app.php" )){
 					if(!OC_Installer::isInstalled($filename)){
 						$info = OC_Installer::installShippedApp($filename);
 						$enabled = isset($info['default_enable']);
@@ -270,15 +270,15 @@ class OC_Installer{
 	 */
 	public static function installShippedApp($app){
 		//install the database
-		if(is_file(OC::$SERVERROOT."/apps/$app/appinfo/database.xml")){
-			OC_DB::createDbFromStructure(OC::$SERVERROOT."/apps/$app/appinfo/database.xml");
+		if(is_file(OC::$APPSROOT."/apps/$app/appinfo/database.xml")){
+			OC_DB::createDbFromStructure(OC::$APPSROOT."/apps/$app/appinfo/database.xml");
 		}
 
 		//run appinfo/install.php
-		if(is_file(OC::$SERVERROOT."/apps/$app/appinfo/install.php")){
-			include(OC::$SERVERROOT."/apps/$app/appinfo/install.php");
+		if(is_file(OC::$APPSROOT."/apps/$app/appinfo/install.php")){
+			include(OC::$APPSROOT."/apps/$app/appinfo/install.php");
 		}
-		$info=OC_App::getAppInfo(OC::$SERVERROOT."/apps/$app/appinfo/info.xml");
+		$info=OC_App::getAppInfo(OC::$APPSROOT."/apps/$app/appinfo/info.xml");
 		OC_Appconfig::setValue($app,'installed_version',$info['version']);
 		return $info;
 	}
diff --git a/lib/l10n.php b/lib/l10n.php
index a5544eb3a27..636326f9864 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -243,8 +243,8 @@ class OC_L10N{
 		$i18ndir = OC::$SERVERROOT.'/core/l10n/';
 		if($app != ''){
 			// Check if the app is in the app folder
-			if(file_exists(OC::$SERVERROOT.'/apps/'.$app.'/l10n/')){
-				$i18ndir = OC::$SERVERROOT.'/apps/'.$app.'/l10n/';
+			if(file_exists(OC::$APPSROOT.'/apps/'.$app.'/l10n/')){
+				$i18ndir = OC::$APPSROOT.'/apps/'.$app.'/l10n/';
 			}
 			else{
 				$i18ndir = OC::$SERVERROOT.'/'.$app.'/l10n/';
diff --git a/lib/template.php b/lib/template.php
index 5fe2eb7d6c7..148e400d4e8 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -170,39 +170,39 @@ class OC_Template{
 
 		// Check if it is a app template or not.
 		if( $app != "" ){
-			// Check if the app is in the app folder or in the root
-			if( file_exists( 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/";
-				}
-
-			}
+	                        // Check if the app is in the app folder or in the root
+                        if( file_exists( OC::$APPSROOT."/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::$APPSROOT."/apps/$app/templates/"."$name$fext.php" ){
+                                        $template = OC::$APPSROOT."/apps/$app/templates/"."$name$fext.php";
+                                        $path = OC::$APPSROOT."/apps/$app/templates/";
+                                }else{
+                                        $template = OC::$APPSROOT."/apps/$app/templates/"."$name.php";
+                                        $path = OC::$APPSROOT."/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{
 			// Check if the template is overwritten by the selected theme
 			if( file_exists( OC::$SERVERROOT."/themes/$theme/core/templates/"."$name$fext.php" )){
@@ -357,10 +357,10 @@ class OC_Template{
 					$page->append( "jsfiles", OC::$WEBROOT."/themes/$theme/apps/$script.js" );
 
 				// Is it part of an app?
-				}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::$APPSROOT."/apps/$script$fext.js" )){
+					$page->append( "jsfiles", OC::$APPSWEBROOT."/apps/$script$fext.js" );
+				}elseif(is_file(OC::$APPSROOT."/apps/$script.js" )){
+					$page->append( "jsfiles", OC::$APPSWEBROOT."/apps/$script.js" );
 
 				// Is it in the owncloud root but overwritten by the theme?
 				}elseif(is_file(OC::$SERVERROOT."/themes/$theme/$script$fext.js" )){
@@ -394,10 +394,10 @@ class OC_Template{
 				if(is_file(OC::$THIRDPARTYROOT."/$style.css" )){
 					$page->append( "cssfiles", OC::$THIRDPARTYWEBROOT."/$style.css" );
 				// or in apps?
-				}elseif(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::$APPSROOT."/apps/$style$fext.css" )){
+					$page->append( "cssfiles", OC::$APPSWEBROOT."/apps/$style$fext.css" );
+				}elseif(is_file(OC::$APPSROOT."/apps/$style.css" )){
+					$page->append( "cssfiles", OC::$APPSWEBROOT."/apps/$style.css" );
 				// or in the owncloud root?
 				}elseif(is_file(OC::$SERVERROOT."/$style$fext.css" )){
 					$page->append( "cssfiles", OC::$WEBROOT."/$style$fext.css" );
-- 
GitLab


From a501d4b61e3ba30aa1643b6a92c5177ee69d3b7d Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Sun, 26 Feb 2012 19:13:14 +0100
Subject: [PATCH 189/248] =?UTF-8?q?change=20back=20to=2032bit.=20autoincre?=
 =?UTF-8?q?ment=20doesn=C2=B4t=20work=20with=20sqlite=20otherwise?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db_structure.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db_structure.xml b/db_structure.xml
index bdbb16759db..879bbcb48ad 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -53,7 +53,7 @@
 	   <type>integer</type>
 	   <default>0</default>
 	   <notnull>true</notnull>
-	   <length>8</length>
+	   <length>4</length>
    </field>
 
    <field>
-- 
GitLab


From 04c9cc60349fe8d6899a42781ccacaf6d9df5bf5 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 26 Feb 2012 21:23:20 +0100
Subject: [PATCH 190/248] give users the possibility to choose between monday
 and sunday as first day of the week

---
 apps/calendar/ajax/settings/getfirstday.php | 12 ++++++++++++
 apps/calendar/ajax/settings/setfirstday.php | 17 +++++++++++++++++
 apps/calendar/js/calendar.js                |  2 +-
 apps/calendar/js/settings.js                | 12 ++++++++++++
 apps/calendar/templates/calendar.php        |  1 +
 apps/calendar/templates/settings.php        |  7 +++++++
 6 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 apps/calendar/ajax/settings/getfirstday.php
 create mode 100644 apps/calendar/ajax/settings/setfirstday.php

diff --git a/apps/calendar/ajax/settings/getfirstday.php b/apps/calendar/ajax/settings/getfirstday.php
new file mode 100644
index 00000000000..cab5870509a
--- /dev/null
+++ b/apps/calendar/ajax/settings/getfirstday.php
@@ -0,0 +1,12 @@
+<?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();
+$firstday = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'firstday', 'mo');
+OC_JSON::encodedPrint(array('firstday' => $firstday));
+?> 
diff --git a/apps/calendar/ajax/settings/setfirstday.php b/apps/calendar/ajax/settings/setfirstday.php
new file mode 100644
index 00000000000..3b652212205
--- /dev/null
+++ b/apps/calendar/ajax/settings/setfirstday.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();
+if(isset($_POST["firstday"])){
+	OC_Preferences::setValue(OC_User::getUser(), 'calendar', 'firstday', $_POST["firstday"]);
+	OC_JSON::success();
+}else{
+	OC_JSON::error();
+}
+?> 
+ 
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 84b76a3c88f..a1b25780b76 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -661,7 +661,7 @@ $(document).ready(function(){
 	Calendar.UI.initScroll();
 	$('#calendar_holder').fullCalendar({
 		header: false,
-		firstDay: 1,
+		firstDay: firstDay,
 		editable: true,
 		defaultView: defaultView,
 		timeFormat: {
diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
index fcbfc423db3..c768a47a797 100644
--- a/apps/calendar/js/settings.js
+++ b/apps/calendar/js/settings.js
@@ -17,6 +17,14 @@ $(document).ready(function(){
 			}
 		});
 	});
+	$('#firstday').change( function(){
+		var data = $('#firstday').serialize();
+		$.post( OC.filePath('calendar', 'ajax/settings', 'setfirstday.php'), data, function(data){
+			if(data == 'error'){
+				console.log('saving firstday failed');
+			}
+		});
+	});
 	$('#timezonedetection').change( function(){
 		var post = $('#timezonedetection').serialize();
 		$.post( OC.filePath('calendar', 'ajax/settings', 'timezonedetection.php'), post, function(data){
@@ -32,4 +40,8 @@ $(document).ready(function(){
 			$('#timezonedetection').attr('checked', 'checked');
 		}
 	});
+	$.getJSON(OC.filePath('calendar', 'ajax/settings', 'getfirstday.php'), function(jsondata, status) {
+		$('#' + jsondata.firstday).attr('selected',true);
+		$('#firstday').chosen();
+	});
 });
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index eb82d0d02ad..63c3b500296 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -19,6 +19,7 @@
 				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::linkToAbsolute('calendar', 'caldav.php'); ?>/calendars';
+				var firstDay = '<?php echo (OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'firstday', 'mo') == 'mo' ? '1' : '0'); ?>';
 				$(document).ready(function() {
 				<?php
 				if(array_key_exists('showevent', $_)){
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index 979634874e4..f74a45203e1 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -37,6 +37,13 @@
                 </select>
             </td></tr>
 
+            <tr><td><label for="firstday" class="bold"><?php echo $l->t('First day of the week');?></label></td><td>
+                <select style="display: none;" id="firstday" title="<?php echo "First day"; ?>" name="firstday">
+                    <option value="mo" id="mo"><?php echo $l->t("Monday"); ?></option>
+                    <option value="su" id="su"><?php echo $l->t("Sunday"); ?></option>
+                </select>
+            </td></tr>
+
         </table>
 
         <?php echo $l->t('Calendar CalDAV syncing address:');?>
-- 
GitLab


From 8c09330959a461ae50c6924cedb16eb8212f5c69 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 26 Feb 2012 21:29:52 +0100
Subject: [PATCH 191/248] add missing parameter to addEventListener function -
 bugfix for oc-225

---
 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 a1b25780b76..d2af6918d5c 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -214,7 +214,7 @@ Calendar={
 		},
 		initScroll:function(){
 			if(window.addEventListener)
-				document.addEventListener('DOMMouseScroll', Calendar.UI.scrollCalendar);
+				document.addEventListener('DOMMouseScroll', Calendar.UI.scrollCalendar, false);
 			//}else{
 				document.onmousewheel = Calendar.UI.scrollCalendar;
 			//}
-- 
GitLab


From 089c24e650caec8a950eb36cc8007dc74057455f Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 26 Feb 2012 21:44:35 +0100
Subject: [PATCH 192/248] fix baseUri of the Caldav server

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

diff --git a/apps/calendar/caldav.php b/apps/calendar/caldav.php
index e0925c54ee7..b710b99ea43 100644
--- a/apps/calendar/caldav.php
+++ b/apps/calendar/caldav.php
@@ -25,7 +25,7 @@ $nodes = array(
 
 // Fire up server
 $server = new Sabre_DAV_Server($nodes);
-$server->setBaseUri(OC::$APPSROOT.'/apps/calendar/caldav.php');
+$server->setBaseUri(OC::$APPSWEBROOT.'/apps/calendar/caldav.php');
 // Add plugins
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
 $server->addPlugin(new Sabre_CalDAV_Plugin());
-- 
GitLab


From aae0d990ca3da9a50fa2b85215aa7553e348f9ef Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 26 Feb 2012 21:46:20 +0100
Subject: [PATCH 193/248] fix baseUri of the Carddav server

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

diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php
index c09ff80b99c..654aeb66a72 100644
--- a/apps/contacts/carddav.php
+++ b/apps/contacts/carddav.php
@@ -39,7 +39,7 @@ $nodes = array(
 
 // Fire up server
 $server = new Sabre_DAV_Server($nodes);
-$server->setBaseUri(OC::$APPSROOT.'/apps/contacts/carddav.php');
+$server->setBaseUri(OC::$APPSWEBROOT.'/apps/contacts/carddav.php');
 // Add plugins
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
 $server->addPlugin(new Sabre_CardDAV_Plugin());
-- 
GitLab


From 2a351f4456243b735c2b92ce73ae2cb5a7fc20de Mon Sep 17 00:00:00 2001
From: Roland van Laar <roland@micite.net>
Date: Sun, 26 Feb 2012 22:09:21 +0100
Subject: [PATCH 194/248] Fixed off by one bug. List length is 1 larger than
 the index of the last element.

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

diff --git a/core/js/js.js b/core/js/js.js
index 0f8122b3d1e..61588f7a0f2 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -455,7 +455,7 @@ function humanFileSize(size) {
 	// Calculate Log with base 1024: size = 1024 ** order
 	order = Math.floor(Math.log(size) / Math.log(1024));
 	// Stay in range of the byte sizes that are defined
-	order = Math.min(humanList.length, order);
+	order = Math.min(humanList.length - 1, order);
 	readableFormat = humanList[order];
 	relativeSize = (size / Math.pow(1024, order)).toFixed(1);
 	if(relativeSize.substr(relativeSize.length-2,2)=='.0'){
-- 
GitLab


From 5eca0e4f292470a4bc2dd105870d1db684c28e43 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 26 Feb 2012 23:31:09 +0100
Subject: [PATCH 195/248] remove accidendally added file

---
 owncloud.db.filesystem | Bin 2348032 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 owncloud.db.filesystem

diff --git a/owncloud.db.filesystem b/owncloud.db.filesystem
deleted file mode 100644
index 082977a37eff00bc5a0e6aeffa6a8fa9f57025fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2348032
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
z%0D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
F{}1O3LE``b

-- 
GitLab


From e2721fc93c22d1badfab572396c5ec61d26f934d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 27 Feb 2012 11:28:11 +0100
Subject: [PATCH 196/248] make OC_FileStorage abstract

---
 lib/filestorage.php | 50 ++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/lib/filestorage.php b/lib/filestorage.php
index b6d71d41743..6b679eab899 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -23,30 +23,30 @@
 /**
  * Privde a common interface to all different storage options
  */
-class OC_Filestorage{
+abstract class 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){}
-	public function is_readable($path){}
-	public function is_writable($path){}
-	public function file_exists($path){}
-	public function filectime($path){}
-	public function filemtime($path){}
-	public function file_get_contents($path){}
-	public function file_put_contents($path,$data){}
-	public function unlink($path){}
-	public function rename($path1,$path2){}
-	public function copy($path1,$path2){}
-	public function fopen($path,$mode){}
-	public function getMimeType($path){}
-	public function hash($type,$path,$raw){}
-	public function free_space($path){}
-	public function search($query){}
-	public function getLocalFile($path){}// get a path to a local version of the file, whether the original file is local or remote
+	abstract public function mkdir($path);
+	abstract public function rmdir($path);
+	abstract public function opendir($path);
+	abstract public function is_dir($path);
+	abstract public function is_file($path);
+	abstract public function stat($path);
+	abstract public function filetype($path);
+	abstract public function filesize($path);
+	abstract public function is_readable($path);
+	abstract public function is_writable($path);
+	abstract public function file_exists($path);
+	abstract public function filectime($path);
+	abstract public function filemtime($path);
+	abstract public function file_get_contents($path);
+	abstract public function file_put_contents($path,$data);
+	abstract public function unlink($path);
+	abstract public function rename($path1,$path2);
+	abstract public function copy($path1,$path2);
+	abstract public function fopen($path,$mode);
+	abstract public function getMimeType($path);
+	abstract public function hash($type,$path,$raw);
+	abstract public function free_space($path);
+	abstract public function search($query);
+	abstract public function getLocalFile($path);// get a path to a local version of the file, whether the original file is local or remote
 }
-- 
GitLab


From 4eb9a69bd87f5118dbbef1df2988916b42b1139b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 27 Feb 2012 12:01:06 +0100
Subject: [PATCH 197/248] fix test case for filestorage

file storage no longer needs to implement file_put_contents for streams
---
 tests/lib/filestorage.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index 7f024dafaa3..041d858f18a 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -81,10 +81,6 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$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');
@@ -98,15 +94,15 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$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->instance->file_put_contents('/lorem.txt',file_get_contents($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->instance->file_put_contents('/logo-wide.png',file_get_contents($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->instance->file_put_contents('/logo-wide.svg',file_get_contents($svgFile,'r'));
 		$this->assertEqual('image/svg+xml',$this->instance->getMimeType('/logo-wide.svg'));
 	}
 }
-- 
GitLab


From cef230c141897f587dd732860cca6568fd6edc2c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 27 Feb 2012 12:04:04 +0100
Subject: [PATCH 198/248] extend filestorage common and provide test
 implementation

---
 lib/filestorage/common.php           | 122 +++++++++++++++++++++++++++
 lib/filestorage/commontest.php       |  75 ++++++++++++++++
 lib/filestoragecommon.php            |  75 ----------------
 lib/filesystemview.php               |   4 +-
 lib/helper.php                       |  17 ++++
 tests/lib/filestorage/commontest.php |  41 +++++++++
 6 files changed, 257 insertions(+), 77 deletions(-)
 create mode 100644 lib/filestorage/common.php
 create mode 100644 lib/filestorage/commontest.php
 delete mode 100644 lib/filestoragecommon.php
 create mode 100644 tests/lib/filestorage/commontest.php

diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
new file mode 100644
index 00000000000..28c5e70041d
--- /dev/null
+++ b/lib/filestorage/common.php
@@ -0,0 +1,122 @@
+<?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/>.
+*/
+
+abstract class OC_Filestorage_Common extends OC_Filestorage {
+
+	public function __construct($parameters){}
+// 	abstract public function mkdir($path);
+// 	abstract public function rmdir($path);
+// 	abstract public function opendir($path);
+	public function is_dir($path){
+		return $this->filetype($path)=='dir';
+	}
+	public function is_file($path){
+		return $this->filetype($path)=='file';
+	}
+// 	abstract public function stat($path);
+// 	abstract public function filetype($path);
+	public function filesize($path) {
+		if($this->is_dir($path)){
+			return 0;//by definition
+		}else{
+			$stat = $this->stat($path);
+			return $stat['size'];
+		}
+	}
+// 	abstract public function is_readable($path);
+// 	abstract public function is_writable($path);
+// 	abstract public function file_exists($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);
+	}
+// 	abstract public function unlink($path);
+	public function rename($path1,$path2){
+		if($this->copy($path1,$path2)){
+			return $this->unlink($path1);
+		}else{
+			return false;
+		}
+	}
+	public function copy($path1,$path2) {
+		$source=$this->fopen($path1,'r');
+		$target=$this->fopen($path2,'w');
+		$count=OC_Helper::streamCopy($source,$target);
+		return $count>0;
+	}
+// 	abstract public function fopen($path,$mode);
+	public function getMimeType($path){
+		if(!$this->file_exists($path)){
+			return false;
+		}
+		if($this->is_dir($path)){
+			return 'httpd/unix-directory';
+		}
+		$source=$this->fopen($path,'r');
+		if(!$source){
+			return false;
+		}
+		$head=fread($source,8192);//8kb should suffice to determine a mimetype
+		$tmpFile=tempnam(get_temp_dir(),'OC_TMP_').substr($path,strrpos($path,'.'));
+		file_put_contents($tmpFile,$head);
+		$mime=OC_Helper::getMimeType($tmpFile);
+		unlink($tmpFile);
+		return $mime;
+	}
+	public function hash($type,$path,$raw){
+		$tmpFile=$this->getLocalFile();
+		$hash=hash($type,$tmpFile,$raw);
+		unlink($tmpFile);
+		return $hash;
+	}
+// 	abstract public function free_space($path);
+// 	abstract public function search($query);
+	public function getLocalFile($path){
+		return $this->getLocalFile();
+	}
+	private function toTmpFile($path){//no longer in the storage api, still usefull here
+		$source=$this->fopen($path,'r');
+		if(!$source){
+			return false;
+		}
+		$tmpFile=tempnam(get_temp_dir(),'OC_TMP_').substr($path,strrpos($path,'.'));
+		$target=fopen($tmpFile);
+		$count=OC_Helper::streamCopy($source,$target);
+		return $tmpFile;
+	}
+}
diff --git a/lib/filestorage/commontest.php b/lib/filestorage/commontest.php
new file mode 100644
index 00000000000..dd552c6865b
--- /dev/null
+++ b/lib/filestorage/commontest.php
@@ -0,0 +1,75 @@
+<?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/>.
+*
+*/
+
+/**
+ * test implementation for OC_FileStorage_Common with OC_FileStorage_Local
+ */
+
+class OC_Filestorage_CommonTest extends OC_Filestorage_Common{
+	/**
+	 * underlying local storage used for missing functions
+	 * @var OC_FileStorage_Local
+	 */
+	private $storage;
+	
+	public function __construct($params){
+		$this->storage=new OC_Filestorage_Local($params);
+	}
+	
+	public function mkdir($path){
+		return $this->storage->mkdir($path);
+	}
+	public function rmdir($path){
+		return $this->storage->rmdir($path);
+	}
+	public function opendir($path){
+		return $this->storage->opendir($path);
+	}
+	public function stat($path){
+		return $this->storage->stat($path);
+	}
+	public function filetype($path){
+		return $this->storage->filetype($path);
+	}
+	public function is_readable($path){
+		return $this->storage->is_readable($path);
+	}
+	public function is_writable($path){
+		return $this->storage->is_writable($path);
+	}
+	public function file_exists($path){
+		return $this->storage->file_exists($path);
+	}
+	public function unlink($path){
+		return $this->storage->unlink($path);
+	}
+	public function fopen($path,$mode){
+		return $this->storage->fopen($path,$mode);
+	}
+	public function free_space($path){
+		return $this->storage->free_space($path);
+	}
+	public function search($query){
+		return $this->storage->search($query);
+	}
+}
\ No newline at end of file
diff --git a/lib/filestoragecommon.php b/lib/filestoragecommon.php
deleted file mode 100644
index 45ad11fcde8..00000000000
--- a/lib/filestoragecommon.php
+++ /dev/null
@@ -1,75 +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_writable($path){}
-	public function file_exists($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){}
-}
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 0c530677f54..9f0a88f8ab0 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -329,7 +329,7 @@ class OC_FilesystemView {
 	 * @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)){
+		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and OC_Filesystem::isValidPath($path)){
 			$interalPath=$this->getInternalPath($path);
 			$run=true;
 			if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()){
@@ -341,7 +341,7 @@ class OC_FilesystemView {
 					}
 				}
 			}
-			if($run){
+			if($run and $storage=$this->getStorage($path)){
 				if(!is_null($extraParam)){
 					$result=$storage->$operation($interalPath,$extraParam);
 				}else{
diff --git a/lib/helper.php b/lib/helper.php
index 60af4e376b1..525a096947d 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -398,4 +398,21 @@ class OC_Helper {
 		}
 		return false;
 	}
+	
+	/**
+	 * copy the contents of one stream to another
+	 * @param resource source
+	 * @param resource target
+	 * @return int the number of bytes copied
+	 */
+	public static function streamCopy($source,$target){
+		if(!$source or !$target){
+			return false;
+		}
+		$count=0;
+		while(!feof($source)){
+			$count+=fwrite($target,fread($source,8192));
+		}
+		return $count;
+	}
 }
diff --git a/tests/lib/filestorage/commontest.php b/tests/lib/filestorage/commontest.php
new file mode 100644
index 00000000000..ab5375ec2b0
--- /dev/null
+++ b/tests/lib/filestorage/commontest.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_CommonTest extends Test_FileStorage {
+	/**
+	 * @var string tmpDir
+	 */
+	private $tmpDir;
+	public function setUp(){
+		$this->tmpDir=get_temp_dir().'/filestoragecommon';
+		if(!file_exists($this->tmpDir)){
+			mkdir($this->tmpDir);
+		}
+		$this->instance=new OC_Filestorage_CommonTest(array('datadir'=>$this->tmpDir));
+	}
+
+	public function tearDown(){
+		OC_Helper::rmdirr($this->tmpDir);
+	}
+}
+
+?>
\ No newline at end of file
-- 
GitLab


From d8d4420f227588acedb50918a1b794a2c68a7ade Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 27 Feb 2012 12:20:37 +0100
Subject: [PATCH 199/248] some cleanup in filestorage

---
 lib/filestorage/local.php |  4 +---
 lib/filesystemview.php    | 16 ++++------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 7d889fbce58..8acfe504cb2 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -96,9 +96,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 			$source=substr($path1,strrpos($path1,'/')+1);
 			$path2.=$source;
 		}
-		if($return=copy($this->datadir.$path1,$this->datadir.$path2)){
-		}
-		return $return;
+		return copy($this->datadir.$path1,$this->datadir.$path2);
 	}
 	public function fopen($path,$mode){
 		if($return=fopen($this->datadir.$path,$mode)){
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 9f0a88f8ab0..b014c3272f7 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -173,13 +173,11 @@ class OC_FilesystemView {
 		if(is_resource($data)){//not having to deal with streams in file_put_contents makes life easier
 			$target=$this->fopen($path,'w');
 			if($target){
-				while(!feof($data)){
-					fwrite($target,fread($data,8192));
-				}
+				$count=OC_Helper::streamCopy($data,$target);
 				fclose($target);
 				fclose($data);
 				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, array( OC_Filesystem::signal_param_path => $path));
-				return true;
+				return $count>0;
 			}else{
 				return false;
 			}
@@ -204,9 +202,7 @@ class OC_FilesystemView {
 				}else{
 					$source=$this->fopen($path1,'r');
 					$target=$this->fopen($path2,'w');
-					while (!feof($source)){
-						fwrite($target,fread($source,8192));
-					}
+					$count=OC_Helper::streamCopy($data,$target);
 					$storage1=$this->getStorage($path1);
 					$storage1->unlink($this->getInternalPath($path1));
 				}
@@ -236,11 +232,7 @@ class OC_FilesystemView {
 				}else{
 					$source=$this->fopen($path1,'r');
 					$target=$this->fopen($path2,'w');
-					if($target and $source){
-						while (!feof($source)){
-							fwrite($target,fread($source,8192));
-						}
-					}
+					$count=OC_Helper::streamCopy($data,$target);
 				}
         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){
-- 
GitLab


From 63a088c2b1ee77c4d9511df8c7ee77b1d88bb800 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 27 Feb 2012 12:20:47 +0100
Subject: [PATCH 200/248] more tests for filestorage

---
 tests/lib/filestorage.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index 041d858f18a..5a89c74fe89 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -105,6 +105,19 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->instance->file_put_contents('/logo-wide.svg',file_get_contents($svgFile,'r'));
 		$this->assertEqual('image/svg+xml',$this->instance->getMimeType('/logo-wide.svg'));
 	}
+	
+	public function testCopyAndMove(){
+		$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
+		$this->instance->file_put_contents('/source.txt',file_get_contents($textFile));
+		$this->instance->copy('/source.txt','/target.txt');
+		$this->assertTrue($this->instance->file_exists('/target.txt'));
+		$this->assertEqual($this->instance->file_get_contents('/source.txt'),$this->instance->file_get_contents('/target.txt'));
+		
+		$this->instance->rename('/source.txt','/target2.txt');
+		$this->assertTrue($this->instance->file_exists('/target2.txt'));
+		$this->assertFalse($this->instance->file_exists('/source.txt'));
+		$this->assertEqual(file_get_contents($textFile),$this->instance->file_get_contents('/target.txt'));
+	}
 }
 
 
-- 
GitLab


From 5943af17e7deaa88b9c529b337557ef6aa0f4031 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Mon, 27 Feb 2012 18:01:43 +0100
Subject: [PATCH 201/248] spaces -> tabs Thanks to Jakob for reminding me

---
 lib/helper.php   | 34 ++++++++++++-------------
 lib/template.php | 66 ++++++++++++++++++++++++------------------------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index 525a096947d..1ea0a55f469 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -83,24 +83,24 @@ class OC_Helper {
 	 * Returns the path to the image.
 	 */
         public static function imagePath( $app, $image ){
-                // Read the selected theme from the config file
-                $theme=OC_Config::getValue( "theme" );
+		// 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::$APPSROOT."/apps/$app/img/$image" )){
-                        return OC::$APPSWEBROOT."/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";
-                }
-        }
+		// 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::$APPSROOT."/apps/$app/img/$image" )){
+			return OC::$APPSWEBROOT."/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
diff --git a/lib/template.php b/lib/template.php
index 148e400d4e8..b79faa9e755 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -170,39 +170,39 @@ class OC_Template{
 
 		// Check if it is a app template or not.
 		if( $app != "" ){
-	                        // Check if the app is in the app folder or in the root
-                        if( file_exists( OC::$APPSROOT."/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::$APPSROOT."/apps/$app/templates/"."$name$fext.php" ){
-                                        $template = OC::$APPSROOT."/apps/$app/templates/"."$name$fext.php";
-                                        $path = OC::$APPSROOT."/apps/$app/templates/";
-                                }else{
-                                        $template = OC::$APPSROOT."/apps/$app/templates/"."$name.php";
-                                        $path = OC::$APPSROOT."/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/";
-                                }
-
-                        }	
+			// Check if the app is in the app folder or in the root
+			if( file_exists( OC::$APPSROOT."/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::$APPSROOT."/apps/$app/templates/"."$name$fext.php" ){
+					$template = OC::$APPSROOT."/apps/$app/templates/"."$name$fext.php";
+					$path = OC::$APPSROOT."/apps/$app/templates/";
+				}else{
+					$template = OC::$APPSROOT."/apps/$app/templates/"."$name.php";
+					$path = OC::$APPSROOT."/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{
 			// Check if the template is overwritten by the selected theme
 			if( file_exists( OC::$SERVERROOT."/themes/$theme/core/templates/"."$name$fext.php" )){
-- 
GitLab


From d190ebee48a0bda9a024739b1bba0f06664efecf Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Mon, 27 Feb 2012 14:59:41 -0500
Subject: [PATCH 202/248] Initial work on Google Docs storage backend

---
 lib/filestorage/google.php | 260 +++++++++++++++++++++++++++++++++----
 1 file changed, 238 insertions(+), 22 deletions(-)

diff --git a/lib/filestorage/google.php b/lib/filestorage/google.php
index fc271f4e4ba..dd898b7955d 100644
--- a/lib/filestorage/google.php
+++ b/lib/filestorage/google.php
@@ -20,36 +20,252 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class OC_Filestorage_Google extends OC_Filestorage_Common {
-	
-	private $auth;
+class OC_Filestorage_Google {
+
+	private $datadir;
+	private $consumer;
+	private $oauth_token;
+	private $sig_method;
+
+	public function __construct($arguments) {
+		$this->datadir = $arguments['datadir'];
+		$consumer_key = isset($arguments['consumer_key']) ? $arguments['consumer_key'] : 'anonymous';
+		$consumer_secret = isset($arguments['consumer_secret']) ? $arguments['consumer_secret'] : 'anonymous';
+		$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
+		$this->oauth_token = new OAuthToken($arguments['token'], $arguments['token_secret']);
+		$this->sig_method = new OAuthSignatureMethod_HMAC_SHA1();
+	}
+
+	private function sendRequest($feedUri, $http_method, $postData = null) {
+		$feedUri = trim($feedUri);
+		// create an associative array from each key/value url query param pair.
+		$params = array();
+		$pieces = explode('?', $feedUri);
+		if (isset($pieces[1])) {
+			$params = explode_assoc('=', '&', $pieces[1]);
+		}
+		// urlencode each url parameter key/value pair
+		$tempStr = $pieces[0];
+		foreach ($params as $key => $value) {
+			$tempStr .= '&' . urlencode($key) . '=' . urlencode($value);
+		}
+		$feedUri = preg_replace('/&/', '?', $tempStr, 1);
+		$req = OAuthRequest::from_consumer_and_token($this->consumer, $this->oauth_token, $http_method, $feedUri, $params);
+		$req->sign_request($this->sig_method, $this->consumer, $this->oauth_token);
+		$auth_header = $req->to_header();
+		$result = send_signed_request($http_method, $feedUri, array($auth_header, 'Content-Type: application/atom+xml', 'GData-Version: 3.0'), $postData);
+		// TODO Return false if error is received
+		if (!$result) {
+			return false;
+		}
+		$result = explode('<', $result, 2);
+		$result = isset($result[1]) ? '<'.$result[1] : $result[0];
+		$dom = new DOMDocument();
+		$dom->loadXML($result);
+		return $dom;
+	}
+
+	private function getResource($path) {
+		// TODO Look up google docs query caching/only send back if changes occured
+		// TODO Look inside of collections for specific file
+		// TODO Strip extension
+		$title = basename($path);
+		return $this->sendRequest('https://docs.google.com/feeds/default/private/full?showfolders=true&title='.$title.'&title-exact=true', 'GET');
+	}
+
+	public function mkdir($path) {
+		$dir = dirname($path);
+		// Check if path parent is root directory
+		if ($dir == '/' || $dir == '\.' || $dir == '.') {
+			$feedUri = 'https://docs.google.com/feeds/default/private/full';
+		// Get parent content link
+		} else {
+			$dom = $this->getResource(basename($dir));
+			$feedUri = $dom->getElementsByTagName('content')->item(0)->getAttribute('src');
+		}
+		$title = basename($path);
+		// Construct post data
+		$postData = '<?xml version="1.0" encoding="UTF-8"?>';
+		$postData .= '<entry xmlns="http://www.w3.org/2005/Atom">';
+		$postData .= '<category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/docs/2007#folder"/>';
+		$postData .= '<title>'.$title.'</title>';
+		$postData .= '</entry>';
+		if ($dom = $this->sendRequest($feedUri, 'POST', $postData)) {
+			return true;
+		}
+		return false;
+	}
 
-	public function __construct($parameters) {
+	public function rmdir($path) {
+		return $this->unlink($path);
+	}
+
+	public function opendir($path) {
+		if ($path == '' || $path == '/') {
+			$resource = 'https://docs.google.com/feeds/default/private/full/folder%3Aroot/contents';
+			$dom = $this->sendRequest('https://docs.google.com/feeds/default/private/full/folder%3Aroot/contents', 'GET');
+		} else {
+			$dom = $this->getResource($path); 
+		}
+		global $FAKEDIRS;
+		$files = array();
+// 		while ($next) {
+// 			// send request $next link
+// 			$links = $dom->getElementsByTagName('link');
+// 			foreach ($links as $link) {
+// 				if ($link->getAttribute('rel') == 'next') {
+// 					$next = $link->getAttribute('src');
+// 					break;
+// 				} else {
+// 					$next = false;
+// 				}
+// 			}
+			$entries = $dom->getElementsByTagName('entry');
+			foreach($entries as $entry) {
+				$name = $entry->getElementsByTagName('title')->item(0)->nodeValue;
+				// Native Google resources don't include extensions in title
+				if (!strpos($name, '.')) {
+					if ($ext = $this->filetype('', $entry)) {
+						$name .= '.'.$ext;
+					}
+				}
+				$files[] = $name;
+			}
+// 		}
+		$FAKEDIRS['google'] = $files;
+		return opendir('fakedir://google');
+	}
+
+	public function is_dir($path) {
+		if ($entry = $this->getResource($path)) {
+			$categories = $entry->getElementsByTagName('category');
+			foreach ($categories as $category) {
+				if ($category->getAttribute('scheme') == 'http://schemas.google.com/g/2005#kind') {
+					// Check if label is equal to folder
+					$type = $category->getAttribute('label');
+					if (strlen(strstr($type, 'folder')) > 0) {
+						return true;
+					}
+				}
+			}
+		}
+		return false; 
+	}
+
+	public function is_file($path) {
+		if ($this->getResource($path)) {
+			return true;
+		}
+		return false;
+	}
+
+	public function stat($path) {
+		if ($dom = $this->getResource($path)) {
+			// TODO Native resources don't have a file size
+			$stat['size'] =  $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
+			$stat['mtime'] = strtotime($dom->getElementsByTagName('updated')->item(1)->nodeValue);
+			$stat['ctime'] = strtotime($dom->getElementsByTagName('published')->item(0)->nodeValue);
+			return $stat;
+		}
+		return false; 
 		
 	}
+
+	public function filetype($path, $entry = null) {
+		if ($entry == null) {
+			$entry = $this->getResource($path);
+		}
+		$categories = $entry->getElementsByTagName('category');
+		foreach ($categories as $category) {
+			if ($category->getAttribute('scheme') == 'http://schemas.google.com/g/2005#kind') {
+				// Guess extension from label, default to ODF extensions
+				$type = $category->getAttribute('label');
+				if (strlen(strstr($type, 'folder')) > 0) {
+					return '';
+				} else if (strlen(strstr($type, 'document')) > 0) {
+					return 'odt';
+				} else if (strlen(strstr($type, 'presentation')) > 0) {
+					return 'odp';
+				} else if (strlen(strstr($type, 'spreadsheet')) > 0) {
+					return 'ods';
+				} else {
+					return $type;
+				}
+			}
+		}
+	}
+
+	public function is_readable($path) {
+		return true;
+	}
+
+	public function is_writable($path) {
+		// Check if edit or edit-media links exist
+		if ($entry = $this->getResource($path)) {
+			$links = $entry->getElementsByTagName('link');
+			foreach ($links as $link) {
+				if ($link->getAttribute('rel') == 'edit') {
+					return true;
+				} else if ($link->getAttribute('rel') == 'edit-media') {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
 	
-	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 file_exists($path) {
+		if ($this->getResource($path)) {
+			return true;
+		}
+		return false;
+	}
+	
+	public function unlink($path) {
+		// Get resource self link to trash resource
+		if ($entry = $this->getResource($path)) {
+			$links = $entry->getElementsByTagName('link');
+			foreach ($links as $link) {
+				if ($link->getAttribute('rel') == 'self') {
+					$feedUri = $link->getAttribute('href');
+				}
+			}
+		}
+		if (isset($feedUri)) {
+			$this->sendRequest($feedUri, 'DELETE');
+			return true;
+		}
+		return false;
+	}
+
+	public function rename($path1,$path2) {
+
+	}
+
 	public function fopen($path,$mode){}
-	public function toTmpFile($path){}
+
+	public function toTmpFile($path) {
+		$dom = $this->getResource($path);
+		$url = $dom->getElementsByTagName('content')->getAttribute('src');		
+	}
+
 	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 free_space($path) {
+		if ($dom = $this->sendRequest('https://docs.google.com/feeds/metadata/default', 'GET')) {
+			$total = $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesTotal')->item(0)->nodeValue;
+			$used = $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
+			return $total - $used;
+		}
+		return false;
+	}
+  
 	public function search($query){}
-	public function getLocalFile($path){}
+	
+	public function getLocalFile($path) {
+		return false;
+	}
 }
\ No newline at end of file
-- 
GitLab


From 630cee0ef29697c8cfef4c5816f599534706b350 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Mon, 27 Feb 2012 18:20:40 -0500
Subject: [PATCH 203/248] bookmarklets should not look like buttons

---
 apps/bookmarks/templates/bookmarklet.php | 2 +-
 core/css/styles.css                      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/bookmarks/templates/bookmarklet.php b/apps/bookmarks/templates/bookmarklet.php
index 3d8bbcc7b31..5ea67f04df2 100644
--- a/apps/bookmarks/templates/bookmarklet.php
+++ b/apps/bookmarks/templates/bookmarklet.php
@@ -3,6 +3,6 @@
 function createBookmarklet() {
 	$l = new OC_L10N('bookmarks');
 	echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:') . '</small>'
-	. '<a class="button" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open(\'' . OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location),\'bkmk_popup\',\'left=\'+((a.screenX||a.screenLeft)+10)+\',top=\'+((a.screenY||a.screenTop)+10)+\',height=230px,width=230px,resizable=1,alwaysRaised=1\');a.setTimeout(function(){d.focus()},300);})();">'
+	. '<a class="bookmarklet" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open(\'' . OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location),\'bkmk_popup\',\'left=\'+((a.screenX||a.screenLeft)+10)+\',top=\'+((a.screenY||a.screenTop)+10)+\',height=230px,width=230px,resizable=1,alwaysRaised=1\');a.setTimeout(function(){d.focus()},300);})();">'
 	. $l->t('Read later') . '</a>';
 } 
diff --git a/core/css/styles.css b/core/css/styles.css
index b14c8fb9caf..62f5299ef78 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -128,4 +128,6 @@ 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;}
-.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
+.separator { display: inline; border-left: 1px solid #d3d3d3; border-right: 1px solid #fff; height: 10px; width:0px; margin: 4px; }
+
+a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padding-top: 0px;padding-bottom: 2px; text-decoration: none; margin-top: 5px }
-- 
GitLab


From 77b51f03e3495fec8f0ed6489b884b1f13e6157d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 28 Feb 2012 11:16:19 +0100
Subject: [PATCH 204/248] add temporary file managment

---
 lib/base.php   |  3 +++
 lib/helper.php | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/lib/base.php b/lib/base.php
index 32dcfd78258..7783b4c6380 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -313,6 +313,9 @@ class OC{
 		// Last part: connect some hooks
 		OC_HOOK::connect('OC_User', 'post_createUser', 'OC_Connector_Sabre_Principal', 'addPrincipal');
 		OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Connector_Sabre_Principal', 'deletePrincipal');
+		
+		//make sure temporary files are cleaned up
+		register_shutdown_function(array('OC_Helper','cleanTmp'));
 	}
 }
 
diff --git a/lib/helper.php b/lib/helper.php
index 1ea0a55f469..3c76d38328b 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -26,6 +26,7 @@
  */
 class OC_Helper {
 	private static $mimetypes=array();
+	private static $tmpFiles=array();
 	
 	/**
 	 * @brief Creates an url
@@ -415,4 +416,28 @@ class OC_Helper {
 		}
 		return $count;
 	}
+	
+	/**
+	 * create a temporary file with an unique filename
+	 * @param string postfix
+	 * @return string
+	 *
+	 * temporary files are automatically cleaned up after the script is finished
+	 */
+	public static function tmpFile($postfix=''){
+		$file=tempnam(get_temp_dir(),'OC_TMP_').$postfix;
+		self::$tmpFiles[]=$file;
+		return $file;
+	}
+	
+	/**
+	 * remove all files created by self::tmpFile
+	 */
+	public static function cleanTmp(){
+		foreach(self::$tmpFiles as $file){
+			if(file_exists($file)){
+				unlink($file);
+			}
+		}
+	}
 }
-- 
GitLab


From 273d7fb4fd15eceb92e488df116c859fda7cd2d5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 28 Feb 2012 11:16:41 +0100
Subject: [PATCH 205/248] fix copy/paste error in common filestorage

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

diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index 28c5e70041d..2e7ad957129 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -107,7 +107,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 // 	abstract public function free_space($path);
 // 	abstract public function search($query);
 	public function getLocalFile($path){
-		return $this->getLocalFile();
+		return $this->toTmpFile();
 	}
 	private function toTmpFile($path){//no longer in the storage api, still usefull here
 		$source=$this->fopen($path,'r');
-- 
GitLab


From 7ec1c0703d49639c4a5da1a593f742ac581158f3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 28 Feb 2012 11:16:58 +0100
Subject: [PATCH 206/248] fix testcase runner

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

diff --git a/tests/index.php b/tests/index.php
index d29579a4bba..1333a83a3b9 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -41,7 +41,7 @@ function loadTests($dir=''){
 					$testCase=new TestSuite(getTestName($file));
 					$testCase->addFile($basedir.$file);
 					if($testCase->getSize()>0){
-						$testCase->run(new DefaultReporter());
+						$testCase->run(new HtmlReporter());
 					}
 				}
 			}
-- 
GitLab


From a76ff563d645ce456d6366b34fd763d5b11ee0d3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 28 Feb 2012 11:32:45 +0100
Subject: [PATCH 207/248] fix temporary file creation

---
 lib/helper.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/helper.php b/lib/helper.php
index 3c76d38328b..fc0b8867703 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -425,8 +425,11 @@ class OC_Helper {
 	 * temporary files are automatically cleaned up after the script is finished
 	 */
 	public static function tmpFile($postfix=''){
-		$file=tempnam(get_temp_dir(),'OC_TMP_').$postfix;
+		$file=get_temp_dir().'/'.md5(time().rand()).$postfix;
+		$fh=fopen($file,'w');
+		fclose($fh);
 		self::$tmpFiles[]=$file;
+		error_log($file);
 		return $file;
 	}
 	
@@ -436,6 +439,7 @@ class OC_Helper {
 	public static function cleanTmp(){
 		foreach(self::$tmpFiles as $file){
 			if(file_exists($file)){
+				error_log("clean $file");
 				unlink($file);
 			}
 		}
-- 
GitLab


From 3e0bb3e7c4a34b3e7344665b901918ce54b57d81 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 28 Feb 2012 11:33:59 +0100
Subject: [PATCH 208/248] use temporary file managment

---
 lib/filestorage/common.php | 6 ++++--
 lib/filesystemview.php     | 3 ++-
 lib/installer.php          | 5 +----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index 2e7ad957129..62b12fede09 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -92,7 +92,8 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 			return false;
 		}
 		$head=fread($source,8192);//8kb should suffice to determine a mimetype
-		$tmpFile=tempnam(get_temp_dir(),'OC_TMP_').substr($path,strrpos($path,'.'));
+		$extention=substr($path,strrpos($path,'.'));
+		$tmpFile=OC_Helper::tmpFile($extention);
 		file_put_contents($tmpFile,$head);
 		$mime=OC_Helper::getMimeType($tmpFile);
 		unlink($tmpFile);
@@ -114,7 +115,8 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		if(!$source){
 			return false;
 		}
-		$tmpFile=tempnam(get_temp_dir(),'OC_TMP_').substr($path,strrpos($path,'.'));
+		$extention=substr($path,strrpos($path,'.'));
+		$tmpFile=OC_Helper::tmpFile($extention);
 		$target=fopen($tmpFile);
 		$count=OC_Helper::streamCopy($source,$target);
 		return $tmpFile;
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index b014c3272f7..5996a5f60fb 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -278,8 +278,9 @@ class OC_FilesystemView {
 	public function toTmpFile($path){
 		if(OC_Filesystem::isValidPath($path)){
 			$source=$this->fopen($path,'r');
-			$tmpFile=tempnam(get_temp_dir(),'OC_TMP_').substr($path,strrpos($path,'.'));
 			if($source){
+				$extention=substr($path,strrpos($path,'.'));
+				$tmpFile=OC_Helper::tmpFile($extention);
 				return file_put_contents($tmpFile,$source);
 			}
 		}
diff --git a/lib/installer.php b/lib/installer.php
index 2cc7555f0d6..2a9676998f6 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -62,7 +62,7 @@ class OC_Installer{
 		
 		//download the file if necesary
 		if($data['source']=='http'){
-			$path=tempnam(get_temp_dir(),'oc_installer_');
+			$path=OC_Helper::tmpFile('.zip');
 			if(!isset($data['href'])){
 				OC_Log::write('core','No href specified when installing app from http',OC_Log::ERROR);
 				return false;
@@ -142,9 +142,6 @@ class OC_Installer{
 		
 		//remove temporary files
 		OC_Helper::rmdirr($extractDir);
-		if($data['source']=='http'){
-			unlink($path);
-		}
 		
 		//install the database
 		if(is_file($basedir.'/appinfo/database.xml')){
-- 
GitLab


From de37bafa5c00683984302ca6849719a282835da0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 28 Feb 2012 11:39:39 +0100
Subject: [PATCH 209/248] use in-memory files for the datase scheme during
 installation

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

diff --git a/lib/db.php b/lib/db.php
index 02eac7cac9a..9fab51edfcd 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -316,8 +316,8 @@ class OC_DB {
 		// read file
 		$content = file_get_contents( $file );
 		
-		// Make changes and save them to a temporary file
-		$file2 = tempnam( get_temp_dir(), 'oc_db_scheme_' );
+		// Make changes and save them to an in-memory file
+		$file2 = 'static://db_scheme';
 		if($file2 == ''){
 			die('could not create tempfile in get_temp_dir() - aborting');
 		}
@@ -331,7 +331,7 @@ class OC_DB {
 		// Try to create tables
 		$definition = self::$schema->parseDatabaseDefinitionFile( $file2 );
 		
-		// Delete our temporary file
+		//clean up memory
 		unlink( $file2 );
 
 		// Die in case something went wrong
@@ -371,8 +371,8 @@ class OC_DB {
 			return false;
 		}
 
-		// Make changes and save them to a temporary file
-		$file2 = tempnam( get_temp_dir(), 'oc_db_scheme_' );
+		// Make changes and save them to an in-memory file
+		$file2 = 'static://db_scheme';
 		$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
@@ -381,7 +381,7 @@ class OC_DB {
 		file_put_contents( $file2, $content );
 		$op = self::$schema->updateDatabase($file2, $previousSchema, array(), false);
 		
-		// Delete our temporary file
+		//clean up memory
 		unlink( $file2 );
 		
 		if (PEAR::isError($op)) {
-- 
GitLab


From d1c3aa3112b363f84d721e9fce299d24833cbe7e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 28 Feb 2012 12:06:34 +0100
Subject: [PATCH 210/248] add test case for getLocalFile

---
 lib/filestorage/common.php |  4 ++--
 tests/lib/filestorage.php  | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index 62b12fede09..40a9cff5d06 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -108,7 +108,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 // 	abstract public function free_space($path);
 // 	abstract public function search($query);
 	public function getLocalFile($path){
-		return $this->toTmpFile();
+		return $this->toTmpFile($path);
 	}
 	private function toTmpFile($path){//no longer in the storage api, still usefull here
 		$source=$this->fopen($path,'r');
@@ -117,7 +117,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		}
 		$extention=substr($path,strrpos($path,'.'));
 		$tmpFile=OC_Helper::tmpFile($extention);
-		$target=fopen($tmpFile);
+		$target=fopen($tmpFile,'w');
 		$count=OC_Helper::streamCopy($source,$target);
 		return $tmpFile;
 	}
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index 5a89c74fe89..fb050868ee3 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -118,6 +118,12 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertFalse($this->instance->file_exists('/source.txt'));
 		$this->assertEqual(file_get_contents($textFile),$this->instance->file_get_contents('/target.txt'));
 	}
+	
+	public function testLocalFile(){
+		$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
+		$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile));
+		$localFile=$this->instance->getLocalFile('/lorem.txt');
+		$this->assertTrue(file_exists($localFile));
+		$this->assertEqual(file_get_contents($localFile),file_get_contents($textFile));
+	}
 }
-
-
-- 
GitLab


From de642697bb6c8bd6d04ca2c946bae2fe63418e23 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 28 Feb 2012 14:11:51 +0100
Subject: [PATCH 211/248] make LDAP filter for user list configurable

---
 apps/user_ldap/templates/settings.php |  3 ++-
 apps/user_ldap/user_ldap.php          | 15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 5bbd5d4008d..99af275525d 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -7,7 +7,8 @@
 		<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>
+		<label for="ldap_login_filter"><?php echo $l->t('Filter (use %%uid placeholder)');?></label><input type="text" id="ldap_login_filter" name="ldap_login_filter" value="<?php echo $_['ldap_login_filter']; ?>" />
+		<label for="ldap_userlist_filter"><?php echo $l->t('Filter to retrieve user list (without any placeholder)');?></label><input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter" value="<?php echo $_['ldap_userlist_filter']; ?>" /><small><?php echo $l->t('For example "objectClass=person".');?>	</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>
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 670d938ea95..fb42cc81337 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -32,7 +32,8 @@ class OC_USER_LDAP extends OC_User_Backend {
 	protected $ldap_dn;
 	protected $ldap_password;
 	protected $ldap_base;
-	protected $ldap_filter;
+	protected $ldap_login_filter;
+	protected $ldap_userlist_filter;
 	protected $ldap_tls;
 	protected $ldap_nocase;
 	protected $ldap_display_name;
@@ -49,7 +50,8 @@ class OC_USER_LDAP extends OC_User_Backend {
 		$this->ldap_dn = OC_Appconfig::getValue('user_ldap', 'ldap_dn','');
 		$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_login_filter = OC_Appconfig::getValue('user_ldap', 'ldap_login_filter','');
+		$this->ldap_userlist_filter = OC_Appconfig::getValue('user_ldap', 'ldap_userlist_filter','objectClass=person');
 		$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);
@@ -61,7 +63,7 @@ class OC_USER_LDAP extends OC_User_Backend {
 			&& !empty($this->ldap_port)
 			&& ((!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_login_filter)
 			&& !empty($this->ldap_display_name)
 		)
 		{
@@ -127,7 +129,7 @@ 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_login_filter);
 		$sr = ldap_search( $this->getDs(), $this->ldap_base, $filter );
 		$entries = ldap_get_entries( $this->getDs(), $sr );
 
@@ -161,7 +163,7 @@ class OC_USER_LDAP extends OC_User_Backend {
 		}
 
 		if($this->ldap_nocase) {
-			$filter = str_replace('%uid', $uid, $this->ldap_filter);
+			$filter = str_replace('%uid', $uid, $this->ldap_login_filter);
 			$sr = ldap_search( $this->getDs(), $this->ldap_base, $filter );
 			$entries = ldap_get_entries( $this->getDs(), $sr );
 			if( $entries['count'] == 1 ) {
@@ -202,8 +204,7 @@ class OC_USER_LDAP extends OC_User_Backend {
 			return false;
 
 		// get users
-		$filter = 'objectClass=person';
-		$sr = ldap_search( $this->getDs(), $this->ldap_base, $filter );
+		$sr = ldap_search( $this->getDs(), $this->ldap_base, $this->ldap_userlist_filter );
 		$entries = ldap_get_entries( $this->getDs(), $sr );
 		if( $entries['count'] == 0 )
 			return false;
-- 
GitLab


From 5e9d268c21ab96e382a9634dcb1e66cb5b6637ff Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Tue, 28 Feb 2012 16:14:12 +0100
Subject: [PATCH 212/248] never try to load an non existing template,css,img.
 do propper checking, error reporting and motivate the developerto fix it ;-)

---
 lib/helper.php   |  5 ++++-
 lib/template.php | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index fc0b8867703..5b1efd749ae 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -98,8 +98,11 @@ class OC_Helper {
 			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{
+		}elseif( file_exists( OC::$SERVERROOT."/core/img/$image" )){
 			return OC::$WEBROOT."/core/img/$image";
+		}else{
+			echo('image not found: image:'.$image.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);	
+			die();
 		}
 	}
 
diff --git a/lib/template.php b/lib/template.php
index b79faa9e755..eea2925975c 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -197,9 +197,12 @@ class OC_Template{
 				}elseif( file_exists( OC::$SERVERROOT."/$app/templates/"."$name$fext.php" )){
 					$template = OC::$SERVERROOT."/$app/templates/"."$name$fext.php";
 					$path = OC::$SERVERROOT."/$app/templates/";
-				}else{
+				}elseif( file_exists( OC::$SERVERROOT."/$app/templates/"."$name.php" )){
 					$template = OC::$SERVERROOT."/$app/templates/"."$name.php";
 					$path = OC::$SERVERROOT."/$app/templates/";
+				}else{
+					echo('template not found: template:'.$name.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);	
+					die();
 				}
 
 			}	
@@ -383,9 +386,13 @@ class OC_Template{
 				// Is it in core?
 				}elseif(is_file(OC::$SERVERROOT."/core/$script$fext.js" )){
 					$page->append( "jsfiles", OC::$WEBROOT."/core/$script$fext.js" );
-				}else{
+				}elseif(is_file(OC::$SERVERROOT."/core/$script.js" )){
 					$page->append( "jsfiles", OC::$WEBROOT."/core/$script.js" );
 
+				}else{
+					echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);	
+					die();
+
 				}
 			}
 			// Add the css files
@@ -406,8 +413,12 @@ class OC_Template{
 				// or in core ?	
 				}elseif(is_file(OC::$SERVERROOT."/core/$style$fext.css" )){
 					$page->append( "cssfiles", OC::$WEBROOT."/core/$style$fext.css" );
-				}else{
+				}elseif(is_file(OC::$SERVERROOT."/core/$style.css" )){
 					$page->append( "cssfiles", OC::$WEBROOT."/core/$style.css" );
+
+				}else{
+					echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);	
+					die();
 				}
 			}
                         // Add the theme css files. you can override the default values here
-- 
GitLab


From a829ce69c5da821795f35f21566595c61249a5c4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 28 Feb 2012 17:24:59 +0100
Subject: [PATCH 213/248] make sure the streamwrappers are registered early

---
 lib/base.php           | 9 +++++----
 lib/streamwrappers.php | 3 ---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 7783b4c6380..d1422d7fc5e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -293,6 +293,11 @@ class OC{
 		if( !OC_Config::getValue( "installed", false )){
 			$_SESSION['user_id'] = '';
 		}
+		
+		// register the stream wrappers
+		require_once('streamwrappers.php');
+		stream_wrapper_register("fakedir", "OC_FakeDirStream");
+		stream_wrapper_register('static', 'OC_StaticStreamWrapper');
 
 		OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
 		OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" ));
@@ -346,9 +351,5 @@ if(!function_exists('get_temp_dir')) {
 
 OC::init();
 
-require_once('streamwrappers.php');
-
-
-
 // FROM search.php
 new OC_Search_Provider_File();
diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php
index 1454a99e8d5..05d5598819a 100644
--- a/lib/streamwrappers.php
+++ b/lib/streamwrappers.php
@@ -218,6 +218,3 @@ class OC_StaticStreamWrapper {
 		return false;
 	}
 }
-
-stream_wrapper_register("fakedir", "OC_FakeDirStream");
-stream_wrapper_register('static', 'OC_StaticStreamWrapper');
-- 
GitLab


From 0a9b0ee382e9c284f8de4f534d7d0a7655187d57 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Tue, 28 Feb 2012 18:21:23 +0100
Subject: [PATCH 214/248] change the detection of the webroot. it is simpler
 now and also works for app directories outside the owncloud folder. works for
 me and hopefully for everybody else too

---
 lib/base.php | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index d1422d7fc5e..d4dbdcde9b6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -159,7 +159,9 @@ class OC{
 				OC::$SUBURI=OC::$SUBURI.'index.php';
 			}
 		}
-		OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
+//              OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
+		// try a new way to detect the WEBROOT which is simpler and also works with the app directory outside the owncloud folder. let´s see if this works for everybody
+		OC::$WEBROOT=substr(OC::$SERVERROOT,strlen(OC::$DOCUMENTROOT));
 
 
 		if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){
@@ -187,23 +189,23 @@ class OC{
 			exit;
 		}
 
-                // search the apps folder
-                if(file_exists(OC::$SERVERROOT.'/apps')){
-                        OC::$APPSROOT=OC::$SERVERROOT;
-                        OC::$APPSWEBROOT=OC::$WEBROOT;
-                }elseif(file_exists(OC::$SERVERROOT.'/../apps')){
-                        $url_tmp=explode('/',OC::$WEBROOT);
-                        $length=count($url_tmp);
-                        unset($url_tmp[$length-1]);
-                        OC::$APPSWEBROOT=implode('/',$url_tmp);
-                        $root_tmp=explode('/',OC::$SERVERROOT);
-                        $length=count($root_tmp);
-                        unset($root_tmp[$length-1]);
-                        OC::$APPSROOT=implode('/',$root_tmp);
-                }else{
-                        echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
-                        exit;
-                }
+		// search the apps folder
+		if(file_exists(OC::$SERVERROOT.'/apps')){
+			OC::$APPSROOT=OC::$SERVERROOT;
+			OC::$APPSWEBROOT=OC::$WEBROOT;
+		}elseif(file_exists(OC::$SERVERROOT.'/../apps')){
+			$url_tmp=explode('/',OC::$WEBROOT);
+			$length=count($url_tmp);
+			unset($url_tmp[$length-1]);
+			OC::$APPSWEBROOT=implode('/',$url_tmp);
+			$root_tmp=explode('/',OC::$SERVERROOT);
+			$length=count($root_tmp);
+			unset($root_tmp[$length-1]);
+			OC::$APPSROOT=implode('/',$root_tmp);
+		}else{
+			echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
+			exit;
+		}
 
 		// set the right include path
 		set_include_path(OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.OC::$SERVERROOT.'/config'.PATH_SEPARATOR.OC::$THIRDPARTYROOT.'/3rdparty'.PATH_SEPARATOR.OC::$APPSROOT.PATH_SEPARATOR.OC::$APPSROOT.'/apps'.PATH_SEPARATOR.get_include_path().PATH_SEPARATOR.OC::$SERVERROOT);
-- 
GitLab


From ea15c17149227373045dd6a5d08cf8e83c8a374b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 28 Feb 2012 20:38:51 +0100
Subject: [PATCH 215/248] typo in function call

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

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index fb42cc81337..fbc87f158a1 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -189,7 +189,7 @@ class OC_USER_LDAP extends OC_User_Backend {
 		if(!$this->configured){
 			return false;
 		}
-		$dn = $this->getDn($uid);
+		$dn = $this->getDc($uid);
 		return !empty($dn);
 	}
 
-- 
GitLab


From 2754cac21ffaba199b05526e0a8df5bcd4a25768 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Tue, 28 Feb 2012 23:02:02 +0100
Subject: [PATCH 216/248] dialogs library for apps

---
 apps/gallery/templates/index.php |   1 -
 core/js/js.js                    |   3 +-
 core/js/oc-dialogs.js            | 145 +++++++++++++++++++++++++++++++
 lib/base.php                     |   1 +
 4 files changed, 148 insertions(+), 2 deletions(-)
 create mode 100644 core/js/oc-dialogs.js

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 7cc7dad3ac6..1b8d53e82d4 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -5,7 +5,6 @@ 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">
   <div id="scan">
     <div id="scanprogressbar"></div>
diff --git a/core/js/js.js b/core/js/js.js
index 61588f7a0f2..df1b5c6ce76 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -125,7 +125,8 @@ OC={
 				OC.search.showResults(results);
 			});
 		}
-	}
+	},
+	dialogs:OCdialogs
 };
 OC.search.customResults={};
 OC.search.currentResult=-1;
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
new file mode 100644
index 00000000000..de67c342a71
--- /dev/null
+++ b/core/js/oc-dialogs.js
@@ -0,0 +1,145 @@
+/**
+ * ownCloud
+ *
+ * @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 Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * todo(bartek): add select option in form
+ */
+
+/**
+ * this class ease usage of jquery dialogs
+ */
+OCdialogs = {
+  /**
+   * displays alert dialog
+   * @param text content of dialog
+   * @param title dialog title
+   * @param callback which will be triggered when user press OK
+   */
+  alert:function(text, title, callback) {
+    var content = '<p><span class="ui-icon ui-icon-alert"></span>'+text+'</p>';
+    OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback);
+  },
+  /**
+   * displays info dialog
+   * @param text content of dialog
+   * @param title dialog title
+   * @param callback which will be triggered when user press OK
+   */
+  info:function(text, title, callback) {
+    var content = '<p><span class="ui-icon ui-icon-info"></span>'+text+'</p>';
+    OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback);
+  },
+  /**
+   * displays confirmation dialog
+   * @param text content of dialog
+   * @param title dialog title
+   * @param callback which will be triggered when user press YES or NO (true or false would be passed to callback respectively)
+   */
+  confirm:function(text, title, callback) {
+    var content = '<p><span class="ui-icon ui-icon-notice"></span>'+text+'</p>';
+    OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.YES_NO_BUTTON, callback);
+  },
+  /**
+   * prompt for user input
+   * @param text content of dialog
+   * @param title dialog title
+   * @param callback which will be triggered when user press OK (input text will be passed to callback)
+   */
+  prompt:function(text, title, callback) {
+    var content = '<p><span class="ui-icon ui-icon-pencil"></span>'+text+':<br/><input type="text" id="oc-dialog-prompt-input" style="width:90%"></p>';
+    OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, callback);
+  },
+  /**
+   * prompt user for input with custom form
+   * fields should be passed in following format: [{text:'prompt text', name:'return name', type:'input type'},...]
+   * @param fields to display 
+   * @param title dialog title
+   * @param callback which will be triggered when user press OK (user answers will be passed to callback in following format: [{name:'return name', value: 'user value'},...])
+   */
+  form:function(fields, title, callback) {
+    var content = '<table>';
+    for (var a in fields) {
+      content += '<tr><td>'+fields[a].text+'</td><td>';
+      var type=fields[a].type;
+      if (type == 'text' || type == 'checkbox' || type == 'password')
+          content += '<input type="'+type+'" name="'+fields[a].name+'">';
+      content += "</td></tr>"
+    }
+    content += "</table>";
+    OCdialogs.message(content, title, OCdialogs.FORM_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, callback);
+  },
+  message:function(content, title, dialog_type, buttons, callback) {
+    var c_name = 'oc-dialog-'+OCdialogs.dialogs_counter+'-content';
+    var c_id = '#'+c_name;
+    var d = '<div id="'+c_name+'" title="'+title+'">'+content+'</div>';
+    $('body').append(d);
+    var b = [];
+    switch (buttons) {
+      case OCdialogs.YES_NO_BUTTONS:
+        b[1] = {text: t('dialogs', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }};
+        b[0] = {text: t('dialogs', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}};
+      break;
+      case OCdialogs.OK_CANCEL_BUTTONS:
+        b[1] = {text: t('dialogs', 'Cancel'), click: function(){$(c_id).dialog('close'); }};
+      case OCdialogs.OK_BUTTON: // fallthrough
+        var f;
+        switch(dialog_type) {
+          case OCdialogs.ALERT_DIALOG:
+            f = function(){$(c_id).dialog('close'); };
+          break;
+          case OCdialogs.PROMPT_DIALOG:
+            f = function(){OCdialogs.prompt_ok_handler(callback, c_id)};
+          break;
+          case OCdialogs.FORM_DIALOG:
+            f = function(){OCdialogs.form_ok_handler(callback, c_id)};
+          break;
+        }
+        b[0] = {text: t('dialogs', 'Ok'), click: f};
+      break;
+    }
+    $(c_id).dialog({width: 4*$(document).width()/9, height: $(d).height() + 150, modal: false, buttons: b});
+    OCdialogs.dialogs_counter++;
+  },
+  // dialogs buttons types
+  YES_NO_BUTTONS: 70,
+  OK_BUTTONS: 71,
+  OK_CANCEL_BUTTONS: 72,
+  // dialogs types
+  ALERT_DIALOG: 80,
+  INFO_DIALOG: 81,
+  PROMPT_DIALOG: 82,
+  FORM_DIALOG: 83,
+  dialogs_counter: 0,
+  determineValue: function(element) {
+    switch ($(element).attr('type')) {
+      case 'checkbox': return $(element).attr('checked') != undefined;
+    }
+    return $(element).val();
+  },
+  prompt_ok_handler: function(callback, c_id){callback(true, $(c_id + " input#oc-dialog-prompt-input").val()); $(c_id).dialog('close');},
+  form_ok_handler: function(callback, c_id) {
+    var r = [];
+    var c = 0;
+    $(c_id + ' input').each(function(i, elem) {
+      r[c] = {name: $(elem).attr('name'), value: OCdialogs.determineValue(elem)};
+      c++;
+    });
+    $(c_id).dialog('close');
+    callback(r);
+  }
+};
diff --git a/lib/base.php b/lib/base.php
index d4dbdcde9b6..c98477ce15c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -268,6 +268,7 @@ class OC{
 		OC_Util::addScript( "jquery-showpassword" );
 		OC_Util::addScript( "jquery.infieldlabel.min" );
 		OC_Util::addScript( "jquery-tipsy" );
+		OC_Util::addScript( "oc-dialogs" );
 		OC_Util::addScript( "js" );
 		OC_Util::addScript( "eventsource" );
 		OC_Util::addScript( "config" );
-- 
GitLab


From 02f15e9a037a63ab6795927231015f366d47846e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 28 Feb 2012 19:15:49 -0500
Subject: [PATCH 217/248] More work on Google Docs storage backend

---
 lib/filestorage/google.php | 279 +++++++++++++++++++++++--------------
 1 file changed, 175 insertions(+), 104 deletions(-)

diff --git a/lib/filestorage/google.php b/lib/filestorage/google.php
index dd898b7955d..0c562941d41 100644
--- a/lib/filestorage/google.php
+++ b/lib/filestorage/google.php
@@ -20,12 +20,15 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class OC_Filestorage_Google {
+require_once 'common.inc.php';
+
+class OC_Filestorage_Google extends OC_Filestorage_Common {
 
 	private $datadir;
 	private $consumer;
 	private $oauth_token;
 	private $sig_method;
+	private $entries;
 
 	public function __construct($arguments) {
 		$this->datadir = $arguments['datadir'];
@@ -34,6 +37,7 @@ class OC_Filestorage_Google {
 		$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
 		$this->oauth_token = new OAuthToken($arguments['token'], $arguments['token_secret']);
 		$this->sig_method = new OAuthSignatureMethod_HMAC_SHA1();
+		$this->entries = array();
 	}
 
 	private function sendRequest($feedUri, $http_method, $postData = null) {
@@ -66,32 +70,59 @@ class OC_Filestorage_Google {
 	}
 
 	private function getResource($path) {
-		// TODO Look up google docs query caching/only send back if changes occured
-		// TODO Look inside of collections for specific file
-		// TODO Strip extension
-		$title = basename($path);
-		return $this->sendRequest('https://docs.google.com/feeds/default/private/full?showfolders=true&title='.$title.'&title-exact=true', 'GET');
+		if (array_key_exists($path, $this->entries)) {
+			return $this->entries[$path];
+		} else {
+			$title = basename($path);
+			$dom = $this->sendRequest('https://docs.google.com/feeds/default/private/full?showfolders=true&title='.$title, 'GET');
+			// Check if request was successful and entry exists
+			if ($dom && $entry = $dom->getElementsByTagName('entry')->item(0)) {
+				$this->entries[$path] = $entry;
+				return $entry;
+			}
+			return false;
+		}
 	}
 
+	private function getExtension($entry) {
+		$mimetype = $this->getMimeType('', $entry);
+		switch($mimetype) {
+			case 'httpd/unix-directory':
+				return '';
+			case 'application/vnd.oasis.opendocument.text':
+				return 'odt';
+			case 'application/vnd.oasis.opendocument.spreadsheet':
+				return 'ods';
+			case 'application/vnd.oasis.opendocument.presentation':
+				return 'pptx';
+			case 'text/html':
+				return 'html';
+			default:
+				return 'html';
+		}
+	}
+	
+
 	public function mkdir($path) {
 		$dir = dirname($path);
 		// Check if path parent is root directory
 		if ($dir == '/' || $dir == '\.' || $dir == '.') {
 			$feedUri = 'https://docs.google.com/feeds/default/private/full';
 		// Get parent content link
-		} else {
-			$dom = $this->getResource(basename($dir));
+		} else if ($dom = $this->getResource(basename($dir))) {
 			$feedUri = $dom->getElementsByTagName('content')->item(0)->getAttribute('src');
 		}
-		$title = basename($path);
-		// Construct post data
-		$postData = '<?xml version="1.0" encoding="UTF-8"?>';
-		$postData .= '<entry xmlns="http://www.w3.org/2005/Atom">';
-		$postData .= '<category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/docs/2007#folder"/>';
-		$postData .= '<title>'.$title.'</title>';
-		$postData .= '</entry>';
-		if ($dom = $this->sendRequest($feedUri, 'POST', $postData)) {
-			return true;
+		if (isset($feedUri)) {
+			$title = basename($path);
+			// Construct post data
+			$postData = '<?xml version="1.0" encoding="UTF-8"?>';
+			$postData .= '<entry xmlns="http://www.w3.org/2005/Atom">';
+			$postData .= '<category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/docs/2007#folder"/>';
+			$postData .= '<title>'.$title.'</title>';
+			$postData .= '</entry>';
+			if ($dom = $this->sendRequest($feedUri, 'POST', $postData)) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -102,106 +133,87 @@ class OC_Filestorage_Google {
 
 	public function opendir($path) {
 		if ($path == '' || $path == '/') {
-			$resource = 'https://docs.google.com/feeds/default/private/full/folder%3Aroot/contents';
-			$dom = $this->sendRequest('https://docs.google.com/feeds/default/private/full/folder%3Aroot/contents', 'GET');
+			$next = 'https://docs.google.com/feeds/default/private/full/folder%3Aroot/contents';
 		} else {
-			$dom = $this->getResource($path); 
+			if ($entry = $this->getResource($path)) {
+				$collectionId = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'resourceId')->item(0)->nodeValue;
+				$next = 'https://docs.google.com/feeds/default/private/full/folder%3A'.$collectionId.'/contents';
+			} else {
+				return false;
+			}
 		}
-		global $FAKEDIRS;
 		$files = array();
-// 		while ($next) {
-// 			// send request $next link
-// 			$links = $dom->getElementsByTagName('link');
-// 			foreach ($links as $link) {
-// 				if ($link->getAttribute('rel') == 'next') {
-// 					$next = $link->getAttribute('src');
-// 					break;
-// 				} else {
-// 					$next = false;
-// 				}
-// 			}
+		while ($next) {
+			$dom = $this->sendRequest($next, 'GET');
+			$links = $dom->getElementsByTagName('link');
+			foreach ($links as $link) {
+				if ($link->getAttribute('rel') == 'next') {
+					$next = $link->getAttribute('src');
+					break;
+				} else {
+					$next = false;
+				}
+			}
 			$entries = $dom->getElementsByTagName('entry');
-			foreach($entries as $entry) {
+			foreach ($entries as $entry) {
 				$name = $entry->getElementsByTagName('title')->item(0)->nodeValue;
-				// Native Google resources don't include extensions in title
+				// Google Docs resources don't always include extensions in title
 				if (!strpos($name, '.')) {
-					if ($ext = $this->filetype('', $entry)) {
-						$name .= '.'.$ext;
-					}
+					$name .= '.'.$this->getExtension($entry);
 				}
 				$files[] = $name;
+				// Cache entry for future use
+				$this->entries[$name] = $entry;
 			}
-// 		}
-		$FAKEDIRS['google'] = $files;
+		}
+		OC_FakeDirStream::$dirs['google'] = $files;
 		return opendir('fakedir://google');
 	}
 
-	public function is_dir($path) {
-		if ($entry = $this->getResource($path)) {
+	public function stat($path) {
+		if ($path == '' || $path == '/') {
+			$stat['size'] = $this->free_space($path);
+			$stat['atime'] = time();
+			$stat['mtime'] = time();
+			$stat['ctime'] = time();
+		} else if ($entry = $this->getResource($path)) {
+			// NOTE: Native resources don't have a file size
+			$stat['size'] = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
+			$stat['atime'] = strtotime($entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue);
+			$stat['mtime'] = strtotime($entry->getElementsByTagName('updated')->item(0)->nodeValue);
+			$stat['ctime'] = strtotime($entry->getElementsByTagName('published')->item(0)->nodeValue);
+		}
+		return $stat;
+	}
+
+	public function filetype($path) {
+		if ($path == '' || $path == '/') {
+			return 'dir';
+		} else if ($entry = $this->getResource($path)) {
 			$categories = $entry->getElementsByTagName('category');
 			foreach ($categories as $category) {
 				if ($category->getAttribute('scheme') == 'http://schemas.google.com/g/2005#kind') {
-					// Check if label is equal to folder
 					$type = $category->getAttribute('label');
 					if (strlen(strstr($type, 'folder')) > 0) {
-						return true;
+						return 'dir';
+					} else {
+						return 'file';
 					}
 				}
 			}
 		}
-		return false; 
-	}
-
-	public function is_file($path) {
-		if ($this->getResource($path)) {
-			return true;
-		}
 		return false;
 	}
 
-	public function stat($path) {
-		if ($dom = $this->getResource($path)) {
-			// TODO Native resources don't have a file size
-			$stat['size'] =  $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
-			$stat['mtime'] = strtotime($dom->getElementsByTagName('updated')->item(1)->nodeValue);
-			$stat['ctime'] = strtotime($dom->getElementsByTagName('published')->item(0)->nodeValue);
-			return $stat;
-		}
-		return false; 
-		
-	}
-
-	public function filetype($path, $entry = null) {
-		if ($entry == null) {
-			$entry = $this->getResource($path);
-		}
-		$categories = $entry->getElementsByTagName('category');
-		foreach ($categories as $category) {
-			if ($category->getAttribute('scheme') == 'http://schemas.google.com/g/2005#kind') {
-				// Guess extension from label, default to ODF extensions
-				$type = $category->getAttribute('label');
-				if (strlen(strstr($type, 'folder')) > 0) {
-					return '';
-				} else if (strlen(strstr($type, 'document')) > 0) {
-					return 'odt';
-				} else if (strlen(strstr($type, 'presentation')) > 0) {
-					return 'odp';
-				} else if (strlen(strstr($type, 'spreadsheet')) > 0) {
-					return 'ods';
-				} else {
-					return $type;
-				}
-			}
-		}
-	}
-
 	public function is_readable($path) {
 		return true;
 	}
 
 	public function is_writable($path) {
-		// Check if edit or edit-media links exist
-		if ($entry = $this->getResource($path)) {
+		if ($path == '' || $path == '/') {
+			return true;
+		} else if ($entry = $this->getResource($path)) {
+			// Check if edit or edit-media links exist
 			$links = $entry->getElementsByTagName('link');
 			foreach ($links as $link) {
 				if ($link->getAttribute('rel') == 'edit') {
@@ -215,7 +227,9 @@ class OC_Filestorage_Google {
 	}
 	
 	public function file_exists($path) {
-		if ($this->getResource($path)) {
+		if ($path == '' || $path == '/') {
+			return true;
+		} else if ($this->getResource($path)) {
 			return true;
 		}
 		return false;
@@ -238,24 +252,82 @@ class OC_Filestorage_Google {
 		return false;
 	}
 
-	public function rename($path1,$path2) {
-
+	public function rename($path1, $path2) {
+		// TODO Add support for moving to different collections
+		// Get resource edit link to rename resource
+		if ($entry = $this->getResource($path1)) {
+			$etag = $entry->getElementsByTagName('entry')->item(0)->getAttribute('gd:etag');
+			$links = $entry->getElementsByTagName('link');
+			foreach ($links as $link) {
+				if ($link->getAttribute('rel') == 'edit') {
+					$feedUri = $link->getAttribute('href');
+				}
+			}
+		}
+		if (isset($etag) && isset($feedUri)) {
+			$title = basename($path2);
+			// Construct post data
+			$postData = '<?xml version="1.0" encoding="UTF-8"?>';
+			$postData .= '<entry xmlns="http://www.w3.org/2005/Atom" xmlns:docs="http://schemas.google.com/docs/2007" xmlns:gd="http://schemas.google.com/g/2005" gd:etag='.$etag.'>';
+			$postData .= '<title>'.$title.'</title>';
+			$postData .= '</entry>';
+			$this->sendRequest($feedUri, 'PUT', $postData);
+			return true;
+		}
+		return false;
 	}
 
-	public function fopen($path,$mode){}
-
-	public function toTmpFile($path) {
-		$dom = $this->getResource($path);
-		$url = $dom->getElementsByTagName('content')->getAttribute('src');		
+	public function fopen($path, $mode) {
+		if ($entry = $this->getResource($path)) {
+			$extension = $this->getExtension($path);
+			$downloadUri = $entry->getElementsByTagName('content')->item(0)->getAttribute('src');
+			// TODO Non-native documents don't need these additional parameters
+			$downloadUri .= '&exportFormat='.$extension.'&format='.$extension;
+		}
 	}
 
-	public function fromTmpFile($tmpPath,$path){}
-	public function fromUploadedFile($tmpPath,$path){}
-	public function getMimeType($path){}
-	public function hash($type,$path,$raw){}
+	public function getMimeType($path, $entry = null) {
+		if ($entry == null) {
+			if ($path == '' || $path == '/') {
+				return 'httpd/unix-directory';
+			} else {
+				$entry = $this->getResource($path);
+			}
+		}
+		if ($entry) {
+			$mimetype = $entry->getElementsByTagName('content')->item(0)->getAttribute('type');
+			// Native Google Docs resources often default to text/html, but it may be more useful to default to a corresponding ODF mimetype
+			// Collections get reported as application/atom+xml, make sure it actually is a folder and fix the mimetype
+			if ($mimetype == 'text/html' || $mimetype == 'application/atom+xml') {
+				$categories = $entry->getElementsByTagName('category');
+				foreach ($categories as $category) {
+					if ($category->getAttribute('scheme') == 'http://schemas.google.com/g/2005#kind') {
+						$type = $category->getAttribute('label');
+						if (strlen(strstr($type, 'folder')) > 0) {
+							return 'httpd/unix-directory';
+						} else if (strlen(strstr($type, 'document')) > 0) {
+							return 'application/vnd.oasis.opendocument.text';
+						} else if (strlen(strstr($type, 'spreadsheet')) > 0) {
+							return 'application/vnd.oasis.opendocument.spreadsheet';
+						} else if (strlen(strstr($type, 'presentation')) > 0) {
+							return 'application/vnd.oasis.opendocument.presentation';
+						} else if (strlen(strstr($type, 'drawing')) > 0) {
+							return 'application/vnd.oasis.opendocument.graphics';
+						} else {
+							// If nothing matches return text/html, all native Google Docs resources can be exported as text/html
+							return 'text/html';
+						}
+					}
+				}
+			}
+			return $mimetype;
+		}
+		return false;
+	}
 	
 	public function free_space($path) {
 		if ($dom = $this->sendRequest('https://docs.google.com/feeds/metadata/default', 'GET')) {
+			// NOTE: Native Google Docs resources don't count towards quota
 			$total = $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesTotal')->item(0)->nodeValue;
 			$used = $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
 			return $total - $used;
@@ -263,9 +335,8 @@ class OC_Filestorage_Google {
 		return false;
 	}
   
-	public function search($query){}
-	
-	public function getLocalFile($path) {
-		return false;
+	public function search($query) {
+		
 	}
+
 }
\ No newline at end of file
-- 
GitLab


From 3c72a7c934ed4ec036f1b82d95053dde10463ade Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Feb 2012 12:57:11 +0100
Subject: [PATCH 218/248] make ldap settings a little bit less ugly

---
 apps/user_ldap/templates/settings.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 99af275525d..69b9c171816 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -6,9 +6,9 @@
 		<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_login_filter"><?php echo $l->t('Filter (use %%uid placeholder)');?></label><input type="text" id="ldap_login_filter" name="ldap_login_filter" value="<?php echo $_['ldap_login_filter']; ?>" />
-		<label for="ldap_userlist_filter"><?php echo $l->t('Filter to retrieve user list (without any placeholder)');?></label><input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter" value="<?php echo $_['ldap_userlist_filter']; ?>" /><small><?php echo $l->t('For example "objectClass=person".');?>	</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']; ?>" /></p>
+		<p><label for="ldap_login_filter"><?php echo $l->t('User Login Filter');?></label><input type="text" id="ldap_login_filter" name="ldap_login_filter" value="<?php echo $_['ldap_login_filter']; ?>" /><small><?php echo $l->t('use %%uid placeholder, e.g. uid=%%uid');?></small></p>
+		<p><label for="ldap_userlist_filter"><?php echo $l->t('User List Filter');?></label><input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter" value="<?php echo $_['ldap_userlist_filter']; ?>" /><small><?php echo $l->t('without any placeholder, e.g. "objectClass=person".');?>	</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>
-- 
GitLab


From f040ce044c20a80e03a76b0aa92292839122f929 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Feb 2012 13:03:44 +0100
Subject: [PATCH 219/248] consider changed/new setting variables for user_ldap

---
 apps/user_ldap/settings.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 1f2d8ed9af3..01c5b1749e9 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -20,7 +20,7 @@
  * 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', 'ldap_display_name', 'ldap_tls', 'ldap_nocase');
+$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_password', 'ldap_base', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_display_name', 'ldap_tls', 'ldap_nocase');
 
 if ($_POST) {
 	foreach($params as $param){
@@ -29,12 +29,12 @@ if ($_POST) {
 		}
 		elseif('ldap_tls' == $param) {
 			// unchecked checkboxes are not included in the post paramters
-				OC_Appconfig::setValue('user_ldap', $param, 0);		
+				OC_Appconfig::setValue('user_ldap', $param, 0);
 		}
 		elseif('ldap_nocase' == $param) {
 			OC_Appconfig::setValue('user_ldap', $param, 0);
 		}
-		
+
 	}
 }
 
-- 
GitLab


From baffa03fa59430312e9c625451c633b54a3a51ce Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 29 Feb 2012 13:18:19 -0500
Subject: [PATCH 220/248] Fix opendir for folders aka Google Docs collections

---
 lib/filestorage/google.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/filestorage/google.php b/lib/filestorage/google.php
index 0c562941d41..49985548382 100644
--- a/lib/filestorage/google.php
+++ b/lib/filestorage/google.php
@@ -136,8 +136,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 			$next = 'https://docs.google.com/feeds/default/private/full/folder%3Aroot/contents';
 		} else {
 			if ($entry = $this->getResource($path)) {
-				$collectionId = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'resourceId')->item(0)->nodeValue;
-				$next = 'https://docs.google.com/feeds/default/private/full/folder%3A'.$collectionId.'/contents';
+				$next = $entry->getElementsByTagName('content')->item(0)->getAttribute('src');
 			} else {
 				return false;
 			}
-- 
GitLab


From b23b5aae7fba9467fd0e6b6137268c894ea6f8e8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 29 Feb 2012 23:17:49 +0100
Subject: [PATCH 221/248] remove debug output

---
 lib/helper.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index 5b1efd749ae..0c6c73aa76b 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -432,7 +432,6 @@ class OC_Helper {
 		$fh=fopen($file,'w');
 		fclose($fh);
 		self::$tmpFiles[]=$file;
-		error_log($file);
 		return $file;
 	}
 	
@@ -442,7 +441,6 @@ class OC_Helper {
 	public static function cleanTmp(){
 		foreach(self::$tmpFiles as $file){
 			if(file_exists($file)){
-				error_log("clean $file");
 				unlink($file);
 			}
 		}
-- 
GitLab


From e76e4e75407cc672bf342f13bbd77392a93c1623 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 29 Feb 2012 23:42:40 +0100
Subject: [PATCH 222/248] add touch() to all storage backands, and make 
 parameter optional

---
 apps/files_sharing/sharedstorage.php |  8 +++++++-
 lib/filestorage.php                  |  1 +
 lib/filestorage/common.php           |  1 +
 lib/filestorage/commontest.php       |  3 +++
 lib/filestorage/local.php            | 11 ++++++++---
 lib/filesystem.php                   |  2 +-
 lib/filesystemview.php               |  2 +-
 7 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 3067d4d34c0..845659588ef 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -505,7 +505,13 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 			return $storage->getLocalFile($this->getInternalPath($source));
 		}
 	}
-	
+	public function touch($path, $mtime=null){
+		$source = $this->getSource($path);
+		if ($source) {
+			$storage = OC_Filesystem::getStorage($source);
+			return $storage->touch($this->getInternalPath($source),$time);
+		}
+	}
 }
 
 ?>
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 6b679eab899..fd6497b9478 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -48,5 +48,6 @@ abstract class OC_Filestorage{
 	abstract public function hash($type,$path,$raw);
 	abstract public function free_space($path);
 	abstract public function search($query);
+	abstract public function touch($path, $mtime=null);
 	abstract public function getLocalFile($path);// get a path to a local version of the file, whether the original file is local or remote
 }
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index 40a9cff5d06..fa14d7e99fd 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -121,4 +121,5 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		$count=OC_Helper::streamCopy($source,$target);
 		return $tmpFile;
 	}
+// 	abstract public function touch($path, $mtime=null);
 }
diff --git a/lib/filestorage/commontest.php b/lib/filestorage/commontest.php
index dd552c6865b..512e7c1b66d 100644
--- a/lib/filestorage/commontest.php
+++ b/lib/filestorage/commontest.php
@@ -72,4 +72,7 @@ class OC_Filestorage_CommonTest extends OC_Filestorage_Common{
 	public function search($query){
 		return $this->storage->search($query);
 	}
+	public function touch($path, $mtime=null){
+		return $this->storage->touch($path,$mtime);
+	}
 }
\ No newline at end of file
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 8acfe504cb2..8e07ce6025b 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -58,15 +58,20 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function filemtime($path){
 		return filemtime($this->datadir.$path);
 	}
-	public function touch($path, $mtime){
+	public function touch($path, $mtime=null){
 		// 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 ) ) {
+		if(!is_null($mtime)){
+			$result=touch( $this->datadir.$path, $mtime );
+		}else{
+			$result=touch( $this->datadir.$path);
+		}
+		if( $result ) {
 			clearstatcache( true, $this->datadir.$path );
 		}
 		
-		return touch($this->datadir.$path, $mtime);
+		return $result;
 	}
 	public function file_get_contents($path){
 		return file_get_contents($this->datadir.$path);
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 90195bc2130..5013b3968c5 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -345,7 +345,7 @@ class OC_Filesystem{
 	static public function filemtime($path){
 		return self::$defaultInstance->filemtime($path);
 	}
-	static public function touch($path, $mtime){
+	static public function touch($path, $mtime=null){
 		return self::$defaultInstance->touch($path, $mtime);
 	}
 	static public function file_get_contents($path){
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 5996a5f60fb..2d54a676c8c 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -163,7 +163,7 @@ class OC_FilesystemView {
 	public function filemtime($path){
 		return $this->basicOperation('filemtime',$path);
 	}
-	public function touch($path, $mtime){
+	public function touch($path, $mtime=null){
 		return $this->basicOperation('touch', $path, array('write'), $mtime);
 	}
 	public function file_get_contents($path){
-- 
GitLab


From f193e474c1f499458f6d18ba6d7fa7f83c2098c8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 29 Feb 2012 23:47:53 +0100
Subject: [PATCH 223/248] add test cases for stat and touch

---
 tests/lib/filestorage.php | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index fb050868ee3..6296d7abf99 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -126,4 +126,49 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertTrue(file_exists($localFile));
 		$this->assertEqual(file_get_contents($localFile),file_get_contents($textFile));
 	}
+
+	public function testStat(){
+		$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
+		$ctimeStart=time();
+		$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile));
+		$this->assertTrue($this->instance->is_readable('/lorem.txt'));
+		$ctimeEnd=time();
+		$cTime=$this->instance->filectime('/lorem.txt');
+		$mTime=$this->instance->filemtime('/lorem.txt');
+		$this->assertTrue($ctimeStart<=$cTime);
+		$this->assertTrue($cTime<=$ctimeEnd);
+		$this->assertEqual($cTime,$mTime);
+		$this->assertEqual(filesize($textFile),$this->instance->filesize('/lorem.txt'));
+		
+		$stat=$this->instance->stat('/lorem.txt');
+		//only size, mtime and ctime are requered in the result
+		$this->assertEqual($stat['size'],$this->instance->filesize('/lorem.txt'));
+		$this->assertEqual($stat['mtime'],$mTime);
+		$this->assertEqual($stat['ctime'],$cTime);
+		
+		$mtimeStart=time();
+		$this->instance->touch('/lorem.txt');
+		$mtimeEnd=time();
+		$originalCTime=$cTime;
+		$cTime=$this->instance->filectime('/lorem.txt');
+		$mTime=$this->instance->filemtime('/lorem.txt');
+		$this->assertTrue($mtimeStart<=$mTime);
+		$this->assertTrue($mTime<=$mtimeEnd);
+		$this->assertEqual($cTime,$originalCTime);
+		
+		$this->instance->touch('/lorem.txt',100);
+		$mTime=$this->instance->filemtime('/lorem.txt');
+		$this->assertEqual($mTime,100);
+		
+		$mtimeStart=time();
+		$fh=$this->instance->fopen('/lorem.txt','a');
+		fwrite($fh,' ');
+		fclose($fh);
+		clearstatcache();
+		$mtimeEnd=time();
+		$originalCTime=$cTime;
+		$mTime=$this->instance->filemtime('/lorem.txt');
+		$this->assertTrue($mtimeStart<=$mTime);
+		$this->assertTrue($mTime<=$mtimeEnd);
+	}
 }
-- 
GitLab


From eb8ffd9315273ce7990f95d1ea7a94d05d2dd33d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 1 Mar 2012 14:18:28 +0100
Subject: [PATCH 224/248] LDAP fix: set user quota, if attribute is provided

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

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index fbc87f158a1..3de5ebacd36 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -81,9 +81,9 @@ class OC_USER_LDAP extends OC_User_Backend {
 		if( !$this->ldap_dc )
 			return false;
 
-		$quota = $this->ldap_dc[$this->ldap_quota_attr][0];
+		$quota = $this->ldap_dc[strtolower($this->ldap_quota_attr)][0];
 		$quota = $quota != -1 ? $quota : $this->ldap_quota_def;
-		OC_Preferences::setValue($uid, 'files', 'quota', $quota);
+		OC_Preferences::setValue($uid, 'files', 'quota', OC_Helper::computerFileSize($quota));
 	}
 
 	private function setEmail( $uid ) {
@@ -154,7 +154,7 @@ class OC_USER_LDAP extends OC_User_Backend {
 			return false;
 		}
 
-		if(!empty($this->ldap_quota) && !empty($this->ldap_quota_def)) {
+		if(!empty($this->ldap_quota_attr) && !empty($this->ldap_quota_def)) {
 			$this->setQuota($uid);
 		}
 
-- 
GitLab


From b192f86d84866fab1d7c440d9dad35798f352353 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 1 Mar 2012 14:21:38 +0100
Subject: [PATCH 225/248] LDPA: fix setting variables and add missing ones to
 the array

---
 apps/user_ldap/settings.php           | 2 +-
 apps/user_ldap/templates/settings.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 01c5b1749e9..ad44fe95f9e 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -20,7 +20,7 @@
  * 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_userlist_filter', 'ldap_login_filter', 'ldap_display_name', 'ldap_tls', 'ldap_nocase');
+$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_password', 'ldap_base', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_display_name', 'ldap_tls', 'ldap_nocase'. 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr');
 
 if ($_POST) {
 	foreach($params as $param){
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 69b9c171816..828c72cba97 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -13,9 +13,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']; ?>" />
+		<p><label for="ldap_quota_attr">Quota Attribute</label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" value="<?php echo $_['ldap_quota_attr']; ?>" />
                 <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>
+                <p><label for="ldap_email_attr">Email Attribute</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" value="<?php echo $_['ldap_email_attr']; ?>" /></p>
 		<input type="submit" value="Save" />
 	</fieldset>
 </form>
-- 
GitLab


From fa6ad6ba68ac671375b50971a92a61dc43e250c7 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 1 Mar 2012 14:31:06 +0100
Subject: [PATCH 226/248] LDAP: set also quota, when there is no explicit
 default value

---
 apps/user_ldap/user_ldap.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 3de5ebacd36..3521a9d90cf 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -81,7 +81,11 @@ class OC_USER_LDAP extends OC_User_Backend {
 		if( !$this->ldap_dc )
 			return false;
 
-		$quota = $this->ldap_dc[strtolower($this->ldap_quota_attr)][0];
+		if(!empty($this->ldap_quota_attr)) {
+			$quota = $this->ldap_dc[strtolower($this->ldap_quota_attr)][0];
+		} else {
+			$quota = false;
+		}
 		$quota = $quota != -1 ? $quota : $this->ldap_quota_def;
 		OC_Preferences::setValue($uid, 'files', 'quota', OC_Helper::computerFileSize($quota));
 	}
@@ -154,7 +158,7 @@ class OC_USER_LDAP extends OC_User_Backend {
 			return false;
 		}
 
-		if(!empty($this->ldap_quota_attr) && !empty($this->ldap_quota_def)) {
+		if(!empty($this->ldap_quota_attr) || !empty($this->ldap_quota_def)) {
 			$this->setQuota($uid);
 		}
 
-- 
GitLab


From d29a02a65a4cc6c7adda17260327e2fe8547e88f Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Thu, 1 Mar 2012 15:19:44 +0100
Subject: [PATCH 227/248] undo the change of the webroot detection. seams to be
 buggy

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

diff --git a/lib/base.php b/lib/base.php
index d4dbdcde9b6..67d30f8780a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -159,9 +159,9 @@ class OC{
 				OC::$SUBURI=OC::$SUBURI.'index.php';
 			}
 		}
-//              OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
+                OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
 		// try a new way to detect the WEBROOT which is simpler and also works with the app directory outside the owncloud folder. let´s see if this works for everybody
-		OC::$WEBROOT=substr(OC::$SERVERROOT,strlen(OC::$DOCUMENTROOT));
+//		OC::$WEBROOT=substr(OC::$SERVERROOT,strlen(OC::$DOCUMENTROOT));
 
 
 		if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){
-- 
GitLab


From 6ecbaf0041034d77ba0878467b4e369b18dc77e7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 1 Mar 2012 18:44:26 +0100
Subject: [PATCH 228/248] load streamwrappers earlier

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

diff --git a/lib/base.php b/lib/base.php
index af999d45fa5..5a4904c50f2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -144,6 +144,11 @@ class OC{
 			$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
 		}
 
+		// register the stream wrappers
+		require_once('streamwrappers.php');
+		stream_wrapper_register("fakedir", "OC_FakeDirStream");
+		stream_wrapper_register('static', 'OC_StaticStreamWrapper');
+		
 		// calculate the documentroot
 		OC::$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
 		OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13));
@@ -176,13 +181,13 @@ class OC{
 			OC::$THIRDPARTYROOT=OC::$SERVERROOT;
 			OC::$THIRDPARTYWEBROOT=OC::$WEBROOT;
 		}elseif(file_exists(OC::$SERVERROOT.'/../3rdparty')){
-			$url_tmp=explode('/',OC::$WEBROOT);	
+			$url_tmp=explode('/',OC::$WEBROOT);
 			$length=count($url_tmp);
-			unset($url_tmp[$length-1]); 
+			unset($url_tmp[$length-1]);
 			OC::$THIRDPARTYWEBROOT=implode('/',$url_tmp);
-			$root_tmp=explode('/',OC::$SERVERROOT);	
+			$root_tmp=explode('/',OC::$SERVERROOT);
 			$length=count($root_tmp);
-			unset($root_tmp[$length-1]); 
+			unset($root_tmp[$length-1]);
 			OC::$THIRDPARTYROOT=implode('/',$root_tmp);
 		}else{
 			echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
@@ -296,11 +301,7 @@ class OC{
 		if( !OC_Config::getValue( "installed", false )){
 			$_SESSION['user_id'] = '';
 		}
-		
-		// register the stream wrappers
-		require_once('streamwrappers.php');
-		stream_wrapper_register("fakedir", "OC_FakeDirStream");
-		stream_wrapper_register('static', 'OC_StaticStreamWrapper');
+
 
 		OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
 		OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" ));
-- 
GitLab


From 642ccd27ab9ce3bfcc5d0bbec4910268b4cadb28 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 1 Mar 2012 20:46:34 +0100
Subject: [PATCH 229/248] Bookmarks: fix loading and displaying of the
 bookmarks

---
 apps/bookmarks/css/bookmarks.css |  4 +++-
 apps/bookmarks/js/bookmarks.js   | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index b1139f2c346..3a3e0fbf6b3 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -17,7 +17,9 @@
 }
 
 .bookmarks_list {
-	margin-top: 36px;
+	overflow: auto;
+	position: fixed;
+	top: 6.5em;
 }
 
 .bookmarks_addBml {
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 7317a154a76..fa5adde2545 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -5,7 +5,11 @@ var bookmarks_sorting = 'bookmarks_sorting_recent';
 
 $(document).ready(function() {	
 	$('#bookmark_add_submit').click(addOrEditBookmark);
-	$(window).scroll(updateOnBottom);
+	$(window).resize(function () {
+		fillWindow($('.bookmarks_list'));
+	});
+	$(window).resize();
+	$($('.bookmarks_list')).scroll(updateOnBottom);
 	
 	$('.bookmarks_list').empty();
 	getBookmarks();
@@ -21,7 +25,9 @@ function getBookmarks() {
 		url: 'ajax/updateList.php',
 		data: 'tag=' + encodeURI($('#bookmarkFilterTag').val()) + '&page=' + bookmarks_page + '&sort=' + bookmarks_sorting,
 		success: function(bookmarks){
-			bookmarks_page += 1;
+			if (bookmarks.data.length) {
+				bookmarks_page += 1;
+			}
 			$('.bookmark_link').unbind('click', recordClick);
 			$('.bookmark_delete').unbind('click', delBookmark);
 			$('.bookmark_edit').unbind('click', showBookmark);
@@ -39,6 +45,9 @@ function getBookmarks() {
 			$('.bookmark_edit').click(showBookmark);
 			
 			bookmarks_loading = false;
+			if (bookmarks.data.length) {
+				updateOnBottom()
+			}
 		}
 	});	
 }
@@ -146,7 +155,11 @@ function updateBookmarksList(bookmark) {
 
 function updateOnBottom() {
 	//check wether user is on bottom of the page
-	if ($('body').height() <= ($(window).height() + $(window).scrollTop())) {
+	var top = $('.bookmarks_list>:last-child').position().top;
+	var height = $('.bookmarks_list').height();
+	// use a bit of margin to begin loading before we are really at the
+	// bottom
+	if (top < height * 1.2) {
 		getBookmarks();
 	}
 }
-- 
GitLab


From fe3bcb5fe2acfdddde52b849a7ce8cf8a02c2e6a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 1 Mar 2012 20:50:00 +0100
Subject: [PATCH 230/248] Calendar: fix bug in creating DTEND from DTSTART

---
 apps/calendar/ajax/events.php | 2 +-
 apps/calendar/lib/object.php  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 1436f634316..098e539a2de 100755
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -44,8 +44,8 @@ foreach($events as $event){
 	$return_event = create_return_event($event, $vevent);
 
 	$dtstart = $vevent->DTSTART;
-	$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
 	$start_dt = $dtstart->getDateTime();
+	$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
 	$end_dt = $dtend->getDateTime();
 	if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
 		$return_event['allDay'] = true;
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 230c610d35a..b84e575bc83 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -309,6 +309,8 @@ class OC_Calendar_Object{
 			$dtend = $vevent->DTEND;
 		}else{
 			$dtend = clone $vevent->DTSTART;
+			// clone creates a shallow copy, also clone DateTime
+			$dtend->setDateTime(clone $dtend->getDateTime(), $dtend->getDateType());
 			if ($vevent->DURATION){
 				$duration = strval($vevent->DURATION);
 				$invert = 0;
@@ -817,4 +819,4 @@ class OC_Calendar_Object{
 
 		return $vcalendar;
 	}
-}
\ No newline at end of file
+}
-- 
GitLab


From f914cd014432f0883b0fde9ca0826d32393a07a9 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 1 Mar 2012 20:51:59 +0100
Subject: [PATCH 231/248] Implement showing Birthdays of contacts in the
 calendar

---
 apps/calendar/ajax/events.php | 22 ++++++++++++-----
 apps/calendar/index.php       |  4 ++++
 apps/contacts/appinfo/app.php |  2 ++
 apps/contacts/lib/hooks.php   | 45 +++++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 098e539a2de..a912889f292 100755
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -30,16 +30,26 @@ 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']);
+$calendar_id = $_GET['calendar_id'];
+if (is_numeric($calendar_id)) {
+	$calendar = OC_Calendar_App::getCalendar($calendar_id);
+	OC_Response::enableCaching(0);
+	OC_Response::setETagHeader($calendar['ctag']);
+	$events = OC_Calendar_Object::allInPeriod($calendar_id, $start, $end);
+} else {
+	$events = array();
+	OC_Hook::emit('OC_Calendar', 'getEvents', array('calendar_id' => $calendar_id, 'events' => &$events));
+}
 
-$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;
+	if (isset($event['calendardata'])) {
+		$object = OC_VObject::parse($event['calendardata']);
+		$vevent = $object->VEVENT;
+	} else {
+		$vevent = $event['vevent'];
+	}
 
 	$return_event = create_return_event($event, $vevent);
 
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 12b51f564b4..c00a4098f7a 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -9,16 +9,20 @@
 require_once ('../../lib/base.php');
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
+
 // Create default calendar ...
 $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(), 1);
 }
+
 $eventSources = array();
 foreach($calendars as $calendar){
 	$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
 }
+OC_Hook::emit('OC_Calendar', 'getSources', array('sources' => &$eventSources));
+
 //Fix currentview for fullcalendar
 if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "oneweekview"){
 	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "agendaWeek");
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 9e424aa89f8..c3b4916a3fd 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -5,6 +5,8 @@ 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_deleteUser', 'OC_Contacts_Hooks', 'deleteUser');
+OC_HOOK::connect('OC_Calendar', 'getEvents', 'OC_Contacts_Hooks', 'getBirthdayEvents');
+OC_HOOK::connect('OC_Calendar', 'getSources', 'OC_Contacts_Hooks', 'getCalenderSources');
 
 OC_App::register( array(
   'order' => 10,
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index 155cf40f914..10ae82bbf4f 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -38,4 +38,49 @@ class OC_Contacts_Hooks{
 
 		return true;
 	}
+
+	static public function getCalenderSources($parameters) {
+		$base_url = OC_Helper::linkTo('calendar', 'ajax/events.php').'?calendar_id=';
+		foreach(OC_Contacts_Addressbook::all(OC_User::getUser()) as $addressbook) {
+			$parameters['sources'][] =
+				array(
+					'url' => $base_url.'birthday_'. $addressbook['id'],
+					'backgroundColor' => '#cccccc',
+					'borderColor' => '#888',
+					'textColor' => 'black',
+					'cache' => true,
+					'editable' => false,
+				);
+		}
+	}
+
+	static public function getBirthdayEvents($parameters) {
+		$name = $parameters['calendar_id'];
+		if (strpos('birthday_', $name) != 0) {
+			return;
+		}
+		$info = explode('_', $name);
+		$aid = $info[1];
+		OC_Contacts_App::getAddressbook($aid);
+		foreach(OC_Contacts_VCard::all($aid) as $card){
+			$vcard = OC_VObject::parse($card['carddata']);
+			$birthday = $vcard->BDAY;
+			if ($birthday) {
+				$date = new DateTime($birthday);
+				$vevent = new OC_VObject('VEVENT');
+				$vevent->setDateTime('LAST-MODIFIED', new DateTime($vcard->REV));
+				$vevent->setDateTime('DTSTART', $date, Sabre_VObject_Element_DateTime::DATE);
+				$vevent->setString('DURATION', 'P1D');
+				// DESCRIPTION?
+				$vevent->setString('RRULE', 'FREQ=YEARLY');
+				$title = str_replace('{name}', $vcard->getAsString('FN'), OC_Contacts_App::$l10n->t('{name}\'s Birthday'));
+				$parameters['events'][] = array(
+					'id' => 0,//$card['id'],
+					'vevent' => $vevent,
+					'repeating' => true,
+					'summary' => $title,
+					);
+			}
+		}
+	}
 }
-- 
GitLab


From ec2f49833da5c1fdb54d63c4ec05b7309c4e3c68 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 1 Mar 2012 20:56:00 +0100
Subject: [PATCH 232/248] Calendar: Don't request edit form for readonly events

---
 apps/calendar/js/calendar.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index d2af6918d5c..907d94edb02 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -73,6 +73,9 @@ Calendar={
 			}
 		},
 		editEvent:function(calEvent, jsEvent, view){
+			if (calEvent.editable == false || calEvent.source.editable == false) {
+				return;
+			}
 			var id = calEvent.id;
 			if($('#event').dialog('isOpen') == true){
 				// TODO: save event
-- 
GitLab


From 5dcd9e20d03f089408ada52e3ea5462c88bf191a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 1 Mar 2012 20:56:51 +0100
Subject: [PATCH 233/248] Small cleanups

---
 apps/calendar/lib/calendar.php |  3 ++-
 apps/contacts/lib/app.php      |  2 +-
 apps/contacts/lib/hooks.php    |  2 +-
 lib/base.php                   | 10 +++++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 277539af97d..7eeb004d181 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -240,9 +240,10 @@ class OC_Calendar_Calendar{
 			'#9fc6e7', // "light blue"
 		);
 	}
+
 	public static function getEventSourceInfo($calendar){
 		return array(
-			'url' => 'ajax/events.php?calendar_id='.$calendar['id'],
+			'url' => OC_Helper::linkTo('calendar', 'ajax/events.php').'?calendar_id='.$calendar['id'],
 			'backgroundColor' => $calendar['calendarcolor'],
 			'borderColor' => '#888',
 			'textColor' => 'black',
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index ff348403a9b..ce52df4b75e 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -83,7 +83,7 @@ class OC_Contacts_App {
 		$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');
+			$appinfo = 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);
 			}
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index 10ae82bbf4f..b858c4a5a48 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -29,7 +29,7 @@ class OC_Contacts_Hooks{
 	 * @param paramters parameters from postDeleteUser-Hook
 	 * @return array
 	 */
-	public function deleteUser($parameters) {
+	static public function deleteUser($parameters) {
 		$addressbooks = OC_Contacts_Addressbook::all($parameters['uid']);
 
 		foreach($addressbooks as $addressbook) {
diff --git a/lib/base.php b/lib/base.php
index 5a4904c50f2..0df6631df4d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -213,7 +213,15 @@ class OC{
 		}
 
 		// set the right include path
-		set_include_path(OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.OC::$SERVERROOT.'/config'.PATH_SEPARATOR.OC::$THIRDPARTYROOT.'/3rdparty'.PATH_SEPARATOR.OC::$APPSROOT.PATH_SEPARATOR.OC::$APPSROOT.'/apps'.PATH_SEPARATOR.get_include_path().PATH_SEPARATOR.OC::$SERVERROOT);
+		set_include_path(
+			OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.
+			OC::$SERVERROOT.'/config'.PATH_SEPARATOR.
+			OC::$THIRDPARTYROOT.'/3rdparty'.PATH_SEPARATOR.
+			OC::$APPSROOT.PATH_SEPARATOR.
+			OC::$APPSROOT.'/apps'.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') {
-- 
GitLab


From 5d8d7ef2a1c5197c8ee9e03eedc28a5a23e7c07f Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Thu, 1 Mar 2012 20:55:12 +0000
Subject: [PATCH 234/248] remoteStorage app version 0.5

---
 apps/remoteStorage/ajax/revokeToken.php  |  41 +++++++++++
 apps/remoteStorage/appinfo/app.php       |   1 +
 apps/remoteStorage/appinfo/info.xml      |   2 +-
 apps/remoteStorage/auth.css              |   8 ++
 apps/remoteStorage/auth.php              |  89 ++++++++++++++++-------
 apps/remoteStorage/lib_remoteStorage.php |   3 +-
 apps/remoteStorage/remoteStorage-big.png | Bin 0 -> 9742 bytes
 apps/remoteStorage/remoteStorage.png     | Bin 0 -> 1273 bytes
 apps/remoteStorage/settings.php          |   7 ++
 9 files changed, 121 insertions(+), 30 deletions(-)
 create mode 100644 apps/remoteStorage/ajax/revokeToken.php
 create mode 100644 apps/remoteStorage/auth.css
 create mode 100644 apps/remoteStorage/remoteStorage-big.png
 create mode 100644 apps/remoteStorage/remoteStorage.png
 create mode 100644 apps/remoteStorage/settings.php

diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php
new file mode 100644
index 00000000000..ca56cf560ec
--- /dev/null
+++ b/apps/remoteStorage/ajax/revokeToken.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+* ownCloud
+*
+* Original:
+* @author Frank Karlitschek
+* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* 
+* Adapted:
+* @author Michiel de Jong, 2012
+*
+* 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/>.
+*
+*/
+
+
+// Do not load FS ...
+$RUNTIME_NOSETUPFS = true;
+
+require_once('../../../lib/base.php');
+OC_Util::checkAppEnabled('remoteStorage');
+require_once('Sabre/autoload.php');
+require_once('../lib_remoteStorage.php');
+
+ini_set('default_charset', 'UTF-8');
+#ini_set('error_reporting', '');
+@ob_clean();
+
+echo OC_remoteStorage::deleteToken(file_get_contents("php://input"));
diff --git a/apps/remoteStorage/appinfo/app.php b/apps/remoteStorage/appinfo/app.php
index ac1ecde5082..a1fbebc42f5 100644
--- a/apps/remoteStorage/appinfo/app.php
+++ b/apps/remoteStorage/appinfo/app.php
@@ -3,3 +3,4 @@ OC_App::register( array(
   'order' => 10,
   'id' => 'remoteStorage',
   'name' => 'remoteStorage compatibility' ));
+OC_APP::registerPersonal('remoteStorage','settings');
diff --git a/apps/remoteStorage/appinfo/info.xml b/apps/remoteStorage/appinfo/info.xml
index 1fc146aac73..121587795db 100644
--- a/apps/remoteStorage/appinfo/info.xml
+++ b/apps/remoteStorage/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>remoteStorage</id>
 	<name>remoteStorage compatibility</name>
 	<description>Enables your users to use ownCloud as their remote storage for unhosted applications.</description>
-	<version>0.4</version>
+	<version>0.5</version>
 	<licence>AGPL or MIT</licence>
 	<author>Michiel de Jong</author>
 	<require>2</require>
diff --git a/apps/remoteStorage/auth.css b/apps/remoteStorage/auth.css
new file mode 100644
index 00000000000..2dedad5dd0f
--- /dev/null
+++ b/apps/remoteStorage/auth.css
@@ -0,0 +1,8 @@
+h2 { font-size:2em; font-weight:bold; margin-bottom:1em; white-space:nowrap; }
+ul.scopes { list-style:disc; }
+ul.scopes li { white-space:nowrap; }
+h2 img { width: 50% }
+#oauth { margin:4em auto 2em; width:20em; }
+#allow-auth { background-color:#5c3; text-shadow:#5e3 0 1px 0; color:#fff;
+-webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; }
+#deny-auth { padding:0; margin:.7em; border:0; background:none; font-size:1.2em; -moz-box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; -webkit-box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; }
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index cc40e895e01..c00f9d5555c 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -8,7 +8,7 @@
 * @copyright 2010 Frank Karlitschek karlitschek@kde.org
 * 
 * Adapted:
-* @author Michiel de Jong, 2011
+* @author Michiel de Jong, 2012
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -17,11 +17,11 @@
 *
 * 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
+* 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/>.
+* License along with this library.	If not, see <http://www.gnu.org/licenses/>.
 *
 */
 
@@ -39,24 +39,8 @@ ini_set('default_charset', 'UTF-8');
 #ini_set('error_reporting', '');
 @ob_clean();
 
-//allow use as remote storage for other websites
-if(isset($_SERVER['HTTP_ORIGIN'])) {
-	header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
-	header('Access-Control-Max-Age: 3600');
-	header('Access-Control-Allow-Methods: OPTIONS, GET, PUT, DELETE, PROPFIND');
-  	header('Access-Control-Allow-Headers: Authorization, Content-Type');
-} else {
-	header('Access-Control-Allow-Origin: *');
-}
-
 $path = substr($_SERVER["REQUEST_URI"], strlen($_SERVER["SCRIPT_NAME"]));
-$pathParts =  explode('/', $path);
-// for webdav:
-// 0/     1       /   2    /   3  /   4     /    5     /   6     / 7
-//  /$ownCloudUser/remoteStorage/webdav/$userHost/$userName/$dataScope/$key
-// for oauth:
-// 0/      1      /  2     /  3  / 4
-//  /$ownCloudUser/remoteStorage/oauth/auth
+$pathParts =	explode('/', $path);
 
 if(count($pathParts) == 2 && $pathParts[0] == '') {
 	//TODO: input checking. these explodes may fail to produces the desired arrays:
@@ -66,7 +50,8 @@ if(count($pathParts) == 2 && $pathParts[0] == '') {
 		if($k=='user_address'){
 			$userAddress=$v;
 		} else if($k=='redirect_uri'){
-			$appUrl=$v;
+			$appUrlParts=explode('/', $v);
+		$appUrl = $appUrlParts[2];//bit dodgy i guess
 		} else if($k=='scope'){
 			$categories=$v;
 		}
@@ -78,7 +63,56 @@ if(count($pathParts) == 2 && $pathParts[0] == '') {
 			$token=OC_remoteStorage::createCategories($appUrl, $categories);
 			header('Location: '.$_GET['redirect_uri'].'#access_token='.$token.'&token_type=bearer');
 		} else {
-			echo '<form method="POST"><input name="allow" type="submit" value="Allow this web app to store stuff on your owncloud."></form>';
+?>
+<!DOCTYPE html>
+<html>
+	<head>
+	<title>ownCloud</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<link rel="shortcut icon" href="../../../core/img/favicon.png" /><link rel="apple-touch-icon-precomposed" href="../../../core/img/favicon-touch.png" />
+			<link rel="stylesheet" href="../../../core/css/styles.css" type="text/css" media="screen" />
+			<link rel="stylesheet" href="../auth.css" type="text/css" media="screen" />
+		</head>
+	<body id="body-login">
+	<div id="login">
+		<header>
+		<div id="header">
+			<img src="../../../core/img/owncloud-logo-medium-white.png" alt="ownCloud" />
+		</div>
+		</header>
+		<section id="main">
+		<div id="oauth">
+      <h2><img src="../remoteStorage-big.png" alt="remoteStorage" /></h2>
+      <p><strong><?php $appUrlParts = explode('/', $_GET['redirect_uri']); echo htmlentities($appUrlParts[2]); ?></strong>
+      requests read &amp; write access to your 
+      <?php
+        $categories = explode(',', htmlentities($_GET['scope']));
+        if(!count($categories)) {
+          echo htmlentities($_GET['scope']);
+        } else {
+          echo '<em>'.$categories[0].'</em>';
+          if(count($categories)==2) {
+            echo ' and <em>'.$categories[1].'</em>';
+          } else if(count($categories)>2) {
+            for($i=1; $i<count($categories)-1; $i++) {
+              echo ', <em>'.$categories[$i].'</em>';
+            }
+            echo ', and <em>'.$categories[$i].'</em>';
+          }
+        }
+      ?>.
+			</p>
+			<form accept-charset="UTF-8" method="post">
+				<input id="allow-auth" name="allow" type="submit" value="Allow" />
+				<input id="deny-auth" name="deny" type="submit" value="Deny" />
+			</form>
+		</div>
+		</section>
+	</div>
+	<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; web services under your control</p></footer>
+	</body>
+</html>
+<?php
 		}
 	} else {
 		if((isset($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'])) {
@@ -88,12 +122,11 @@ if(count($pathParts) == 2 && $pathParts[0] == '') {
 		}
 		$url .= $_SERVER['SERVER_NAME'];
 		$url .= substr($_SERVER['SCRIPT_NAME'], 0, -strlen('apps/remoteStorage/compat.php'));
-		die('You are '.($currUser?'logged in as '.$currUser.' instead of '.$ownCloudUser:'not logged in').'. Please '
-			.'<input type="submit" onclick="'
-			."window.open('$url','Close me!','height=600,width=300');"
-			.'" value="log in">'
-			.', close the pop-up, and '
-			.'<form method="POST"><input name="allow" type="submit" value="Click here"></form>');
+		if($currUser) {
+			die('You are logged in as '.$currUser.' instead of '.$ownCloudUser);
+		} else {
+			header('Location: /?redirect_url='.urlencode('/apps/remoteStorage/auth.php'.$_SERVER['PATH_INFO'].'?'.$_SERVER['QUERY_STRING']));
+		}
 	}
 } else {
 	//die('please use auth.php/username?params. '.var_export($pathParts, true));
diff --git a/apps/remoteStorage/lib_remoteStorage.php b/apps/remoteStorage/lib_remoteStorage.php
index a9b73516aad..6e6a19c739f 100644
--- a/apps/remoteStorage/lib_remoteStorage.php
+++ b/apps/remoteStorage/lib_remoteStorage.php
@@ -20,7 +20,7 @@ class OC_remoteStorage {
 		$ret = array();
 		while($row=$result->fetchRow()){
 			$ret[$row['token']] = array(
-				'appUrl' => $row['appurl'],
+				'appUrl' => $row['appUrl'],
 				'categories' => $row['category'],
 			);
 		}
@@ -31,6 +31,7 @@ class OC_remoteStorage {
 		$user=OC_User::getUser();
 		$query=OC_DB::prepare("DELETE FROM *PREFIX*authtoken WHERE token=? AND user=?");
 		$result=$query->execute(array($token,$user));
+		return 'unknown';//how can we see if any rows were affected?
 	}
 	private static function addToken($token, $appUrl, $categories){
 		$user=OC_User::getUser();
diff --git a/apps/remoteStorage/remoteStorage-big.png b/apps/remoteStorage/remoteStorage-big.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c429a6a738ddb19638a8f7ee540866e0d501e04
GIT binary patch
literal 9742
zcmV+pCh^&cP)<h;3K|Lk000e1NJLTq007zm004jp1^@s6Z3uTt00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1AOJ~3K~#90?VWen=0w&1Kf`WVc5z|pO%M<jmnz6lU{^uVrG%xt
zt_UxJporoNFI5mk#TO|`lP+Rog{6tqfFMm_0YQ52AXPdnZHYYd`{N`$dFGj!OmgRb
z+U9#*x$b0gGMVI_lXK?GIcJpCnh}RMnj6>y*bz7e_&rJ5GpKE9F-Jp<I7W-3sld^|
z3c#Dde8BC%o+RlFgW0qeb1p^>qs7rg;8@^Gh0+&*#S6#h0{fGs{~E}qwP-Q?87+<$
z0Db~|7Z`1veH>WcD0>$;5;%$^eW&{kY|&ykGg=&t0(L=|Y#|5LeZWeNb58>YlB8#M
zp>-`<^uh3Cv^d%TF>*{Sq5LQC*%F$YfW1i4+nZ=wixxHvFGh=_<$+%Sn-@xb5Ab*3
z3!d|;P{(xOM<nSB9ksDV3k!w^qs7s9;0M6&z!>AK?*Xm=Hu9WT#_=rR2;g{<^!=*M
zY|+AnxdyudUc`|ij&?xCTKghQrYmgkc+O!d8xI@`+?7oev}n-?hAyMU(K^6P;51-S
zsxeFmqxrVwfIksOmuJ%kEn0Mhp~q-(v=ni4I&dwp2K5-FQ%1|TF9Np`N5>II3wHU*
zTZ~`~oiSP*jRp2XRK#)g9ecU<ePsYA0smtuH^*kSGG*+)3j7TCHA(s($NgHguwrOP
zv^bgu+y(p?7>i#ew3WMPJC$g~x)(sE6mBJsHf-?eTg(A4Jt+njakM((mpF<3otwaY
zU)ejBa^;{6rCAY3h@(ppcdo}u>T1zqkR)0hEkYcf4BSXBlVSYUl|04m-43pG(d56I
z0e28bhZ9Hhb@)bFjBpGrqs37~9PJ6*3w)Da$<YK;bwhP5yHA9SEAJ(ab|Q|3hAQ4-
z$YJ0*MjUMd+<{C8&rkJ^PDOefqt&S+WLp$C1-OwonpFQKwHT@BzSS{~Rs@a$zKmN9
zGt12LW|_H<qkKo;4~1i!wb3lM?N|9#z<Iy{B<a(R`?Z+E&^<<rqY1!|knojJS*ee?
z%6`p#+p$@`EpS%0AHrnjaa9H@?!Su|dX8?xaauI5I>yl`;^;fT{lISYWwJUdS}2`)
z4T$PU2X%BpHxF<SGJe}8<khtpxoB3R#nJl6T+_;wkF#+6R#6$t8ov?ZSnNZn+L-TG
zk!r>LHXLUTMl*~SN6P^}2eu;2m|@!w`8D@#$3=Vr36*i7TWX_ke>!kb8;&z)p)*E{
zqmLlrD|^!4vmVbe0cFKsSDEd&i2n!N;yLePv`~f%-8YZl0uBR?Yr}Eo4Af(^I8wmZ
zfy0sHH)UfMO7?wac*<<YIeLIKktqcix~VpX96t{1OOjsfX=95Kfa;7EM{5JW1lFS5
zFyK43?T7sO_KSEQNn>!g<NQFVjkaT3+10?_B<a15wze4N2xqi7S_+wL{_m`$iWF;d
zyk_p(jsf0AJ_h$Yo~Tns>y+8d@*dz+;KwBCtBy9e7^Wy^v^bgv*atX(-td(&)3#ae
zJ0_qEPnqo);0<Jq_K@Srs*cY(Wwua;dkr`kIHe8889DIJqe=M614ta!I17czJg)K(
z$yO%SLKwWby$_@TbfN92T95A?*{;j6AaFdAPT|Y67!j~bv^ZJ~I1X5^P+FyvhA>Fk
zzVFxEw;jI#tPMQb{{g$IHg+P-%yNKBkn!82mgi_OOwd=NN%+dIkX-dPCbPlyb@r8o
z?034Qnd(*LnzH+cwmbB_*xspGJ{7o+IQm5!jx&5Aj3(hLdjXFC-@&a?`Z}PE##I*D
z;p<$RZ~6R`sXm6(Y2F_Py=y;|vC7_Mj=6#F0}m5N-)h5gh9Bn2!dLD=T&L!@(1dh`
zDqrsq2@xV`e06Dr!9W-;lsW5c<}=vZRra1-G$s}UeuJb_nC!T|#Sp}3;2dOmqbew4
zzB0zM9sBlezvjMq{GY<Ft5a8jD%4ZlcOBc>R~&n}+GLI&ZCC^e|5@R~i<H^|8CTmd
z8+ZvZY+VLithN5YdUK`j47k6E$y)2Tlu~;jfv`C?)mpozS8Vs*3^=h+w7b^&5)0k@
zz*m6{fsX_80?z`s0n@eC4;b`20RI=-4i64R_{HbeXG70uBxxwfr0J5trwatWueb>x
zT^*@r+sD}VG1~iuUtgy-naB0(qPNvmEVH$<c+P~6Iqw8sM~pmg7<BUjA9K_R@JS?X
z#LmD&N~xW-*0%NHR`b;1LLQ+p!DvH_dmht<Esg8vH3^hbJ0Z(+ncCMxB<68HrPTgf
z>!S+i=EMJPLNOmAoT|Q~o?O=-k9-~8LV`4(D7i3{0jn~dPc^gA`s&M7$J9e#XTwvU
z>;3rNOUOs;K4ht>xq<bO5S&i%Dc~xl)RYeEDZ?fe={NSBR7&jz{0{pNC&ygCkxHpk
zE8e@SFbCCZAr8V9Ao&%aBdjCj2$gD8BwO9h#%N72m#wX~^C9oVg`DnjWW9lz$p6t~
z*5on3ACywvv}8_JN{ufk1Etiez*3&`6A;xc6uT&;hD=%sTe`W?z}~>4z^;fYxi6v?
zK=rS22;)&<zxZqJ7t2gWv#EADTxwv`<1$~Hi+BNX*nSO((q6KJ-iGTCZype)S`10;
zP?R!D0N(&k@YJ&&y=u4%Z#l{%WChj>O0I`;>9;4My5&fb@!TcA2f*im{pq__-cNuj
zNNS0HI_mun@?LVx!2Ld+vXsq6v<x4#E3czQR?55(iJw{r*a7*v+B`&x*Of7#kLhgZ
z%YM!M{MckP6Rt6pudK?r%+@X&O%XX`U4$%8HPu5~hF7)LHydT=Dy3#1DIRicgP+m<
zp|ze}vkf2&)C8mLZX6%3wf;%r`0q-o`+-XfWnWfGeM)Qn5b$qXrI`Vyi03Tttw?XC
zhX24vpQCI(MkC=cHy{#jMdT|oo9;?A+i_J@uV~)yq%K?CWzSNkBARq>Ar9LUkz6A;
zBZh>Kx~jsozOAm58fB$y2BqV)OnqI~bADmOH7&=xNIYL3Xsr|AR-^cnVa@C=LMJ{K
zLgsI#BWcxE1<pW3wu!1zt&GWhb^5l@F`Db%zBbsNBlJBKX=ei`BMkOuL=8F`_=u&x
zrtlEG?*>FeS-gw)`>0ZCl@gi_5jE3=WsKveJW}?-l4}PAHb(PxkoAx+#@CR<J8L28
zWe@HS=d0Itj*@-z*R`4RXjLVZ?f$m5mOYydA0Qv9)sb<;UWmb?Z1tRup~bn?OrtQt
zM%y6Dq*~eeevIa!eZ1t_K|vi?o_UZkj+wv&l5~4yFnCRNzDh^&b=tDJ%9zB*Xd&$^
zlX!KcSr77I`W#8RE24_u3hY7eT+~3olm^|tcc+YIj*DLL(7t3GFJz?}V07X$Hxams
zI64M+j3oUpBp<!0BNtIes#RsWe5+&L_qEZ*SfP^V8sLj0={JDaiKE{k>f*;7^xec_
z#<4m1-83e-rV*4<D+3=bx!yDgH6q;y5+<Wn?aTn*LVWKwCrM|Lq#Geo*!MZ;O@wr6
zbKm@}%V@rOZ0&H-`JU+?z-A=rG~n)Rso-0HuXx(!Yi~!$tY*cztq*Wm<Qhb7=C`5h
zr1r2xQ(oYU1E&*5XA(zClB8E4>g2BU^)d<RKxIr8Dvex>R;3<Sn?j!FK43eNG$u)J
zB91<R7(0%m{+Or<X8X2r{GitQy$0$ngNvc&2u7>2K3d2ZcVl2Oar86bw<PKL#L-2_
zyv<(pS6N(j+sd)*W1-KHkI`K7XeO%8m*wRq9!K1zE+R=aaWpqF2HT6?lzhJHyMoL_
zJ_Sh+Sj43k@**ZErM&ZKTI<&Xn$VA-GOv;09)+MXuN5D>6V`RrmU)pmj%mcv-X!UL
zz#oaDbAg?ZrEVvb)bC?DurnUUe&~d?kBNLtVP5k*k{#@v4|9D;#;~K2xtuy4BCdOf
zV2V;IH+9d4c!8LBA2_X~p3+3GN~sB2>#}j)Qc9^+wbsR~WMyXk;efG-qk#`SMMi6M
zEC754xH5~_K8hrL7x)!%bSAJ1GPWyvXE!0$Y>ZYVOeWN=s(9{IWUcJ!B&mG)<7j?l
znc(ecMm;z0AHsMaL7azuI9zKzkSmsMO5gN<bA;Lmoppi`RdN*YJ>Xj6XgvUubQVc^
zH1K(361?bT;;TR8o<$l{b@bH%{oCOC@My%F<5*x4NqSm=$+ke^m27GGI?)uGMi0>K
z#I2@}q{&$3@rcdZ9Li{&c93O&8N|_v#F5NvB<U+8=^=>G<Q&BM<-1Q+rmJFgwAJZ)
z_V<tv#OF!UUy`J60}w|aC64}xczP^S;oS@t^UVcZsFdm#^JQRmz~;jB#__sY&?ZW$
zm4KxS=RQCd0vV1ddq3}mdWLj@Vm(_R(rxPx&nD^fB<TUj$}frKej&_ZqpLGv?YbXG
zM>rdq3p<P?6}?=RsoI5no~#)(@&2zvoWa*YOzYpJzX$u$h=-34^J}f=DcM}(v)kx9
zbubzU&V>Hb>?X>`Iztif1iYVli;ULEpISvVngAS09G#u5LL*4hCrHvg5N5p2Q%9&&
zv!yZ!VJ`DtJ&0L;Ba-wWlC-zu#L+5<`t?J^W2RebVx8+>)mq=2ZC7ipPenpW&Nb+E
z?4Vs`(7<1evQ3QN9G7*m9fOXX(W?H5O?05Ofxi$(yAwyfmZv0rfF#`oF(lmPxu1_w
zLR3ey4%>aM1GXed_aRAp{p;dr9C36I68^DLg=g-R0Xur<TI(JpuB)d|yrNR7oBn_%
z18wXu>(3F47J^RxWLF1^kU#zs;%Lo2S0w3eB<a_Yz&tbWM2KXv8AC#t6vU0}ze&<v
zNz%S4#pCFU$X9wN<o$Ijt<3gx6<X`(foF{3G8d>$a3#I}1xOI<-bh-89M5X4@9JV3
z1|1<2)^$2T)i3r6z*)r6*}#z`>8uaWB<c0U(GAFC>u!i)#U_O?enZXsMU(#h!0{yM
zjs2+NXc1&h?o9}v6RSG^Rji|%liAPE*Q<SjZrw<0{kl@>CdA5|V?TqeOq%r=$36iu
zB>f_N4eo@&>OdjkH<uGfeUr2#sm|QGwm>2WUZ6iCo5w|oW;<Uzegav@W7~dA7Dp;u
zgZgqxlE+xkiHhCL4r0a;b~_=f$w+3Dei@^^XdEx<p*3Uc%xeb)zKq0G(1g^>uU{BA
zmN+_@IO^-okfc2%=>@>%h?~=^MqR~yo7K^zeIAJi`wB^V6-nCn8RBRKByQ{{$OLew
zW7E20vf&ONBfSq?RdW5mjAP%Ja`}>L2L-0;*zJx`rIW4?tVJ9h51dJo_NouE9PJF^
z=t9J3vK_r&$-Hit>Zp)-CJ9qX(qgo+Adbc$-YYxfcM+<q>gCskUZX44Kct|wzFR5v
z4EC|$^;&CJa-SUi7)>cPPHX*+h4$0N@sMD&x+=p!eVNB1`uq&yXvKbKlk^>u^fW}J
zJOi0b&hM40M@5PDCNiPCB}saYgUQwc&PN!nuG4kZYnrAVin!cSUTSU3=INd;6paCX
zYSJmCzKTSx=jcJAC<Yy-uVd5bMB){%n}`@o#PcFa`-XKS=^McD#L*1IhjJ=?RmXRc
zlw*JFV`wQt{1f*<nAYawIHyXiDN3pSAEdsxN^4!VXyRq`57EiXL+}gwX6xEpDYX>B
z!2dz!2)|`qbB@-!+Y)V*QmSn1{-O7NRc2_CE|h*QB<0<P#L;0S>CAo<N%}JIbK>ZX
zLVdRZ(@0Wx_<I~}isY^|L*`xW8%zcoXr>JDhnzrpl=fA~c&upFe?n_*Cev}@H%Ok!
zJjdl+Nch#Z4*DM8kifb-!5G}q`op$VQH@||NWCQx>2(DX70`dZ=Olf$ux}=7>4mJz
zeIPP<KG;hk4P~j;F|tK4{!ZUW>)=Uht@V3Z-u?6Fn@H7$9$-Inv5Ub(KH=Ilx*_#U
zhLjAnakK?-RIP)Gf8sX~XXek<Y)dz2M><T#s^kr#wZ0PZ-Sn+~`X;cI*81p*ZR;wk
z4)zBNu6xgi_!(|O939@rP0EEhS_zS2pTIu3IUL4Sw)gQoa7E$x4$t+s07Z*kajxla
zHQJMp&mJ|}@Q^_#KBIyj;9BGS9f$!e$MfcmwAS}4rB*~fv>PCn%(>}Zw(0x;D`pW7
zm$cbLO7(Ztqx7bui#Zv6TPR%>+9v7VM^wp+oR1qvI|JWD;^b`WMk_?hyUx|6ZJJI2
zFOsCTsOc6%5LLz{gE@XEyLSqlh4|I^a31nibxFu7&p6ocW5kZ<Mj}SzUuC5(LhGz@
zZ&zA@TM_@rCjp3~`AE{fE0{`xoVl`TfWwKSi;<N_ij$k&VzNPH2&L3$V3Ew3*hTXx
z>bLW0t@YcEdOuR8#wn%7(cjZU121Z=YsaT$c_e!(s*%O(L)tzb%VLQZd{EWu*e#}{
zLcKZti@-4?>0g1InWh0d5=XHy8NE1g5^?lvAR$TbBaU_i{tHPK<XhNopwK8oDy4Qo
z(kZM3j8jUz4BQSJrM3R6L4H5=t*$WzqlQvy8zjbUHDGb2)Jwo!z}Z^s-&(F;2Zsxm
zQtJ7vZ6|20-9rL9&O@>me?9a9rPOzjKC~LJh*Ii>tnJga)-x=Z9E?OFl;P=|(W*+8
zrlnOC`aEy_uSwE(GK=Gvk=!J?L+M!hF61y4NiXn2U|Ztoc#`yH;7`QS)kr$H&GC2k
z;`k^O-H>M9Ix`7&0uo+yHsV?H6k`0@0Qiei>M-EPSss3}a$CLQkf`?`Ac<gYxI4S=
z7$iy2H?#X54m<`dhgfz`Q%Y?J?Cfxz+LFF=aSI{qQ?HGrTsQ;RMQi=8@A<Q~j6xXr
z<uclgem=w{Z%g3xY<mewk2n=LQz`XDU^mO+8V@4*OMQ5+DA9(Jw8~*#cN=gRNh+C}
z;%E(oNhZ?QFftEf=FO2WMXQjIoD+znTY%$8(uaYAiK7b;Yh=;Ys}6G&ud71e6n>5@
zF8Ecg_4&rRW3#XJuMp{W0f5%pYDFuo)_ITC`nr<)?utl{uV}5!_0UdKN=-+iyZ6Pu
zaQjTHwUsfHQd5zS>%GYHm0?vR8}oRj)Dk|mIl~W;3|(s&>F@xiE2TC<CZ!($jxo;9
z3V1iQ)rC48sZM9guX_bJkR<&UN%|OZv}~61|1|nWIOp`{8qf34pJ_e^oJkxVOdKsr
zlHP@Q8T=f0yGDEKO1x0|Qd*_dLWm^$sfEb^$Wj_yhIFn*kV(<KfZtn~EWhtxk*r~R
zD5WYbOQp5WGdzDkaH-zO$n=E<yvyrm$xnAhQtz2emf!yhWVy2alu~1DG-WUut=kM#
zwKL{w;#86}A&wR#jt&I=MDKE@Hq*C{(TdlMLR7|!iKE?su_WmXWU-D*y6`;abyes?
z@NGn8KBa{2NMKE+)M^#l;KPQ9LF1?rx|0y&!Im}d@k>NXZ5lv330dvvK|Bi_X4ncb
z3LaTPcQ6tMH#Ok?{os;l-R?NWYh0c6cEm^V2p}bnzKx6*zDBRL)MT7|-(<A04%#BU
z)GtAvuV<OLb^so6w6zln-7WgnfNQnZZ<f&IxmcE~P`3}u1Fw`NW7S%}f`qMnyy^|K
z)~_NS{2vP-pNuftOiCmg@(yk;TYo@n{Sq>{UF)5dg@g|T!<pB=ia3vM4?Id7ZHcHl
z|4Uy}s@dU-$EJ9<sg5>=SrAdFE+URLAW3gSER#nd>SUeg=|t*P#j^Mp=>tG(JqsDb
zE?q_&h^6VDhs1^Fk#^RBnS!Aolv2wAOCd~l1Mry=b#H0HSJQcpn(r)RjMjv-3PBHW
zCa^I{dLd#pIv+R`vHrN~3{f4&I_PXnr;xAK3B=KKU?NHS2gG&Aw;)8560h#Z>Z4fP
zmK=DFUQhT=u~b%H2>wld27i(AWq>CmLymtS%oZV294;(L_(${&YQD3oo*_+iAlr5)
zuoX%AQ($r8=r@SDbw$TL%NWKd(QxeB?y(kdZf1BHLz3=|NZQ97_pgg4>HwHUxLUR|
z@P`KO3DTL%V%Bo}hx!X!EJ(S@eiCrE)_RuK`cZ_jedDyz^iTfd!hVRhRT(*>4TQw9
z;WcEA=BvQV#L;0${L|+RIv-P+=OIj@nRWQ?6C*h&e}I^HV?>>_%?J75ld4s(x8V``
zMi@JxwVtW9E_0wAYFLW$)C7}(VuGcRaas_x){oSEXGMwD3Dfwbl?^?>3}mA8QY5$I
zHNe)`9e!>1^4-^Fb#&32<*w%%gGhmE5hKa(5o_CJCC}f)2PyRW^MKVe@AeUeY@D?W
zo-wFWY5`=rrx+AG6Ie$n)r7`S8#dLk$qr(x?;gaw`y<3u`!`^B`m1}c>#^*cbY@+q
zM6=cFDmO7da1d}c@L7`ddx)!3lgl5~eg9`6p(fL_xvi0eU66S(pX2zt$oncX+6{=8
zN!b!sT}9{^tqJCP1JQ4%A}QsrL>4SuIPg9pjFN9=-oSC5y2~V+>$;_Z6SGWQvk^D2
zBar+gRnXXnO>6xD;uW$AaJf>dDPzZ=LMinLWPEf=W@dL`GVqL%C*%&~KWRjLtcy;*
zdZ8UcBff7xL#$$FBNjzl3IktWj*vjhoTh9Z&GqYJY#is-0RD^w4<3fNH64OT>u#!(
zR%opsQc6uhq}x48sbhhYI`M=bAk3qbD*kT^BT{Hx<OBUM<?dJcMD>TzTBk~>Te5m=
zPR*TSyi#iY5}JO#jyan0dAtWPc07-y2iwY1zm2hM?FwN)m+DC1Z>Ur&Vq-+AodJA5
z`#p^Q2|eqe5_4*;uUAT~jxhWI!2U|9-vUQ#t)KQ^J!tT?>l$D)pF^=yYHq|zY^ECr
zQ6Hyu);uRxq<^HiiKl&@A)S1A-$ef4X-Ka6nZQ>Z_1fz9b#|~bMR6+|qlMJtYKN_j
z`4%DG>o+6n+eXM&*yVK)BJpZTJ+1Z2TI*dA757l&zqmh3a5EIK3%yybwnd!9Pesxr
ztcRU}iuf#|$@I^TCS{+>d_kMWok+qc-?nBI)iLxBKL=40V`S2>xG+4_mu6KEBGIsv
z`IxK<1B^!^0d_*hZIcn{mM@Ue6}8cZ%ysDqrPMLV|MDB9)CyYb#+-^9!UZ<({Y+9F
z2>e(n^|03ZEXVbek%?#9sx&tumhN>4@L^R-J%(7nZMaHny>sC>)mpz$R%erzsr!)-
zh=qZRfMw}F4s&%b7fn$uEE}U0&%2Bv<~=$cua!xlC6U;$`;h$o(-Fp7&hs2T)Miet
z_4|nT`D4H-N~s&P)@At!2OU|v4^~Po4jiYH`l}<HW)kp^%phde@rF|BzKkZsS^RYD
zhQh7!FR<Z+$!K-{$XSSLatGq!ycX_UjiJ)4jM>az6F!M%-qR(`ie<j>nhhq+Du|Kf
z8YG+UMo3tR&o!(O71D&(`qV7G>UT=1Wwh3z9vy>?-2Zh;B$=v-Nx)@FskI%~KSjAG
zKLA>5Tf7`fsa2@y)zYa%I~TF!d>2uT%95elI!lPrqiSlmx{Q|phNzNQ%F7sHLu8Wv
zOr*o?P4%Uqn!t&OVQLBz5i#VUwSG-0^#HK4c`kD#UI<~t?LF1Jr<95Y<Kt2{@bf`r
z1(%l*QM^UrT$L}fPhynS<r_nl&7+01)5m00p3B@uA#+_9AX>oAG_>N0Qfiw(uaH}j
zF-w(YfrkPfz~1I{k#vL0;4w%b#*#G#q@@OI63zETehUfi>p_AG=cB(AtCGsCOq$hE
z8=+jH74PX|a<i;>>{BO0r0+OH9eN1~k6#Q41sdb1FQm>RfuoTRp%Yr`SxTuV5kplI
z_z%+V5X?=u1G0(N>Ax%!2&3ImGIjAnmh5K|ee<8pCcN!qsP2#eRFi0bMiQ><gp9>p
znWI8FNtr~#b1r1-Wi-i-<x80Ay0@<lw&w_a4<_xR$P~b)h+A6OqI^C)gDjXBf<*`q
zZ7IW>h{JCP7Dt@Po5Z@nO#yT_(|?@y4B??KOClMOE2E6j6fz@!1h6bJ4*MA4ov2t(
zNJp)r-ubqo>NvK;x<VM!Rlf^1+KI^0L=hsHo(Zh02-jkNeQz$#x8so|g`2>OgvXdI
zfh>*O2$WLuBFT9AuRGo!H__h}>uJK<zBK-cbtili*6$+T4NoB|&YA)BRh4FDnX3*Q
zzpiVFs-w%YXS=Sf%+~(UXANbV^%2jK+mSiRDr(lFz=i>y>YE_y|2-Az_F*P4zfx*d
zACXdO38b^$+|YeNk}QoPT%s+mlq!1bJOV6V<`<fceHX^Rz=jhpM!ONX4%h~<O!c{^
zXS24^K@-xM%kJlD!)W3tH^bWUg@j0{s!Ue)yuNp0+qTHIztEfGqYS@7G>&h&2$WKD
zA?X^<Zg7#l>yZvv=Do2e;#}V3{M|Z8w&ajh3jahtTt)TqLL`00UM1J=2Ru$qE3L_B
z&ml~<3gX!jQSEE&W4_SNU6;XJQmyJ-RTW0`eK<nii3`PN*c@0E`C|J#*U?%(g-o{`
zk<Iz^tyI#yorU;cTIY)DAe&U)75JJ`>U%aCrPOx7Zos~ow@On89iNf;O5R05eaw>b
z90&Z5Qp&ohVfIYh1BV8zY-&Yrb$lOTvhjpX>bW|LX>nARb7omt$Mabkee-Q&kwJRM
z99nVT_ZuSR%re{al`*x6g^(}zzY$g5XL#5f8Kd5*lsX@ghVLL5vc81;=U-?#x>{>}
zl~U>`-~^@A*2o9Dn5p<nNZ!ZOo4RMFBCmsGJ!=nc2EJgF9feqZXDFq1KqTLjNLq+V
zh<n$;NU*Po1+z5hKD<2|VY1oCSJOl&L%C?HPDY2gT!l_vk1PDTn9Drwl*vM+xv%{`
zy2Y~JH<ACXAF{9ZH<VIWAY-xZ5X<Hrhzr=sA-;J9%tn&kltOELfKuu_Brxx!W;_4@
z1%F9IK~#1cVwiajanGBqwYE9@_GI@6K}z4}UJ+P;K#7*&Cg6KYsrmA>eAxu{o=T}}
zkhB_GAX5JkL<0Vw*7|BkeIG}(1RtJOdehOHAQ@y`5vaDc$Xw-R=go3T_I<zRzInVc
zN%{bBGzH0MoTDzI<-Z|JW*(Q7m(^wBc3=;Z^ajWI7DEhkk))R+W3s)mFZdnuH4gof
zn`L;;g-8qEaW2uC7^8(UhV8jS-jj>Q#J>?wlC@eU8(t7&NRp-`>9NR)Bd6j{zvb&}
zHX2u1Xy>hSZN9mTAt7~|_s2o++AsUqxX!tl?|o!$?UN+wZ%NY7^k^-H2>Mzblk_E$
z^t*^Z*xw3gLchReU-hb;wUe!m)v@gUq3sTRFSd7TmR|y_M3U~;Z-K=Y!v^+wv?RTY
zBwZgF7(Q7z<NE@KGF&$p%yxawXtu;WP2SJ<jAb7lS35uq2vbPX%}LT)lcX(%4*V`y
zN%|+miSr=r$wEUqkMGz#S1dDst1^mdb*##$zWawVpz9sEK1v{yr~eDA_Tg%#ErvbH
zor;t6J(BcL#434aRvOZAsxn3yO-LPe87<^KSk8y+hcK8z#>FQCpCCz3AW3UYjJ6n>
z2>0Gk(q~E1?U4z*TPg2IzGK&Zoy~Q9lb#`E_w_xGt$pVEx*GTlNxB<J+N9S+iy?yQ
zfuFMW^E$|a;4e_lTsY2~v^J^Xqv=$lh1OF>>wBiM_whKgxW^Qd^j=zwSk#NKPEt*h
z{t=m(KLVNA50!4_xhAAq9YzajgX=j$+Ut7<Zy^y8E0d%b(_+M<ZYl#olD<Wf9z<{Q
znX1eaLQ|I!b4HuD#<g|Y<=dyQe>(7KlJrQD)apjnV&tKjbaP4i1h6%6v_2A+pC?eM
z>c?0-SH<Dj2A8j+2^%vM_sue!WV4+!_iqCBB1v!ew57!eMQ0MtM3P>Iq?_9vcm;pQ
zYeF3hk!V${j=uJVwAc2m&jLG;r0cazHs_*QMgvIF4@lBek<k1T>Gk{`NVO6AS{>`w
z(FxsqNM_)bNz$_e-(HImisl(DN0PoylJ0|~K)8zLq*_@A&&zG9V^fS=R?m6BDkSM4
zBx%)EL0gPKbbqnBBz+Lrj5yi^ag1G|aJJK!Gau$H{F=;cLRHvzeHcI%JlKaMwZ&bv
zn1j(hiDp8=aXy1A<MamAr34k}O-8FzN9gt<63V}B%VaHV7&u0QJRIkjh*k1;^h&Ny
z)HK&t*9EJ}eNrT7c4d<E_igw}3m25uO|3at197xEl38~W<q_0n*^te$7Z8RvR~~6f
zeY_OdpCoN^?dldI6oboXIpSy<lALuJ><r~gS>P&r6R~{S(vaDh%`CHx>lBjzeP5E)
zl|!OMi+&hb)zJkB$5{<Yf%Yzbwar#;D;q~=YNJ{AYe>3>wOS@?Q58c&q7@NGOCi$j
zYlYIPYGaNyaVH-wlWO_?2grI{KW#nhThztSW3(J`v<@<UTa)^XHU+rSaV~_>u0hQ8
z_xl^$qJ<wrLv^$vN%I8>zKxjA>sSUC@|^Q+PXN<M(oI?>YtaOTE~7ynjx!xueC{av
zhU0{6i+IjqDVv4lrC*IC4O#2BMT;N|ZAQzHq_arU9|Ef*S)oE1ZQ(#VkSx9{lcYzr
z;VUhgM)zH?nnaR54ooACHbBC0CgPqKgI-4Sp$%VY(RB<DiDn{6uR)9?dmve(>Zp#-
z(1x$H7$6K!MuR*Y=M*Fz-bsiVK7`TU0}i1LUuiLb7`o>Ds)(bBh~MFt3Z=IrS(kI1
zi?~fSwE$m>7C{&}jFuygrXuriD**pO+`4WD_G}l1XfaqAd5i`SM{^_Nx9xxvfY!6V
c#h~K<1G@<3WDEr%@&Et;07*qoM6N<$f)Gml(*OVf

literal 0
HcmV?d00001

diff --git a/apps/remoteStorage/remoteStorage.png b/apps/remoteStorage/remoteStorage.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b751c09997e82ee88ef5a78fc7ef1bee3df5b0f
GIT binary patch
literal 1273
zcmV<V1P1$wP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11a?V8K~z|Uwbx&$WmO#q@Xv4WeVx2>WuQN(OrePsSBi*Ybc&gz
z7{R8A-h$pzdP$ftrcw}^A{a^;>0x?MsyE++2&X{B9;AYDKu8mPDKW4=Y6?!=nX}LS
z^|04I=iGhnb;dioV6oTP`?r4I@A|IaS-;<k%(SC+>w7+`n%)b#`a6ER@%&EQ#M>rt
zDE3%s?h(F;X?a^qKQn26<gt9?-68OUsQhW=Hu5;$hs4?PbvFX9636YE{KEIMd*=vz
zY2|=)A3lywNGUO_c8?HJpu%5-V;-42d1(X=$2F{+Aisicp=ar@6wCMP6&MJV9=~F8
zx6}FJ+avJhST$|Fi#xF*OyvTBltSX=GUI9~!~%g(Ni`<8U)}!1uk(KwCUCg<8r2E%
zDohLbw15xKL4kjiSsxrJP!|$)AyE_mq`TYc_Mxo_9KP(+<WI35Z2_B(#^Y@mq`k(H
z`~$FNH2x#;EvL^vr5Ki$4-k7tAe&d71Cf}Lt*{|%kZu2NOSMMCV{ebuw`M_&Rq|^5
z4!eX;mVKXtM@;FaWUoNlD08QDT`zl8%k1^&=Z4TpXK;=@$ZX!C0y9Dfu?Humr)SJ(
z;DZ9uO6R5X#9RSgAvz1#r*X3QJUCkP5`jLr!gbP7RX#%=!wYjc3s7i9Z1jDIlUR(E
z7sz9(d`3DdTxTA<n^rs~(3L|bWqcK%6M3AhW!!-)(Mnyv`kB<(`-_)FcM4M($EB;v
zcBOgnZb@K~T`u(Z%IYND6Qa3|$!BzNyRe7uTyGvz=`~gUoRvSw$vsq`C!3M4G0rwy
zpm3fUb}1Z??ZdKathGl(oD%VB>8Gr<M`YE=_F>@w-5fBt2H#47?Z+93UF5f&UAaXa
zKlG`|FTt71KH}`k1LVih^tO3npO$0bB3oXsbI70ltNcDhUcVDhiv;2=$B`i;$TN79
zIBZ(~2h?sP@5e2~O}*_!__Q1YG5Z(`V^zp_1rK6_xJ%{@s_Jr8b-BzNh`ai49_($a
znE4E`<bN9l#)g5E-EUN;#5ZKn=Lc9V&p!Exn}wUn$8}kYI5P6JL}DBReL|TR7k?%H
zCgKY+cF_$dUejmETrIPPtXIjbsg8&|M?Ow`7@sIUtG7~M&Mv)y=kOt7-8?JSeE`Qm
zuqTk3UV)saVy+;*i2vd#X&oQ95P>9LLWsCYY7216tVN|9W+nB;?lP^Jsi&%Y+gVz^
zQrIi=-*}0*b~^$Syjcv|l2(Tm_3O<fB8ZNzlesqA0#&a-W?zUb7AC1GslMqkOa{<}
ze?fd5&sr`jHdi?PHq=BTs@<a6O*H*G^%D5}IrL`>R*!m#CE4%Gtk2qENj5$QINd&^
zo~+{pCUUl_p`>a`&^5xEu(s*lP=d|DCpe*=tdGIBR$!AF7c9%4E0*gc1un5HAGhr<
zCVwv$*Y5OUvb+UbwMQmT+Sl$Uj^g#X+<8UcXIt<(an!zc|HXiF>6g>tqOtn!UrxuZ
jzn=dXboKXkdOiO?hWRn8&NvS%00000NkvXXu0mjfeUWAd

literal 0
HcmV?d00001

diff --git a/apps/remoteStorage/settings.php b/apps/remoteStorage/settings.php
new file mode 100644
index 00000000000..fa85f77a535
--- /dev/null
+++ b/apps/remoteStorage/settings.php
@@ -0,0 +1,7 @@
+<?php
+
+require_once('lib_remoteStorage.php');
+$tmpl = new OC_Template( 'remoteStorage', 'settings');
+
+return $tmpl->fetchPage();
+?>
-- 
GitLab


From e10402c61b748857c2d9acace60d632c87d8e4ac Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Thu, 1 Mar 2012 20:55:20 +0000
Subject: [PATCH 235/248] remoteStorage app version 0.5

---
 apps/remoteStorage/templates/settings.php | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 apps/remoteStorage/templates/settings.php

diff --git a/apps/remoteStorage/templates/settings.php b/apps/remoteStorage/templates/settings.php
new file mode 100644
index 00000000000..9b5c3b6229c
--- /dev/null
+++ b/apps/remoteStorage/templates/settings.php
@@ -0,0 +1,28 @@
+	<fieldset class="personalblock">
+		<?php
+			echo '<img src="/apps/remoteStorage/remoteStorage.png" style="width:16px"> '
+				.'<strong>'.$l->t('remoteStorage').'</strong> user address: '
+				.OC_User::getUser().'@'.$_SERVER['SERVER_NAME']
+				.' (<a href="http://unhosted.org/">more info</a>)';
+		?>
+		<p><em>Apps that currently have access to your ownCloud:</em></p>
+		<script>
+			function revokeToken(token) {
+				var xhr = new XMLHttpRequest();
+				xhr.open('POST', '/apps/remoteStorage/ajax/revokeToken.php', true);
+				xhr.send(token);
+			}
+		</script>
+		<ul>
+		<?php
+			foreach(OC_remoteStorage::getAllTokens() as $token => $details) {
+				echo '<li onmouseover="'
+					.'document.getElementById(\'revoke_'.$token.'\').style.display=\'inline\';"'
+					.'onmouseout="document.getElementById(\'revoke_'.$token.'\').style.display=\'none\';"'
+					.'> <strong>'.$details['appUrl'].'</strong>: '.$details['categories']
+					.' <a href="#" title="Revoke" class="action" style="display:none" id="revoke_'.$token.'" onclick="'
+					.'revokeToken(\''.$token.'\');this.parentNode.style.display=\'none\';"'
+					.'><img src="/core/img/actions/delete.svg"></a></li>'."\n";
+			}
+		?></ul>
+	</fieldset>
-- 
GitLab


From 1471d8f7109a9f6aa322a67a19e03e8faf37c985 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Thu, 1 Mar 2012 20:58:14 +0000
Subject: [PATCH 236/248] remoteStorage app version 0.5

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

diff --git a/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/WebDAV.php
index 3a463a21a5c..cad465181a9 100644
--- a/apps/remoteStorage/WebDAV.php
+++ b/apps/remoteStorage/WebDAV.php
@@ -66,7 +66,7 @@ if(count($pathParts) >= 3 && $pathParts[0] == '') {
 	$server = new Sabre_DAV_Server($publicDir);
 
 	// Path to our script
-	$server->setBaseUri(OC::$APPSROOT."/apps/remoteStorage/WebDAV.php/$ownCloudUser");
+	$server->setBaseUri(OC::$WEBROOT."/apps/remoteStorage/WebDAV.php/$ownCloudUser");
 
 	// Auth backend
 	$authBackend = new OC_Connector_Sabre_Auth_ro_oauth(
-- 
GitLab


From 3d3190309f85a3b66890763f9605a6919f52d5f4 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 1 Mar 2012 22:04:13 +0100
Subject: [PATCH 237/248] Simplify stripping the last part off WEBROOT and
 SERVERROOT for 3rdparty and app dir

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

diff --git a/lib/base.php b/lib/base.php
index 0df6631df4d..ee79f08eb22 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -181,14 +181,8 @@ class OC{
 			OC::$THIRDPARTYROOT=OC::$SERVERROOT;
 			OC::$THIRDPARTYWEBROOT=OC::$WEBROOT;
 		}elseif(file_exists(OC::$SERVERROOT.'/../3rdparty')){
-			$url_tmp=explode('/',OC::$WEBROOT);
-			$length=count($url_tmp);
-			unset($url_tmp[$length-1]);
-			OC::$THIRDPARTYWEBROOT=implode('/',$url_tmp);
-			$root_tmp=explode('/',OC::$SERVERROOT);
-			$length=count($root_tmp);
-			unset($root_tmp[$length-1]);
-			OC::$THIRDPARTYROOT=implode('/',$root_tmp);
+			OC::$THIRDPARTYWEBROOT=rtrim(dirname(OC::$WEBROOT), '/');
+			OC::$THIRDPARTYROOT=rtrim(dirname(OC::$SERVERROOT), '/');
 		}else{
 			echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
 			exit;
@@ -199,14 +193,8 @@ class OC{
 			OC::$APPSROOT=OC::$SERVERROOT;
 			OC::$APPSWEBROOT=OC::$WEBROOT;
 		}elseif(file_exists(OC::$SERVERROOT.'/../apps')){
-			$url_tmp=explode('/',OC::$WEBROOT);
-			$length=count($url_tmp);
-			unset($url_tmp[$length-1]);
-			OC::$APPSWEBROOT=implode('/',$url_tmp);
-			$root_tmp=explode('/',OC::$SERVERROOT);
-			$length=count($root_tmp);
-			unset($root_tmp[$length-1]);
-			OC::$APPSROOT=implode('/',$root_tmp);
+			OC::$APPSWEBROOT=rtrim(dirname(OC::$WEBROOT), '/');
+			OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/');
 		}else{
 			echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
 			exit;
-- 
GitLab


From 8c7b13db7011c8be986e9e525ca392bb13375432 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 1 Mar 2012 22:56:08 +0100
Subject: [PATCH 238/248] Files: Fix wrong attribute name in
 OC_Search_Provider_File

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

diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index 34803c75aeb..a37af495599 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -6,10 +6,10 @@ class OC_Search_Provider_File extends OC_Search_Provider{
 		$results=array();
 		foreach($files as $fileData){
 			$file=$fileData['path'];
-			if($fileData['mime']=='httpd/unix-directory'){
+			$mime=$fileData['mimetype'];
+			if($mime=='httpd/unix-directory'){
 				$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php' ).'?dir='.$file,'Files');
 			}else{
-				$mime=$fileData['mime'];
 				$mimeBase=$fileData['mimepart'];
 				switch($mimeBase){
 					case 'audio':
-- 
GitLab


From d1dcd7893cb878263b8179bab16d101036c57a88 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 1 Mar 2012 22:58:44 +0100
Subject: [PATCH 239/248] Search: Change provider registration to class name,
 for lazy loading of search providers

---
 apps/bookmarks/appinfo/app.php | 3 ++-
 apps/bookmarks/lib/search.php  | 7 ++-----
 apps/calendar/appinfo/app.php  | 3 ++-
 apps/calendar/lib/search.php   | 5 ++---
 apps/contacts/appinfo/app.php  | 3 ++-
 apps/contacts/lib/search.php   | 5 ++---
 apps/gallery/appinfo/app.php   | 6 +++---
 apps/media/appinfo/app.php     | 3 ++-
 apps/media/lib_media.php       | 6 ++----
 files/appinfo/app.php          | 2 +-
 lib/base.php                   | 3 ---
 lib/search.php                 | 4 ++--
 lib/search/provider.php        | 8 ++------
 lib/search/provider/file.php   | 4 ++--
 14 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/apps/bookmarks/appinfo/app.php b/apps/bookmarks/appinfo/app.php
index a1f6139d89b..09d7b5df525 100644
--- a/apps/bookmarks/appinfo/app.php
+++ b/apps/bookmarks/appinfo/app.php
@@ -8,6 +8,7 @@
 */
 
 OC::$CLASSPATH['OC_Bookmarks_Bookmarks'] = 'apps/bookmarks/lib/bookmarks.php';
+OC::$CLASSPATH['OC_Search_Provider_Bookmarks'] = 'apps/bookmarks/lib/search.php';
 
 OC_App::register( array( 'order' => 70, 'id' => 'bookmark', 'name' => 'Bookmarks' ));
 
@@ -15,5 +16,5 @@ $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');
+OC_Search::registerProvider('OC_Search_Provider_Bookmarks');
diff --git a/apps/bookmarks/lib/search.php b/apps/bookmarks/lib/search.php
index 59495db82ea..235587855d9 100644
--- a/apps/bookmarks/lib/search.php
+++ b/apps/bookmarks/lib/search.php
@@ -20,8 +20,8 @@
  *
  */
 
-class OC_Search_Provider_Bookmarks extends OC_Search_Provider{
-	function search($query){
+class OC_Search_Provider_Bookmarks implements OC_Search_Provider{
+	static function search($query){
 		$results=array();
 		
 		$offset = 0;
@@ -45,6 +45,3 @@ class OC_Search_Provider_Bookmarks extends OC_Search_Provider{
 		return $results;
 	}
 }
-new OC_Search_Provider_Bookmarks();
-
-?>
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 9c95768895f..174bc009e45 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -6,6 +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::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
 	OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
 	OC_Util::addScript('calendar','loader');
 	OC_App::register( array( 
@@ -19,5 +20,5 @@ if(version_compare(PHP_VERSION, '5.3.0', '>=')){
 	  'icon' => OC_Helper::imagePath( 'calendar', 'icon.svg' ),
 	  'name' => $l->t('Calendar')));
 	OC_App::registerPersonal('calendar', 'settings');
-	require_once('apps/calendar/lib/search.php');
+	OC_Search::registerProvider('OC_Search_Provider_Calendar');
 }
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 0016751a66a..8405866392d 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -1,6 +1,6 @@
 <?php
-class OC_Search_Provider_Calendar extends OC_Search_Provider{
-	function search($query){
+class OC_Search_Provider_Calendar implements OC_Search_Provider{
+	static function search($query){
 		$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1);
 		if(count($calendars)==0 || !OC_App::isEnabled('calendar')){
 			//return false;
@@ -44,4 +44,3 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{
 		return $results;
 	}
 }
-new OC_Search_Provider_Calendar();
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index c3b4916a3fd..63833dd5cd6 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -4,6 +4,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::$CLASSPATH['OC_Search_Provider_Contacts'] = 'apps/contacts/lib/search.php';
 OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Contacts_Hooks', 'deleteUser');
 OC_HOOK::connect('OC_Calendar', 'getEvents', 'OC_Contacts_Hooks', 'getBirthdayEvents');
 OC_HOOK::connect('OC_Calendar', 'getSources', 'OC_Contacts_Hooks', 'getCalenderSources');
@@ -23,4 +24,4 @@ OC_App::addNavigationEntry( array(
 
 OC_APP::registerPersonal('contacts','settings');
 OC_UTIL::addScript('contacts', 'loader');
-require_once('apps/contacts/lib/search.php');
+OC_Search::registerProvider('OC_Search_Provider_Contacts');
diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
index 5aad6a25f09..cf0a5fe6997 100644
--- a/apps/contacts/lib/search.php
+++ b/apps/contacts/lib/search.php
@@ -1,6 +1,6 @@
 <?php
-class OC_Search_Provider_Contacts extends OC_Search_Provider{
-	function search($query){
+class OC_Search_Provider_Contacts implements OC_Search_Provider{
+	static function search($query){
 		$addressbooks = OC_Contacts_Addressbook::all(OC_User::getUser(), 1);
 // 		if(count($calendars)==0 || !OC_App::isEnabled('contacts')){
 // 			//return false;
@@ -26,4 +26,3 @@ class OC_Search_Provider_Contacts extends OC_Search_Provider{
 		return $results;
 	}
 }
-new OC_Search_Provider_Contacts();
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index b8de32ea587..1e5e27d408f 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -40,8 +40,8 @@ OC_App::addNavigationEntry( array(
  'icon' => OC_Helper::imagePath('core', 'places/picture.svg'),
  'name' => $l->t('Gallery')));
 
- class OC_GallerySearchProvider extends OC_Search_Provider{
-	function search($query){
+ class OC_GallerySearchProvider implements OC_Search_Provider{
+	static function search($query){
 		$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ? AND album_name LIKE ?');
 		$result = $stmt->execute(array(OC_User::getUser(),'%'.$query.'%'));
 		$results=array();
@@ -52,7 +52,7 @@ OC_App::addNavigationEntry( array(
 	}
 }
 
-new OC_GallerySearchProvider();
+OC_Search::registerProvider('OC_GallerySearchProvider');
 
 require_once('apps/gallery/lib/hooks_handlers.php');
 ?>
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index 475a33500f4..651067fbbe1 100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -30,4 +30,5 @@ OC_APP::registerPersonal('media','settings');
 OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
 
 OC_App::addNavigationEntry(array('id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo('media', 'index.php'), 'icon' => OC_Helper::imagePath('core', 'places/music.svg'), 'name' => $l->t('Music')));
-?>
+
+OC_Search::registerProvider('OC_MediaSearchProvider');
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index a2109c151aa..9de291e8da2 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -82,8 +82,8 @@ class OC_MEDIA{
 	}
 }
 
-class OC_MediaSearchProvider extends OC_Search_Provider{
-	function search($query){
+class OC_MediaSearchProvider implements OC_Search_Provider{
+	static function search($query){
 		require_once('lib_collection.php');
 		$artists=OC_MEDIA_COLLECTION::getArtists($query);
 		$albums=OC_MEDIA_COLLECTION::getAlbums(0,$query);
@@ -107,5 +107,3 @@ class OC_MediaSearchProvider extends OC_Search_Provider{
 	}
 }
 
-new OC_MediaSearchProvider();
-?>
diff --git a/files/appinfo/app.php b/files/appinfo/app.php
index e434296b250..0bf73d9a07e 100644
--- a/files/appinfo/app.php
+++ b/files/appinfo/app.php
@@ -7,4 +7,4 @@ OC_App::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
 
 OC_App::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_Helper::linkTo( "files", "index.php" ), "icon" => OC_Helper::imagePath( "core", "places/home.svg" ), "name" => $l->t("Files") ));
 
-?>
+OC_Search::registerProvider('OC_Search_Provider_File');
diff --git a/lib/base.php b/lib/base.php
index ee79f08eb22..336ff9fa231 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -350,6 +350,3 @@ if(!function_exists('get_temp_dir')) {
 }
 
 OC::init();
-
-// FROM search.php
-new OC_Search_Provider_File();
diff --git a/lib/search.php b/lib/search.php
index f6f805bfe65..6b33fa38140 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -29,7 +29,7 @@ class OC_Search{
 	
 	/**
 	 * register a new search provider to be used
-	 * @param OC_Search_Provider $provider
+	 * @param string $provider class name of a OC_Search_Provider
 	 */
 	public static function registerProvider($provider){
 		self::$providers[]=$provider;
@@ -43,7 +43,7 @@ class OC_Search{
 	public static function search($query){
 		$results=array();
 		foreach(self::$providers as $provider){
-			$results=array_merge($results,$provider->search($query));
+			$results=array_merge($results, $provider::search($query));
 		}
 		return $results;
 	}
diff --git a/lib/search/provider.php b/lib/search/provider.php
index cceed8b04a3..9487ca51f2b 100644
--- a/lib/search/provider.php
+++ b/lib/search/provider.php
@@ -2,15 +2,11 @@
 /**
  * provides search functionalty
  */
-abstract class OC_Search_Provider{
-	public function __construct(){
-		OC_Search::registerProvider($this);
-	}
-
+interface OC_Search_Provider {
 	/**
 	 * search for $query
 	 * @param string $query
 	 * @return array An array of OC_Search_Result's
 	 */
-	abstract function search($query);
+	static function search($query);
 }
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index a37af495599..3bdb3bcd2af 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -1,7 +1,7 @@
 <?php
 
-class OC_Search_Provider_File extends OC_Search_Provider{
-	function search($query){
+class OC_Search_Provider_File implements OC_Search_Provider{
+	static function search($query){
 		$files=OC_FileCache::search($query,true);
 		$results=array();
 		foreach($files as $fileData){
-- 
GitLab


From 3b9ce95fc3ebe3ab6ab8a7d47dec679bb9a4453b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 2 Mar 2012 15:32:20 +0100
Subject: [PATCH 240/248] allow apps to ship test cases

---
 tests/index.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/tests/index.php b/tests/index.php
index 1333a83a3b9..b5ae55808a1 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -26,20 +26,27 @@ require_once 'simpletest/mock_objects.php';
 require_once 'simpletest/collector.php';
 require_once 'simpletest/default_reporter.php';
 
-//load all test cases
-loadTests();
+//load core test cases
+loadTests(dirname(__FILE__));
+
+//load app test cases
+$apps=OC_App::getAllApps();
+foreach($apps as $app){
+	if(is_dir(OC::$SERVERROOT.'/apps/'.$app.'/tests')){
+		loadTests(OC::$SERVERROOT.'/apps/'.$app.'/tests');
+	}
+}
 
 function loadTests($dir=''){
-	$basedir=dirname(__FILE__).'/';
-	if($dh=opendir($basedir.$dir)){
+	if($dh=opendir($dir)){
 		while($name=readdir($dh)){
 			if(substr($name,0,1)!='.'){//no hidden files, '.' or '..'
 				$file=$dir.'/'.$name;
-				if(is_dir($basedir.$file)){
+				if(is_dir($file)){
 					loadTests($file);
 				}elseif(substr($file,-4)=='.php' and $file!=__FILE__){
 					$testCase=new TestSuite(getTestName($file));
-					$testCase->addFile($basedir.$file);
+					$testCase->addFile($file);
 					if($testCase->getSize()>0){
 						$testCase->run(new HtmlReporter());
 					}
@@ -50,6 +57,7 @@ function loadTests($dir=''){
 }
 
 function getTestName($file){
-	//TODO: get better test names
-	return substr($file,5,-4);//strip /lib/ and .php
+// 	//TODO: get better test names
+	$file=substr($file,strlen(OC::$SERVERROOT));
+	return substr($file,0,-4);//strip .php
 }
-- 
GitLab


From b621431c1116bb4166d4a89690bdea3a7a17d08c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 2 Mar 2012 15:46:11 +0100
Subject: [PATCH 241/248] don't try to seach apps in hidden folders

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

diff --git a/lib/app.php b/lib/app.php
index 696b35485bd..f841180ebad 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -365,7 +365,7 @@ class OC_App{
 		$apps=array();
 		$dh=opendir(OC::$APPSROOT.'/apps');
 		while($file=readdir($dh)){
-			if(is_file(OC::$APPSROOT.'/apps/'.$file.'/appinfo/app.php')){
+			if(substr($file,0,1)!='.' and is_file(OC::$APPSROOT.'/apps/'.$file.'/appinfo/app.php')){
 				$apps[]=$file;
 			}
 		}
-- 
GitLab


From 4daedda35a3a8cffb283e47b37e66f5b0524cbd8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 2 Mar 2012 17:40:38 +0100
Subject: [PATCH 242/248] only test enabled apps

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

diff --git a/tests/index.php b/tests/index.php
index b5ae55808a1..2e86366740b 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -30,7 +30,7 @@ require_once 'simpletest/default_reporter.php';
 loadTests(dirname(__FILE__));
 
 //load app test cases
-$apps=OC_App::getAllApps();
+$apps=OC_Appconfig::getApps();
 foreach($apps as $app){
 	if(is_dir(OC::$SERVERROOT.'/apps/'.$app.'/tests')){
 		loadTests(OC::$SERVERROOT.'/apps/'.$app.'/tests');
-- 
GitLab


From e8afe4f1588ad5697b8ef6627417dfeb4a6c0573 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 2 Mar 2012 18:42:04 +0100
Subject: [PATCH 243/248] add search implementation to filestorage common

---
 lib/filestorage/common.php     | 21 ++++++++++++++++++++-
 lib/filestorage/commontest.php |  3 ---
 tests/lib/filestorage.php      | 20 +++++++++++++++++---
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index fa14d7e99fd..fa0e7babf56 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -106,7 +106,9 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		return $hash;
 	}
 // 	abstract public function free_space($path);
-// 	abstract public function search($query);
+	public function search($query){
+		return $this->searchInDir($query);
+	}
 	public function getLocalFile($path){
 		return $this->toTmpFile($path);
 	}
@@ -122,4 +124,21 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		return $tmpFile;
 	}
 // 	abstract public function touch($path, $mtime=null);
+
+	protected function searchInDir($query,$dir=''){
+		$files=array();
+		$dh=$this->opendir($dir);
+		if($dh){
+			while($item=readdir($dh)){
+				if ($item == '.' || $item == '..') continue;
+				if(strstr(strtolower($item),strtolower($query))!==false){
+					$files[]=$dir.'/'.$item;
+				}
+				if($this->is_dir($dir.'/'.$item)){
+					$files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item));
+				}
+			}
+		}
+		return $files;
+	}
 }
diff --git a/lib/filestorage/commontest.php b/lib/filestorage/commontest.php
index 512e7c1b66d..1b01ff856a3 100644
--- a/lib/filestorage/commontest.php
+++ b/lib/filestorage/commontest.php
@@ -69,9 +69,6 @@ class OC_Filestorage_CommonTest extends OC_Filestorage_Common{
 	public function free_space($path){
 		return $this->storage->free_space($path);
 	}
-	public function search($query){
-		return $this->storage->search($query);
-	}
 	public function touch($path, $mtime=null){
 		return $this->storage->touch($path,$mtime);
 	}
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index 6296d7abf99..f8d4d9c4395 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -156,9 +156,10 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertTrue($mTime<=$mtimeEnd);
 		$this->assertEqual($cTime,$originalCTime);
 		
-		$this->instance->touch('/lorem.txt',100);
-		$mTime=$this->instance->filemtime('/lorem.txt');
-		$this->assertEqual($mTime,100);
+		if($this->instance->touch('/lorem.txt',100)!==false){
+			$mTime=$this->instance->filemtime('/lorem.txt');
+			$this->assertEqual($mTime,100);
+		}
 		
 		$mtimeStart=time();
 		$fh=$this->instance->fopen('/lorem.txt','a');
@@ -171,4 +172,17 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertTrue($mtimeStart<=$mTime);
 		$this->assertTrue($mTime<=$mtimeEnd);
 	}
+
+	public function testSearch(){
+		$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
+		$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile,'r'));
+		$pngFile=OC::$SERVERROOT.'/tests/data/logo-wide.png';
+		$this->instance->file_put_contents('/logo-wide.png',file_get_contents($pngFile,'r'));
+		$svgFile=OC::$SERVERROOT.'/tests/data/logo-wide.svg';
+		$this->instance->file_put_contents('/logo-wide.svg',file_get_contents($svgFile,'r'));
+		$result=$this->instance->search('logo');
+		$this->assertEqual(2,count($result));
+		$this->assertNotIdentical(false,array_search('/logo-wide.svg',$result));
+		$this->assertNotIdentical(false,array_search('/logo-wide.png',$result));
+	}
 }
-- 
GitLab


From 48fe85d9bd7fc6a82f54d23befe06c2457b590bc Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 2 Mar 2012 18:42:23 +0100
Subject: [PATCH 244/248] add streamwrapper that provides a callback on stream
 close

---
 lib/base.php                 |  1 +
 lib/streamwrappers.php       | 86 ++++++++++++++++++++++++++++++++++++
 tests/lib/streamwrappers.php | 31 +++++++++++++
 3 files changed, 118 insertions(+)

diff --git a/lib/base.php b/lib/base.php
index 336ff9fa231..4e24f9f44ac 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -148,6 +148,7 @@ class OC{
 		require_once('streamwrappers.php');
 		stream_wrapper_register("fakedir", "OC_FakeDirStream");
 		stream_wrapper_register('static', 'OC_StaticStreamWrapper');
+		stream_wrapper_register('close', 'OC_CloseStreamWrapper');
 		
 		// calculate the documentroot
 		OC::$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php
index 05d5598819a..f1e0fa0e1d9 100644
--- a/lib/streamwrappers.php
+++ b/lib/streamwrappers.php
@@ -218,3 +218,89 @@ class OC_StaticStreamWrapper {
 		return false;
 	}
 }
+
+/**
+ * stream wrapper that provides a callback on stream close
+ */
+class OC_CloseStreamWrapper{
+	public static $callBacks=array();
+	private $path='';
+	private $source;
+	private static $open=array();
+	public function stream_open($path, $mode, $options, &$opened_path){
+		$path=substr($path,strlen('close://'));
+		$this->path=$path;
+		$this->source=fopen($path,$mode);
+		if(is_resource($this->source)){
+			$this->meta=stream_get_meta_data($this->source);
+		}
+		self::$open[]=$path;
+		return is_resource($this->source);
+	}
+
+	public function stream_seek($offset, $whence=SEEK_SET){
+		fseek($this->source,$offset,$whence);
+	}
+
+	public function stream_tell(){
+		return ftell($this->source);
+	}
+
+	public function stream_read($count){
+		return fread($this->source,$count);
+	}
+
+	public function stream_write($data){
+		return fwrite($this->source,$data);
+	}
+
+	public function stream_set_option($option,$arg1,$arg2){
+		switch($option){
+			case STREAM_OPTION_BLOCKING:
+				stream_set_blocking($this->source,$arg1);
+				break;
+			case STREAM_OPTION_READ_TIMEOUT:
+				stream_set_timeout($this->source,$arg1,$arg2);
+				break;
+			case STREAM_OPTION_WRITE_BUFFER:
+				stream_set_write_buffer($this->source,$arg1,$arg2);
+		}
+	}
+
+	public function stream_stat(){
+		return fstat($this->source);
+	}
+
+	public function stream_lock($mode){
+		flock($this->source,$mode);
+	}
+
+	public function stream_flush(){
+		return fflush($this->source);
+	}
+
+	public function stream_eof(){
+		return feof($this->source);
+	}
+
+	public function url_stat($path) {
+		$path=substr($path,strlen('close://'));
+		if(file_exists($path)){
+			return stat($path);
+		}else{
+			return false;
+		}
+	}
+
+	public function stream_close(){
+		fclose($this->source);
+		if(isset(self::$callBacks[$this->path])){
+			call_user_func(self::$callBacks[$this->path],$this->path);
+		}
+	}
+
+	public function unlink($path){
+		$path=substr($path,strlen('close://'));
+		return unlink($path);
+	}
+}
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index c4784a62976..17a92c6658c 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -44,4 +44,35 @@ class Test_StreamWrappers extends UnitTestCase {
 		clearstatcache();
 		$this->assertFalse(file_exists($staticFile));
 	}
+
+	public function testCloseStream(){
+		//ensure all basic stream stuff works
+		$sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
+		$tmpFile=OC_Helper::TmpFile('.txt');
+		$file='close://'.$tmpFile;
+		$this->assertTrue(file_exists($file));
+		file_put_contents($file,file_get_contents($sourceFile));
+		$this->assertEqual(file_get_contents($sourceFile),file_get_contents($file));
+		unlink($file);
+		clearstatcache();
+		$this->assertFalse(file_exists($file));
+		
+		//test callback
+		$tmpFile=OC_Helper::TmpFile('.txt');
+		$file='close://'.$tmpFile;
+		OC_CloseStreamWrapper::$callBacks[$tmpFile]=array('Test_StreamWrappers','closeCallBack');
+		$fh=fopen($file,'w');
+		fwrite($fh,'asd');
+		try{
+			fclose($fh);
+			$this->fail('Expected exception');
+		}catch(Exception $e){
+			$path=$e->getMessage();
+			$this->assertEqual($path,$tmpFile);
+		}
+	}
+
+	public static function closeCallBack($path){
+		throw new Exception($path);
+	}
 }
\ No newline at end of file
-- 
GitLab


From 503e5cada3656a6d9ac519921f4c8bf2614d47bb Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 2 Mar 2012 20:25:20 +0100
Subject: [PATCH 245/248] Add /dav.php, a single location bundling all
 *DAV-operations.

---
 apps/calendar/appinfo/app.php |  5 ++-
 apps/calendar/lib/hooks.php   | 15 ++++++-
 apps/contacts/appinfo/app.php |  1 +
 apps/contacts/lib/hooks.php   | 12 ++++++
 dav.php                       | 77 +++++++++++++++++++++++++++++++++++
 5 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 dav.php

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 174bc009e45..0968737219a 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -8,12 +8,13 @@ if(version_compare(PHP_VERSION, '5.3.0', '>=')){
 	OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php';
 	OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
 	OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
+	OC_Hook::connect('OC_DAV', 'initialize', 'OC_Calendar_Hooks', 'initializeCalDAV');
 	OC_Util::addScript('calendar','loader');
-	OC_App::register( array( 
+	OC_App::register( array(
 	  'order' => 10,
 	  'id' => 'calendar',
 	  'name' => 'Calendar' ));
-	OC_App::addNavigationEntry( array( 
+	OC_App::addNavigationEntry( array(
 	  'id' => 'calendar_index',
 	  'order' => 10,
 	  'href' => OC_Helper::linkTo( 'calendar', 'index.php' ),
diff --git a/apps/calendar/lib/hooks.php b/apps/calendar/lib/hooks.php
index 14f96bb5fe1..54f1680a36e 100644
--- a/apps/calendar/lib/hooks.php
+++ b/apps/calendar/lib/hooks.php
@@ -17,11 +17,24 @@ class OC_Calendar_Hooks{
 	 */
 	public static function deleteUser($parameters) {
 		$calendars = OC_Calendar_Calendar::allCalendars($parameters['uid']);
-		
+
 		foreach($calendars as $calendar) {
 			OC_Calendar_Calendar::deleteCalendar($calendar['id']);
 		}
 
 		return true;
 	}
+
+	/**
+	 * @brief Adds the CardDAV resource to the DAV server
+	 * @param paramters parameters from initialize-Hook
+	 * @return array
+	 */
+	public static function initializeCalDAV($parameters){
+		// We need a backend, the root node and the caldav plugin
+		$parameters['backends']['caldav'] = new OC_Connector_Sabre_CalDAV();
+		$parameters['nodes'][] = new Sabre_CalDAV_CalendarRootNode($parameters['backends']['principal'], $parameters['backends']['caldav']);
+		$parameters['plugins'][] = new Sabre_CalDAV_Plugin();
+		return true;
+	}
 }
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 63833dd5cd6..85c383c4c32 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -8,6 +8,7 @@ OC::$CLASSPATH['OC_Search_Provider_Contacts'] = 'apps/contacts/lib/search.php';
 OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Contacts_Hooks', 'deleteUser');
 OC_HOOK::connect('OC_Calendar', 'getEvents', 'OC_Contacts_Hooks', 'getBirthdayEvents');
 OC_HOOK::connect('OC_Calendar', 'getSources', 'OC_Contacts_Hooks', 'getCalenderSources');
+OC_Hook::connect('OC_DAV', 'initialize', 'OC_Contacts_Hooks', 'initializeCardDAV');
 
 OC_App::register( array(
   'order' => 10,
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index b858c4a5a48..2fe4afe716b 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -39,6 +39,18 @@ class OC_Contacts_Hooks{
 		return true;
 	}
 
+	/**
+	 * @brief Adds the CardDAV resource to the DAV server
+	 * @param paramters parameters from initialize-Hook
+	 * @return array
+	 */
+	static public function initializeCardDAV($parameters){
+		// We need a backend, the root node and the carddav plugin
+		$parameters['backends']['carddav'] = new OC_Connector_Sabre_CardDAV();
+		$parameters['nodes'][] = new Sabre_CardDAV_AddressBookRoot($parameters['backends']['principal'], $parameters['backends']['carddav']);
+		$parameters['plugins'][] = new Sabre_CardDAV_Plugin();
+		return true;
+
 	static public function getCalenderSources($parameters) {
 		$base_url = OC_Helper::linkTo('calendar', 'ajax/events.php').'?calendar_id=';
 		foreach(OC_Contacts_Addressbook::all(OC_User::getUser()) as $addressbook) {
diff --git a/dav.php b/dav.php
new file mode 100644
index 00000000000..78e2711aec8
--- /dev/null
+++ b/dav.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@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/>.
+*
+*/
+
+require_once('lib/base.php');
+
+// Backends we always need (auth, principal and files)
+$backends = array(
+	'auth' => new OC_Connector_Sabre_Auth(),
+	'principal' => new OC_Connector_Sabre_Principal()
+);
+
+// Root nodes
+$nodes = array(
+	new Sabre_CalDAV_Principal_Collection($backends['principal'])
+);
+
+// Plugins
+$plugins = array(
+	new Sabre_DAV_Auth_Plugin($backends['auth'],'ownCloud'),
+	new Sabre_DAVACL_Plugin(),
+	new Sabre_DAV_Browser_Plugin(false) // Show something in the Browser, but no upload
+);
+
+// Load the plugins etc we need for usual file sharing
+$backends['lock'] = new OC_Connector_Sabre_Locks();
+$plugins[] = new Sabre_DAV_Locks_Plugin($backends['lock']);
+// Add a RESTful user directory
+// /files/$username/
+if( OC_User::isLoggedIn()){
+	$currentuser = OC_User::getUser();
+	$files = new Sabre_DAV_SimpleCollection('files');
+	foreach( OC_User::getUsers() as $username ){
+		if( $username == $currentuser ){
+			$public = new OC_Connector_Sabre_Directory('.');
+			$files->addChild( new Sabre_DAV_SimpleCollection( $username, $public->getChildren()));
+		}
+		else{
+			$files->addChild(new Sabre_DAV_SimpleCollection( $username ));
+		}
+	}
+	$nodes[] = $files;
+}
+
+// Get the other plugins and nodes
+OC_Hook::emit( 'OC_DAV', 'initialize', array( 'backends' => &$backends, 'nodes' => &$nodes, 'plugins' => &$plugins ));
+
+// Fire up server
+$server = new Sabre_DAV_Server($nodes);
+$server->setBaseUri(OC::$WEBROOT.'/dav.php');
+
+// Load additional plugins
+foreach( $plugins as &$plugin ){
+	$server->addPlugin( $plugin );
+} unset( $plugin ); // Always do this after foreach with references!
+
+// And off we go!
+$server->exec();
-- 
GitLab


From 90e2962c91a160fb73cb977c0aa431c179e292df Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 2 Mar 2012 20:37:49 +0100
Subject: [PATCH 246/248] Remove the link between the principals table and the
 sabre principals connector.

---
 lib/base.php                      |  4 ---
 lib/connector/sabre/principal.php | 44 -------------------------------
 2 files changed, 48 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 4e24f9f44ac..9995544f14e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -316,10 +316,6 @@ class OC{
 			OC_App::loadApps();
 		}
 
-		// Last part: connect some hooks
-		OC_HOOK::connect('OC_User', 'post_createUser', 'OC_Connector_Sabre_Principal', 'addPrincipal');
-		OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Connector_Sabre_Principal', 'deletePrincipal');
-		
 		//make sure temporary files are cleaned up
 		register_shutdown_function(array('OC_Helper','cleanTmp'));
 	}
diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index 72e180c65c0..28a36438e87 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -8,50 +8,6 @@
  */
 
 class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
-	/**
-	 * TODO: write doc
-	 */
-	public static function addPrincipal($params){
-		// Add the user
-		$uri = 'principals/'.$params['uid'];
-		$displayname = $params['uid'];
-		$query = OC_DB::prepare('INSERT INTO *PREFIX*principals (uri,displayname) VALUES(?,?)');
-		$query->execute(array($uri,$displayname));
-		
-		// Add calendar and addressbook read and write support (sharing calendars)
-		$uri = 'principals/'.$params['uid'].'/calendar-proxy-read';
-		$displayname = null;
-		$query->execute(array($uri,$displayname));
-		$uri = 'principals/'.$params['uid'].'/calendar-proxy-write';
-		$query->execute(array($uri,$displayname));
-		$uri = 'principals/'.$params['uid'].'/addressbook-proxy-read';
-		$query->execute(array($uri,$displayname));
-		$uri = 'principals/'.$params['uid'].'/addressbook-proxy-write';
-		$query->execute(array($uri,$displayname));
-
-		return true;
-	}
-	
-	/**
-	 * TODO: write doc
-	 */
-	public static function deletePrincipal($params){
-		$query = OC_DB::prepare('SELECT * FROM *PREFIX*principals');
-		$result = $query->execute();
-
-		$deleteprincipal = OC_DB::prepare('DELETE FROM *PREFIX*principals WHERE id = ?');
-		$deletegroup = OC_DB::prepare('DELETE FROM *PREFIX*principalgroups WHERE principal_id = ? OR member_id = ?');
-		// We have to delete the principals and relations! Principals include 
-		while($row = $result->fetchRow()){
-			// Checking if the principal is in the prefix
-			$array = explode('/',$row['uri']);
-			if ($array[1] != $params['uid']) continue;
-			$deleteprincipal->execute(array($row['id']));
-			$deletegroup->execute(array($row['id'],$row['id']));
-		}
-		return true;
-	}
-
 	/**
 	 * Returns a list of principals based on a prefix.
 	 *
-- 
GitLab


From 1865659ce1d184929f29db5c6eec82f24af1c332 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 2 Mar 2012 21:01:44 +0100
Subject: [PATCH 247/248] Fix missing bracket

---
 apps/contacts/lib/hooks.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index 2fe4afe716b..e09da20be86 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -50,6 +50,7 @@ class OC_Contacts_Hooks{
 		$parameters['nodes'][] = new Sabre_CardDAV_AddressBookRoot($parameters['backends']['principal'], $parameters['backends']['carddav']);
 		$parameters['plugins'][] = new Sabre_CardDAV_Plugin();
 		return true;
+	}
 
 	static public function getCalenderSources($parameters) {
 		$base_url = OC_Helper::linkTo('calendar', 'ajax/events.php').'?calendar_id=';
-- 
GitLab


From 3e84f170e7133d9acc46123ba4c901a24e438b2c Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 2 Mar 2012 21:07:37 +0100
Subject: [PATCH 248/248] The tables "principals" and "principalgroups" are
 obsolete

---
 db_structure.xml | 96 ------------------------------------------------
 1 file changed, 96 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index 879bbcb48ad..5eef44d8e84 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -427,102 +427,6 @@
 
  </table>
 
- <table>
-
-  <name>*dbprefix*principalgroups</name>
-
-  <declaration>
-
-   <field>
-    <name>id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>principal_id</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>member_id</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <index>
-    <name>principals_members_index</name>
-    <unique>true</unique>
-    <field>
-     <name>principal_id</name>
-     <sorting>ascending</sorting>
-    </field>
-    <field>
-     <name>member_id</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*principals</name>
-
-  <declaration>
-
-   <field>
-    <name>id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>uri</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>displayname</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <index>
-    <name>uri</name>
-    <unique>true</unique>
-    <field>
-     <name>uri</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-
-  </declaration>
-
- </table>
-
  <table>
 
   <name>*dbprefix*properties</name>
-- 
GitLab