From 435e282efa4a1298551d092c2ce1a33a714ae64c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 25 Jun 2010 13:51:22 +0000
Subject: [PATCH 01/91] propset svn:keywords Id

---
 admin/inc/class.admin_applications.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/inc/class.admin_applications.inc.php b/admin/inc/class.admin_applications.inc.php
index 04cada28b0..907e50fa48 100644
--- a/admin/inc/class.admin_applications.inc.php
+++ b/admin/inc/class.admin_applications.inc.php
@@ -6,7 +6,7 @@
  * @author Christian Füller <cf@stylite.de>
  * @package admin
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @version $Id: class.admin_register_hooks.inc.php 29103 2010-05-25 15:30:25Z füller $
+ * @version $Id$
  */
 
 class admin_applications

From 4e42eb30f0bdf478df137e0ee45f1c9272af5003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Fri, 25 Jun 2010 17:08:09 +0000
Subject: [PATCH 02/91] Enable Funambol client 8.5 again; various SyncML
 optimizations

---
 phpgwapi/inc/horde/Horde/RPC/syncml.php       |   3 +-
 phpgwapi/inc/horde/Horde/SyncML.php           |  50 ++++++-
 phpgwapi/inc/horde/Horde/SyncML/Command.php   |   1 +
 .../inc/horde/Horde/SyncML/Command/Alert.php  |  41 ------
 .../inc/horde/Horde/SyncML/Command/Get.php    |  59 ++++++--
 .../horde/Horde/SyncML/Command/Replace.php    |   2 +-
 .../inc/horde/Horde/SyncML/Command/Sync.php   |   3 +-
 phpgwapi/inc/horde/Horde/SyncML/State.php     | 128 ++++++++++--------
 phpgwapi/inc/horde/Horde/SyncML/Sync.php      |  22 ++-
 .../inc/horde/Horde/SyncML/Sync/SlowSync.php  |   2 +
 phpgwapi/inc/horde/config/registry.php        |  10 ++
 11 files changed, 206 insertions(+), 115 deletions(-)

diff --git a/phpgwapi/inc/horde/Horde/RPC/syncml.php b/phpgwapi/inc/horde/Horde/RPC/syncml.php
index 93350b03da..2920523bdc 100644
--- a/phpgwapi/inc/horde/Horde/RPC/syncml.php
+++ b/phpgwapi/inc/horde/Horde/RPC/syncml.php
@@ -92,7 +92,8 @@ class Horde_RPC_syncml extends Horde_RPC {
         $this->_output = new XML_WBXML_ContentHandler();
 
         $this->_parse($request);
-        $response = $this->_output->getOutput();
+        $response = '<?xml version="1.0" encoding="' . $this->_charset . '"?>';
+        $response .= $this->_output->getOutput();
 
         /* Very useful for debugging. */
         if (!empty($this->_debugDir) && is_dir($this->_debugDir)) {
diff --git a/phpgwapi/inc/horde/Horde/SyncML.php b/phpgwapi/inc/horde/Horde/SyncML.php
index fbabda2eec..6eed33fafc 100644
--- a/phpgwapi/inc/horde/Horde/SyncML.php
+++ b/phpgwapi/inc/horde/Horde/SyncML.php
@@ -569,7 +569,8 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
 					}
 					$state->setAlert222Received(false);
 				}
-
+				
+				if ($state->needDeviceInfo()) $this->outputGetRequest();
 
 				// send the sync reply
 				// we do still have some data to send OR
@@ -700,5 +701,52 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
 			$this->_currentCommand->characters($str);
 		}
 	}
+	
+	function outputGetRequest()
+    {
+    	$attrs = array();
 
+        $state =& $_SESSION['SyncML.state'];
+
+        $uri = $state->getURI();
+        $uriMeta = $state->getURIMeta();
+        
+        Horde::logMessage('SyncML: PreferedContentTypeClient missing, sending <Get>',
+        	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+        $this->_output->startElement($uri, 'Get', $attrs);
+        
+        $this->_output->startElement($uri, 'CmdID', $attrs);
+        $this->_output->characters($this->_currentCmdID);
+        $this->_currentCmdID++;
+        $this->_output->endElement($uri, 'CmdID');
+        
+        $this->_output->startElement($uri, 'Meta', $attrs);
+        $this->_output->startElement($uriMeta, 'Type', $attrs);
+        if (is_a($this->_output, 'XML_WBXML_Encoder')) {
+	        $this->_output->characters('application/vnd.syncml-devinf+wbxml');
+        } else {
+	        $this->_output->characters('application/vnd.syncml-devinf+xml');
+        }
+        $this->_output->endElement($uriMeta, 'Type');
+        $this->_output->endElement($uri, 'Meta');
+        
+        $this->_output->startElement($uri, 'Item', $attrs);
+        $this->_output->startElement($uri, 'Target', $attrs);
+        $this->_output->startElement($uri, 'LocURI', $attrs);
+        if ($state->getVersion() == 2) {
+	        $this->_output->characters('./devinf12');
+        } elseif ($state->getVersion() == 1) {
+	        $this->_output->characters('./devinf11');
+        } else {
+	        $this->_output->characters('./devinf10');
+        }
+        $this->_output->endElement($uri, 'LocURI');
+        $this->_output->endElement($uri, 'Target');
+        $this->_output->endElement($uri, 'Item');
+        
+        $this->_output->endElement($uri, 'Get');
+        
+        $state->deviceInfoRequested();
+    }
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command.php b/phpgwapi/inc/horde/Horde/SyncML/Command.php
index 505a32e12c..123d0e0fd3 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command.php
@@ -153,6 +153,7 @@ class Horde_SyncML_Command {
         }
         if (class_exists($class)) {
             $cmd = new $class($params);
+            if (empty($cmd->_cmdName)) $cmd->_cmdName = $command;
         } else {
             $msg = 'SyncML: Class definition of ' . $class . ' not found.';
             Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
index 5785b00e0d..1327a66add 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
@@ -401,47 +401,6 @@ class Horde_SyncML_Command_Alert extends Horde_SyncML_Command {
 
         $currentCmdID++;
 
-        if ($state->_devinfoRequested == false &&
-            $this->_sourceLocURI != null &&
-            is_a($state->getPreferedContentTypeClient($this->_sourceLocURI), 'PEAR_Error')) {
-
-            Horde::logMessage("SyncML: PreferedContentTypeClient missing, sending <Get>", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-
-            $output->startElement($state->getURI(), 'Get', $attrs);
-
-            $output->startElement($state->getURI(), 'CmdID', $attrs);
-            $output->characters($currentCmdID);
-            $currentCmdID++;
-            $output->endElement($state->getURI(), 'CmdID');
-
-            $output->startElement($state->getURI(), 'Meta', $attrs);
-            $output->startElement($state->getURIMeta(), 'Type', $attrs);
-            if (is_a($output, 'XML_WBXML_Encoder')) {
-                $output->characters('application/vnd.syncml-devinf+wbxml');
-            } else {
-                $output->characters('application/vnd.syncml-devinf+xml');
-            }
-            $output->endElement($state->getURIMeta(), 'Type');
-            $output->endElement($state->getURI(), 'Meta');
-
-            $output->startElement($state->getURI(), 'Item', $attrs);
-            $output->startElement($state->getURI(), 'Target', $attrs);
-            $output->startElement($state->getURI(), 'LocURI', $attrs);
-	    if ($state->getVersion() == 2) {
-                $output->characters('./devinf12');
-            } elseif ($state->getVersion() == 1) {
-                $output->characters('./devinf11');
-            } else {
-                $output->characters('./devinf10');
-            }
-            $output->endElement($state->getURI(), 'LocURI');
-            $output->endElement($state->getURI(), 'Target');
-            $output->endElement($state->getURI(), 'Item');
-
-            $output->endElement($state->getURI(), 'Get');
-
-            $state->_devinfoRequested = true;
-        }
         return $currentCmdID;
     }
 
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
index 2ffa10133b..49de9cdcdf 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
@@ -20,6 +20,13 @@ include_once 'Horde/SyncML/Command.php';
 include_once 'Horde/SyncML/Command/Results.php';
 
 class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
+	
+	 /**
+     * Name of the command.
+     *
+     * @var string
+     */
+	var $_cmdName = 'Get';
 
     function output($currentCmdID, &$output)
     {
@@ -33,7 +40,7 @@ class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
             $ref = './devinf10';
         }
 
-        $status = new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), 'Get');
+        $status = new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), $this->_cmdName);
         $status->setCmdRef($this->_cmdID);
         $status->setTargetRef($ref);
         $currentCmdID = $status->output($currentCmdID, $output);
@@ -80,16 +87,31 @@ class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
             $output->startElement($state->getURIDevInf() , 'DevInf', $attrs);
             $output->startElement($state->getURIDevInf() , 'VerDTD', $attrs);
             if ($state->getVersion() == 2) {
-		$output->characters('1.2');
+	            $output->characters('1.2');
             } elseif($state->getVersion() == 1) {
-		$output->characters('1.1');
+	            $output->characters('1.1');
             } else {
-		$output->characters('1.0');
+	            $output->characters('1.0');
             }
             $output->endElement($state->getURIDevInf() , 'VerDTD', $attrs);
             $output->startElement($state->getURIDevInf() , 'Man', $attrs);
             $output->characters('www.egroupware.org');
             $output->endElement($state->getURIDevInf() , 'Man', $attrs);
+            $output->startElement($state->getURIDevInf() , 'Mod', $attrs);
+            $output->characters('DS Server');
+            $output->endElement($state->getURIDevInf() , 'Mod', $attrs);
+            $output->startElement($state->getURIDevInf() , 'OEM', $attrs);
+            $output->characters('-');
+            $output->endElement($state->getURIDevInf() , 'OEM', $attrs);
+            $output->startElement($state->getURIDevInf() , 'FwV', $attrs);
+            $output->characters('-');
+            $output->endElement($state->getURIDevInf() , 'FwV', $attrs);
+            $output->startElement($state->getURIDevInf() , 'SwV', $attrs);
+            $output->characters('1.7.x');
+            $output->endElement($state->getURIDevInf() , 'SwV', $attrs);
+            $output->startElement($state->getURIDevInf() , 'HwV', $attrs);
+            $output->characters('-');
+            $output->endElement($state->getURIDevInf() , 'HwV', $attrs);
             $output->startElement($state->getURIDevInf() , 'DevID', $attrs);
             $output->characters($_SERVER['HTTP_HOST']);
             $output->endElement($state->getURIDevInf() , 'DevID', $attrs);
@@ -102,28 +124,36 @@ class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
             $output->endElement($state->getURIDevInf() , 'SupportNumberOfChanges', $attrs);
             $output->startElement($state->getURIDevInf() , 'SupportLargeObjs', $attrs);
             $output->endElement($state->getURIDevInf() , 'SupportLargeObjs', $attrs);
-            $this->_writeDataStore('./notes', 'text/x-vnote', '1.1', $output,
+            $this->_writeDataStore('notes', 'text/x-vnote', '1.1', $output,
                                    array('text/plain' => '1.0'));
-            $this->_writeDataStore('./contacts', 'text/vcard', '3.0', $output,
+            $this->_writeDataStore('contacts', 'text/vcard', '3.0', $output,
                                    array('text/x-vcard' => '2.1'));
-            $this->_writeDataStore('./card', 'text/vcard', '3.0', $output,
+            $this->_writeDataStore('card', 'text/vcard', '3.0', $output,
                                    array('text/x-vcard' => '2.1'));
-            $this->_writeDataStore('./tasks', 'text/calendar', '2.0', $output,
+            $this->_writeDataStore('tasks', 'text/calendar', '2.0', $output,
                                    array('text/x-vcalendar' => '1.0'));
-            $this->_writeDataStore('./jobs', 'text/calendar', '2.0', $output,
+            $this->_writeDataStore('jobs', 'text/calendar', '2.0', $output,
                                    array('text/x-vcalendar' => '1.0'));
-            $this->_writeDataStore('./calendar', 'text/calendar', '2.0', $output,
+            $this->_writeDataStore('calendar', 'text/calendar', '2.0', $output,
                                    array('text/x-vcalendar' => '1.0'));
-            $this->_writeDataStore('./events', 'text/calendar', '2.0', $output,
+            $this->_writeDataStore('events', 'text/calendar', '2.0', $output,
                                    array('text/x-vcalendar' => '1.0'));
-            $this->_writeDataStore('./caltasks', 'text/calendar', '2.0', $output,
+            $this->_writeDataStore('caltasks', 'text/calendar', '2.0', $output,
                                    array('text/x-vcalendar' => '1.0'));
+            // Funambol special Datastore
+            $this->_writeDataStore('configuration', 'text/plain', '1.0', $output);
             $output->endElement($state->getURIDevInf() , 'DevInf', $attrs);
 
             $output->endElement($state->getURI(), 'Data');
             $output->endElement($state->getURI(), 'Item');
             $output->endElement($state->getURI(), 'Results');
-
+            /*
+			$output->startElement($state->getURIDevInf() , 'Ext', $attrs);
+			$output->startElement($state->getURIDevInf() , 'XNam', $attrs);
+			$output->characters('X-funambol-smartslow');
+            $output->endElement($state->getURIDevInf() , 'XNam', $attrs);
+            $output->endElement($state->getURIDevInf() , 'Ext', $attrs);
+            */
             $currentCmdID++;
         }
 
@@ -151,6 +181,9 @@ class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
         $output->startElement($state->getURIDevInf() , 'SourceRef', $attrs);
         $output->characters($sourceref);
         $output->endElement($state->getURIDevInf() , 'SourceRef', $attrs);
+        $output->startElement($state->getURIDevInf() , 'DisplayName', $attrs);
+        $output->characters($sourceref);
+        $output->endElement($state->getURIDevInf() , 'DisplayName', $attrs);
         $output->startElement($state->getURIDevInf() , 'MaxGUIDSize', $attrs);
         $output->characters(255);
         $output->endElement($state->getURIDevInf() , 'MaxGUIDSize', $attrs);
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Replace.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Replace.php
index 010083bbf2..19f0751c01 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Replace.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Replace.php
@@ -15,7 +15,7 @@
  */
 include_once 'Horde/SyncML/Command.php';
 
-class Horde_SyncML_Command_Final extends Horde_SyncML_Command {
+class Horde_SyncML_Command_Replace extends Horde_SyncML_Command {
 
     /**
      * Name of the command.
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
index 9e4704df22..d65944a47b 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
@@ -88,8 +88,7 @@ class Horde_SyncML_Command_Sync extends Horde_SyncML_Command {
 
         $currentCmdID = $status->output($currentCmdID, $output);
 
-        if ($this->_targetURI != "configuration" && // Fix Funambol issue
-        	($sync = &$state->getSync($this->_targetURI))) {
+        if (($sync = &$state->getSync($this->_targetURI))) {
             $currentCmdID = $sync->startSync($currentCmdID, $output);
 
             foreach ($this->_syncElements as $element) {
diff --git a/phpgwapi/inc/horde/Horde/SyncML/State.php b/phpgwapi/inc/horde/Horde/SyncML/State.php
index a088667917..3635cab7cb 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State.php
@@ -69,7 +69,7 @@ define('RESPONSE_NO_CONTENT', 204);
 define('RESPONSE_RESET_CONTENT', 205);
 define('RESPONSE_PARTIAL_CONTENT', 206);
 define('RESPONSE_CONFLICT_RESOLVED_WITH_MERGE', 207);
-define('RESPONSE_CONFLICT_RESOLVED_WITH_CLIENT_WINNING', 208);
+define('RESPONSE_CONFLICT_RESOLVED_WITH_CLIENT_WINS', 208);
 define('RESPONSE_CONFILCT_RESOLVED_WITH_DUPLICATE', 209);
 define('RESPONSE_DELETE_WITHOUT_ARCHIVE', 210);
 define('RESPONSE_ITEM_NO_DELETED', 211);
@@ -80,60 +80,60 @@ define('RESPONSE_NO_EXECUTED', 215);
 define('RESPONSE_ATOMIC_ROLL_BACK_OK', 216);
 
 define('RESPONSE_MULTIPLE_CHOICES', 300);
-// Need to change names.
-// define('RESPONSE_MULTIPLE_CHOICES', 301);
-// define('RESPONSE_MULTIPLE_CHOICES', 302);
-// define('RESPONSE_MULTIPLE_CHOICES', 303);
-// define('RESPONSE_MULTIPLE_CHOICES', 304);
+define('RESPONSE_MOVED_PERMANENTLY', 301);
+define('RESPONSE_FOUND', 302);
+define('RESPONSE_SEE_OTHER', 303);
+define('RESPONSE_NOT_MODIFIED', 304);
 define('RESPONSE_USE_PROXY', 305);
 
 define('RESPONSE_BAD_REQUEST', 400);
 define('RESPONSE_INVALID_CREDENTIALS', 401);
-// Need to change names.
-// define('RESPONSE_INVALID_CREDENTIALS', 402);
-// define('RESPONSE_INVALID_CREDENTIALS', 403);
+define('RESPONSE_PAYMENT_NEEDED', 402);
+define('RESPONSE_FORBIDDEN', 403);
 define('RESPONSE_NOT_FOUND', 404);
-// Need to change names.
-// define('RESPONSE_INVALID_CREDENTIALS', 405);
-// define('RESPONSE_INVALID_CREDENTIALS', 406);
+define('RESPONSE_COMMAND_DENIED', 405);
+define('RESPONSE_FEATURE_NOT_SUPPORTED', 406);
 define('RESPONSE_MISSING_CREDENTIALS', 407);
-// define('RESPONSE_INVALID_CREDENTIALS', 408);
-// define('RESPONSE_INVALID_CREDENTIALS', 409);
-// define('RESPONSE_INVALID_CREDENTIALS', 410);
-// define('RESPONSE_INVALID_CREDENTIALS', 411);
-// define('RESPONSE_INVALID_CREDENTIALS', 412);
-// define('RESPONSE_INVALID_CREDENTIALS', 413);
-// define('RESPONSE_INVALID_CREDENTIALS', 414);
-// define('RESPONSE_INVALID_CREDENTIALS', 415);
+define('RESPONSE_REQUEST_TIMEOUT', 408);
+define('RESPONSE_CONFLICT_DETECTED', 409);
+define('RESPONSE_ITEM_GONE', 410);
+define('RESPONSE_SIZE_REQUIRED', 411);
+define('RESPONSE_INCOMPLETE_COMMAND', 412);
+define('RESPONSE_ENTITY_TO_LARGE', 413);
+define('RESPONSE_URI_TOO_LONG', 414);
+define('RESPONSE_UNSUPPORTED_MEDIA_TYPE', 415);
 define('RESPONSE_REQUEST_SIZE_TOO_BIG', 416);
-// Need to change names.
-// define('RESPONSE_INVALID_CREDENTIALS', 417);
-// define('RESPONSE_INVALID_CREDENTIALS', 418);
-// define('RESPONSE_INVALID_CREDENTIALS', 419);
-// define('RESPONSE_INVALID_CREDENTIALS', 420);
-// define('RESPONSE_INVALID_CREDENTIALS', 421);
-// define('RESPONSE_INVALID_CREDENTIALS', 422);
-// define('RESPONSE_INVALID_CREDENTIALS', 423);
+define('RESPONSE_RETRY_LATER', 417);
+define('RESPONSE_ALREADY_EXISITS', 418);
+define('RESPONSE_CONFLICT_RESOLVED_WITH_SERVER_WINS', 419);
+define('RESPONSE_DEVICE_FULL', 420);
+define('RESPONSE_UNKNOWN_SEARCH_GRAMMAR', 421);
+define('RESPONSE_BAD_CGI', 422);
+define('RESPONSE_SOFT_DELETE_CONFICT', 423);
 define('RESPONSE_SIZE_MISMATCH', 424);
+define('RESPONSE_PERMISSION_DENIED', 425);
+define('RESPONSE_PARTIAL_ITEM_NOT_ACCEPTED', 426);
+define('RESPONSE_ITEM_NOT_EMPTY', 427);
+define('RESPONSE_MOVE_FAILED', 428);
 
 define('RESPONSE_COMMAND_FAILED', 500);
-// Need to change names.
-// define('RESPONSE_COMMAND_FAILED', 501);
-// define('RESPONSE_COMMAND_FAILED', 502);
-// define('RESPONSE_COMMAND_FAILED', 503);
-// define('RESPONSE_COMMAND_FAILED', 504);
-// define('RESPONSE_COMMAND_FAILED', 505);
-// define('RESPONSE_COMMAND_FAILED', 506);
-// define('RESPONSE_COMMAND_FAILED', 507);
+define('RESPONSE_COMMAND_NOT_IMPLEMENTED', 501);
+define('RESPONSE_BAD_GATEWAY', 502);
+define('RESPONSE_SERVICE_UNAVAILABLE', 503);
+define('RESPONSE_GATEWAY_TIMEOUT', 504);
+define('RESPONSE_DTD_VERSION_NOT_SUPPORTED', 505);
+define('RESPONSE_PROCESSING_ERROR', 506);
+define('RESPONSE_ATOMIC_FAILED', 507);
 define('RESPONSE_REFRESH_REQUIRED', 508);
-// define('RESPONSE_COMMAND_FAILED', 509);
-// define('RESPONSE_COMMAND_FAILED', 510);
-// define('RESPONSE_COMMAND_FAILED', 511);
-// define('RESPONSE_COMMAND_FAILED', 512);
-// define('RESPONSE_COMMAND_FAILED', 513);
-// define('RESPONSE_COMMAND_FAILED', 514);
-// define('RESPONSE_COMMAND_FAILED', 515);
+// define('RESPONSE_FUTURE_USE', 509);
+define('RESPONSE_DATASTORE_FAILURE', 510);
+define('RESPONSE_SERVER_FAILURE', 511);
+define('RESPONSE_SYNCHRONIZATION_FAILED', 512);
+define('RESPONSE_PROTOCOL_VERSION_NOT_SUPPORTED', 513);
+define('RESPONSE_OPERATION_CANCELLED', 514);
+define('RESPONSE_COMMAND_FAILED', 515);
 define('RESPONSE_ATOMIC_ROLL_BACK_FAILED', 516);
+define('RESPONSE_ATOMIC_RESPONSE_TOO_LARGE', 517);
 
 define('NAME_SPACE_URI_SYNCML_1_0', 'syncml:syncml1.0');
 define('NAME_SPACE_URI_SYNCML_1_1', 'syncml:syncml1.1');
@@ -629,6 +629,29 @@ class Horde_SyncML_State {
 
     	return $targets;
     }
+    
+    function needDeviceInfo()
+    {
+    	if ($this->_devinfoRequested || count($this->_syncs) < 1) return false;
+    		
+		$sendGetRequest = false;
+		
+    	foreach($this->_syncs as $sync)
+    	{
+    		if (($source = $sync->getSourceLocURI()) &&
+    			is_a($this->getPreferedContentTypeClient($source), 'PEAR_Error')) {
+    			$sendGetRequest = true;
+				break;
+    		}
+    	}
+
+    	return $sendGetRequest;
+    }
+    
+    function deviceInfoRequested()
+    {
+    	$this->_devinfoRequested = true;
+    }
 
     function getURI()
     {
@@ -912,53 +935,45 @@ class Horde_SyncML_State {
 			case 'contacts':
 			case 'card':
 				return 'contacts';
-				break;
 
 			case 'notes':
 				return 'notes';
-				break;
 
 			case 'tasks':
 			case 'jobs':
 				return 'tasks';
-				break;
 
 			case 'events':
 			case 'calendar':
 				return 'calendar';
-				break;
 
 			case 'caltasks':
 				return 'caltasks';
-				break;
 
 			# funambol related types
-
 			case 'sifcalendar':
 			case 'scal':
 				return 'sifcalendar';
-				break;
 
 			case 'sifcontacts':
 			case 'scard':
 				return 'sifcontacts';
-				break;
 
 			case 'siftasks':
 			case 'stask':
 				return 'siftasks';
-				break;
 
 			case 'sifnotes':
 			case 'snote':
 				return 'sifnotes';
-				break;
+				
+			case 'configuration':
+				return 'configuration';
 
 			default:
 				Horde::logMessage("SyncML: unknown hordeType for type=$type ($_type)", __FILE__, __LINE__, PEAR_LOG_INFO);
-				return $_type;
-				break;
 		}
+		return $_type;
 	}
 
 	/**
@@ -993,6 +1008,9 @@ class Horde_SyncML_State {
 				'mayFragment'		=>	1,
 				'Properties'		=>	$cprops,
 				);
+				
+			if ($_targetLocURI == 'configuration') $clientPrefs['ContentFormat'] = 'b64';
+			
 			#Horde::logMessage('SyncML: sourceLocURI ' . $_sourceLocURI . " clientPrefs:\n"
 			#	. print_r($clientPrefs, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
 			return $this->adjustContentType($clientPrefs, $_targetLocURI);
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync.php
index b826742bef..1fff5eaa90 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync.php
@@ -114,6 +114,18 @@ class Horde_SyncML_Sync {
 	function setSourceLocURI($sourceURI) {
 		$this->_sourceLocURI = $sourceURI;
 	}
+	
+	/**
+	 * Get sourceURI.
+	 *
+	 * @return string $sourceURI or false on error.
+	 */
+	function getSourceLocURI() {
+		if (empty($this->_sourceLocURI)) {
+			return false;
+		}
+		return $this->_sourceLocURI;	
+	}
 
 	/**
 	 * Setter for property targetURI.
@@ -308,6 +320,10 @@ class Horde_SyncML_Sync {
 				$replace = true;
 				$ok = false;
 				$merge = false;
+				if ($hordeType == 'configuration')
+				{
+					$command->setStatus(RESPONSE_ALREADY_EXISITS);
+				}
 				if ($guid)
 				{
 					Horde::logMessage('SyncML: locuri '. $locURI . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -317,12 +333,13 @@ class Horde_SyncML_Sync {
 						switch ($sync_conflicts)
 						{
 							case CONFLICT_CLIENT_WINNING:
-								$command->setStatus(RESPONSE_CONFLICT_RESOLVED_WITH_CLIENT_WINNING);
+								$command->setStatus(RESPONSE_CONFLICT_RESOLVED_WITH_CLIENT_WINS);
 								break;
 							case CONFLICT_SERVER_WINNING:
 								Horde::logMessage('SyncML: REJECT client change for locuri ' .
 									$locURI . ' guid ' . $guid ,
 									__FILE__, __LINE__, PEAR_LOG_WARNING);
+								$command->setStatus(RESPONSE_CONFLICT_RESOLVED_WITH_SERVER_WINS);
 								$ok = true;
 								$replace = false;
 								$state->log('Client-AddReplaceIgnored');
@@ -331,6 +348,7 @@ class Horde_SyncML_Sync {
 								Horde::logMessage('SyncML: Merge server and client data for locuri ' .
 									$locURI . ' guid ' . $guid ,
 									__FILE__, __LINE__, PEAR_LOG_WARNING);
+								$command->setStatus(RESPONSE_CONFLICT_RESOLVED_WITH_MERGE);
 							    $merge = true;
 								break;
 							case CONFLICT_RESOLVED_WITH_DUPLICATE:
@@ -340,6 +358,7 @@ class Horde_SyncML_Sync {
 								Horde::logMessage('SyncML: Server RO! REJECT client change for locuri ' .
 									$locURI . ' guid ' . $guid ,
 									__FILE__, __LINE__, PEAR_LOG_WARNING);
+								$command->setStatus(RESPONSE_PERMISSION_DENIED);
 								$ok = true;
 								$replace = false;
 								$ts = $state->getSyncTSforAction($guid, 'modify');
@@ -350,6 +369,7 @@ class Horde_SyncML_Sync {
 								Horde::logMessage('SyncML: Server RO! UNDO client change for locuri ' .
 									$locURI . ' guid ' . $guid ,
 									__FILE__, __LINE__, PEAR_LOG_WARNING);
+								$command->setStatus(RESPONSE_PERMISSION_DENIED);
 								$state->pushChangedItem($type, $guid);
 								$ok = true;
 								$replace = false;
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
index 143aae2639..4f7ecb0749 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
@@ -244,6 +244,7 @@ class Horde_SyncML_Sync_SlowSync extends Horde_SyncML_Sync_TwoWaySync {
 						. ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_WARNING);
 					if 	($sync_conflicts != CONFLICT_RESOLVED_WITH_DUPLICATE) {
 						$state->log("Client-AddReplaceIgnored");
+						$command->setStatus(RESPONSE_CONFILCT_RESOLVED_WITH_DUPLICATE);
 						continue;
 					}
 				} else {
@@ -252,6 +253,7 @@ class Horde_SyncML_Sync_SlowSync extends Horde_SyncML_Sync_TwoWaySync {
 						__FILE__, __LINE__, PEAR_LOG_DEBUG);
 						$state->setUID($type, $locURI, $guid);
 						$state->log("Client-Map");
+						$command->setStatus(RESPONSE_ALREADY_EXISITS);
 						continue;
 				}
 			}
diff --git a/phpgwapi/inc/horde/config/registry.php b/phpgwapi/inc/horde/config/registry.php
index d6f93773f3..fba8f4b48e 100644
--- a/phpgwapi/inc/horde/config/registry.php
+++ b/phpgwapi/inc/horde/config/registry.php
@@ -151,3 +151,13 @@ $this->applications['egwcaltaskssync'] = array(
     'menu_parent' => 'organizing'
 );
 
+$this->applications['egwconfigurationsync'] = array(
+    'fileroot' => EGW_SERVER_ROOT.'/syncml/configuration',
+    'webroot' => $this->applications['horde']['webroot'] . '/mnemo',
+    'icon' => $this->applications['horde']['webroot'] . '/mnemo/graphics/mnemo.gif',
+    'name' => _("Funambol Configurations"),
+    'status' => 'active',
+    'provides' => array('configuration'),
+    'menu_parent' => 'organizing'
+);
+

From 99cb0d791a92173909f660cfb060b2774a6db075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sat, 26 Jun 2010 11:26:46 +0000
Subject: [PATCH 03/91] Fix SyncML SourceURI issue

---
 phpgwapi/inc/horde/Horde/SyncML/Command/Put.php | 2 +-
 phpgwapi/inc/horde/Horde/SyncML/State.php       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
index c99a7b0c16..a1bcc14251 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
@@ -133,7 +133,7 @@ class Horde_SyncML_Command_Put extends Horde_SyncML_Command {
 						break;
 
 					case 'SourceRef':
-						$this->_sourceReference = trim($this->_chars);
+						$this->_sourceReference = strtolower(trim($this->_chars));
 						break;
 
 					case 'Tx-Pref':
diff --git a/phpgwapi/inc/horde/Horde/SyncML/State.php b/phpgwapi/inc/horde/Horde/SyncML/State.php
index 3635cab7cb..eca8b74a78 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State.php
@@ -985,6 +985,7 @@ class Horde_SyncML_State {
 
 	function getPreferedContentTypeClient($_sourceLocURI, $_targetLocURI = null) {
 		$deviceInfo = $this->getClientDeviceInfo();
+		$_sourceLocURI = strtolower($_sourceLocURI);
 
 		if(isset($deviceInfo['dataStore'][$_sourceLocURI]['maxGUIDSize']['contentType'])) {
 			$this->_maxGUIDSize = $deviceInfo['dataStore'][$this->_sourceURI]['maxGUIDSize']['contentType'];

From c5ae8dd8e257f6cef59a77ec0c717d3832d8a382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sat, 26 Jun 2010 11:35:11 +0000
Subject: [PATCH 04/91] Support Free/Busy information with credentials as part
 of the URL

---
 addressbook/inc/class.addressbook_bo.inc.php | 12 +++--
 calendar/freebusy.php                        | 48 ++++++++++++++++----
 calendar/inc/class.calendar_bo.inc.php       | 19 ++++++--
 calendar/inc/class.calendar_hooks.inc.php    | 16 +++++--
 calendar/lang/egw_de.lang                    |  6 +--
 calendar/lang/egw_en.lang                    |  7 ++-
 groupdav.php                                 |  2 +
 7 files changed, 83 insertions(+), 27 deletions(-)

diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php
index f924b0313c..81f7e40ef2 100755
--- a/addressbook/inc/class.addressbook_bo.inc.php
+++ b/addressbook/inc/class.addressbook_bo.inc.php
@@ -607,6 +607,8 @@ class addressbook_bo extends addressbook_so
 	 */
 	function db2data($data, $date_format='ts')
 	{
+		static $fb_url = false;
+		
 		// convert timestamps from server-time in the db to user-time
 		foreach ($this->timestamps as $name)
 		{
@@ -620,10 +622,12 @@ class addressbook_bo extends addressbook_so
 		// set freebusy_uri for accounts
 		if (!$data['freebusy_uri'] && !$data['owner'] && $data['account_id'] && !is_object($GLOBALS['egw_setup']))
 		{
-			static $fb_url;
-			if (!$fb_url && @is_dir(EGW_SERVER_ROOT.'/calendar/inc')) $fb_url = calendar_bo::freebusy_url('');
-			if ($fb_url) $data['freebusy_uri'] = $fb_url.urlencode(
-				isset($data['account_lid']) ? $data['account_lid'] : $GLOBALS['egw']->accounts->id2name($data['account_id']));
+			if ($fb_url || @is_dir(EGW_SERVER_ROOT.'/calendar/inc'))
+			{
+				$fb_url = true;
+				$user = isset($data['account_lid']) ? $data['account_lid'] : $GLOBALS['egw']->accounts->id2name($data['account_id']);
+				$data['freebusy_uri'] = calendar_bo::freebusy_url($user);
+			}
 		}
 		return $data;
 	}
diff --git a/calendar/freebusy.php b/calendar/freebusy.php
index eb7c124b05..21d68b98d0 100644
--- a/calendar/freebusy.php
+++ b/calendar/freebusy.php
@@ -43,6 +43,7 @@ if (strpos($_SERVER['QUERY_STRING'],'=3D') !== false && substr($_GET['user'],0,2
 {
 	$_GET['user'] = substr($_GET['user'],2);
 	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2);
+	if (isset($_GET['cred'])) $_GET['cred'] = substr($_GET['cred'],2);
 }
 if (!is_numeric($user = $_GET['user']))
 {
@@ -58,15 +59,46 @@ if ($user === false || !($username = $GLOBALS['egw']->accounts->id2name($user)))
 }
 if (!$loged_in)
 {
-	$GLOBALS['egw']->preferences->account_id = $user;
-	$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
-	$GLOBALS['egw_info']['user']['account_id'] = $user;
-	$GLOBALS['egw_info']['user']['account_lid'] = $username;
-
-	$cal_prefs = &$GLOBALS['egw_info']['user']['preferences']['calendar'];
-	if (!$cal_prefs['freebusy'] || !empty($cal_prefs['freebusy_pw']) && $cal_prefs['freebusy_pw'] != $_GET['password'])
+	if (empty($_GET['cred']))
 	{
-		fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!",$_GET['user']));
+		$GLOBALS['egw_info']['user']['account_id'] = $user;
+		$GLOBALS['egw_info']['user']['account_lid'] = $username;
+		$GLOBALS['egw']->preferences->account_id = $user;
+		$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
+		$cal_prefs = &$GLOBALS['egw_info']['user']['preferences']['calendar'];
+		$loged_in = !empty($cal_prefs['freebusy']) &&
+			(empty($cal_prefs['freebusy_pw']) || $cal_prefs['freebusy_pw'] == $_GET['password']);
+	}
+	else
+	{
+		$credentials = base64_decode($_GET['cred']);
+		list($authuser, $password) = explode(':', $credentials, 2);
+		if (strpos($authuser, '@') === false)
+		{
+			$domain = $GLOBALS['egw_info']['server']['default_domain'];
+			$authuser .= '@' . $domain;
+		}
+		else
+		{
+			list(, $domain) = explode('@',$authuser, 2);
+		}
+		if (array_key_exists($domain, $GLOBALS['egw_domain']))
+		{
+			$_POST['login'] = $authname;
+			$_REQUEST['domain'] = $domain;
+			$GLOBALS['egw_info']['server']['default_domain'] = $domain;
+			$GLOBALS['egw_info']['user']['domain'] = $domain;
+			$GLOBALS['egw_info']['flags']['currentapp'] = 'login';
+			$GLOBALS['egw_info']['flags']['noapi'] = false;
+			require_once(EGW_API_INC . '/functions.inc.php');
+			$loged_in =  $GLOBALS['egw']->session->create($authuser, $password, 'text');
+			session_unset();
+			session_destroy();
+		}
+	}
+	if (!$loged_in)
+	{
+		fail_exit(lang("freebusy: Unknow user '%1', or not available for unauthenticated users!", $_GET['user']));
 	}
 }
 if ($_GET['debug'])
diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 177a1b520a..87352ec3d7 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -1772,14 +1772,25 @@ class calendar_bo
 	 * @param int|string $user account_id or account_lid
 	 * @param string $pw=null password
 	 */
-	static function freebusy_url($user,$pw=null)
+	static function freebusy_url($user='',$pw=null)
 	{
 		if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
-
+		
+		$credentials = '';
+		
+		if ($pw)
+		{
+			$credentials = '&password='.urlencode($pw);
+		}
+		elseif ($GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy'] == 2)
+		{
+			$credentials = $GLOBALS['egw_info']['user']['account_lid']
+				. ':' . $GLOBALS['egw_info']['user']['passwd'];
+			$credentials = '&cred=' . base64_encode($credentials);
+		}
 		return (!$GLOBALS['egw_info']['server']['webserver_url'] || $GLOBALS['egw_info']['server']['webserver_url'][0] == '/' ?
 			($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'] : '').
-			$GLOBALS['egw_info']['server']['webserver_url'].'/calendar/freebusy.php?user='.urlencode($user).
-			($pw ? '&password='.urlencode($pw) : '');
+			$GLOBALS['egw_info']['server']['webserver_url'].'/calendar/freebusy.php/?user='.urlencode($user).$credentials;
 	}
 
 	/**
diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php
index 2515ea5fd7..6c7c446bba 100644
--- a/calendar/inc/class.calendar_hooks.inc.php
+++ b/calendar/inc/class.calendar_hooks.inc.php
@@ -240,6 +240,11 @@ class calendar_hooks
 			'all'		=> lang('Always'),
 			'startday'	=> lang('If start day differs'),
 		);
+		$freebusy_values = array(
+			0		=> lang('No'),
+			1		=> lang('Yes'),
+			2		=> lang('With credentials included'),
+		);
 		if (!$hook_data['setup'])	// does not work at setup time
 		{
 			$options = array('0' => lang('none'));
@@ -248,7 +253,9 @@ class calendar_hooks
 				$options[$group['account_id']] = common::grab_owner_name($group['account_id']);
 			}
 			$freebusy_url = calendar_bo::freebusy_url($GLOBALS['egw_info']['user']['account_lid'],$GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy_pw']);
-			$freebusy_help = lang('Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is %1.','<a href="'.$freebusy_url.'" target="_blank">'.$freebusy_url.'</a>');
+			$freebusy_url = '<a href="'.$freebusy_url.'" target="_blank">'.$freebusy_url.'</a>';
+			$freebusy_help = lang('Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is');
+			$freebusy_help .= ' ' . $freebusy_url;
 
 			// Timezone for file exports
 			$export_tzs = array('0' => 'Use Event TZ');
@@ -536,15 +543,16 @@ class calendar_hooks
 				'admin'  => False,
 			),
 			'freebusy' => array(
-				'type'  => 'check',
+				'type'  => 'select',
 				'label' => 'Make freebusy information available to not loged in persons?',
 				'name'  => 'freebusy',
 				'help'  => $freebusy_help,
+				'values'	=> $freebusy_values,
 				'run_lang' => false,
 				'subst_help' => False,
 				'xmlrpc' => True,
 				'admin'  => False,
-				'forced' => false,
+				'forced' => 0,
 			),
 			'freebusy_pw' => array(
 				'type'  => 'input',
@@ -553,7 +561,7 @@ class calendar_hooks
 				'help'  => 'If you dont set a password here, the information is available to everyone, who knows the URL!!!',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'forced' => 'no'
+				'forced' => ''
 			)
 		);
 	}
diff --git a/calendar/lang/egw_de.lang b/calendar/lang/egw_de.lang
index 99c21b2f0c..d63c9f51a2 100644
--- a/calendar/lang/egw_de.lang
+++ b/calendar/lang/egw_de.lang
@@ -180,7 +180,7 @@ forward one month	calendar	de	einen Monat weiter
 forward one year	calendar	de	ein Jahr weiter
 four days view	calendar	de	Vier-Tagesansicht
 freebusy	common	de	frei / belegt
-freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	de	Frei / Belegt: Unbekannter Benutzername '%1', falsches Passwort oder nicht verfügbar für nicht angemeldete Benutzer !!!
+freebusy: unknow user '%1', or not available for unauthenticated users!	calendar	de	Free/Busy: Unbekannter Benutzer '%1', oder Daten ohne Authentisierung nicht verfügbar!
 freetime search	calendar	de	Terminsuche
 fri	calendar	de	Fr
 full description	calendar	de	vollständige Beschreibung
@@ -355,8 +355,7 @@ set new events to private	calendar	de	Neue Termine als private Termine eintragen
 setting lock time calender	admin	de	Zeitintervall für Datensatzlock (default 1 sec.)
 shall the date parameter be accepted (e.g. from calendar module)?	calendar	de	Soll der Parameter Datum akzeptiert werden (z.B. vom Kalender Modul)?
 should new events created as private by default ?	calendar	de	Sollen neue Termine generell als Privat angelegt werden?
-should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1.	calendar	de	Sollen nicht angemeldete Personen Ihre Belegtzeiten einsehen können? Sie können ein Passwort setzen um diese Informationen zu schützen. Das Passwort sollte sich von Ihrem normalen Passwort unterscheiden. Die Belegtzeiten sind im iCal Format und enthalten ausschließlich die Zeiten, an denen Sie nicht verfügbar sind. Sie enthalten NICHT den Namen, die Beschreibung oder den Ort des Termins. Die Adresse (URL) Ihrer Belegtzeiten ist %1.
-should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is <a href="http://213.183.76.121/egroupware/calendar/freebusy.php?user=mkk" target="_blank">http://213.183.76.121/egroupware/calendar/freebusy.php?user=mkk</a>.	calendar	de	Soll Ihre Verfügbarkeit auch ohne Anmeldung sichtbar sein? Sie können auch ein separates Passwort zum Schutz dieser Information vergeben. Ihre Verfügbarkeit wird im iCal-Format veröffnetlicht und enthält nur die Zeiten, zu denen sie bereits gebucht sind. Titel, Beschreibung und Ort sind so nicht einsehbar.
+should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is	calendar	de	Sollen nicht angemeldete Personen Ihre Belegtzeiten einsehen können? Sie können ein Passwort setzen um diese Informationen zu schützen. Das Passwort sollte sich von Ihrem normalen Passwort unterscheiden. Die Belegtzeiten sind im iCal Format und enthaltena usschließlich die Zeiten, an denen Sie nicht verfügbar sind. Sie enthalten NICHT den Namen, die Beschreibung oder den Ort des Termins. Die Adresse (URL) Ihrer Belegtzeiten ist
 should the grid be shown in the calendar	calendar	de	Soll das Gitternetz im Kalender angezeigt werden?
 should the number of weeks be shown on top of the calendar	calendar	de	Soll die Wochenanzahl im Kalander oben abgezeigt werden?
 should the number of weeks be shown on top of the calendar (only if offset = 0)	calendar	de	Soll die Kalenderwoche im oberen Teil des Kalenders angezeigt werden (Nur wenn Abstabd=0)
@@ -466,6 +465,7 @@ which events do you want to see when you enter the calendar.	calendar	de	Welche
 which of calendar view do you want to see, when you start calendar ?	calendar	de	Welche der möglichen Ansichten des Kalenders möchten Sie als Standard sehen, wenn der Kalender geöffnet wird?
 whole day	calendar	de	ganztägig
 whole query	calendar	de	Ganze Abfrage
+with credentials included	calendar	de	Mit Zugangsdaten im URL
 wk	calendar	de	KW
 work day ends on	calendar	de	Arbeitstag endet um
 work day starts on	calendar	de	Arbeitstag beginnt um
diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang
index 53a1d0fc93..1143dd80d1 100644
--- a/calendar/lang/egw_en.lang
+++ b/calendar/lang/egw_en.lang
@@ -180,7 +180,7 @@ forward one month	calendar	en	forward one month
 forward one year	calendar	en	forward one year
 four days view	calendar	en	Four days view
 freebusy	common	en	Free/Busy
-freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	en	Free/Busy: Unknown user '%1', wrong password or not available to not logged in users !!!
+freebusy: unknow user '%1', or not available for unauthenticated users!	calendar	en	freebusy: Unknow user '%1', or not available for unauthenticated users!
 freetime search	calendar	en	Freetime Search
 fri	calendar	en	Fri
 full description	calendar	en	Full description
@@ -355,9 +355,7 @@ set new events to private	calendar	en	Set new events to private
 setting lock time calender	admin	en	Setting Data lock Time for Calendar (default 1 sec.)
 shall the date parameter be accepted (e.g. from calendar module)?	calendar	en	Shall the date parameter be accepted (e.g. from calendar module)?
 should new events created as private by default ?	calendar	en	Should new events created as private by default ?
-should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1.	calendar	en	Should not logged in persons be able to see your Free/Busy information? You can set an extra password, different from your normal password, to protect this information. The Free/Busy information is in iCal format and only includes the times when you are busy. It does not include the event-name, description or locations. The URL to your Free/Busy information is %1.
-should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is <a href="http://213.183.76.121/egroupware/calendar/freebusy.php?user=mkk" target="_blank">http://213.183.76.121/egroupware/calendar/freebusy.php?user=mkk</a>.	calendar	en	Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is <a href="http://213.183.76.121/egroupware/calendar/freebusy.php?user=mkk" target="_blank">http://213.183.76.121/egroupware/calendar/freebusy.php?user=mkk</a>.
-should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is <a href="https://www.serveahead.de/trunk/calendar/freebusy.php?user=admin" target="_blank">https://www.serveahead.de/trunk/calendar/freebusy.php?user=admin</a>.	calendar	en	Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is <a href="https://www.serveahead.de/trunk/calendar/freebusy.php?user=admin" target="_blank">https://www.serveahead.de/trunk/calendar/freebusy.php?user=admin</a>.
+should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is	calendar	en	Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is
 should the grid be shown in the calendar	calendar	en	Should the grid be shown in the calendar
 should the number of weeks be shown on top of the calendar	calendar	en	Should the number of weeks be shown on top of the calendar
 should the number of weeks be shown on top of the calendar (only if offset = 0)	calendar	en	Should the number of weeks be shown on top of the calendar (only if offset = 0)
@@ -467,6 +465,7 @@ which events do you want to see when you enter the calendar.	calendar	en	Which e
 which of calendar view do you want to see, when you start calendar ?	calendar	en	Which of calendar views do you want to see, when you start calendar ?
 whole day	calendar	en	Whole day
 whole query	calendar	en	whole query
+with credentials included	calendar	en	With credentials included
 wk	calendar	en	Wk
 work day ends on	calendar	en	Work day ends on
 work day starts on	calendar	en	Work day starts on
diff --git a/groupdav.php b/groupdav.php
index bfe90c7362..e6b1daa890 100644
--- a/groupdav.php
+++ b/groupdav.php
@@ -28,6 +28,8 @@ $GLOBALS['egw_info'] = array(
 require_once('phpgwapi/inc/class.egw_digest_auth.inc.php');
 include(dirname(__FILE__).'/header.inc.php');
 
+$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
+
 $headertime = microtime(true);
 
 $groupdav = new groupdav();

From c6b0f825d92411129be55906f508dfc47f515de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sat, 26 Jun 2010 15:58:33 +0000
Subject: [PATCH 05/91] Fix SyncML replace and recur_enddate issue

---
 calendar/inc/class.calendar_ical.inc.php | 149 ++++++-----------------
 calendar/inc/class.calendar_so.inc.php   |  28 +++--
 2 files changed, 52 insertions(+), 125 deletions(-)

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index f41389e841..3bd314fa25 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -615,6 +615,8 @@ class calendar_ical extends calendar_boupdate
 						$rrule = $rriter->generate_rrule($version);
 						if ($event['recur_enddate'])
 						{
+							$length = $event['end'] - $event['start'];
+							$rrule['UNTIL']->modify($length . ' second');
 							if (!$tzid || $version != '1.0')
 							{
 								if (!isset(self::$tz_cache['UTC']))
@@ -1052,6 +1054,7 @@ class calendar_ical extends calendar_boupdate
 	function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null)
 	{
 		$this->events_imported = 0;
+		$replace = $delete_exceptions= false;
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
@@ -1065,6 +1068,7 @@ class calendar_ical extends calendar_boupdate
 		{
 			if (count($events) == 1)
 			{
+				$replace = $recur_date == 0;
 				$events[0]['id'] = $cal_id;
 				if (!is_null($etag)) $events[0]['etag'] = (int) $etag;
 				if ($recur_date) $events[0]['recurrence'] = $recur_date;
@@ -1120,43 +1124,42 @@ class calendar_ical extends calendar_boupdate
 					. array2string($event)."\n",3,$this->logfile);
 			}
 
-			/*
-			if ($event['recur_type'] != MCAL_RECUR_NONE)
+			$updated_id = false;
+			
+			if ($replace)
 			{
-				// Adjust the event start -- no exceptions before and at the start
-				$length = $event['end'] - $event['start'];
-				$rriter = calendar_rrule::event2rrule($event, false);
-				$rriter->rewind();
-				if (!$rriter->valid()) continue; // completely disolved into exceptions
-
-				$newstart = egw_time::to($rriter->current, 'server');
-				if ($newstart != $event['start'])
+				$event_info['type'] = $event['recur_type'] == MCAL_RECUR_NONE ?
+					'SINGLE' : 'SERIES-MASTER';
+				$event_info['acl_edit'] = $this->check_perms(EGW_ACL_EDIT, $cal_id);
+				if (($event_info['stored_event'] = $this->read($cal_id, 0, false, 'server')) &&
+					$event_info['stored_event']['recur_type'] != MCAL_RECUR_NONE &&
+					($event_info['stored_event']['recur_type'] != $event['recur_type']
+					|| $event_info['stored_event']['recur_interval'] != $event['recur_interval']
+					|| $event_info['stored_event']['recur_data'] != $event['recur_data']
+					|| $event_info['stored_event']['start'] != $event['start']))
 				{
-					// leading exceptions skiped
-					$event['start'] = $newstart;
-					$event['end'] = $newstart + $length;
-				}
-
-				$exceptions = $event['recur_exception'];
-				foreach($exceptions as $key => $day)
-				{
-					// remove leading exceptions
-					if ($day <= $event['start'])
+					// handle the old exceptions
+					$recur_exceptions = $this->so->get_related($event_info['stored_event']['uid']);
+					foreach ($recur_exceptions as $id)
 					{
-						if ($this->log)
+						if ($delete_exceptions)
 						{
-							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'(): event SERIES-MASTER skip leading exception ' .
-								$day . "\n",3,$this->logfile);
+							$this->delete($id);
+						}
+						else
+						{
+							if (!($exception = $this->read($id))) continue;
+							$exception['uid'] = common::generate_uid('calendar', $id);
+							$exception['reference'] = $exception['recurrence'] = 0;
+							$this->update($exception, true);
 						}
-						unset($exceptions[$key]);
 					}
 				}
-				$event['recur_exception'] = $exceptions;
 			}
-			*/
-			$updated_id = false;
-			$event_info = $this->get_event_info($event);
+			else
+			{
+				$event_info = $this->get_event_info($event);
+			}
 
 			// common adjustments for existing events
 			if (is_array($event_info['stored_event']))
@@ -1471,55 +1474,7 @@ class calendar_ical extends calendar_boupdate
 						if (is_array($days))
 						{
 							$recur_exceptions = array();
-							/*
-							if (!isset($days[$event_info['stored_event']['start']]) &&
-								$event_info['stored_event']['start'] < $event['start'])
-							{
-								// We started with a pseudo exception and moved the
-								// event start therefore to the future; let's try to go back
-								$exceptions = $this->so->get_recurrence_exceptions($event_info['stored_event'], $this->tzid, 0, 0, 'rrule');
-								if ($this->log)
-								{
-									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(START ADJUSTMENT):\n" .
-										array2string($exceptions)."\n",3,$this->logfile);
-								}
-								$startdate = $event_info['stored_event']['start'];
-								$length = $event['end'] - $event['start'];
-								$rriter = calendar_rrule::event2rrule($event_info['stored_event'], false);
-								$rriter->rewind();
-								do
-								{
-									// start is a pseudo excpetion for sure
-									$rriter->next_no_exception();
-									$day = $this->date2ts($rriter->current());
-									if ($this->log)
-									{
-										error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-											'(): event SERIES-MASTER try leading pseudo exception ' .
-											$day . "\n",3,$this->logfile);
-									}
-									if ($day >= $event['start']) break;
-									if (!isset($exceptions[$day]))
-									{
-										// all leading occurrences have to be exceptions;
-										// if not -> no restore
-										if ($this->log)
-										{
-											error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-												'(): event SERIES-MASTER pseudo exception series broken at ' .
-												$rriter->current() . "!\n",3,$this->logfile);
-										}
-										$startdate = $event['start'];
-										$recur_exceptions = array();
-										break;
-									}
-									$recur_exceptions[] = $day;
-								} while ($rriter->valid());
-
-								$event['start'] = $startdate;
-								$event['end'] = $startdate + $length;
-							} */
-
+							
 							foreach ($event['recur_exception'] as $recur_exception)
 							{
 								if (isset($days[$recur_exception]))
@@ -1592,43 +1547,7 @@ class calendar_ical extends calendar_boupdate
 									array_unique(array_merge($event_info['master_event']['recur_exception'],
 										array($event['recurrence'])));
 							}
-							/*
-							// Adjust the event start -- must not be an exception
-							$length = $event_info['master_event']['end'] - $event_info['master_event']['start'];
-							$rriter = calendar_rrule::event2rrule($event_info['master_event'], false);
-							$rriter->rewind();
-							if ($rriter->valid())
-							{
-								$newstart = egw_time::to($rriter->current, 'server');
-								foreach($event_info['master_event']['recur_exception'] as $key => $day)
-								{
-									// remove leading exceptions
-									if ($day < $newstart)
-									{
-										if (($foundEvents = $this->find_event(
-											array('uid' => $event_info['master_event']['uid'],
-												'recurrence' => $day), 'exact')) &&
-												($eventId = array_shift($foundEvents)) &&
-												($exception = read($eventId, 0, 'server')))
-										{
-											// Unlink this exception
-											unset($exception['uid']);
-											$this->update($exception, true);
-										}
-										if ($event['recurrence'] == $day)
-										{
-											// Unlink this exception
-											unset($event['uid']);
-										}
-										unset($event_info['master_event']['recur_exception'][$key]);
-									}
-								}
-							}
-							if ($event_info['master_event']['start'] < $newstart)
-							{
-								$event_info['master_event']['start'] = $newstart;
-								$event_info['master_event']['end'] = $newstart + $length;
-							}*/
+							
 							$event['reference'] = $event_info['master_event']['id'];
 							$event['category'] = $event_info['master_event']['category'];
 							$event['owner'] = $event_info['master_event']['owner'];
diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index 9bc7bce4ba..5b0fe85e32 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -914,8 +914,23 @@ ORDER BY cal_user_type, cal_usre_id
 			$this->db->update($this->cal_table, array('cal_uid' => $event['cal_uid']),
 				array('cal_id' => $event['cal_id']),__LINE__,__FILE__,'calendar');
 		}
-		// write information about recuring event, if recur_type is present in the array
-		if ($event['recur_type'] != MCAL_RECUR_NONE)
+		
+		if ($event['recur_type'] == MCAL_RECUR_NONE)
+		{
+			$this->db->delete($this->dates_table,array(
+				'cal_id' => $cal_id),
+				__LINE__,__FILE__,'calendar');
+			
+			// delete all user-records, with recur-date != 0
+			$this->db->delete($this->user_table,array(
+				'cal_id' => $cal_id, 'cal_recur_date != 0'),
+				__LINE__,__FILE__,'calendar');
+			
+			$this->db->delete($this->repeats_table,array(
+				'cal_id' => $cal_id),
+				__LINE__,__FILE__,'calendar');
+		}
+		else // write information about recuring event, if recur_type is present in the array
 		{
 			// fetch information about the currently saved (old) event
 			$old_min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
@@ -1024,14 +1039,7 @@ ORDER BY cal_user_type, cal_usre_id
 			// write the repeats table
 			$event['recur_exception'] = empty($event['recur_exception']) ? null : implode(',',$event['recur_exception']);
 			unset($event[0]);	// unset the 'etag=etag+1', as it's not in the repeats table
-			if($event['recur_type'] != MCAL_RECUR_NONE)
-			{
-				$this->db->insert($this->repeats_table,$event,array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
-			}
-			else
-			{
-				$this->db->delete($this->repeats_table,array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
-			}
+			$this->db->insert($this->repeats_table,$event,array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
 		}
 		// update start- and endtime if present in the event-array, evtl. we need to move all recurrences
 		if (isset($event['cal_start']) && isset($event['cal_end']))

From bce68a9e821d86eae1d6d2f05045537f072beab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sun, 27 Jun 2010 22:16:22 +0000
Subject: [PATCH 06/91] Fix CalDAV group attendee issue; various GroupDAV
 improvements

---
 .../inc/class.addressbook_groupdav.inc.php    |  4 +-
 calendar/inc/class.calendar_groupdav.inc.php  | 12 ++-
 calendar/inc/class.calendar_ical.inc.php      | 78 ++++++++-----------
 phpgwapi/inc/class.groupdav.inc.php           | 34 +++++---
 .../inc/class.groupdav_principals.inc.php     | 29 +++++--
 5 files changed, 90 insertions(+), 67 deletions(-)

diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php
index 97c14c6798..70ae27d8b8 100644
--- a/addressbook/inc/class.addressbook_groupdav.inc.php
+++ b/addressbook/inc/class.addressbook_groupdav.inc.php
@@ -391,9 +391,9 @@ class addressbook_groupdav extends groupdav_handler
 		// should we hide the accounts addressbook
 		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
 
-		$result = $this->bo->search(array(),'MAX(contact_modified) AS contact_modified','','','','','',$filter);
+		$result = $this->bo->search(array(),'MAX(contact_modified) AS contact_modified','','','',false,'AND',false,$filter);
 
-		$ctag = 'EGw-'.$result[0]['modified'].'-wGE';
+		$ctag = 'EGw-'.$result[0]['contact_modified'].'-wGE';
 		return $ctag;
 	}
 
diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index 73c0e95616..18dfcc61d4 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -591,6 +591,8 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 	 */
 	function post(&$options,$id,$user=null)
 	{
+		$status = $this->put($options,$id,$user);
+		// error_log("CalDAV POST: $status" . print_r($options, true));
 		return true;
 	}
 
@@ -869,8 +871,12 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 			array(HTTP_WebDAV_Server::mkprop(groupdav::DAV,'href',$base_uri.'/calendar/')));
 		*/
 		// email of the current user, see caldav-sheduling draft
-		$props[] =	HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
-			HTTP_WebDAV_Server::mkprop('href','MAILTO:'.$GLOBALS['egw_info']['user']['email'])));
+		$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
+			HTTP_WebDAV_Server::mkprop('href','MAILTO:'.$GLOBALS['egw_info']['user']['email']),
+			HTTP_WebDAV_Server::mkprop('href',$base_uri.'/principals/users/'.$GLOBALS['egw_info']['user']['account_lid'].'/'),
+			HTTP_WebDAV_Server::mkprop('href','urn:uuid:'.$GLOBALS['egw_info']['user']['account_lid'])));
+		//$props[] =	HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
+		//	HTTP_WebDAV_Server::mkprop('href','MAILTO:'.$GLOBALS['egw_info']['user']['email'])));
 		// supported components, currently only VEVENT
 		$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'supported-calendar-component-set',array(
 			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VCALENDAR')),
@@ -886,6 +892,8 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-data', array('content-type' => 'text/calendar', 'version'=> '2.0')),
 			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-data', array('content-type' => 'text/x-calendar', 'version'=> '1.0'))));
 		$props[] = HTTP_WebDAV_Server::mkprop(groupdav::ICAL,'calendar-color','#0040A0FF'); // TODO: make it configurable
+		//$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'publish-url',array(
+		//	HTTP_WebDAV_Server::mkprop('href',$base_uri.'/calendar/')));
 
 		//$props = self::current_user_privilege_set($props);
 		return $props;
diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index 3bd314fa25..4f5fbad689 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -433,27 +433,6 @@ class calendar_ical extends calendar_boupdate
 					sort($exceptions);
 				}
 				$event['recur_exception'] = $exceptions;
-				/*
-				// Adjust the event start -- must not be an exception
-				$length = $event['end'] - $event['start'];
-				$rriter = calendar_rrule::event2rrule($event, false, $tzid);
-				$rriter->rewind();
-				if ($rriter->valid())
-				{
-					$event['start'] = egw_time::to($rriter->current, 'server');
-					$event['end'] = $event['start'] + $length;
-					foreach($exceptions as $key => $day)
-					{
-						// remove leading exceptions
-						if ($day <= $event['start']) unset($exceptions[$key]);
-					}
-					$event['recur_exception'] = $exceptions;
-				}
-				else
-				{
-					// the series dissolved completely into exceptions
-					continue;
-				}*/
 			}
 
 			foreach ($egwSupportedFields as $icalFieldName => $egwFieldName)
@@ -496,15 +475,15 @@ class calendar_ical extends calendar_boupdate
 							{
 								$participantURL = empty($info['email']) ? '' : 'MAILTO:' . $info['email'];
 							}
+							// RSVP={TRUE|FALSE}	// resonse expected, not set in eGW => status=U
+							$rsvp = $status == 'U' ? 'TRUE' : 'FALSE';
 							if ($role == 'CHAIR')
 							{
 								$organizerURL = $participantURL;
+								$rsvp = '';
 								$organizerCN = $participantCN;
 								$organizerUID = ($info['type'] != 'e' ? $uid : '');
 							}
-							$attributes['ATTENDEE'][]	= $participantURL;
-							// RSVP={TRUE|FALSE}	// resonse expected, not set in eGW => status=U
-							$rsvp = $status == 'U' ? 'TRUE' : 'FALSE';
 							// PARTSTAT={NEEDS-ACTION|ACCEPTED|DECLINED|TENTATIVE|DELEGATED|COMPLETED|IN-PROGRESS} everything from delegated is NOT used by eGW atm.
 							$status = $this->status_egw2ical[$status];
 							// CUTYPE={INDIVIDUAL|GROUP|RESOURCE|ROOM|UNKNOWN}
@@ -512,6 +491,11 @@ class calendar_ical extends calendar_boupdate
 							{
 								case 'g':
 									$cutype = 'GROUP';
+									if ($this->productManufacturer == 'groupdav')
+									{
+										$participantURL = 'invalid:nomail';
+										$cutype = 'INDIVIDUAL';
+									}
 									break;
 								case 'r':
 									$cutype = 'RESOURCE';
@@ -526,14 +510,17 @@ class calendar_ical extends calendar_boupdate
 									break;
 							};
 							// ROLE={CHAIR|REQ-PARTICIPANT|OPT-PARTICIPANT|NON-PARTICIPANT|X-*}
-							$parameters['ATTENDEE'][] = array(
-								'CN'       => $participantCN,
-								'ROLE'     => $role,
-								'PARTSTAT' => $status,
-								'CUTYPE'   => $cutype,
-								'RSVP'     => $rsvp,
-							)+($info['type'] != 'e' ? array('X-EGROUPWARE-UID' => $uid) : array())+
-							($quantity > 1 ? array('X-EGROUPWARE-QUANTITY' => $quantity) : array());
+							$options = array();
+							if (!empty($participantCN)) $options['CN'] = $participantCN;
+							if (!empty($role)) $options['ROLE'] = $role;
+							if (!empty($status)) $options['PARTSTAT'] = $status;
+							if (!empty($cutype)) $options['CUTYPE'] = $cutype;
+							if (!empty($rsvp)) $options['RSVP'] = $rsvp;
+							if (!empty($info['email'])) $options['EMAIL'] = $info['email'];
+							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = $uid;
+							if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = $quantity;
+							$attributes['ATTENDEE'][]	= $participantURL;
+							$parameters['ATTENDEE'][] = $options;
 						}
 						break;
 
@@ -547,37 +534,38 @@ class calendar_ical extends calendar_boupdate
 	    				{
 	    					$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
 			    				. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
-			    			$organizerURL = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
 			    			if ($version == '1.0')
 			    			{
 		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
 			    			}
 			    			else
 			    			{
-		    					$organizerURL = empty($organizerURL) ? '' : 'MAILTO:' . $organizerURL;
+		    					$organizerURL = empty($organizerEMail) ? '' : 'MAILTO:' . $organizerEMail;
 			    			}
 			    			$organizerUID = $event['owner'];
 		    				if (!isset($event['participants'][$event['owner']]))
 		    				{
-			    				$attributes['ATTENDEE'][] = $organizerURL;
-			    				$parameters['ATTENDEE'][] = array(
-				    				'CN'       => $organizerCN,
+			    				$options = array(
 									'ROLE'     => 'CHAIR',
 									'PARTSTAT' => 'DELEGATED',
 									'CUTYPE'   => 'INDIVIDUAL',
-									'RSVP'     => 'FALSE',
-									'X-EGROUPWARE-UID' => $event['owner'],
-			    				);
+									//'RSVP'     => 'FALSE',
+									);
+								if (!empty($organizerCN)) $options['CN'] = $organizerCN;	
+								if (!empty($organizerEMail)) $options['EMAIL'] = $organizerEMail;
+								if (!empty($event['owner'])) $options['X-EGROUPWARE-UID'] = $event['owner'];
+								$attributes['ATTENDEE'][] = $organizerURL;
+			    				$parameters['ATTENDEE'][] = $options;
 		    				}
 	    				}
-		    			if ($this->productManufacturer != 'groupdav' ||
-			    			!$this->check_perms(EGW_ACL_EDIT,$event))
-			    			{
+	    				if ($this->productManufacturer != 'groupdav' ||	!$this->check_perms(EGW_ACL_EDIT,$event))
+	    				{
 		    				$attributes['ORGANIZER'] = $organizerURL;
 		    				$parameters['ORGANIZER']['CN'] = $organizerCN;
 		    				if (!empty($organizerUID))
 		    				{
-		    					$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
+			    				$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
 		    				}
 	    				}
 	    				break;
@@ -615,7 +603,7 @@ class calendar_ical extends calendar_boupdate
 						$rrule = $rriter->generate_rrule($version);
 						if ($event['recur_enddate'])
 						{
-							$length = $event['end'] - $event['start'];
+							$length = ($event['end'] - $event['start']) / 2;
 							$rrule['UNTIL']->modify($length . ' second');
 							if (!$tzid || $version != '1.0')
 							{
diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php
index 773bd96bf5..988fdc2649 100644
--- a/phpgwapi/inc/class.groupdav.inc.php
+++ b/phpgwapi/inc/class.groupdav.inc.php
@@ -273,12 +273,16 @@ class groupdav extends HTTP_WebDAV_Server
 						self::mkprop('href',$this->base_uri.$user_prefix))),
 					self::mkprop('current-user-principal',array(self::mkprop('href',$this->principalURL))),
 					self::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
-						self::mkprop('href','MAILTO:'.$GLOBALS['egw_info']['user']['email']))),
-						self::mkprop('principal-collection-set',array(
-							self::mkprop('href',$this->base_uri.'/principals/users/'),
-							self::mkprop('href',$this->base_uri.'/principals/groups/'))),
+						self::mkprop('href','MAILTO:'.$account['account_email']),
+						self::mkprop('href',$this->base_uri.'/principals/users/'.$account['account_lid'].'/'),
+						self::mkprop('href','urn:uuid:'.$account['account_lid']))),
+					self::mkprop(groupdav::CALENDARSERVER,'email-address-set',array(
+						self::mkprop(groupdav::CALENDARSERVER,'email-address',$GLOBALS['egw_info']['user']['email']))),
 					//self::mkprop('principal-URL',array(self::mkprop('href',$this->principalURL))),
-					//self::mkprop('principal-collection-set',array(self::mkprop('href',$this->base_uri.'/principals/'))),
+					self::mkprop('principal-collection-set',array(self::mkprop('href',$this->base_uri.'/principals/'))),
+					// OUTBOX URLs of the current user
+					self::mkprop(groupdav::CALDAV,'schedule-outbox-URL',array(
+						self::mkprop(groupdav::DAV,'href',$this->base_uri.'/calendar/'))),
 				);
 			//$props = self::current_user_privilege_set($props);
 			$files['files'][] = array(
@@ -296,11 +300,11 @@ class groupdav extends HTTP_WebDAV_Server
 			            	self::mkprop('displayname',lang('Accounts')),
 							self::mkprop('resourcetype',array(self::mkprop('principals',''))),
 							self::mkprop('current-user-principal',array(self::mkprop('href',$this->principalURL))),
-							self::mkprop(groupdav::CALDAV,'calendar-home-set',array(
-								self::mkprop('href',$this->base_uri.$user_prefix))),
-							self::mkprop(groupdav::CARDDAV,'addressbook-home-set',array(
-								self::mkprop('href',$this->base_uri.$user_prefix))),
-							self::mkprop('principal-URL',array(self::mkprop('href',$this->principalURL))),
+							//self::mkprop(groupdav::CALDAV,'calendar-home-set',array(
+							//	self::mkprop('href',$this->base_uri.$user_prefix))),
+							//self::mkprop(groupdav::CARDDAV,'addressbook-home-set',array(
+							//	self::mkprop('href',$this->base_uri.$user_prefix))),
+							//self::mkprop('principal-URL',array(self::mkprop('href',$this->principalURL))),
 		            	),
 					);
 				}
@@ -382,9 +386,15 @@ class groupdav extends HTTP_WebDAV_Server
 			self::mkprop('alternate-URI-set',array(
 				self::mkprop('href','MAILTO:'.$GLOBALS['egw_info']['user']['email']))),
 			self::mkprop('principal-collection-set',array(
-				self::mkprop('href',$this->base_uri.'/principals/users/'),
-				self::mkprop('href',$this->base_uri.'/principals/groups/'),
+				self::mkprop('href',$this->base_uri.'/principals/'),
 			)),
+			self::mkprop('principal-URL',array(self::mkprop('href',$this->principalURL))),
+			self::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
+				self::mkprop('href','MAILTO:'.$GLOBALS['egw_info']['user']['email']),
+				self::mkprop('href',$this->base_uri.'/principals/users/'.$GLOBALS['egw_info']['user']['account_lid'].'/'),
+				self::mkprop('href','urn:uuid:'.$GLOBALS['egw_info']['user']['account_lid']))),
+			self::mkprop(groupdav::CALENDARSERVER,'email-address-set',array(
+				self::mkprop(groupdav::CALENDARSERVER,'email-address',$GLOBALS['egw_info']['user']['email']))),		
 		);
 
 		switch ($app)
diff --git a/phpgwapi/inc/class.groupdav_principals.inc.php b/phpgwapi/inc/class.groupdav_principals.inc.php
index 1ae8150950..731e57fc99 100644
--- a/phpgwapi/inc/class.groupdav_principals.inc.php
+++ b/phpgwapi/inc/class.groupdav_principals.inc.php
@@ -84,6 +84,7 @@ class groupdav_principals extends groupdav_handler
 		{
 			$displayname = $this->translation->convert($account['account_fullname'],
 				$this->translation->charset(),'utf-8');
+			
 			$props = array(
 				HTTP_WebDAV_Server::mkprop('displayname',$displayname),
 				HTTP_WebDAV_Server::mkprop('getetag',$this->get_etag($account)),
@@ -91,9 +92,12 @@ class groupdav_principals extends groupdav_handler
 					HTTP_WebDAV_Server::mkprop('principal', ''))),
 				HTTP_WebDAV_Server::mkprop('alternate-URI-set',''),
 				HTTP_WebDAV_Server::mkprop('principal-URL',$this->base_uri.'/principals/'.$account['account_lid']),
-				HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-home-set',$this->base_uri.$account['account_lid'].'/'),
-				HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set','MAILTO:'.$account['account_email']),
+				HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-home-set',array(
+					HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
+				HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-home-set',array(
+					HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
 			);
+			
 			foreach($this->accounts->memberships($account['account_id']) as $gid => $group)
 			{
 				$props[] = HTTP_WebDAV_Server::mkprop('group-membership',$this->base_uri.'/groups/'.$group);
@@ -146,8 +150,11 @@ class groupdav_principals extends groupdav_handler
 			{
 				case '':
 					$files[] = $this->add_account($account);
-					$files[] = $this->add_collection('/principals/users/'.$account['account_lid'].'/calendar-proxy-read');
-					$files[] = $this->add_collection('/principals/users/'.$account['account_lid'].'/calendar-proxy-write');
+					if ($options['depth'])
+					{
+						$files[] = $this->add_collection('/principals/users/'.$account['account_lid'].'/calendar-proxy-read');
+						$files[] = $this->add_collection('/principals/users/'.$account['account_lid'].'/calendar-proxy-write');
+					}
 					break;
 				case 'calendar-proxy-read':
 				case 'calendar-proxy-write':
@@ -250,10 +257,20 @@ class groupdav_principals extends groupdav_handler
 			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-home-set',array(
 				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
 			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
-			HTTP_WebDAV_Server::mkprop('href','MAILTO:'.$account['account_email']))),
+				HTTP_WebDAV_Server::mkprop('href','MAILTO:'.$account['account_email']),
+				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/principals/users/'.$account['account_lid'].'/'),
+				HTTP_WebDAV_Server::mkprop('href','urn:uuid:'.$account['account_lid']))),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'schedule-outbox-URL',array(
+				HTTP_WebDAV_Server::mkprop(groupdav::DAV,'href',$this->base_uri.'/calendar/'))),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'email-address-set',array(
+			HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'email-address',$account['account_email']))),
 			HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-home-set',array(
 				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
 			HTTP_WebDAV_Server::mkprop('group-member-ship', $memberships),
+			HTTP_WebDAV_Server::mkprop('supported-report-set',array(
+			HTTP_WebDAV_Server::mkprop('supported-report',array(
+				HTTP_WebDAV_Server::mkprop('report',
+					HTTP_WebDAV_Server::mkprop('acl-principal-prop-set')))))),
 		);
 		if ($this->debug > 1) error_log(__METHOD__."($path) path=/principals/users/".$account['account_lid'].', props='.array2string($props));
 		return array(
@@ -288,7 +305,7 @@ class groupdav_principals extends groupdav_handler
 					HTTP_WebDAV_Server::mkprop('principal', ''))),
 			HTTP_WebDAV_Server::mkprop('alternate-URI-set',''),
 			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-home-set',array(
-				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/calendar/'))),
+				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
 			HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-home-set',array(
 				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
 			HTTP_WebDAV_Server::mkprop('group-member-set', $members),

From 2bfebbdb7fb1d495047c0a89421451d9daf32c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Mon, 28 Jun 2010 05:08:22 +0000
Subject: [PATCH 07/91] Improve group invitation handling

---
 calendar/inc/class.calendar_ical.inc.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index 4f5fbad689..154b22ec52 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -496,6 +496,22 @@ class calendar_ical extends calendar_boupdate
 										$participantURL = 'invalid:nomail';
 										$cutype = 'INDIVIDUAL';
 									}
+									$members = $GLOBALS['egw']->accounts->members($uid, true);
+									if (!isset($event['participants'][$this->user]) && in_array($this->user, $members))
+									{
+										$user = $this->resource_info($this->user);
+										$attributes['ATTENDEE'][] = 'MAILTO:' . $user['email'];
+			    						$parameters['ATTENDEE'][] = array(
+			    							'CN'		=>	$user['name'],
+			    							'ROLE'		=> 'REQ-PARTICIPANT',
+											'PARTSTAT'	=> 'NEEDS-ACTION',
+											'CUTYPE'	=> 'INDIVIDUAL',
+											'RSVP'		=> 'TRUE',
+											'X-EGROUPWARE-UID'	=> $this->user,
+											'EMAIL'		=>	$user['email'],
+			    							);
+			    						$event['participants'][$this->user] = true;
+									}
 									break;
 								case 'r':
 									$cutype = 'RESOURCE';

From aa6b4adcc139fa51fbe14b8af2f7efbace75e147 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 28 Jun 2010 10:52:37 +0000
Subject: [PATCH 08/91] return default instead of referer containing "cd=yes",
 which causes a load of the framework inside the framework

---
 phpgwapi/inc/class.common.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 011cb54563..3cbda42ac5 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -1556,6 +1556,7 @@ class common
 	 * @param string $default='' default to use if referer is not set by webserver or not determinable
 	 * @param string $referer='' referer string to use, default ('') use $_SERVER['HTTP_REFERER']
 	 * @return string
+	 * @todo get "real" referer for jDots template
 	 */
 	static function get_referer($default='',$referer='')
 	{
@@ -1573,7 +1574,7 @@ class common
 		}
 		$referer = str_replace('/etemplate/process_exec.php','/index.php',$referer);
 
-		if (empty($referer)) $referer = $default;
+		if (empty($referer) || strpos($referer,'cd=yes') !== false) $referer = $default;
 
 		return $referer;
 	}

From cb3590ebab80d2bd597b3c0db4d362625268c097 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jun 2010 11:15:25 +0000
Subject: [PATCH 09/91] Do not send notification when a deleted event is purged

---
 calendar/inc/class.calendar_boupdate.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index ac14c13e52..a6525236b1 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1210,7 +1210,12 @@ class calendar_boupdate extends calendar_bo
 		{
 			return false;
 		}
-		$this->send_update(MSG_DELETED,$event['participants'],$event);
+
+		// Don't send notification if the event has already been deleted
+		if(!$event['deleted'])
+		{
+			$this->send_update(MSG_DELETED,$event['participants'],$event);
+		}
 
 		if (!$recur_date || $event['recur_type'] == MCAL_RECUR_NONE)
 		{

From 3a4bd1e45aee3a240d17659b397480c49c34c91b Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jun 2010 11:38:28 +0000
Subject: [PATCH 10/91] Allow admins to restore deleted events

---
 calendar/inc/class.calendar_uiforms.inc.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 4d85e2c4ce..9429140615 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1445,6 +1445,15 @@ function replace_eTemplate_onsubmit()
 			$etpl->set_cell_attribute('button[cancel]','onclick','');
 		}
 
+		// Allow admins to restore deleted events
+		$config = config::read('phpgwapi');
+		if($config['calendar_delete_history'] && $event['deleted'] && $GLOBALS['egw_info']['user']['apps']['admin'])
+		{
+			$content['deleted'] = $preserv['deleted'] = false;
+			$etpl->set_cell_attribute('button[save]', 'label', 'recover');
+			$etpl->set_cell_attribute('button[apply]', 'disabled', true);
+		}
+
 		// Setup history tab
 		$this->setup_history($content, $sel_options);
 

From 5b9a4cb7e93bc235dbec723f132f1d451d804149 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jun 2010 11:38:43 +0000
Subject: [PATCH 11/91] Allow admins to restore deleted events - translation

---
 calendar/lang/egw_en.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang
index 1143dd80d1..a353043eea 100644
--- a/calendar/lang/egw_en.lang
+++ b/calendar/lang/egw_en.lang
@@ -313,6 +313,7 @@ re-edit event	calendar	en	Re-Edit event
 receive email updates	calendar	en	Receive email updates
 receive notifications about events you created/modified/deleted	calendar	en	Receive notifications about events you created/modified/deleted
 receive summary of appointments	calendar	en	Receive summary of appointments
+recover	calendar	en	Recover
 recurrence	calendar	en	Recurrence
 recurring event	calendar	en	Recurring event
 rejected	calendar	en	Rejected

From ff7601188fbbbaeccd6d1349b78dfca5d50c3c32 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jun 2010 12:36:10 +0000
Subject: [PATCH 12/91] Fix category search when category ID is sent as an
 array in  (addressbook advanced search)

---
 addressbook/inc/class.addressbook_sql.inc.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php
index 65cab23046..8b5aad9e3f 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -246,6 +246,12 @@ class addressbook_sql extends so_sql_cf
 
 		$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
 
+		// fix cat_id criteria to search in comma-separated multiple cats and return subcats
+		if (($cats = $criteria['cat_id']))
+		{
+			$criteria += $this->_cat_search($criteria['cat_id'],$not);
+			unset($criteria['cat_id']);
+		}
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if (($cats = $filter['cat_id']))
 		{

From 30ce9afd8bd33b80d5ce0f63ea3baaded056d10d Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jun 2010 12:51:52 +0000
Subject: [PATCH 13/91] Set the timesheet title to the first linked entry

---
 timesheet/inc/class.timesheet_ui.inc.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 5430aa0c20..3cc0de2713 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -316,7 +316,10 @@ class timesheet_ui extends timesheet_bo
 							unset($content['end_time']);
 							break;
 						default:
-							$preserv['ts_title_blur'] = egw_link::title($link_app,$link_id);
+							if(!$preserv['ts_title_blur'])
+							{
+								$preserv['ts_title_blur'] = egw_link::title($link_app,$link_id);
+							}
 							break;
 					}
 					egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link_app,$link_id);

From f096249cabe7b380e88bef82d7bd65dac348d980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Mon, 28 Jun 2010 13:35:10 +0000
Subject: [PATCH 14/91] Fixed bug with simple timesheet view mode and the
 unused quantity field

---
 timesheet/inc/class.timesheet_ui.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 3cc0de2713..b42d88a15b 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -158,7 +158,7 @@ class timesheet_ui extends timesheet_bo
 				case 'save':
 				case 'save_new':
 				case 'apply':
-					if (!$this->data['ts_quantity'] && $this->data['ts_duration'])	// set the quantity (in h) from the duration (in min)
+					if ((!$this->data['ts_quantity'] || $this->ts_viewtype == 'short') && $this->data['ts_duration'])	// set the quantity (in h) from the duration (in min)
 					{
 						$this->data['ts_quantity'] = $this->data['ts_duration'] / 60.0;
 					}

From f616c628b53812eeae351d3eed6caebffa3369fa Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 28 Jun 2010 13:46:39 +0000
Subject: [PATCH 15/91] fixed not working display and deleting of recurence
 exceptions (name of grid in template got somehow lost)

---
 calendar/setup/etemplates.inc.php   | 4 ++--
 calendar/templates/default/edit.xet | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/calendar/setup/etemplates.inc.php b/calendar/setup/etemplates.inc.php
index 55318b2fdd..6b8daae838 100644
--- a/calendar/setup/etemplates.inc.php
+++ b/calendar/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application calendar
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2010-06-09 19:36
+	* generated by soetemplate::dump4setup() 2010-06-28 15:43
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package calendar
@@ -39,7 +39,7 @@ $templ_data[] = array('name' => 'calendar.edit.participants','template' => '','l
 
 $templ_data[] = array('name' => 'calendar.edit.print','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:27:"User or group,calendar+,,10";s:4:"name";s:7:"account";s:4:"help";s:13:"User or group";}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:19:",!@resources_status";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:16:"resources_select";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:27:"resources_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1229280346',);
 
-$templ_data[] = array('name' => 'calendar.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:11:{s:1:"A";s:2:"95";s:1:"D";s:3:"50%";s:2:"c1";s:3:"row";s:2:"h1";s:12:",!@reference";s:2:"c2";s:2:"th";s:2:"h2";s:2:"12";s:2:"c3";s:3:"row";s:2:"h3";s:2:"12";s:2:"c4";s:3:"row";s:2:"h4";s:2:"12";s:2:"c5";s:7:"row,top";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Exception";}s:1:"B";a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:10:"recurrence";s:4:"type";s:9:"date-time";s:4:"span";s:5:",gray";}s:1:"C";a:3:{s:4:"name";s:9:"reference";s:4:"type";s:5:"label";s:4:"span";s:5:",gray";}s:1:"D";a:3:{s:4:"name";s:3:"uid";s:4:"type";s:5:"label";s:4:"span";s:5:",gray";}}i:2;a:4:{s:1:"A";a:3:{s:4:"span";s:8:"all,gray";s:4:"type";s:5:"label";s:5:"label";s:27:"Repeating Event Information";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"size";s:13:",,,recur_type";s:4:"type";s:5:"label";s:5:"label";s:11:"Repeat type";}s:1:"B";a:3:{s:8:"onchange";s:34:"check_recur_type(\'recur_type\', 2);";s:4:"name";s:10:"recur_type";s:4:"type";s:6:"select";}s:1:"C";a:3:{s:4:"size";s:17:",,,recur_interval";s:4:"type";s:5:"label";s:5:"label";s:8:"Interval";}s:1:"D";a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:14:"recur_interval";s:4:"size";s:9:"None,2,31";s:4:"help";s:53:"repeating interval, eg. 2 to repeat every second week";}}i:4;a:4:{s:1:"A";a:3:{s:4:"size";s:16:",,,recur_enddate";s:4:"type";s:5:"label";s:5:"label";s:8:"End date";}s:1:"B";a:3:{s:4:"name";s:13:"recur_enddate";s:4:"type";s:4:"date";s:4:"help";s:57:"repeat the event until which date (empty means unlimited)";}s:1:"C";a:3:{s:4:"size";s:7:",,,tzid";s:4:"type";s:5:"label";s:5:"label";s:8:"Timezone";}s:1:"D";a:3:{s:4:"type";s:15:"select-timezone";s:4:"name";s:4:"tzid";s:4:"help";s:49:"Timezone in which recurrences have identical time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"size";s:13:",,,recur_data";s:4:"type";s:5:"label";s:5:"label";s:11:"Repeat days";}s:1:"B";a:4:{s:4:"type";s:10:"select-dow";s:4:"name";s:10:"recur_data";s:4:"size";s:3:"6,1";s:4:"help";s:44:"Days of the week for a weekly repeated event";}s:1:"C";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Exceptions";}i:2;a:5:{s:5:"label";s:16:"@exception_label";s:7:"no_lang";s:1:"1";s:4:"name";s:17:"button[exception]";s:4:"type";s:6:"button";s:4:"help";s:38:"Create an exception for the given date";}}s:1:"D";a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:8:"readonly";s:4:"true";s:4:"name";s:4:"$row";s:4:"type";s:9:"date-time";}s:1:"B";a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:40:"return confirm(\'Delete this exception\');";s:4:"name";s:27:"delete_exception[$row_cont]";s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:4:"help";s:21:"Delete this exception";}}}s:4:"cols";i:2;s:4:"rows";i:1;}}}s:4:"cols";i:4;s:4:"rows";i:5;s:4:"size";s:8:"100%,210";}}','size' => '100%,210','style' => '','modified' => '1274345126',);
+$templ_data[] = array('name' => 'calendar.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:11:{s:1:"A";s:2:"95";s:1:"D";s:3:"50%";s:2:"c1";s:3:"row";s:2:"h1";s:12:",!@reference";s:2:"c2";s:2:"th";s:2:"h2";s:2:"12";s:2:"c3";s:3:"row";s:2:"h3";s:2:"12";s:2:"c4";s:3:"row";s:2:"h4";s:2:"12";s:2:"c5";s:7:"row,top";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Exception";}s:1:"B";a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:10:"recurrence";s:4:"type";s:9:"date-time";s:4:"span";s:5:",gray";}s:1:"C";a:3:{s:4:"name";s:9:"reference";s:4:"type";s:5:"label";s:4:"span";s:5:",gray";}s:1:"D";a:3:{s:4:"name";s:3:"uid";s:4:"type";s:5:"label";s:4:"span";s:5:",gray";}}i:2;a:4:{s:1:"A";a:3:{s:4:"span";s:8:"all,gray";s:4:"type";s:5:"label";s:5:"label";s:27:"Repeating Event Information";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"size";s:13:",,,recur_type";s:4:"type";s:5:"label";s:5:"label";s:11:"Repeat type";}s:1:"B";a:3:{s:8:"onchange";s:34:"check_recur_type(\'recur_type\', 2);";s:4:"name";s:10:"recur_type";s:4:"type";s:6:"select";}s:1:"C";a:3:{s:4:"size";s:17:",,,recur_interval";s:4:"type";s:5:"label";s:5:"label";s:8:"Interval";}s:1:"D";a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:14:"recur_interval";s:4:"size";s:9:"None,2,31";s:4:"help";s:53:"repeating interval, eg. 2 to repeat every second week";}}i:4;a:4:{s:1:"A";a:3:{s:4:"size";s:16:",,,recur_enddate";s:4:"type";s:5:"label";s:5:"label";s:8:"End date";}s:1:"B";a:3:{s:4:"name";s:13:"recur_enddate";s:4:"type";s:4:"date";s:4:"help";s:57:"repeat the event until which date (empty means unlimited)";}s:1:"C";a:3:{s:4:"size";s:7:",,,tzid";s:4:"type";s:5:"label";s:5:"label";s:8:"Timezone";}s:1:"D";a:3:{s:4:"type";s:15:"select-timezone";s:4:"name";s:4:"tzid";s:4:"help";s:49:"Timezone in which recurrences have identical time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"size";s:13:",,,recur_data";s:4:"type";s:5:"label";s:5:"label";s:11:"Repeat days";}s:1:"B";a:4:{s:4:"type";s:10:"select-dow";s:4:"name";s:10:"recur_data";s:4:"size";s:3:"6,1";s:4:"help";s:44:"Days of the week for a weekly repeated event";}s:1:"C";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Exceptions";}i:2;a:5:{s:5:"label";s:16:"@exception_label";s:7:"no_lang";s:1:"1";s:4:"name";s:17:"button[exception]";s:4:"type";s:6:"button";s:4:"help";s:38:"Create an exception for the given date";}}s:1:"D";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:8:"readonly";s:4:"true";s:4:"name";s:4:"$row";s:4:"type";s:9:"date-time";}s:1:"B";a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:40:"return confirm(\'Delete this exception\');";s:4:"name";s:27:"delete_exception[$row_cont]";s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:4:"help";s:21:"Delete this exception";}}}s:4:"cols";i:2;s:4:"rows";i:1;s:4:"name";s:15:"recur_exception";s:7:"options";a:0:{}}}}s:4:"cols";i:4;s:4:"rows";i:5;s:4:"size";s:8:"100%,210";}}','size' => '100%,210','style' => '','modified' => '1274345126',);
 
 $templ_data[] = array('name' => 'calendar.edit_series','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:30:"This event is part of a series";}s:4:"name";s:13:"dialog-header";s:4:"span";s:13:",promptheader";}i:2;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:67:"Do you want to edit this event as an exception or the whole series?";}s:4:"span";s:7:",prompt";s:4:"name";s:14:"dialog-content";i:2;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:14:"Edit exception";s:7:"onclick";s:17:"open_edit(false);";}i:2;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:11:"Edit series";s:7:"onclick";s:16:"open_edit(true);";}i:3;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:7:"onclick";s:62:"document.getElementById(\'edit_series\').style.display = \'none\';";}s:5:"align";s:6:"center";}}s:4:"name";s:11:"edit_series";}}','size' => '','style' => '','modified' => '1272449924',);
 
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index 3e87636db3..aacc908900 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -165,7 +165,7 @@
 						<description value="Exceptions"/>
 						<button label="@exception_label" no_lang="1" id="button[exception]" statustext="Create an exception for the given date"/>
 					</vbox>
-					<grid>
+					<grid id="recur_exception">
 						<columns>
 							<column/>
 							<column/>

From fc841ff9cf23bee4f6731bf4ffc3e7067af92596 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jun 2010 14:05:33 +0000
Subject: [PATCH 16/91] - Fix save so fileas gets updated even if n_fn is set
 (normal edit) - Add isUpdate parameter to fill in any not set fields from DB
 when updating fileas

---
 addressbook/inc/class.addressbook_bo.inc.php | 21 ++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php
index 81f7e40ef2..f11753404d 100755
--- a/addressbook/inc/class.addressbook_bo.inc.php
+++ b/addressbook/inc/class.addressbook_bo.inc.php
@@ -341,15 +341,31 @@ class addressbook_bo extends addressbook_so
 	 *
 	 * @param array $contact
 	 * @param string $type=null file_as type, default null to read it from the contact, unknown/not set type default to the first one
+	 * @param boolean $update=false If true, reads the old record for any not set fields
 	 * @return string
 	 */
-	function fileas($contact,$type=null)
+	function fileas($contact,$type=null, $isUpdate=false)
 	{
 		if (is_null($type)) $type = $contact['fileas_type'];
 		if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
 
 		if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
 
+		if($isUpdate)
+		{
+			$fileas_fields = array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality');
+			$old = null;
+			foreach($fileas_fields as $field)
+			{
+				if(!isset($contact[$field]))
+				{
+					if(is_null($old)) $old = $this->read($contact['id']);
+					$contact[$field] = $old[$field];
+				}
+			}
+			unset($old);
+		}
+
 		$fileas = str_replace(array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality'),
 			array($contact['n_prefix'],$contact['n_given'],$contact['n_middle'],$contact['n_family'],$contact['n_suffix'],
 				$contact['n_fn'],$contact['org_name'],$contact['org_unit'],$contact['adr_one_locality']),$type);
@@ -787,8 +803,9 @@ class addressbook_bo extends addressbook_so
 		if (!isset($contact['n_fn']))
 		{
 			$contact['n_fn'] = $this->fullname($contact);
-			if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact);
 		}
+		if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact, null, false);
+
 		$to_write = $contact;
 		// (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc)
 		if (!$ignore_acl && !$contact['owner'] && !$this->is_admin($contact))

From c8abf9eacc4a71f4937a50960d2ceb3f156ced9c Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 28 Jun 2010 14:09:59 +0000
Subject: [PATCH 17/91] fix a problem with content validation;  was returned as
 array

---
 etemplate/inc/class.customfields_widget.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etemplate/inc/class.customfields_widget.inc.php b/etemplate/inc/class.customfields_widget.inc.php
index 076e36e242..5a034d0ddc 100644
--- a/etemplate/inc/class.customfields_widget.inc.php
+++ b/etemplate/inc/class.customfields_widget.inc.php
@@ -438,6 +438,7 @@ class customfields_widget
 					{
 						$cell = $input;
 						if ($type == 'customfields') $cell['label'] = $field['label'];
+						$value = $value[$this->prefix.$lname];
 						return true;
 					}
 					etemplate::add_child($cell,$input);

From d6c19145db794a767a14ab64d5f290eb9e717085 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jun 2010 14:11:20 +0000
Subject: [PATCH 18/91] Make sure criteria is an array before checking for
 cat_id

---
 addressbook/inc/class.addressbook_sql.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php
index 8b5aad9e3f..9969ca8ad4 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -247,7 +247,7 @@ class addressbook_sql extends so_sql_cf
 		$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
 
 		// fix cat_id criteria to search in comma-separated multiple cats and return subcats
-		if (($cats = $criteria['cat_id']))
+		if (is_array($criteria) && ($cats = $criteria['cat_id']))
 		{
 			$criteria += $this->_cat_search($criteria['cat_id'],$not);
 			unset($criteria['cat_id']);

From b135848f33213acb9a1ccce42a14750940e06c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Mon, 28 Jun 2010 14:45:58 +0000
Subject: [PATCH 19/91] Added space to imploding of email addresses in infolog
 email import to allow linebreaks for long email lists

---
 infolog/inc/class.infolog_bo.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index c1558f9e3b..0a4f79df58 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -1013,8 +1013,8 @@ class infolog_bo
 		$info = array(
 			'info_id' => 0,
 			'info_type' => $type,
-			'info_from' => implode(',',$name),
-			'info_addr' => implode(',',$email),
+			'info_from' => implode(', ',$name),
+			'info_addr' => implode(', ',$email),
 			'info_subject' => $_subject,
 			'info_des' => $_message,
 			'info_startdate' => $_date,

From 4bd384f77d4cd184429c643f74e45504ae15b2f6 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 28 Jun 2010 15:25:27 +0000
Subject: [PATCH 20/91] handling long info_addr lists, splitting by comma to
 enable linebreaks

---
 infolog/inc/class.infolog_ui.inc.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index f447f27ebf..8775f57727 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -398,6 +398,7 @@ class infolog_ui
 		$readonlys = $rows = array();
 		foreach($infos as $id => $info)
 		{
+			if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false) $info['info_addr'] = str_replace(',',', ',$info['info_addr']);
 			if (!$query['csv_export'])
 			{
 				$info['links'] =& $links[$id];
@@ -1033,6 +1034,7 @@ class infolog_ui
 			//echo "<p>infolog_ui::edit: info_id=$info_id,  action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";
 
 			$content = $this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id );
+			if (!(strpos($content['info_addr'],',')===false) && strpos($content['info_addr'],', ')===false) $content['info_addr'] = str_replace(',',', ',$content['info_addr']);
 			if (is_numeric($_REQUEST['cat_id']))
 			{
 				$content['info_cat'] = (int) $_REQUEST['cat_id'];

From 5cb14e716ec80bbdc29f04aef08fa02c7f04a67b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Mon, 28 Jun 2010 17:34:57 +0000
Subject: [PATCH 21/91] Fix CalDAV delete event issue

---
 calendar/inc/class.calendar_groupdav.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index 18dfcc61d4..759128a234 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -591,8 +591,11 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 	 */
 	function post(&$options,$id,$user=null)
 	{
-		$status = $this->put($options,$id,$user);
-		// error_log("CalDAV POST: $status" . print_r($options, true));
+		if (preg_match('/^METHOD:PUBLISH(\r\n|\r|\n)/im', $options['content']))
+		{
+			$status = $this->put($options,$id,$user);
+			// error_log("CalDAV POST: $status" . print_r($options, true));
+		}
 		return true;
 	}
 

From affd4b1885f99572b5e6aafd852056c111a1faa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Tue, 29 Jun 2010 09:19:25 +0000
Subject: [PATCH 22/91] Fix CalDAV issues

---
 calendar/inc/class.calendar_groupdav.inc.php  | 42 +++++++++++++++++--
 .../inc/class.groupdav_principals.inc.php     |  6 +++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index 759128a234..f534b2f1d1 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -482,7 +482,7 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 		$oldEvent = $this->_common_get_put_delete('PUT',$options,$id,$return_no_access);
 		if (!is_null($oldEvent) && !is_array($oldEvent))
 		{
-			if ($this->debug) error_log(__METHOD__.print_r($oldEvent,true).function_backtrace());
+			if ($this->debug) error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
 			return $oldEvent;
 		}
 
@@ -591,10 +591,44 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 	 */
 	function post(&$options,$id,$user=null)
 	{
-		if (preg_match('/^METHOD:PUBLISH(\r\n|\r|\n)/im', $options['content']))
+		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		
+		if (preg_match('/^METHOD:(PUBLISH|REQUEST)(\r\n|\r|\n)(.*)^BEGIN:VEVENT/ism', $options['content']))
 		{
-			$status = $this->put($options,$id,$user);
-			// error_log("CalDAV POST: $status" . print_r($options, true));
+			$handler = $this->_get_handler();
+			$vCalendar = htmlspecialchars_decode($options['content']);
+			$charset = null;
+			if (!empty($options['content_type']))
+			{
+				$content_type = explode(';', $options['content_type']);
+				if (count($content_type) > 1)
+				{
+					array_shift($content_type);
+					foreach ($content_type as $attribute)
+					{
+						trim($attribute);
+						list($key, $value) = explode('=', $attribute);
+						switch (strtolower($key))
+						{
+							case 'charset':
+								$charset = strtoupper(substr($value,1,-1));
+						}
+					}
+				} 
+			}
+			
+			if (($foundEvents = $handler->search($vCalendar, null, false, $charset)))
+			{
+				$eventId = array_shift($foundEvents);
+				list($eventId) = explode(':', $eventId);
+				
+				if (!($cal_id = $handler->importVCal($vCalendar, $eventId, null,
+					false, 0, $this->principalURL, $user, $charset)))
+				{
+					if ($this->debug) error_log(__METHOD__."() importVCal($eventId) returned false");
+				}
+				header('ETag: '.$this->get_etag($eventId));
+			}
 		}
 		return true;
 	}
diff --git a/phpgwapi/inc/class.groupdav_principals.inc.php b/phpgwapi/inc/class.groupdav_principals.inc.php
index 731e57fc99..b03b8cf183 100644
--- a/phpgwapi/inc/class.groupdav_principals.inc.php
+++ b/phpgwapi/inc/class.groupdav_principals.inc.php
@@ -264,6 +264,10 @@ class groupdav_principals extends groupdav_handler
 				HTTP_WebDAV_Server::mkprop(groupdav::DAV,'href',$this->base_uri.'/calendar/'))),
 			HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'email-address-set',array(
 			HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'email-address',$account['account_email']))),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'last-name',$account['account_lastname']),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'first-name',$account['account_firstname']),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'record-type','user'),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-type','INDIVIDUAL'),
 			HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-home-set',array(
 				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
 			HTTP_WebDAV_Server::mkprop('group-member-ship', $memberships),
@@ -308,6 +312,8 @@ class groupdav_principals extends groupdav_handler
 				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
 			HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-home-set',array(
 				HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER,'record-type','group'),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-type','GROUP'),
 			HTTP_WebDAV_Server::mkprop('group-member-set', $members),
 			//HTTP_WebDAV_Server::mkprop('principal-URL',array(self::mkprop('href',$this->principalURL))),
 		);

From c30c4ce198480f361aa989673091f89f8f92a417 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 29 Jun 2010 12:08:34 +0000
Subject: [PATCH 23/91] notify on infolog creation as well (was not, as
 condition was not met for changes=true)

---
 infolog/inc/class.infolog_tracking.inc.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/infolog/inc/class.infolog_tracking.inc.php b/infolog/inc/class.infolog_tracking.inc.php
index 258546020d..acb94dafd7 100644
--- a/infolog/inc/class.infolog_tracking.inc.php
+++ b/infolog/inc/class.infolog_tracking.inc.php
@@ -284,19 +284,20 @@ class infolog_tracking extends bo_tracking
 		if(is_null($changed_fields))
 		{
 			$changed_fields = $this->changed_fields($data, $old);
+			$changes = count($changed_fields); // we need that since TRUE evaluates to 1
 		}
 		if(is_array($changed_fields) && $changes == 1 && in_array('info_datemodified', $changed_fields))
 		{
 			return count($changes);
 		}
 
-                // do not run do_notifications if we have no changes
-                if ($changes && !$skip_notification && !$this->do_notifications($data,$old,$deleted))
-                {
-                        $changes = false;
-                }
-                return $changes;
-        }
+		// do not run do_notifications if we have no changes
+		if ($changes && !$skip_notification && !$this->do_notifications($data,$old,$deleted))
+		{
+			$changes = false;
+		}
+		return $changes;
+	}
 
 	/**
 	 * Save changes to the history log

From 6558a861a1e20c49daddbd7e51c4d8e2a4de4728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Tue, 29 Jun 2010 12:58:55 +0000
Subject: [PATCH 24/91] Added error message if the json content got thrown away
 because there was javascript in it

---
 json.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/json.php b/json.php
index 4cb94d984e..fcdd1586da 100644
--- a/json.php
+++ b/json.php
@@ -90,6 +90,10 @@ if (isset($_GET['menuaction']))
 	$json = new egw_json_request();
 
 	//Check whether the request data is set
+	if (isset($GLOBALS['egw_unset_vars']['_POST[json_data]']))
+	{
+		throw new egw_exception_assertion_failed("JSON Data contains script tags. Aborting...");
+	}
 	$json->parseRequest($_GET['menuaction'], (array)$_POST['json_data']);
 	common::egw_exit();
 }

From 09bc2c09cde24f6691b0db4ae08ae66565e2dc6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Tue, 29 Jun 2010 13:52:56 +0000
Subject: [PATCH 25/91] Fix CTag issues for GroupDAV

---
 .../inc/class.addressbook_groupdav.inc.php    | 14 +++++++--
 calendar/inc/class.calendar_groupdav.inc.php  | 31 +++----------------
 infolog/inc/class.infolog_groupdav.inc.php    |  2 ++
 phpgwapi/inc/class.contenthistory.inc.php     | 28 +++++++++++++++++
 4 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php
index 70ae27d8b8..c0a02124f9 100644
--- a/addressbook/inc/class.addressbook_groupdav.inc.php
+++ b/addressbook/inc/class.addressbook_groupdav.inc.php
@@ -392,9 +392,17 @@ class addressbook_groupdav extends groupdav_handler
 		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
 
 		$result = $this->bo->search(array(),'MAX(contact_modified) AS contact_modified','','','',false,'AND',false,$filter);
-
-		$ctag = 'EGw-'.$result[0]['contact_modified'].'-wGE';
-		return $ctag;
+		
+		if (empty($result))
+		{
+			$ctag = $result[0]['contact_modified'];
+		}
+		else
+		{
+			$ctag = time();
+		}
+				
+		return 'EGw-'.$ctag.'-wGE';
 	}
 
 	/**
diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index f534b2f1d1..2ce33651ef 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -758,34 +758,11 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 	 */
 	public function getctag($path,$user)
 	{
-		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user]");
+		$ctag = $GLOBALS['egw']->contenthistory->getLastChange('calendar');
+
+		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
 		
-		$filter = array(
-			'users' => $user,
-			'start' => time()-100*24*3600,	// default one month back -30 breaks all sync recurrences
-			'end' => time()+365*24*3600,	// default one year into the future +365
-			'enum_recuring' => false,
-			'daywise' => false,
-			'date_format' => 'server',
-			'order' => 'cal_modified DESC,cal_etag DESC',
-			'offset' => 0,
-			'num_rows'	=> 1,
-		);
-
-		if (strpos($path, '/calendar') === 0)
-		{
-			$filter['filter'] = 'owner';
-		}
-		else
-		{
-			$filter['filter'] = 'default'; // not rejected
-		}
-
-		$result =& $this->bo->search($filter);
-
-		$entry = array_shift($result);
-
-		return $this->get_etag($entry);
+		return 'EGw-'.$ctag.'-wGE';
 	}
 
 	/**
diff --git a/infolog/inc/class.infolog_groupdav.inc.php b/infolog/inc/class.infolog_groupdav.inc.php
index b50c135568..7f2b792af7 100644
--- a/infolog/inc/class.infolog_groupdav.inc.php
+++ b/infolog/inc/class.infolog_groupdav.inc.php
@@ -512,6 +512,8 @@ class infolog_groupdav extends groupdav_handler
 		);
 
 		$result =& $this->bo->search($query);
+		
+		if (empty($result)) return 'EGw-'.time().'-wGE';
 
 		$entry = array_shift($result);
 
diff --git a/phpgwapi/inc/class.contenthistory.inc.php b/phpgwapi/inc/class.contenthistory.inc.php
index 2c0ad1f5f7..36c49c2a5f 100644
--- a/phpgwapi/inc/class.contenthistory.inc.php
+++ b/phpgwapi/inc/class.contenthistory.inc.php
@@ -170,4 +170,32 @@ class contenthistory
 		}
 		return true;
 	}
+	
+	/**
+	 * get the timestamp of last change for appname
+	 *
+	 * find which content changed since $_ts for application $_appName
+	 *
+	 * @param string$_appName the appname example: infolog_notes
+	 * 
+	 * @return timestamp of last change for this application
+	 */
+	function getLastChange($_appName)
+	{
+		$max = 0;
+		
+		$where = array('sync_appname' => $_appName);
+
+		foreach (array('modified','deleted','added') as $action)
+		{
+			if (($ts = $this->db->select(self::TABLE,'MAX(sync_'.$action.')',$where,__LINE__,__FILE__)->fetchColumn()))
+			{
+				$ts = $this->db->from_timestamp($ts);
+				if ($ts > $max) $max = $ts;
+			}
+		}
+			
+		return $max;
+	}
+	
 }

From 6391dcf5177888c3c728c7b06e0039730f14f461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Tue, 29 Jun 2010 13:54:23 +0000
Subject: [PATCH 26/91] Fix Nokia E-Series SyncML addressbook mappings

---
 addressbook/inc/class.addressbook_vcal.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index f0cae99c34..24eb931972 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -842,9 +842,9 @@ class addressbook_vcal extends addressbook_bo
 							&& !isset($finalRowNames['TEL;HOME;VOICE']))
 					{
 						$finalRowNames['TEL;HOME;VOICE'] = $vcardKey;
+						break;
 					}
-					break;
-					case 'TEL;X-egw-Ref3':
+				case 'TEL;X-egw-Ref3':
 					if (!in_array('TEL;OTHER', $rowNames)
 							&& !in_array('TEL;OTHER;VOICE', $rowNames)
 							&& !isset($finalRowNames['TEL;OTHER']))

From 04983df2583b74a35e5524d7c72ac22bcb9efa76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Tue, 29 Jun 2010 16:45:01 +0000
Subject: [PATCH 27/91] Fix category search when category ID is sent as an
 array in  (addressbook advanced search) again

---
 addressbook/inc/class.addressbook_sql.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php
index 9969ca8ad4..56d8840235 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -249,7 +249,7 @@ class addressbook_sql extends so_sql_cf
 		// fix cat_id criteria to search in comma-separated multiple cats and return subcats
 		if (is_array($criteria) && ($cats = $criteria['cat_id']))
 		{
-			$criteria += $this->_cat_search($criteria['cat_id'],$not);
+			$criteria = array_merge($criteria, $this->_cat_search($criteria['cat_id']));
 			unset($criteria['cat_id']);
 		}
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats

From 47a7fc933702b10daced84ea833668a52687f0b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Wed, 30 Jun 2010 09:13:17 +0000
Subject: [PATCH 28/91] - Added "beforeSubmit" callback handler to the PHP json
 class - Added "clientCall" and "clientSetOption" function to the base
 etemplate widget class - Got the client side HTML area widget work with the
 new functions described above

---
 phpgwapi/inc/class.egw_json.inc.php | 32 +++++++++++++++++++++++++++++
 phpgwapi/js/egw_json.js             |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_json.inc.php b/phpgwapi/inc/class.egw_json.inc.php
index 29acc84717..80a78c8d7d 100644
--- a/phpgwapi/inc/class.egw_json.inc.php
+++ b/phpgwapi/inc/class.egw_json.inc.php
@@ -145,6 +145,11 @@ class egw_json_response
 	 */
 	private $hasData = false;
 
+	/**
+	 * Array containing all beforeSendData callbacks
+	 */
+	protected $beforeSendDataProcs = array();
+
 	/**
 	 * Holds the actual response data which is then encoded to JSON
 	 * once the "getJSON" function is called
@@ -190,7 +195,12 @@ class egw_json_response
 	{
 		$inst = self::get();
 
+		//Call each attached before send data proc
+		foreach ($inst->beforeSendDataProcs as $proc)
+			call_user_func_array($proc['proc'], $proc['params']);
+
 		$inst->sendHeader();
+
 		echo $inst->getJSON();
 	}
 
@@ -390,6 +400,28 @@ class egw_json_response
 		return json_encode($res);	//PHP5.3+, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP);
 	}
 
+	/**
+	 * Function which can be used to add an event listener callback function to
+	 * the "beforeSendData" callback. This callback might be used to add a response
+	 * which always has to be added after all other responses.
+	 * @param callback Callback function or method which should be called before the response gets sent
+	 * @param mixed n Optional parameters which get passed to the callback function.
+	 */
+	public function addBeforeSendDataCallback($proc)
+	{
+		//Get the current instance
+		$inst = self::get();
+
+		//Get all parameters passed to the function and delete the first one
+		$params = func_get_args();
+		array_shift($params);
+
+		$inst->beforeSendDataProcs[] = array(
+			'proc' => $proc,
+			'params' => $params
+		);
+	}
+
 	/**
 	 * Destructor
 	 */
diff --git a/phpgwapi/js/egw_json.js b/phpgwapi/js/egw_json.js
index b8df167b53..bc66f42e41 100644
--- a/phpgwapi/js/egw_json.js
+++ b/phpgwapi/js/egw_json.js
@@ -187,7 +187,7 @@ egw_json_request.prototype.sendRequest = function(_async, _callback, _sender)
 				"parameters": this.parameters
 			}
 		})
-	}
+	};
 
 	//Send the request via the jquery AJAX interface to the server
 	$.ajax({url: this.url + '?menuaction=' + this.menuaction,

From 8b90b62273317052bbe2e4af2f8e33035f322e4f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 30 Jun 2010 09:56:06 +0000
Subject: [PATCH 29/91] fixed contactform so anonymous user can attach files
 (without giving him addressbook run rights and edit rights for the used
 addressbook)

---
 addressbook/inc/class.addressbook_contactform.inc.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addressbook/inc/class.addressbook_contactform.inc.php b/addressbook/inc/class.addressbook_contactform.inc.php
index 66a9005385..09d7ea4440 100644
--- a/addressbook/inc/class.addressbook_contactform.inc.php
+++ b/addressbook/inc/class.addressbook_contactform.inc.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package addressbook
- * @copyright (c) 2007/8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2007-10 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -60,7 +60,13 @@ class addressbook_contactform
 						{
 							if (is_array($value) && isset($value['tmp_name']) && is_readable($value['tmp_name']))
 							{
+								// do no further permission check, as this would require_once
+								// the anonymous user to have run rights for addressbook AND
+								// edit rights for the addressbook used to store the new entry,
+								// which is clearly not wanted securitywise
+								egw_vfs::$is_root = true;
 								egw_link::link('addressbook',$id,egw_link::VFS_APPNAME,$value,$name);
+								egw_vfs::$is_root = false;
 							}
 						}
 

From a3685d298e393488c8078cc795b5b4dfc0ab69d8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 30 Jun 2010 12:03:50 +0000
Subject: [PATCH 30/91] removed 2. header include, stalling access without home
 rights

---
 phpgwapi/inc/jscalendar-setup.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/phpgwapi/inc/jscalendar-setup.php b/phpgwapi/inc/jscalendar-setup.php
index 809aa1c5e7..d1723f1627 100644
--- a/phpgwapi/inc/jscalendar-setup.php
+++ b/phpgwapi/inc/jscalendar-setup.php
@@ -28,8 +28,6 @@ catch (egw_exception_no_permission_app $e) {
 	// ignore exception, if home is not allowed, eg. for sitemgr
 }
 
-include('../../header.inc.php');
-
 header('Content-type: text/javascript; charset='.translation::charset());
 translation::add_app('jscalendar');
 

From 2768366eb637cfd5cc61b9bb380123a1aa3a84b4 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 1 Jul 2010 11:14:48 +0000
Subject: [PATCH 31/91] fix for cached titles that are empty

---
 phpgwapi/inc/class.egw_link.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_link.inc.php b/phpgwapi/inc/class.egw_link.inc.php
index 6abe2b5883..0369ec457b 100644
--- a/phpgwapi/inc/class.egw_link.inc.php
+++ b/phpgwapi/inc/class.egw_link.inc.php
@@ -632,7 +632,7 @@ class egw_link extends solink
 		if (!$id) return '';
 
 		$title =& self::get_cache($app,$id);
-		if (isset($title) && !is_array($id))
+		if (isset($title) && !empty($title) && !is_array($id))
 		{
 			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (from cache)</p>\n";
 			return $title;

From 0867ed78d83dc864d6aa773500c6b0770af14020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Thu, 1 Jul 2010 13:52:55 +0000
Subject: [PATCH 32/91] Added missing console.info dummy function

---
 phpgwapi/js/jsapi/jsapi.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/phpgwapi/js/jsapi/jsapi.js b/phpgwapi/js/jsapi/jsapi.js
index b5d845eb9c..7753d5cc91 100644
--- a/phpgwapi/js/jsapi/jsapi.js
+++ b/phpgwapi/js/jsapi/jsapi.js
@@ -39,6 +39,23 @@ else if (document.layers)
 	is_ns4 = true;
 }
 
+/**
+ * Check whether the console object is defined - if not, define one
+ */
+if (typeof window.console == 'undefined')
+{
+	window.console = {
+		'log': function() {
+		},
+		'warn': function() {
+		},
+		'error': function() {
+		},
+		'info': function() {
+		}
+	}
+}
+
 /**
  * Seperates all script tags from the given html code and returns the seperately
  * @param object _html object that the html code from which the script should be seperated. The html code has to be stored in _html.html, the result js will be written to _html.js

From f8431b00a720645036375e72cd38cf1f1476c2c1 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 1 Jul 2010 15:27:37 +0000
Subject: [PATCH 33/91] - Fix purging of old events so it doesn't delete
 everything - Trick config into calling the hook when purging is turned off so
 cron job is cancelled

---
 calendar/inc/class.calendar_hooks.inc.php | 14 ++++++++------
 calendar/inc/class.calendar_so.inc.php    |  4 +++-
 calendar/templates/default/config.tpl     |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php
index 6c7c446bba..83970b3aa1 100644
--- a/calendar/inc/class.calendar_hooks.inc.php
+++ b/calendar/inc/class.calendar_hooks.inc.php
@@ -578,12 +578,14 @@ function calendar_purge_old($config) {
 	// Cancel old purge
 	ExecMethod('phpgwapi.asyncservice.cancel_timer', $id);
 
-	$result = ExecMethod2('phpgwapi.asyncservice.set_timer',
-		array('month' => '*', 'day' => 1),
-		$id,
-		'calendar.calendar_boupdate.purge',
-		(int)$config
-	);
+	if((int)$config > 0) {
+		$result = ExecMethod2('phpgwapi.asyncservice.set_timer',
+			array('month' => '*', 'day' => 1),
+			$id,
+			'calendar.calendar_boupdate.purge',
+			(int)$config
+		);
+	}
 	if(!$result)
 	{
 		$GLOBALS['config_error'] = 'Unable to schedule purge';
diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index 5b0fe85e32..9c91638502 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -1516,7 +1516,9 @@ ORDER BY cal_user_type, cal_usre_id
 		$sql = "DELETE egw_cal.* FROM egw_cal
 			LEFT JOIN egw_cal_repeats ON
 			    egw_cal_repeats.cal_id = egw_cal.cal_id
-			WHERE egw_cal_repeats.cal_id IS NULL || (recur_enddate < $date && recur_enddate != 0)";
+			JOIN egw_cal_dates ON
+				egw_cal.cal_id = egw_cal_dates.cal_id
+			WHERE cal_end < $date AND (egw_cal_repeats.cal_id IS NULL || (recur_enddate < $date && recur_enddate != 0))";
 		$this->db->query($sql, __LINE__, __FILE__);
 
 		// Get a list of what we just deleted for links
diff --git a/calendar/templates/default/config.tpl b/calendar/templates/default/config.tpl
index c38a27a316..4cc0f922d1 100644
--- a/calendar/templates/default/config.tpl
+++ b/calendar/templates/default/config.tpl
@@ -72,7 +72,7 @@
     <td>&nbsp;{lang_Automatically_purge_old_events_after}</td>
     <td>
      <select name="newsettings[calendar_purge_old]">
-      <option value="">{lang_No_automatic_purging}</option>
+      <option value="0ff">{lang_No_automatic_purging}</option>
       <option value="1"{selected_calendar_purge_old_1}>1 {lang_year}</option>
       <option value="2"{selected_calendar_purge_old_2}>2 {lang_years}</option>
       <option value="3"{selected_calendar_purge_old_3}>3 {lang_years}</option>

From 75b25bb796ef7be6b00d0ca2c2d3bc81c89911f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Fri, 2 Jul 2010 05:01:15 +0000
Subject: [PATCH 34/91] Fix FroupDAV report issue

---
 addressbook/inc/class.addressbook_groupdav.inc.php | 8 ++++----
 calendar/inc/class.calendar_groupdav.inc.php       | 4 ++--
 infolog/inc/class.infolog_groupdav.inc.php         | 4 ++--
 phpgwapi/inc/class.groupdav_principals.inc.php     | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php
index c0a02124f9..67b545af8b 100644
--- a/addressbook/inc/class.addressbook_groupdav.inc.php
+++ b/addressbook/inc/class.addressbook_groupdav.inc.php
@@ -467,11 +467,11 @@ class addressbook_groupdav extends groupdav_handler
 		// supported reports (required property for CardDAV)
 		$props[] =	HTTP_WebDAV_Server::mkprop('supported-report-set',array(
 			HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',
-					HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-query','')))),
+				HTTP_WebDAV_Server::mkprop('report',array(
+					HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-query',''))))),
 			HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',
-					HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-multiget','')))),
+				HTTP_WebDAV_Server::mkprop('report',array(
+					HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-multiget',''))))),
 		));
 		//$props = self::current_user_privilege_set($props);
 		return $props;
diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index 2ce33651ef..b462dd3d49 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -900,8 +900,8 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 		));
 		$props[] = HTTP_WebDAV_Server::mkprop('supported-report-set',array(
 			HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',
-					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-multiget',''))))));
+				HTTP_WebDAV_Server::mkprop('report',array(
+					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-multiget','')))))));
 		$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'supported-calendar-data',array(
 			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-data', array('content-type' => 'text/calendar', 'version'=> '2.0')),
 			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-data', array('content-type' => 'text/x-calendar', 'version'=> '1.0'))));
diff --git a/infolog/inc/class.infolog_groupdav.inc.php b/infolog/inc/class.infolog_groupdav.inc.php
index 7f2b792af7..6d61240b10 100644
--- a/infolog/inc/class.infolog_groupdav.inc.php
+++ b/infolog/inc/class.infolog_groupdav.inc.php
@@ -567,8 +567,8 @@ class infolog_groupdav extends groupdav_handler
 
 		$props[] = HTTP_WebDAV_Server::mkprop('supported-report-set',array(
 			HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',
-					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-multiget',''))))));
+				HTTP_WebDAV_Server::mkprop('report',array(
+					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-multiget','')))))));
 
 		return $props;
 	}
diff --git a/phpgwapi/inc/class.groupdav_principals.inc.php b/phpgwapi/inc/class.groupdav_principals.inc.php
index b03b8cf183..a645395709 100644
--- a/phpgwapi/inc/class.groupdav_principals.inc.php
+++ b/phpgwapi/inc/class.groupdav_principals.inc.php
@@ -273,8 +273,8 @@ class groupdav_principals extends groupdav_handler
 			HTTP_WebDAV_Server::mkprop('group-member-ship', $memberships),
 			HTTP_WebDAV_Server::mkprop('supported-report-set',array(
 			HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',
-					HTTP_WebDAV_Server::mkprop('acl-principal-prop-set')))))),
+				HTTP_WebDAV_Server::mkprop('report',array(
+					HTTP_WebDAV_Server::mkprop('acl-principal-prop-set'))))))),
 		);
 		if ($this->debug > 1) error_log(__METHOD__."($path) path=/principals/users/".$account['account_lid'].', props='.array2string($props));
 		return array(

From 419516c0119de75cfc9dcc31adccfa8b374e4cd4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 2 Jul 2010 06:00:25 +0000
Subject: [PATCH 35/91] removed columns from DELETE statement

---
 calendar/inc/class.calendar_so.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index 9c91638502..d52bfa746e 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -7,7 +7,7 @@
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @author Christian Binder <christian-AT-jaytraxx.de>
  * @author Joerg Lehrke <jlehrke@noc.de>
- * @copyright (c) 2005-9 by RalfBecker-At-outdoor-training.de
+ * @copyright (c) 2005-10 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -1513,7 +1513,7 @@ ORDER BY cal_user_type, cal_usre_id
 	function purge($date)
 	{
 		// Start with egw_cal, it's the easiest
-		$sql = "DELETE egw_cal.* FROM egw_cal
+		$sql = "DELETE FROM egw_cal
 			LEFT JOIN egw_cal_repeats ON
 			    egw_cal_repeats.cal_id = egw_cal.cal_id
 			JOIN egw_cal_dates ON

From 4e1f3f31e576188e86f918e31321a21c3f7595e9 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 2 Jul 2010 10:06:44 +0000
Subject: [PATCH 36/91] fix bug regarding the CKEditor view of
 Main/Loginscreenmessages

---
 admin/inc/class.uimainscreen.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/inc/class.uimainscreen.inc.php b/admin/inc/class.uimainscreen.inc.php
index a0b4f5f7cb..4b26124b5c 100644
--- a/admin/inc/class.uimainscreen.inc.php
+++ b/admin/inc/class.uimainscreen.inc.php
@@ -20,7 +20,6 @@
 			$section     = $_POST['section'];
 			$select_lang = $_POST['select_lang'];
 			$message     = get_magic_quotes_gpc() ? stripslashes($_POST['message']) : $_POST['message'];
-
 			$acl_ok = array();
 			if (!$GLOBALS['egw']->acl->check('mainscreen_message_access',1,'admin'))
 			{
@@ -36,6 +35,8 @@
 				$GLOBALS['egw']->redirect_link('/admin/index.php');
 			}
 
+			egw_framework::validate_file('ckeditor3','ckeditor','phpgwapi');
+
 			$GLOBALS['egw']->template->set_file(array('message' => 'mainscreen_message.tpl'));
 			$GLOBALS['egw']->template->set_block('message','form','form');
 			$GLOBALS['egw']->template->set_block('message','row','row');
@@ -127,8 +128,7 @@
 					 $htmlarea_button='<input type="submit" name="htmlarea" onclick="self.location.href=\''.
 						$GLOBALS['egw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true').'\'" value="'.
 						lang('activate WYSIWYG-editor').'">';
-
-				}			   
+				}
 				$GLOBALS['egw']->common->egw_header();
 				echo parse_navbar();
 				
@@ -158,7 +158,7 @@
 
 			$GLOBALS['egw']->template->set_var('lang_cancel',lang('Cancel'));
 			$GLOBALS['egw']->template->set_var('error_message',$feedback_message);
-			$GLOBALS['egw']->template->pfp('out','form');
+			$GLOBALS['egw']->template->pparse('out','form');
 		}
 	}
 ?>

From c9e1b56d2dc60b5bf6bd96ac90c2d2caca731f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Mon, 5 Jul 2010 19:05:54 +0000
Subject: [PATCH 37/91] Fix vCalendar v1.0 EXDATE export

---
 calendar/inc/class.calendar_ical.inc.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index 154b22ec52..3dcba248a3 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -678,7 +678,10 @@ class calendar_ical extends calendar_boupdate
 
 							$attributes['EXDATE'] = '';
 							$values['EXDATE'] = $event['recur_exception'];
-							$parameters['EXDATE']['VALUE'] = $value_type;
+							if ($version != '1.0')
+							{
+								$parameters['EXDATE']['VALUE'] = $value_type;
+							}
 						}
 						break;
 

From f2bc58898f341287d29763a2f14481b544e4c17f Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 6 Jul 2010 08:20:53 +0000
Subject: [PATCH 38/91] rework of calendar purge function

---
 calendar/inc/class.calendar_so.inc.php | 46 +++++++++++---------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index d52bfa746e..570df77f38 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -1513,42 +1513,34 @@ ORDER BY cal_user_type, cal_usre_id
 	function purge($date)
 	{
 		// Start with egw_cal, it's the easiest
-		$sql = "DELETE FROM egw_cal
+		$sql = "(SELECT egw_cal.cal_id FROM egw_cal
 			LEFT JOIN egw_cal_repeats ON
-			    egw_cal_repeats.cal_id = egw_cal.cal_id
+				egw_cal_repeats.cal_id = egw_cal.cal_id
 			JOIN egw_cal_dates ON
 				egw_cal.cal_id = egw_cal_dates.cal_id
-			WHERE cal_end < $date AND (egw_cal_repeats.cal_id IS NULL || (recur_enddate < $date && recur_enddate != 0))";
-		$this->db->query($sql, __LINE__, __FILE__);
+			WHERE cal_end < $date AND (egw_cal_repeats.cal_id IS NULL OR (recur_enddate < $date AND recur_enddate != 0))) AS TOPROCESS";
 
-		// Get a list of what we just deleted for links
-		$ids = array();
+		// Get what we want to delete for all tables and links
 		foreach($this->db->select(
-			'egw_cal_dates',
+			$sql,
 			array('cal_id'),
-			array('cal_id NOT IN (SELECT cal_id FROM egw_cal)'),
+			null,
 			__LINE__, __FILE__, false
-		) as $row)
+			) as $row)
 		{
-			$ids[] = $row['cal_id'];
+			//echo __METHOD__." About to delete".$row['cal_id']."\r\n";
+			foreach($this->all_tables as $table)
+			{
+				$this->db->delete($table, array('cal_id'=>$row['cal_id']), __LINE__, __FILE__, 'calendar');
+			}
+			// handle sync
+			$this->db->query('UPDATE egw_api_content_history
+				SET sync_deleted=NOW()
+				WHERE sync_appname = \'calendar\'
+					AND sync_contentid ='.$row['cal_id'], __LINE__, __FILE__);
+			// handle links
+			egw_link::unlink('', 'calendar', $row['cal_id']);
 		}
-
-		// Cascade to other tables
-		foreach($this->all_tables as $table)
-		{
-			if($table == 'egw_cal') continue;
-			$this->db->delete($table, array('cal_id NOT IN (SELECT cal_id FROM egw_cal)'), __LINE__, __FILE__, 'calendar');
-		}
-
-		// Sync
-		$sql = 'UPDATE egw_api_content_history
-			SET sync_deleted=NOW()
-			WHERE sync_appname = \'calendar\'
-			    AND sync_contentid NOT IN (SELECT cal_id from egw_cal)';
-		$this->db->query($sql, __LINE__, __FILE__);
-			
-		// Links
-		egw_link::unlink('', 'calendar', $ids);
 	}
 
 	/**

From 99bd207983301fa1f0205e473dd3fb000b3691e9 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 6 Jul 2010 13:50:55 +0000
Subject: [PATCH 39/91] fix for bug targets (if specified with HTML Links in
 CKEditor) do not szrvive purify. Chr.Fueller investigated
 Attr.AllowedFrameTargets as cause of the issue

---
 phpgwapi/inc/class.html.inc.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 4c94c13f0e..b48ee5f2d8 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -200,6 +200,8 @@ class html
 		$config->set('HTML.TidyLevel', 'light');
 		// EnableID is needed for anchor tags
 		$config->set('Attr.EnableID',true);
+		// enable target attributes
+		$config->set('Attr.AllowedFrameTargets','_blank,_top,_self,_parent');
 		// actual allowed tags and attributes
 		$config->set('URI.AllowedSchemes', array('http'=>true, 'https'=>true, 'ftp'=>true, 'file'=>true, 'cid'=>true));
 		$config->set('AutoFormat.RemoveEmpty', true);
@@ -241,6 +243,8 @@ class html
 		$config->set('HTML.TidyLevel', 'light');
 		// EnableID is needed for anchor tags
 		$config->set('Attr.EnableID',true);
+		// enable target attributes
+		$config->set('Attr.AllowedFrameTargets','_blank,_top,_self,_parent');
 		// actual allowed tags and attributes
 		$config->set('URI.AllowedSchemes', array('http'=>true, 'https'=>true, 'ftp'=>true, 'file'=>true, 'cid'=>true));
 		$config->set('AutoFormat.RemoveEmpty', true);
@@ -1362,6 +1366,8 @@ class html
 				$config->set('HTML.TidyLevel', 'light');
 				// EnableID is needed for anchor tags
 				$config->set('Attr.EnableID',true);
+				// enable target attributes
+				$config->set('Attr.AllowedFrameTargets','_blank,_top,_self,_parent');
 				// actual allowed tags and attributes
 				$config->set('HTML.Allowed', 'br,p[align|style],b,i,u,s,em,pre,tt,strong,strike,center,div[align|style],hr[class|style],'.
 							'ul[type],ol[type|start],li,'.

From 7be12bc70f03d851170d8b1d22581003e008b575 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 6 Jul 2010 15:26:00 +0000
Subject: [PATCH 40/91] added missing table-button to toolbar, when in advanced
 mode

---
 phpgwapi/inc/class.egw_ckeditor_config.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
index b43baf95a9..c4d4f3179f 100644
--- a/phpgwapi/inc/class.egw_ckeditor_config.inc.php
+++ b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
@@ -211,7 +211,7 @@ class egw_ckeditor_config
 				$config['toolbar'][] = array('JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock');
 				$config['toolbar'][] = array('BulletedList','NumberedList','-','Outdent','Indent');
 				$config['toolbar'][] = array('Link','Unlink','Anchor');
-				$config['toolbar'][] = array('Maximize','Image','SpecialChar','PageBreak');
+				$config['toolbar'][] = array('Maximize','Image','Table','SpecialChar','PageBreak');
 
 				$config['toolbar'][] = '/';
 

From cd541542cecb098db27cd514c74b73b01bd5dfc4 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 7 Jul 2010 08:04:15 +0000
Subject: [PATCH 41/91] added missing hr to toolbar, when in advanced mode

---
 phpgwapi/inc/class.egw_ckeditor_config.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
index c4d4f3179f..f36595e111 100644
--- a/phpgwapi/inc/class.egw_ckeditor_config.inc.php
+++ b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
@@ -211,7 +211,7 @@ class egw_ckeditor_config
 				$config['toolbar'][] = array('JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock');
 				$config['toolbar'][] = array('BulletedList','NumberedList','-','Outdent','Indent');
 				$config['toolbar'][] = array('Link','Unlink','Anchor');
-				$config['toolbar'][] = array('Maximize','Image','Table','SpecialChar','PageBreak');
+				$config['toolbar'][] = array('Maximize','Image','Table','HorizontalRule','SpecialChar','PageBreak');
 
 				$config['toolbar'][] = '/';
 

From c1fa529fc8c09d7fe886b8a2c459d2dba23275eb Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 7 Jul 2010 10:10:23 +0000
Subject: [PATCH 42/91] new optional parameter "extra_args" for link widget, to
 add further get parameters to the link

---
 etemplate/inc/class.link_widget.inc.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/etemplate/inc/class.link_widget.inc.php b/etemplate/inc/class.link_widget.inc.php
index 0d62b2ee80..6368dacc3e 100644
--- a/etemplate/inc/class.link_widget.inc.php
+++ b/etemplate/inc/class.link_widget.inc.php
@@ -19,7 +19,8 @@
  * If run in a popup and the app uses no popups, a target will be set, to open a new full decorated window.
  *
  * The class contains the following widgets:
- * - link: Show a link to one linked entry specified by an array with keys app, id and optional title and help-message
+ * - link: Show a link to one linked entry specified by an array with keys app, id and optional title,
+ *         help-message and extra_args (array with additional get parameters)
  *         Optionally the application can be specified as option and the value can be just the id.
  * - link-to: Widget to create links to an other entries of link-aware apps
  *	If the variables $data['widget_id']['to_app'] = $app and $data['widget_id']['to_id'] = $entry_id
@@ -161,6 +162,13 @@ class link_widget
 				{
 					$link .= '&'.$var.'='.$val;
 				}
+				if (isset($value['extra_args']))
+				{
+					foreach($value['extra_args'] as $var => $val)
+					{
+						$link .= '&'.$var.'='.$val;
+					}
+				}
 				if (!($popup = egw_link::is_popup($value['app'],'view')) &&
 					etemplate::$request->output_mode == 2)	// we are in a popup
 				{

From 89ed32a02278d14e71e435e4fb14033d9f55d32c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 7 Jul 2010 10:11:52 +0000
Subject: [PATCH 43/91] add date parameter to next and last date link, to set
 correct exception date for recuring events

---
 addressbook/inc/class.addressbook_bo.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php
index f11753404d..a91c199aa8 100755
--- a/addressbook/inc/class.addressbook_bo.inc.php
+++ b/addressbook/inc/class.addressbook_bo.inc.php
@@ -1312,6 +1312,9 @@ class addressbook_bo extends addressbook_so
 							'id' => $event['id'],
 							'app' => 'calendar',
 							'title' => $bocal->link_title($event),
+							'extra_args' => array(
+								'date' => date('Ymd',$event['start']),
+							),
 						);
 						if ($extra_title)
 						{
@@ -1330,6 +1333,9 @@ class addressbook_bo extends addressbook_so
 							'id' => $event['id'],
 							'app' => 'calendar',
 							'title' => $bocal->link_title($event),
+							'extra_args' => array(
+								'date' => date('Ymd',$event['start']),
+							),
 						);
 						if ($extra_title)
 						{
@@ -1341,7 +1347,6 @@ class addressbook_bo extends addressbook_so
 				}
 			}
 		}
-		//_debug_array($calendars);
 		return $calendars;
 	}
 

From 07930ecd5800a19c51bfa68969b42519f65ee88e Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 7 Jul 2010 11:38:52 +0000
Subject: [PATCH 44/91] fix advanced search for customfields (multiple field
 criteria, combined by AND) in addressbook

---
 etemplate/inc/class.so_sql_cf.inc.php | 28 ++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/etemplate/inc/class.so_sql_cf.inc.php b/etemplate/inc/class.so_sql_cf.inc.php
index e3066ded53..d927118c75 100644
--- a/etemplate/inc/class.so_sql_cf.inc.php
+++ b/etemplate/inc/class.so_sql_cf.inc.php
@@ -458,19 +458,29 @@ class so_sql_cf extends so_sql
 				}
 				elseif (is_string($name) && $this->is_cf($name))
 				{
-					$name = substr($name, 1);
-					if (($negate = $criteria[$name][0] === '!'))
+					if ($op != 'AND')
 					{
-						$val = substr($val,1);
+						$name = substr($name, 1);
+						if (($negate = $criteria[$name][0] === '!'))
+						{
+							$val = substr($val,1);
+						}
+						$cfcriteria[] = '(' . $this->extra_table.'.'.$this->extra_value . ' ' .($negate ? 'NOT ' : '').
+							$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE]. ' ' .
+							$this->db->quote($wildcard.$val.$wildcard) . ' AND ' .
+							$this->extra_table.'.'.$this->extra_key . ' = ' . $this->db->quote($name) .
+							')';
+						unset($criteria[self::CF_PREFIX.$name]);
+					}
+					else
+					{
+						// criteria operator is AND we remap the criteria to be transformed to filters
+						$filter[$name] = $val;
+						unset($criteria[$name]);
 					}
-					$criteria[] = '(' . $this->extra_table.'.'.$this->extra_value . ' ' .($negate ? 'NOT ' : '').
-						$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE]. ' ' .
-						$this->db->quote($wildcard.$val.$wildcard) . ' AND ' .
-						$this->extra_table.'.'.$this->extra_key . ' = ' . $this->db->quote($name) .
-						')';
-					unset($criteria[self::CF_PREFIX.$name]);
 				}
 			}
+			if ($cfcriteria && $op =='OR') $criteria[] = implode(' OR ',$cfcriteria);
 		}
 		if($only_keys === true) {
 			// Expand to keys here, so table_name can be prepended below

From 82e8bdbd9e826bfb63a16252d09bf06ac8e679ec Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 7 Jul 2010 14:11:33 +0000
Subject: [PATCH 45/91] allow for like wildcard.val.wildcard in filtersearch
 for customfields (needed for advanced search, as criteria are now remapped to
 be filters for customfields)

---
 etemplate/inc/class.so_sql_cf.inc.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/etemplate/inc/class.so_sql_cf.inc.php b/etemplate/inc/class.so_sql_cf.inc.php
index d927118c75..285b0ba149 100644
--- a/etemplate/inc/class.so_sql_cf.inc.php
+++ b/etemplate/inc/class.so_sql_cf.inc.php
@@ -553,6 +553,14 @@ class so_sql_cf extends so_sql
 									))
 								);
 							}
+							elseif ($this->customfields[$this->get_cf_name($name)]['type'] == 'text')
+							{
+								$sql_filter = str_replace($this->extra_value,'extra_filter.'.$this->extra_value,
+										$this->db->expression($this->extra_table,array(
+										$this->extra_value.' '.$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($wildcard.$val.$wildcard)
+									))
+								);
+							}
 							else
 							{
 								$sql_filter = str_replace($this->extra_value,'extra_filter.'.

From f3017cdeba0a701a1456e9a78d24814861f8d9b3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 7 Jul 2010 17:11:10 +0000
Subject: [PATCH 46/91] adding "regular" import/export functions (import &
 export) to preferences: allows to use them without being admin

---
 ...rtexport_admin_prefs_sidebox_hooks.inc.php | 67 +------------------
 importexport/setup/setup.inc.php              |  8 +--
 2 files changed, 6 insertions(+), 69 deletions(-)

diff --git a/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php b/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php
index 621bc3ebd7..913d4d3542 100644
--- a/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php
+++ b/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php
@@ -16,22 +16,12 @@ if (!defined('IMPORTEXPORT_APP'))
 
 class importexport_admin_prefs_sidebox_hooks
 {
-	var $config = array();
-
-	function importexport_admin_prefs_sidebox_hooks()
-	{
-		$config =& CreateObject('phpgwapi.config',IMPORTEXPORT_APP);
-		$config->read_repository();
-		$this->config =& $config->config_data;
-		unset($config);
-	}
-
-	function all_hooks($args)
+	static function all_hooks($args)
 	{
 		$appname = IMPORTEXPORT_APP;
 		$location = is_array($args) ? $args['location'] : $args;
 
-		if ($location == 'sidebox_menu')
+		if ($GLOBALS['egw_info']['user']['apps']['preferences'] && $location != 'admin')
 		{
 			$file = array(
 				'Import'=> array(
@@ -47,23 +37,13 @@ class importexport_admin_prefs_sidebox_hooks
 					'icon' => 'export'
 				),
 			);
-			display_sidebox($appname,$GLOBALS['egw_info']['apps'][$appname]['title'].' '.lang('Menu'),$file);
-		}
-
-		if ($GLOBALS['egw_info']['user']['apps']['preferences'] && $location != 'admin')
-		{
-			$file = array(
-//				'Preferences'     => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uisettings.index&appname='.$appname),
-//				'Grant Access'    => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
-//				'Edit Categories' => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=' . $appname . '&cats_level=True&global_cats=True')
-			);
 			if ($location == 'preferences')
 			{
 				display_section($appname,$file);
 			}
 			else
 			{
-				display_sidebox($appname,lang('Preferences'),$file);
+				display_sidebox($appname,lang($appname),$file);
 			}
 		}
 
@@ -88,45 +68,4 @@ class importexport_admin_prefs_sidebox_hooks
 			}
 		}
 	}
-	
-	/**
-	 * populates $GLOBALS['settings'] for the preferences
-	 */
-	function settings()
-	{
-		$this->check_set_default_prefs();
-
-		return true;	// otherwise prefs say it cant find the file ;-)
-	}
-	
-	/**
-	 * Check if reasonable default preferences are set and set them if not
-	 *
-	 * It sets a flag in the app-session-data to be called only once per session
-	 */
-	function check_set_default_prefs()
-	{
-		if ($GLOBALS['egw']->session->appsession('default_prefs_set',IMPORTEXPORT_APP))
-		{
-			return;
-		}
-		$GLOBALS['egw']->session->appsession('default_prefs_set',IMPORTEXPORT_APP,'set');
-
-		$default_prefs =& $GLOBALS['egw']->preferences->default[IMPORTEXPORT_APP];
-
-		$defaults = array(
-		);
-		foreach($defaults as $var => $default)
-		{
-			if (!isset($default_prefs[$var]) || $default_prefs[$var] === '')
-			{
-				$GLOBALS['egw']->preferences->add(IMPORTEXPORT_APP,$var,$default,'default');
-				$need_save = True;
-			}
-		}
-		if ($need_save)
-		{
-			$GLOBALS['egw']->preferences->save_repository(False,'default');
-		}
-	}
 }
diff --git a/importexport/setup/setup.inc.php b/importexport/setup/setup.inc.php
index c87368e96b..13f8bcbf48 100644
--- a/importexport/setup/setup.inc.php
+++ b/importexport/setup/setup.inc.php
@@ -26,11 +26,9 @@ $setup_info['importexport']['note'] =
 '';
 
 /* The hooks this app includes, needed for hooks registration */
-//$setup_info['importexport']['hooks']['preferences'] = 'importexport'.'.admin_prefs_sidebox_hooks.all_hooks';
-//$setup_info['importexport']['hooks']['settings'] = 'importexport'.'.admin_prefs_sidebox_hooks.settings';
-$setup_info['importexport']['hooks']['admin'] = 'importexport'.'.importexport_admin_prefs_sidebox_hooks.all_hooks';
-$setup_info['importexport']['hooks']['sidebox_menu'] = 'importexport'.'.importexport_admin_prefs_sidebox_hooks.all_hooks';
-//$setup_info['importexport']['hooks']['search_link'] = 'importexport'.'.bomyterra.search_link';
+$setup_info['importexport']['hooks']['preferences'] =
+$setup_info['importexport']['hooks']['admin'] =
+$setup_info['importexport']['hooks']['sidebox_menu'] = 'importexport_admin_prefs_sidebox_hooks::all_hooks';
 
 /* Dependencies for this app to work */
 $setup_info['importexport']['depends'][] = array(

From 1c7e2f6e27ca3c57d7c6fbdbee0e2165075969f5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 8 Jul 2010 08:11:44 +0000
Subject: [PATCH 47/91] - implemented limited support for sidebox options in
 preferences - opening import/export dialogs as popups, as they use egw
 window.close()

---
 ...rtexport_admin_prefs_sidebox_hooks.inc.php |  20 +-
 preferences/index.php                         | 243 +++++++++---------
 2 files changed, 133 insertions(+), 130 deletions(-)

diff --git a/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php b/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php
index 913d4d3542..1a9bd0c38e 100644
--- a/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php
+++ b/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php
@@ -24,16 +24,18 @@ class importexport_admin_prefs_sidebox_hooks
 		if ($GLOBALS['egw_info']['user']['apps']['preferences'] && $location != 'admin')
 		{
 			$file = array(
-				'Import'=> array(
+				array(
 					'text' => 'Import',
-					'link' => $GLOBALS['egw']->link('/index.php','menuaction=importexport.importexport_import_ui.import_dialog'),
-					'target' => 'new',
+					'link' => "javascript:egw_openWindowCentered2('".
+						egw::link('/index.php','menuaction=importexport.importexport_import_ui.import_dialog',false).
+						"','_blank',850,440,'yes')",
 					'icon' => 'import'
 				),
-				'Export'=> array(
+				array(
 					'text' => 'Export',
-					'link' => $GLOBALS['egw']->link('/index.php','menuaction=importexport.importexport_export_ui.export_dialog'),
-					'target' => 'new',
+					'link' => "javascript:egw_openWindowCentered2('".
+						egw::link('/index.php','menuaction=importexport.importexport_export_ui.export_dialog',false).
+						"','_blank',850,440,'yes')",
 					'icon' => 'export'
 				),
 			);
@@ -50,11 +52,11 @@ class importexport_admin_prefs_sidebox_hooks
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && $location != 'preferences')
 		{
 			$file = Array(
-				'Import definitions' => $GLOBALS['egw']->link('/index.php','menuaction=importexport.importexport_definitions_ui.import_definition'),
-				'Define imports|exports'  => $GLOBALS['egw']->link('/index.php',array(
+				'Import definitions' => egw::link('/index.php','menuaction=importexport.importexport_definitions_ui.import_definition'),
+				'Define imports|exports'  => egw::link('/index.php',array(
 					'menuaction' => 'importexport.importexport_definitions_ui.index',
 				)),
-				'Schedule' => $GLOBALS['egw']->link('/index.php', array(
+				'Schedule' => egw::link('/index.php', array(
 					'menuaction' => 'importexport.importexport_schedule_ui.index'
 				)),
 			);
diff --git a/preferences/index.php b/preferences/index.php
index 7549fd5707..266f314c86 100755
--- a/preferences/index.php
+++ b/preferences/index.php
@@ -1,142 +1,143 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare - preferences                                                 *
-	* http://www.egroupware.org                                                *
-	* Written by Joseph Engo <jengo@phpgroupware.org>                          *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
+/**
+ * EGroupware preferences
+ *
+ * @package preferences
+ * @link http://www.egroupware.org
+ * @author Joseph Engo <jengo@phpgroupware.org>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-	/* $Id$ */
+$GLOBALS['egw_info'] = array(
+	'flags' => array(
+		'currentapp' => 'preferences',
+		'disable_Template_class' => True,
+	),
+);
+include('../header.inc.php');
 
-	$GLOBALS['egw_info'] = array(
-		'flags' => array(
-			'currentapp' => 'preferences',
-			'disable_Template_class' => True,
-		),
+$pref_tpl =& CreateObject('phpgwapi.Template',EGW_APP_TPL);
+$templates = Array(
+	'pref' => 'index.tpl'
+);
+
+$pref_tpl->set_file($templates);
+
+$pref_tpl->set_block('pref','list');
+$pref_tpl->set_block('pref','app_row');
+$pref_tpl->set_block('pref','app_row_noicon');
+$pref_tpl->set_block('pref','link_row');
+$pref_tpl->set_block('pref','spacer_row');
+
+if ($GLOBALS['egw']->acl->check('run',1,'admin'))
+{
+	// This is where we will keep track of our position.
+	// Developers won't have to pass around a variable then
+	$session_data = $GLOBALS['egw']->session->appsession('session_data','preferences');
+
+	if (! is_array($session_data))
+	{
+		$session_data = array('type' => 'user');
+		$GLOBALS['egw']->session->appsession('session_data','preferences',$session_data);
+	}
+
+	if (! $_GET['type'])
+	{
+		$type = $session_data['type'];
+	}
+	else
+	{
+		$type = $_GET['type'];
+		$session_data = array('type' => $type);
+		$GLOBALS['egw']->session->appsession('session_data','preferences',$session_data);
+	}
+
+	$tabs[] = array(
+		'label' => lang('Your preferences'),
+		'link'  => egw::link('/preferences/index.php','type=user')
 	);
-	include('../header.inc.php');
-
-	$pref_tpl =& CreateObject('phpgwapi.Template',EGW_APP_TPL);
-	$templates = Array(
-		'pref' => 'index.tpl'
+	$tabs[] = array(
+		'label' => lang('Default preferences'),
+		'link'  => egw::link('/preferences/index.php','type=default')
+	);
+	$tabs[] = array(
+		'label' => lang('Forced preferences'),
+		'link'  => egw::link('/preferences/index.php','type=forced')
 	);
 
-	$pref_tpl->set_file($templates);
-
-	$pref_tpl->set_block('pref','list');
-	$pref_tpl->set_block('pref','app_row');
-	$pref_tpl->set_block('pref','app_row_noicon');
-	$pref_tpl->set_block('pref','link_row');
-	$pref_tpl->set_block('pref','spacer_row');
-
-	if ($GLOBALS['egw']->acl->check('run',1,'admin'))
+	switch($type)
 	{
-		// This is where we will keep track of our position.
-		// Developers won't have to pass around a variable then
-		$session_data = $GLOBALS['egw']->session->appsession('session_data','preferences');
+		case 'user':    $selected = 0; break;
+		case 'default': $selected = 1; break;
+		case 'forced':  $selected = 2; break;
+	}
+	$pref_tpl->set_var('tabs',$GLOBALS['egw']->common->create_tabs($tabs,$selected));
+}
 
-		if (! is_array($session_data))
-		{
-			$session_data = array('type' => 'user');
-			$GLOBALS['egw']->session->appsession('session_data','preferences',$session_data);
-		}
+// This func called by the includes to dump a row header
+function section_start($appname='',$icon='')
+{
+	global $pref_tpl;
 
-		if (! $_GET['type'])
-		{
-			$type = $session_data['type'];
-		}
-		else
-		{
-			$type = $_GET['type'];
-			$session_data = array('type' => $type);
-			$GLOBALS['egw']->session->appsession('session_data','preferences',$session_data);
-		}
+	$pref_tpl->set_var('a_name',$appname);
+	$pref_tpl->set_var('app_name',$GLOBALS['egw_info']['apps'][$appname]['title']);
+	$pref_tpl->set_var('app_icon',$icon);
+	if ($icon)
+	{
+		$pref_tpl->parse('rows','app_row',True);
+	}
+	else
+	{
+		$pref_tpl->parse('rows','app_row_noicon',True);
+	}
+}
 
-		$tabs[] = array(
-			'label' => lang('Your preferences'),
-			'link'  => $GLOBALS['egw']->link('/preferences/index.php','type=user')
-		);
-		$tabs[] = array(
-			'label' => lang('Default preferences'),
-			'link'  => $GLOBALS['egw']->link('/preferences/index.php','type=default')
-		);
-		$tabs[] = array(
-			'label' => lang('Forced preferences'),
-			'link'  => $GLOBALS['egw']->link('/preferences/index.php','type=forced')
-		);
+function section_item($pref_link='',$pref_text='')
+{
+	global $pref_tpl;
 
-		switch($type)
-		{
-			case 'user':    $selected = 0; break;
-			case 'default': $selected = 1; break;
-			case 'forced':  $selected = 2; break;
-		}
-		$pref_tpl->set_var('tabs',$GLOBALS['egw']->common->create_tabs($tabs,$selected));
+	$pref_tpl->set_var('pref_link',$pref_link);
+
+	if (strtolower($pref_text) == 'grant access' && $GLOBALS['egw_info']['server']['deny_user_grants_access'])
+	{
+		return False;
+	}
+	else
+	{
+		$pref_tpl->set_var('pref_text',$pref_text);
 	}
 
-	// This func called by the includes to dump a row header
-	function section_start($appname='',$icon='')
+	$pref_tpl->parse('rows','link_row',True);
+}
+
+function section_end()
+{
+	global $pref_tpl;
+
+	$pref_tpl->parse('rows','spacer_row',True);
+}
+
+function display_section($appname,$file,$file2=False)
+{
+	if ($file2)
 	{
-		global $pref_tpl;
-
-		$pref_tpl->set_var('a_name',$appname);
-		$pref_tpl->set_var('app_name',$GLOBALS['egw_info']['apps'][$appname]['title']);
-		$pref_tpl->set_var('app_icon',$icon);
-		if ($icon)
-		{
-			$pref_tpl->parse('rows','app_row',True);
-		}
-		else
-		{
-			$pref_tpl->parse('rows','app_row_noicon',True);
-		}
+		$file = $file2;
 	}
+	section_start($appname,$GLOBALS['egw']->common->image($appname,Array('navbar',$appname)));
 
-	function section_item($pref_link='',$pref_text='')
+	foreach($file as $text => $url)
 	{
-		global $pref_tpl;
-
-		$pref_tpl->set_var('pref_link',$pref_link);
-
-		if (strtolower($pref_text) == 'grant access' && $GLOBALS['egw_info']['server']['deny_user_grants_access'])
+		if (is_array($url))
 		{
-			return False;
+			$text = $url['text'];
+			$url = $url['link'];
 		}
-		else
-		{
-			$pref_tpl->set_var('pref_text',$pref_text);
-		}
-
-		$pref_tpl->parse('rows','link_row',True);
+		section_item($url,lang($text));
 	}
+	section_end();
+}
 
-	function section_end()
-	{
-		global $pref_tpl;
-
-		$pref_tpl->parse('rows','spacer_row',True);
-	}
-
-	function display_section($appname,$file,$file2=False)
-	{
-		if ($file2)
-		{
-			$file = $file2;
-		}
-		section_start($appname,$GLOBALS['egw']->common->image($appname,Array('navbar',$appname)));
-
-		while(list($text,$url) = each($file))
-		{
-			section_item($url,lang($text));
-		}
-		section_end();
-	}
-
-	$GLOBALS['egw']->hooks->process('preferences',array('preferences'));
-	$pref_tpl->pfp('out','list');
-	$GLOBALS['egw']->common->egw_footer();
-?>
+$GLOBALS['egw']->hooks->process('preferences',array('preferences'));
+$pref_tpl->pfp('out','list');
+common::egw_footer();

From 129eaec0e31689770afcb919b218fceaf4c95ec7 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 8 Jul 2010 09:37:24 +0000
Subject: [PATCH 48/91] put out Unrecogniced GroupDAV client Message only, when
 debug bis enabled

---
 phpgwapi/inc/class.groupdav_handler.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.groupdav_handler.inc.php b/phpgwapi/inc/class.groupdav_handler.inc.php
index c79489f6c2..f2264c2575 100644
--- a/phpgwapi/inc/class.groupdav_handler.inc.php
+++ b/phpgwapi/inc/class.groupdav_handler.inc.php
@@ -358,7 +358,7 @@ abstract class groupdav_handler
 			}
 			if (!$agent)
 			{
-				error_log("Unrecogniced GroupDAV client: HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]'!");
+				if ($this->debug) error_log("Unrecogniced GroupDAV client: HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]'!");
 			}
 			else
 			{

From 09100671eefb4c01e964082c4f748036c7b66c98 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 8 Jul 2010 09:41:06 +0000
Subject: [PATCH 49/91] put out Unrecogniced GroupDAV client Message only, when
 debug bis enabled -> does not work, as the function is static, commented the
 error_log

---
 phpgwapi/inc/class.groupdav_handler.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.groupdav_handler.inc.php b/phpgwapi/inc/class.groupdav_handler.inc.php
index f2264c2575..473398e5e5 100644
--- a/phpgwapi/inc/class.groupdav_handler.inc.php
+++ b/phpgwapi/inc/class.groupdav_handler.inc.php
@@ -358,7 +358,7 @@ abstract class groupdav_handler
 			}
 			if (!$agent)
 			{
-				if ($this->debug) error_log("Unrecogniced GroupDAV client: HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]'!");
+				//error_log("Unrecogniced GroupDAV client: HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]'!");
 			}
 			else
 			{

From b78a9865cc2ad37154cb7c0dc6f25245d013e163 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 8 Jul 2010 11:37:56 +0000
Subject: [PATCH 50/91] explicitly process fields to order by, as cutomfields
 may have names with spaces, so we examine each order by criteria, as our preg
 did not do the job properly

---
 etemplate/inc/class.so_sql_cf.inc.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/etemplate/inc/class.so_sql_cf.inc.php b/etemplate/inc/class.so_sql_cf.inc.php
index 285b0ba149..2be41db2f4 100644
--- a/etemplate/inc/class.so_sql_cf.inc.php
+++ b/etemplate/inc/class.so_sql_cf.inc.php
@@ -497,15 +497,24 @@ class so_sql_cf extends so_sql
 				}
 			}
 		}
-
 		// check if we order by a custom field --> join cf table for given cf and order by it's value
-		if (strpos($order_by,self::CF_PREFIX) !== false &&
-			preg_match('/'.self::CF_PREFIX.'([^ ]+) (asc|desc)/i',$order_by,$matches))
+		if (strpos($order_by,self::CF_PREFIX) !== false)
 		{
-			$order_by = str_replace($matches[0],'extra_order.'.$this->extra_value.' IS NULL,extra_order.'.$this->extra_value.' '.$matches[2],$order_by);
-			$join .= $this->extra_join_order.' AND extra_order.'.$this->extra_key.'='.$this->db->quote($matches[1]);
+			// fields to order by, as cutomfields may have names with spaces, we examine each order by criteria
+			$fields2order = explode(',',$order_by);
+			foreach($fields2order as $k => $v)
+			{
+				if (strpos($v,self::CF_PREFIX) !== false)
+				{
+					// we found a customfield, so we split that part by space char in order to get Sorting Direction and Fieldname
+					$buff = explode(' ',trim($v));
+					$orderDir = array_pop($buff);
+					$key = trim(implode(' ',$buff));
+					$order_by = str_replace($v,'extra_order.'.$this->extra_value.' IS NULL,extra_order.'.$this->extra_value.' '.$orderDir,$order_by);
+					$join .= $this->extra_join_order.' AND extra_order.'.$this->extra_key.'='.$this->db->quote(substr($key,1));
+				}
+			}
 		}
-
 		// check if we filter by a custom field
 		if (is_array($filter))
 		{

From b5e33eab09fe9d8c1bd16c8c351088f5abe89236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Thu, 8 Jul 2010 12:03:13 +0000
Subject: [PATCH 51/91] - Fixed etemplate input dirty handling - Now generating
 an widget object tree in widget.js - Added generic response to egw_json -
 Moved "getFramework" function to jsapi and renamed it to "egw_getFramework" -
 Added plugin system to egw_json - Transformed the jQuery "replaceWith" call
 form class.etemplate_form.inc.php into an own json plugin - Fixed label
 creation for et_html

---
 phpgwapi/inc/class.egw_json.inc.php | 12 ++++++++
 phpgwapi/js/egw_json.js             | 47 +++++++++++++++++++++++++++++
 phpgwapi/js/jsapi/jsapi.js          | 17 +++++++++++
 3 files changed, 76 insertions(+)

diff --git a/phpgwapi/inc/class.egw_json.inc.php b/phpgwapi/inc/class.egw_json.inc.php
index 80a78c8d7d..8f0b882854 100644
--- a/phpgwapi/inc/class.egw_json.inc.php
+++ b/phpgwapi/inc/class.egw_json.inc.php
@@ -306,6 +306,18 @@ class egw_json_response
 		}
 	}
 
+	public function generic($type, array $parameters = array())
+	{
+		if (is_string($type))
+		{
+			$this->addGeneric($type, $parameters);
+		}
+		else
+		{
+			throw new Exception("Invalid parameters supplied.");
+		}
+	}
+
 	/**
 	 * Adds an html assign to the response, which is excecuted upon the request is received.
 	 *
diff --git a/phpgwapi/js/egw_json.js b/phpgwapi/js/egw_json.js
index bc66f42e41..0e968cf873 100644
--- a/phpgwapi/js/egw_json.js
+++ b/phpgwapi/js/egw_json.js
@@ -121,6 +121,50 @@ function egw_json_encode(input)
  */
 var egw_json_files = {};
 
+/**
+ * Variable which stores all currently registered plugins
+ */
+var _egw_json_plugins = [];
+
+/**
+ * Register a plugin for the egw_json handler
+ */
+function egw_json_register_plugin(_callback, _context)
+{
+	//Default the context parameter to "window"
+	if (typeof _context == 'undefined') {
+		_context = window;
+	}
+
+	//Add a plugin object to the plugins array
+	_egw_json_plugins[_egw_json_plugins.length] = {
+		'callback': _callback,
+		'context': _context
+	};
+}
+
+/**
+ * Function used internally to pass a response to all registered plugins
+ */
+function _egw_json_plugin_handle(_type, _response) {
+	for (var i = 0; i < _egw_json_plugins.length; i++)
+	{
+		try {
+			var plugin = _egw_json_plugins[i];
+			if (plugin.callback.call(plugin.context, _type, _response)) {
+				return true;
+			}
+		} catch (e) {
+			if (typeof console != 'undefined')
+			{
+				console.log(e);
+			}
+		}
+	}
+
+	return false;
+}
+
 /** The constructor of the egw_json_request class.
  * @param string _menuaction the menuaction function which should be called and which handles the actual request
  * @param array _parameters which should be passed to the menuaction function.
@@ -376,6 +420,9 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
 							throw 'Invalid parameters';
 						break;
 				}
+
+				//Try to handle the json response with all registered plugins
+				hasResponse |= _egw_json_plugin_handle(data.response[i].type, res);
 			} catch(e) {
 				this.jsonError('Internal JSON handler error', e);
 			}
diff --git a/phpgwapi/js/jsapi/jsapi.js b/phpgwapi/js/jsapi/jsapi.js
index 7753d5cc91..2b679f464a 100644
--- a/phpgwapi/js/jsapi/jsapi.js
+++ b/phpgwapi/js/jsapi/jsapi.js
@@ -114,6 +114,23 @@ function egw_appWindow(_app)
 	return window;
 }
 
+window.egw_getFramework = function()
+{
+	if (typeof window.framework != 'undefined')
+	{
+		return framework;
+	}
+	else if (typeof window.parent.egw_getFramework != "undefined")
+	{
+		return window.parent.egw_getFramework();
+	}
+	else
+	{
+		return null;
+	}
+}
+
+
 function egw_set_checkbox_multiselect_enabled(_id, _enabled)
 {
 	//Retrieve the checkbox_multiselect base div

From ea6ad0129a4440baec19c7615c4359ff75309845 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 8 Jul 2010 15:01:40 +0000
Subject: [PATCH 52/91] check the cat filter. If you have no read rights for
 any cats (and with that resources) set the cat-filter to null. As cat_id is
 enforced for resources by UI, you should not ret any results, which is
 expected if you have no read rights.

---
 resources/inc/class.bo_resources.inc.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/inc/class.bo_resources.inc.php b/resources/inc/class.bo_resources.inc.php
index ab271f8a9a..cfd2db7276 100755
--- a/resources/inc/class.bo_resources.inc.php
+++ b/resources/inc/class.bo_resources.inc.php
@@ -90,6 +90,9 @@ class bo_resources
 		{
 			$filter['cat_id'] = array_keys($readcats);
 		}
+		// if there is no catfilter -> this means you have no rights, so set the cat filter to null
+		if (!isset($filter['cat_id']) || empty($filter['cat_id'])) $filter['cat_id'] = NUll;
+
 		if ($query['show_bookable'])
 		{
 			$filter['bookable'] = true;

From 80706f34b721246fb6cc1e8bd76e49c6d54d7a78 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Fri, 9 Jul 2010 13:00:46 +0000
Subject: [PATCH 53/91] If error details are included, show them in the log

---
 phpgwapi/js/egw_json.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/js/egw_json.js b/phpgwapi/js/egw_json.js
index 0e968cf873..dc5858a521 100644
--- a/phpgwapi/js/egw_json.js
+++ b/phpgwapi/js/egw_json.js
@@ -248,6 +248,7 @@ egw_json_request.prototype.sendRequest = function(_async, _callback, _sender)
 egw_json_request.prototype.alertFunc = function(_message, _details)
 {
 	alert(_message);
+	if(_details) _egw_json_debug_log(_message, _details);
 }
 
 function _egw_json_debug_log(_msg, _e)
@@ -264,7 +265,7 @@ egw_json_request.prototype.jsonError = function(_msg, _e)
 	var msg = 'EGW JSON Error: '._msg;
 
 	//Log and show the error message
-	_egw_json_bebug_log(msg, _e);
+	_egw_json_debug_log(msg, _e);
 	this.alertHandler(msg);
 }
 

From 26c7f601f3b531654bcb46ba96798352d1ba09ee Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 13 Jul 2010 11:48:06 +0000
Subject: [PATCH 54/91] making sure / checking that alarmData is an array as
 expected.

---
 calendar/inc/class.calendar_sif.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/calendar/inc/class.calendar_sif.inc.php b/calendar/inc/class.calendar_sif.inc.php
index d00bcf1fe0..7c6b5d5f1a 100644
--- a/calendar/inc/class.calendar_sif.inc.php
+++ b/calendar/inc/class.calendar_sif.inc.php
@@ -578,7 +578,7 @@ class calendar_sif extends calendar_boupdate
 									break;
 								}
 							}
-							if (isset($alarmData)) $event['alarm'][] = $alarmData;
+							if (isset($alarmData)&&is_array($alarmData)) $event['alarm'][] = $alarmData;
 						}
 					}
 					break;

From 48ba641cb37861c62328e1d93f6709b11442cbf1 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 13 Jul 2010 14:22:14 +0000
Subject: [PATCH 55/91] Avoid conflicts with other objects that have ->db
 defined by using the global db

---
 etemplate/inc/class.so_sql.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/inc/class.so_sql.inc.php b/etemplate/inc/class.so_sql.inc.php
index 7225ea26f9..471dce91ab 100644
--- a/etemplate/inc/class.so_sql.inc.php
+++ b/etemplate/inc/class.so_sql.inc.php
@@ -1094,7 +1094,7 @@ class so_sql
 		}
 		if($columns)
 		{
-			$columns = call_user_func_array(array($this->db,'concat'),$columns);
+			$columns = call_user_func_array(array($GLOBALS['egw']->db,'concat'),$columns);
 		}
 
 		// Break the search string into tokens

From e2dab5d56b126276464f784a05458f1d11181532 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 13 Jul 2010 14:35:34 +0000
Subject: [PATCH 56/91] fix for reset_stati on Drag and Drop; Work by
 Chr.Fueller, leithoff

---
 calendar/inc/class.calendar_ajax.inc.php | 33 +++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/calendar/inc/class.calendar_ajax.inc.php b/calendar/inc/class.calendar_ajax.inc.php
index a76b0aa21f..506883f639 100644
--- a/calendar/inc/class.calendar_ajax.inc.php
+++ b/calendar/inc/class.calendar_ajax.inc.php
@@ -44,11 +44,30 @@ class calendar_ajax {
 			return false;
 		}
 
-		$event=$this->calendar->read($eventId);
+		$old_event=$event=$this->calendar->read($eventId);
 		$duration=$event['end']-$event['start'];
 
 		$event['start'] = $this->calendar->date2ts($targetDateTime);
 		$event['end'] = $event['start']+$duration;
+		$status_reset_to_unknown = false;
+		switch ($this->calendar->cal_prefs['reset_stati'])
+		{
+			case 'no':
+				break;
+			case 'startday':
+				if (date('Ymd', $old_event['start']) == date('Ymd', $event['start'])) break;
+			default:
+				$status_reset_to_unknown = true;
+				foreach((array)$event['participants'] as $uid => $status)
+				{
+					//error_log("participant {$GLOBALS['egw']->accounts->id2name($uid)} ($status)");
+					calendar_so::split_status($status,$q,$r);
+					if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->calendar->user && $status != 'U')
+					{
+						$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
+					}
+				}
+		}
 
 		$conflicts=$this->calendar->update($event);
 
@@ -69,6 +88,18 @@ class calendar_ajax {
 					.'&cancel_needs_refresh=true',
 				'',750,410);
 		}
+		if ($status_reset_to_unknown)
+		{
+			foreach((array)$event['participants'] as $uid => $status)
+			{
+				if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->calendar->user)
+				{
+					calendar_so::split_status($status,$q,$r);
+					$status = calendar_so::combine_status('U',$q,$r);
+					$this->calendar->set_status($event['id'], $uid, $status, 0, true);
+				}
+			}
+		}
 
 		return $response->getXML();
 	}

From b5f35a4b75b87fc654b105247e015bce466b3115 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 13 Jul 2010 20:47:25 +0000
Subject: [PATCH 57/91] validating (string) === '' (instead  === ''), as on
 ajax commit no yet set inputs are returned as null instead of ''

---
 etemplate/inc/class.etemplate.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 0f668f65a6..90693b812e 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -2165,7 +2165,7 @@ class etemplate extends boetemplate
 				case 'text':
 				case 'textarea':
 				case 'colorpicker':
-					if ($value === '' && $attr['needed'] && !$attr['blur'])
+					if ((string)$value === '' && $attr['needed'] && !$attr['blur'])
 					{
 						self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
 					}
@@ -2190,7 +2190,7 @@ class etemplate extends boetemplate
 					}
 					elseif ($type == 'int' || $type == 'float')	// cast int and float and check range
 					{
-						if ($value !== '' || $attr['needed'])	// empty values are Ok if needed is not set
+						if ((string)$value !== '' || $attr['needed'])	// empty values are Ok if needed is not set
 						{
 							$value = $type == 'int' ? (int) $value : (float) str_replace(',','.',$value);	// allow for german (and maybe other) format
 

From 544c522904e2f2edc5a5ba19559710408366855f Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 15 Jul 2010 10:09:35 +0000
Subject: [PATCH 58/91] additional statusfilters: open and upcoming, own open
 and upcoming, delegated open and upcoming, responsible open and upcoming

---
 infolog/inc/class.infolog_bo.inc.php | 4 ++++
 infolog/inc/class.infolog_so.inc.php | 4 +++-
 infolog/lang/egw_de.lang             | 4 ++++
 infolog/lang/egw_en.lang             | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index 0a4f79df58..09fb4cb195 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -117,17 +117,21 @@ class infolog_bo
 		'responsible-open-today'   => 'responsible open',
 		'responsible-open-overdue' => 'responsible overdue',
 		'responsible-upcoming'     => 'responsible upcoming',
+		'responsible-open-upcoming'=> 'responsible open and upcoming',
 		'delegated'                => 'delegated',
 		'delegated-open-today'     => 'delegated open',
 		'delegated-open-overdue'   => 'delegated overdue',
 		'delegated-upcoming'       => 'delegated upcomming',
+		'delegated-open-upcoming'  => 'delegated open and upcoming',
 		'own'                      => 'own',
 		'own-open-today'           => 'own open',
 		'own-open-overdue'         => 'own overdue',
 		'own-upcoming'             => 'own upcoming',
+		'own-open-upcoming'		   => 'own open and upcoming',
 		'open-today'               => 'open',
 		'open-overdue'             => 'overdue',
 		'upcoming'                 => 'upcoming',
+		'open-upcoming'			   => 'open and upcoming',
 		'bydate'                   => 'startdate',
 	);
 
diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php
index 7393af4f11..32ba220e79 100644
--- a/infolog/inc/class.infolog_so.inc.php
+++ b/infolog/inc/class.infolog_so.inc.php
@@ -295,7 +295,7 @@ class infolog_so
 	 */
 	function dateFilter($filter = '')
 	{
-		preg_match('/(upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/',$filter,$vars);
+		preg_match('/(open-upcoming|upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/',$filter,$vars);
 		$filter = $vars[1];
 
 		if (isset($vars[2]) && !empty($vars[2]) && ($date = preg_split('/[-\\/.]/',$vars[2])))
@@ -310,6 +310,8 @@ class infolog_so
 		}
 		switch ($filter)
 		{
+			case 'open-upcoming':
+				return  "AND (info_startdate >= $tomorrow OR NOT (info_status IN ('done','billed','cancelled','deleted','template','nonactive','archive')))";
 			case 'upcoming':
 				return " AND info_startdate >= $tomorrow";
 			case 'today':
diff --git a/infolog/lang/egw_de.lang b/infolog/lang/egw_de.lang
index 2f75a395a8..7fee45590f 100644
--- a/infolog/lang/egw_de.lang
+++ b/infolog/lang/egw_de.lang
@@ -104,6 +104,7 @@ default filter for infolog	infolog	de	Standard-Filter für InfoLog
 default status for a new log entry	infolog	de	Vorgabe für den Status eines neuen Eintrags
 delegated	infolog	de	delegiert
 delegated open	infolog	de	delegiert offen
+delegated open and upcoming	infolog	de	delegiert offene und zukünftige
 delegated overdue	infolog	de	delegiert überfällig
 delegated upcomming	infolog	de	delegiert zukünftig
 delegation	infolog	de	Delegation
@@ -238,12 +239,14 @@ only if i get assigned or removed	infolog	de	Nur wenn ich zugewiesen oder entfer
 only the attachments	infolog	de	nur die Anhänge
 only the links	infolog	de	nur die Verknüpfungen
 open	infolog	de	offen
+open and upcoming	infolog	de	zukünftige und offene
 optional note to the link	infolog	de	zusätzliche Notiz zur Verknüfung
 order	infolog	de	Reihenfolge
 organization	infolog	de	Organisation
 overdue	infolog	de	überfällig
 own	infolog	de	eigene
 own open	infolog	de	eigene offen
+own open and upcoming	infolog	de	eigene offene und zukünftige
 own overdue	infolog	de	eigene überfällig
 own upcoming	infolog	de	eigene zukünftig
 parent	infolog	de	Elterneintrag
@@ -285,6 +288,7 @@ remark	infolog	de	Bemerkung
 remove this link (not the entry itself)	infolog	de	Diese Verknüpfung lösen (nicht den Eintrag selbst)
 responsible	infolog	de	verantwortlich
 responsible open	infolog	de	verantwortlich offen
+responsible open and upcoming	infolog	de	verantwortlich offene und zukünftige
 responsible overdue	infolog	de	verantwortlich überfällig
 responsible upcoming	infolog	de	verantwortlich zukünftig
 responsible user, priority	infolog	de	Verantwortlicher, Priorität
diff --git a/infolog/lang/egw_en.lang b/infolog/lang/egw_en.lang
index fc90cb1545..13a7821f12 100644
--- a/infolog/lang/egw_en.lang
+++ b/infolog/lang/egw_en.lang
@@ -104,6 +104,7 @@ default filter for infolog	infolog	en	Default Filter for InfoLog
 default status for a new log entry	infolog	en	default status for a new log entry
 delegated	infolog	en	delegated
 delegated open	infolog	en	delegated open
+delegated open and upcoming	infolog	en	delegated open and upcoming
 delegated overdue	infolog	en	delegated overdue
 delegated upcomming	infolog	en	delegated upcomming
 delegation	infolog	en	Delegation
@@ -238,12 +239,14 @@ only if i get assigned or removed	infolog	en	Only if I get assigned or removed
 only the attachments	infolog	en	only the attachments
 only the links	infolog	en	only the links
 open	infolog	en	open
+open and upcoming	infolog	en	open and upcoming
 optional note to the link	infolog	en	optional note to the Link
 order	infolog	en	Order
 organization	infolog	en	Organization
 overdue	infolog	en	overdue
 own	infolog	en	own
 own open	infolog	en	own open
+own open and upcoming	infolog	en	own open and upcoming
 own overdue	infolog	en	own overdue
 own upcoming	infolog	en	own upcoming
 parent	infolog	en	Parent
@@ -285,6 +288,7 @@ remark	infolog	en	Remark
 remove this link (not the entry itself)	infolog	en	Remove this link (not the entry itself)
 responsible	infolog	en	responsible
 responsible open	infolog	en	responsible open
+responsible open and upcoming	infolog	en	responsible open and upcoming
 responsible overdue	infolog	en	responsible overdue
 responsible upcoming	infolog	en	responsible upcoming
 responsible user, priority	infolog	en	responsible user, priority

From c0be4dbc195cd1dfbf9a881eee6cccb0afdba107 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 15 Jul 2010 14:38:02 +0000
Subject: [PATCH 59/91] suomi translations provided by mkk

---
 filemanager/lang/egw_fi.lang | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/filemanager/lang/egw_fi.lang b/filemanager/lang/egw_fi.lang
index 1d26584953..e6a9a1257e 100644
--- a/filemanager/lang/egw_fi.lang
+++ b/filemanager/lang/egw_fi.lang
@@ -29,31 +29,24 @@ can't open directory %1!	filemanager	fi	Hakemistoa %1 ei voitu avata!
 cancel editing %1 without saving	filemanager	fi	Peru %1:n muokkaus tallentamatta muutoksia
 cannot create directory because it begins or ends in a space	filemanager	fi	Hakemistoa ei voi luoda, koska nimi alkaa tai päättyy välilyöntiin
 check all	filemanager	fi	Valitse kaikki
-choosing dates where to-date is smaller than the from-date, will result in a search returning all entries but thoose between the two entered dates	filemanager	fi	Asettamalla haussa (päivästä x päivään y) jälkimmäisen päivämäärän (y) vanhemmaksi kuin ensimmäisen (x), haku palauttaa tuloksena KAIKKI MUUT paitsi kyseisen aikavälin tapahtumat.
-choosing only one date (from/to) will result in a search returning all entries older/younger than the entered date	filemanager	fi	Asettamalla ainoastaan yhden päivän haussa (Haku päivästä x päivään y) antaa hakutulokseksi kaikki tietueet ENNEN ja JÄLKEEN kyseistä päivämäärää.
 clear search	filemanager	fi	Tyhjennä haku
 comment	filemanager	fi	Kommentti
-comments cannot contain "%1"	filemanager	fi	Kommentti ei saa sisältää "%1"
 copied	filemanager	fi	Kopioitu
 copied %1 to %2	filemanager	fi	%1 kopioitu %2
 copy	filemanager	fi	Kopioi
 copy to	filemanager	fi	Kopioi kohteeseen
 copy to clipboard	filemanager	fi	Kopioi leikepöydälle
 could not copy %1 to %2	filemanager	fi	%1 ei voitu kopioida %2
-could not copy file because no destination directory is given	filemanager	fi	Ei voitu kopioida, koska kohdehakemistoa ei annettu
 could not create %1	filemanager	fi	Ei voitu luoda %1
 could not delete %1	filemanager	fi	Ei voitu poistaa %1
 could not move %1 to %2	filemanager	fi	%1 ei voitu siirtää %2
-could not move file because no destination directory is given	filemanager	fi	Ei voitu siirtää, koska kohdehakemistoa ei annettu
 could not rename %1 to %2	filemanager	fi	%1 ei voitu nimetä %2
-could not save %1	filemanager	fi	%1 ei voitu tallentaa
 create a link	filemanager	fi	Luo linkki
 create directory	filemanager	fi	Luo hakemisto
 create file	filemanager	fi	Luo tiedosto
 create folder	filemanager	fi	Luo kansio
 created	filemanager	fi	Luotu
 created %1,%2	filemanager	fi	Luonut %1,%2
-created between	filemanager	fi	Luotu välillä
 created directory %1	filemanager	fi	Luotiin kansio %1
 current directory	filemanager	fi	Nykyinen hakemisto
 custom fields	filemanager	fi	Lisäkentät
@@ -66,7 +59,6 @@ directories sorted in	filemanager	fi	Sisällytetyt hakemistot
 directory	filemanager	fi	Hakemisto
 directory %1 already exists	filemanager	fi	Hakemisto %1 on jo olemassa
 directory %1 does not exist	filemanager	fi	Hakemisto %1 ei ole
-directory names cannot contain "%1"	filemanager	fi	Hakemiston nimessä ei saa olla "%1"
 directory not found or no permission to access it!	filemanager	fi	Hakemistoa ei löydy tai sinulla ei ole lukuoikeuksia kyseiseen hakemistoon!
 display and modification of content	filemanager	fi	Sisällön muokaus ja näyttö
 display of content	filemanager	fi	Sisällön näyttö (lukuoikeus)
@@ -77,7 +69,6 @@ edit settings	filemanager	fi	Muokkaa asetuksia
 enter setup user and password	filemanager	fi	Anna käyttäjänimi ja salasana
 enter setup user and password to get root rights	filemanager	fi	Anna ROOT käyttäjänimi ja salasana
 enter the complete vfs path to specify a fast access link to a folder	filemanager	fi	Anna täydellinen VFS polku kansiolinkille.
-enter the complete vfs path to specify a fast access link to a folder (1).	filemanager	fi	Anna täydellinen VFS polku kansiolinkille (1).
 enter the complete vfs path to specify your desired start folder.	filemanager	fi	Anna täydellinen VFS polku aloituskansiolle.
 error adding the acl!	filemanager	fi	Virhe ACL -oikeuksia lisättäessä!
 error creating symlink to target %1!	filemanager	fi	Virhe luotaessa symlinkkiä kohteeseen %1!
@@ -87,10 +78,8 @@ extended access control list	filemanager	fi	Laajennetut ACL -oikeudet
 extended acl	filemanager	fi	Laajennetut ACL -oikeudet
 failed to change permissions of %1!	filemanager	fi	%1, oikeuksien myöntäminen epäonnistui!
 failed to create directory!	filemanager	fi	Hakemiston luominen epäonnistui
-fake base dir did not exist, egroupware created a new one.	filemanager	fi	Fake Base Dir:ä ei ollut olemassa, EGroupware loi uuden.
 favorites	filemanager	fi	Suosikit
 file	filemanager	fi	Tiedosto
-file %1 already exists. please edit it or delete it first.	filemanager	fi	Tiedosto %1 on jo olemassa. Muokkaa sitä tai poista se.
 file %1 could not be created.	filemanager	fi	Tiedostoa %1 ei voitu luoda.
 file %1 may be too big. contact your systemadministrator for further info	filemanager	fi	Tiedosto %1 voi olla liian suuri. Ota yhteys ylläpitäjiin lisätietojen saamiseksi!
 file deleted.	filemanager	fi	Tiedosto poistettu
@@ -166,6 +155,7 @@ show hidden files	filemanager	fi	Näytä piilotetut tiedostot
 show link to filemanagers basedirectory (/) in side box menu?	filemanager	fi	Näytetäänkö linkki Tiedostonhallinnan kantahakemistoon (base directory) (/) sivuvalikossa?
 size	filemanager	fi	Koko
 start search	filemanager	fi	Aloita haku
+startfolder	filemanager	fi	Aloituskansio
 superuser	filemanager	fi	SuperUser
 symlink to %1 created.	filemanager	fi	Symlink kohteeseen %1 luotu.
 the default start folder is your personal folder. the default is used, if you leave this empty, the path does not exist or you lack the neccessary access permissions.	filemanager	fi	Aloituskansioksi on oletuksena yksityinen kansiosi. Oletusta käytetään, jos tämä jätetään tyhjäksi, polkua ei löydy tai sinulla ei ole tarvittavia ACL-oikeuksia määrittelemääsi kansioon.
@@ -182,7 +172,6 @@ upload files	filemanager	fi	Lataa tiedostoja
 used space	filemanager	fi	Käytetty tila
 users and groups	filemanager	fi	Käyttäjät ja ryhmät
 versioning	filemanager	fi	Versiointi
-who	filemanager	fi	Kuka
 wrong username or password!	filemanager	fi	Väärä käyttäjätunnus tai salasana!
 you are not allowed to upload a script!	filemanager	fi	Sinulla ei ole riittäviä oikeuksia ladata skriptiä!
 you can only grant additional rights, you can not take rights away!	filemanager	fi	Voit ainoastaan antaa lisää oikeuksia, et voi vähentää/ottaa niitä pois!

From d813c7adc7eda0d979e1e13c17837caaf27997a7 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 16 Jul 2010 09:00:49 +0000
Subject: [PATCH 60/91] save states of calendar view to session only when we
 are in calendar

---
 calendar/inc/class.calendar_ui.inc.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 4644d8312b..a0f854a9d0 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -371,16 +371,19 @@ class calendar_ui
 		$this->view_menuaction = $this->view == 'listview' ? 'calendar.calendar_uilist.listview' : 'calendar.calendar_uiviews.'.$this->view;
 
 		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1) session was %2, states now %3',True,$set_states,$states_session,$states);
-		// save the states in the session
-		$GLOBALS['egw']->session->appsession('session_data','calendar',$states);
-		// save defined states into the user-prefs
-		if(!empty($states) && is_array($states))
+		// save the states in the session only when we are in calendar
+		if ($GLOBALS['egw_info']['flags']['currentapp']=='calendar')
 		{
-			$saved_states = serialize(array_intersect_key($states,array_flip($this->states_to_save)));
-			if ($saved_states != $this->cal_prefs['saved_states'])
+			$GLOBALS['egw']->session->appsession('session_data','calendar',$states);
+			// save defined states into the user-prefs
+			if(!empty($states) && is_array($states))
 			{
-				$GLOBALS['egw']->preferences->add('calendar','saved_states',$saved_states);
-				$GLOBALS['egw']->preferences->save_repository(false,'user',true);
+				$saved_states = serialize(array_intersect_key($states,array_flip($this->states_to_save)));
+				if ($saved_states != $this->cal_prefs['saved_states'])
+				{
+					$GLOBALS['egw']->preferences->add('calendar','saved_states',$saved_states);
+					$GLOBALS['egw']->preferences->save_repository(false,'user',true);
+				}
 			}
 		}
 	}

From 1654d4b07cac7bbe40995e22bc28f2513f24ec71 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 16 Jul 2010 09:13:32 +0000
Subject: [PATCH 61/91] optimize printing by adding spaces to content of
 info_subject and info_des and thus allow automatic line-wrapping in
 printpreview (and print)

---
 infolog/inc/class.infolog_ui.inc.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 8775f57727..d9f081c740 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -1035,6 +1035,21 @@ class infolog_ui
 
 			$content = $this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id );
 			if (!(strpos($content['info_addr'],',')===false) && strpos($content['info_addr'],', ')===false) $content['info_addr'] = str_replace(',',', ',$content['info_addr']);
+			foreach(array('info_subject', 'info_des') as $key)
+			{
+				if(!isset($content[$key]) || strlen($content[$key]) < 75)
+				{
+					continue;
+				}
+				foreach(array(',' => ', ', '.' => '. ') as $pattern => $replace)	// set blank behind all , and .
+				{
+					if(strpos($content[$key], $replace) === false)
+					{
+						$content[$key] = str_replace($pattern, $replace, $content[$key]);
+					}
+				}
+				$content[$key] = wordwrap($content[$key], 75, ' ', true);
+			}
 			if (is_numeric($_REQUEST['cat_id']))
 			{
 				$content['info_cat'] = (int) $_REQUEST['cat_id'];

From fb8b310345252bdf3b13dcfdf704e099ce1f70b0 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 16 Jul 2010 09:58:04 +0000
Subject: [PATCH 62/91] suomi translations provided by mkk

---
 calendar/lang/egw_fi.lang | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/calendar/lang/egw_fi.lang b/calendar/lang/egw_fi.lang
index c2cb78dc86..cdb9719d80 100644
--- a/calendar/lang/egw_fi.lang
+++ b/calendar/lang/egw_fi.lang
@@ -14,7 +14,9 @@ accepted	calendar	fi	Hyväksytyt
 access denied to the calendar of %1 !!!	calendar	fi	Pääsy kalenteriin '%1' estetty !!!
 action that caused the notify: added, canceled, accepted, rejected, ...	calendar	fi	Toimenpide, joka aiheutti huomautuksen: Lisätty, Keskeytetty, Hyväksytty, Hylätty ...
 actions	calendar	fi	Toiminnot
+actions...	calendar	fi	Toiminnot
 add alarm	calendar	fi	Lisää hälytys
+add timesheet entry	calendar	fi	Lisää ajanhallinnan merkintä
 added	calendar	fi	Lisätty
 added by synchronisation	calendar	fi	Lisätty synkronoinnin yhteydessä
 after %1	calendar	fi	%1 jälkeen
@@ -28,10 +30,12 @@ alarms	calendar	fi	Hälytykset
 all categories	calendar	fi	Kaikki kategoriat
 all day	calendar	fi	Koko päivä
 all events	calendar	fi	Kaikki tapahtumat
+all exceptions are converted into single events.	calendar	fi	Kaikki poikkeukset ovat muutettu yksittäisiksi tapahtumiksi
 all future	calendar	fi	Kaikki tulevat
 all incl. rejected	calendar	fi	Kaikki, myös torjutut
 all participants	calendar	fi	Kaikki osallistujat
 allows to edit the event again	calendar	fi	Salli tapahtuman muokkaaminen uudelleen
+always	calendar	fi	Aina
 apply the action on the whole query, not only the shown events	calendar	fi	Suorita toiminto koko kyselylle, ei vain niille jotka näkyvät listalla.
 apply the changes	calendar	fi	Lisää muutokset
 are you sure you want to delete this country ?	calendar	fi	Haluatko varmasti poistaa tämän maan?
@@ -76,6 +80,7 @@ copy this event	calendar	fi	Kopioi tämä tapahtuma
 copy your changes to the clipboard, %1reload the entry%2 and merge them.	calendar	fi	Kopioi muutokset leikepöydälle, %1päivitä merkintä%2 ja sulauta ne.
 countries	calendar	fi	Maat
 country	calendar	fi	Maa
+create a new series	calendar	fi	Luo uusi toistuva tapahtuma
 create an exception for the given date	calendar	fi	Luo poikkeava tapahtuma annetulle päivälle
 create exception	calendar	fi	Luo poikkeus
 create new links	calendar	fi	Luo uusia linkkejä
@@ -98,6 +103,7 @@ default type of resources application selected in the calendar particpants resea
 default type of resources selection	calendar	fi	Oletusresurssi
 default week view	calendar	fi	Oletus viikkonäkymä
 delegated	calendar	fi	Delegoidut
+delete exceptions	calendar	fi	Poista poikkeukset
 delete selected events	calendar	fi	Poista valitut tapahtumat
 delete series	calendar	fi	Poista sarjat
 delete this alarm	calendar	fi	Poista tämä hälytys
@@ -111,11 +117,13 @@ display status of events	calendar	fi	Näytä tapahtumien tila
 displayed view	calendar	fi	Valittu näkymä
 displays your default calendar view on the startpage (page you get when you enter egroupware or click on the homepage icon)?	calendar	fi	Näyttää kalenterin oletusnäkymän etusivulla?
 do not include events of group members	calendar	fi	Ei ryhmänjäsenten tapahtumia
+do you really want to change the start of this series? if you do, the original series will be terminated as of today and a new series for the future reflecting your changes will be created.	calendar	fi	Haluatko varmasti muuttaa tapahtuman aloitusajankohtaa? Jos muutat, alkuperäinen tapahtumasarja päättyy tähän päivään ja luodaan uusi sarja muutoksineen.
 do you want a weekview with or without weekend?	calendar	fi	Haluatko viikkonäkymän viikonlopun kanssa vai ilman?
 do you want to be notified about changes of appointments you modified?	calendar	fi	Haluatko, että sinua huomautetaan tapahtumista, joita itse muokkasit?
 do you want to be notified about new or changed appointments? you are not notified about changes you made yourself.<br>you can limit the notifications to certain changes only. each item includes all notifications listed above. all modifications include changes of title, description, participants, but no participant responses. if the owner of an event requested any notifcations, he will always get participant responses like acceptions or rejections too.	calendar	fi	Haluatko, että sinua huomautetaan uusista tai muuttuneista tapahtumista? Sinua EI huomauteta muutoksista, jotka teit itse.<br>Voit rajoittaa huomautukset vain jonkin tyyppisiin muutoksiin. Kaikki muutokset tarkoittavat muutoksia otsikossa, kuvauksessa ja osanottajissa, mutta ei osallistujien vastauksista. Jos tapahtuman omistaja on pyytänyt huomautuksia, hän saa niitä myös osanottajien vastauksista (hyväksymiset tai hylkäykset).
 do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. all modifications include changes of title, description, participants, but no participant responses. if the owner of an event requested any notifcations, he will always get the participant responses like acceptions and rejections too.	calendar	fi	Haluatko, että sinua huomautetaan uusista tai muuttuneista tapahtumista? Sinua huomautetaa muutoksista, jotka teit itse.<br>Voit rajoittaa huomautukset vain jonkin tyyppisiin muutoksiin. Kaikki muutokset tarkoittavat muutoksia otsikossa, kuvauksessa ja osanottajissa, mutta ei osallistujien vastauksista. Jos tapahtuman omistaja on pyytänyt huomautuksia, hän saa niitä myös osanottajien vastauksista (hyväksymiset tai hylkäykset).
 do you want to edit this event as an exception or the whole series?	calendar	fi	Haluatko muokata tapahtumaa poikkeuksena vai muokkaatko koko tapahtumasarjaa?
+do you want to keep the series exceptions in your calendar?	calendar	fi	Haluatko säilyttää tapahtuman poikkeukset kalenterissasi?
 do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	fi	Haluatko vastaanottaa säännöllisen yhteenvedon tapaamisistasi sähköpostilla?<br>Yhteenveto lähetetään sähköpostiosoitteeseesi joka aamu, tai maanantaina jos kyseessä on viikoittainen yhteenveto.<br>Yhteenveto lähetetään vain, jos  sinulla on tapaamisia kyseisenä päivänä tai kyseisellä viikolla.
 do you wish to autoload calendar holidays files dynamically?	admin	fi	Haluatko ladata kalenterin juhlapäivätiedostot automaattisesti?
 download	calendar	fi	Lataa
@@ -134,6 +142,7 @@ enddate / -time of the meeting, eg. for more then one day	calendar	fi	Tapahtuman
 enddate of the export	calendar	fi	Viennin päättymispäivä
 ends	calendar	fi	Päättyy
 error adding the alarm	calendar	fi	Virhe hälytystä lisättäessä
+error: can't delete original series!	calendar	fi	Virhe: Alkuperäistä tapahtumasarjaa ei voitu poistaa!
 error: importing the ical	calendar	fi	Virhe tuotaessa iCal-tiedostoa
 error: no participants selected !!!	calendar	fi	Virhe: osallistujia ei valittuna !!!
 error: ressources reservation in private events is not allowed!!!	calendar	fi	Virhe: Resurssien varaaminen henkilökohtaisiin tapahtumiin ei ole sallittua!
@@ -155,6 +164,7 @@ export	calendar	fi	Vienti
 extended	calendar	fi	Laajennettu
 extended updates always include the complete event-details. ical's can be imported by certain other calendar-applications.	calendar	fi	Laajennetuissa päivityksissä on aina täydelliset tapahtuman yksityiskohdat. iCal-tiedoston voi viedä muihin kalenterisovelluksiin.
 fieldseparator	calendar	fi	Kentän erotin
+filemanager	calendar	fi	Tiedostonhallinta
 filename	calendar	fi	Tiedostonimi
 filename of the download	calendar	fi	Latauksen tiedostonimi
 find free timeslots where the selected participants are availible for the given timespan	calendar	fi	Etsi vapaa aika, jolloin osallistujat ovat saatavilla valitulla aikavälillä.
@@ -167,7 +177,7 @@ forward one month	calendar	fi	Kuukausi eteenpäin
 forward one year	calendar	fi	Vuosi eteenpäin
 four days view	calendar	fi	4 päivän näkymä
 freebusy	common	fi	Vapaa/Varattu
-freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	fi	Vapaat/Varatut ajat: Tuntematon käyttäjä '%1', väärä salasana tai tiedosto ei ole saatavilla kirjautumattomalle käyttäjille !!!
+freebusy: unknow user '%1', or not available for unauthenticated users!	calendar	fi	Vapaa/Varattu: Tuntematon käyttäjä '%1', tai tieto ei ole saatavilla tuntemattomille käyttäjille.
 freetime search	calendar	fi	Vapaan ajan haku
 fri	calendar	fi	Pe
 full description	calendar	fi	Koko kuvaus
@@ -205,6 +215,7 @@ ical file	calendar	fi	iCal -Tiedosto
 ical import	calendar	fi	iCal -Tuonti
 ical successful imported	calendar	fi	iCal -Tuonti onnistui!
 if checked holidays falling on a weekend, are taken on the monday after.	calendar	fi	Jos valitut lomapäivät osuvat viikonlopulle, ne otetaan seuraavasta maanantaista.
+if start day differs	calendar	fi	Jos aloituspäivä eroaa
 if you dont set a password here, the information is available to everyone, who knows the url!!!	calendar	fi	Jos et aseta tänne salasanaa, tieto on saatavilla kaikille jotka tietävät osoitteen (URL)!!!
 ignore conflict	calendar	fi	Ohita päällekkäisyys
 import	calendar	fi	Tuonti
@@ -214,6 +225,8 @@ interval	calendar	fi	Jakso
 invalid email-address "%1" for user %2	calendar	fi	Virheellinen sähköpostiosoite "%1" käyttäjälle %2
 invitations	calendar	fi	Kutsut
 invite	calendar	fi	Kutsu
+keep exceptions	calendar	fi	Säilytä poikkeukset
+keep the series unchanged.	calendar	fi	Älä muuta tapahtumasarjaa
 last	calendar	fi	Viimeinen
 lastname of person to notify	calendar	fi	Huomautettavan henkilön sukunimi
 length of the time interval	calendar	fi	Aikajakson pituus
@@ -238,6 +251,7 @@ monthly (by day)	calendar	fi	Kuukausittain (päivän mukaan)
 monthview	calendar	fi	Kuukausinäkymä
 multiple week view	calendar	fi	Usean viikon näkymä
 needs action	calendar	fi	Vaatii toimenpiteen
+new	calendar	fi	Uusi
 new search with the above parameters	calendar	fi	Uusi haku yllä olevilla parametreillä
 no automatic purging	admin	fi	Ei automaattista poistoa
 no events found	calendar	fi	Tapahtumia ei löytynyt
@@ -295,6 +309,7 @@ re-edit event	calendar	fi	Muokkaa tapahtumaa uudelleen
 receive email updates	calendar	fi	Vastaanota päivityksiä sähköpostilla
 receive notifications about events you created/modified/deleted	calendar	fi	Vastaanota huomautuksia tapahtumista jotka itse luot, muokkaat tai poistat.
 receive summary of appointments	calendar	fi	Vastaanota tapaamisten yhteenveto
+recover	calendar	fi	Palauta
 recurrence	calendar	fi	Toistuvuus
 recurring event	calendar	fi	Toistuva tapahtuma
 rejected	calendar	fi	Hylätyt
@@ -324,6 +339,7 @@ search string for the events	calendar	fi	Haun merkkijono tapahtumille
 select a %1	calendar	fi	Valitse %1
 select a time	calendar	fi	Valitse aika
 select an action	calendar	fi	Valitse toiminto
+select an action...	calendar	fi	Valitse toiminto
 select multiple contacts for a further action	calendar	fi	Valitse useampi yhteystieto jatkaaksesi
 select resources	calendar	fi	Valitse resurssit
 select who should get the alarm	calendar	fi	Valitse kuka saa hälytyksen
@@ -333,8 +349,7 @@ set a year only for one-time / non-regular holidays.	calendar	fi	Määrittele "v
 set new events to private	calendar	fi	Määrittele uudet tapahtumat yksityisiksi
 setting lock time calender	admin	fi	Aseta Data lock -aika kalenteriin (oletus 1 sek.)
 should new events created as private by default ?	calendar	fi	Luodaanko uudet tapahtumat oletuksena yksityiseksi?
-should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1.	calendar	fi	Voivatko kirjautumattomat käyttäjät nähdä Vapaat/Varatut aikasi? Voit asettaa ylimääräisen salasanan (eri kun normaali salasanasi) suojaamaan tätä tietoa. Vapaat/Varatut ajat ovat iCal muodossa ja näyttävät vain ajat jolloin olet varattu. Se ei näytä tapahtuman nimeä, kuvausta tai sijaintia. Vapaiden/Varattujen aikojen URL on %1.
-should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is <a href="http://213.183.76.121/egroupware/calendar/freebusy.php?user=mkk" target="_blank">http://213.183.76.121/egroupware/calendar/freebusy.php?user=mkk</a>.	calendar	fi	Voivatko kirjautumattomat käyttäjät nähdä Vapaat/Varatut aikasi? Voit asettaa ylimääräisen salasanan (eri kun normaali salasanasi) suojaamaan tätä tietoa. Vapaat/Varatut ajat ovat iCal muodossa ja näyttävät vain ajat jolloin olet varattu. Se ei näytä tapahtuman nimeä, kuvausta tai sijaintia. Vapaiden/Varattujen aikojen URL on %1.
+should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is	calendar	fi	Sallitaanko sisään kirjautumattonien henkilöiden nähdä Vapaa/Varattu tieto? Voit asettaa sille toisen salasanan (eri kuin normaali sisäänkirjautumissalasanasi). Vapaa/Varattu tieto on iCal muodossa ja sisältää ainoastaan ajat jolloin olet varattu. Vapaa/Varattu tieto ei sisällä tapahtumien yksityiskohtaisia tietoja (nimi, aika, paikka...). Vapaa/Varattu tiedon URL on
 should the grid be shown in the calendar	calendar	fi	Näytetäänkö kalenterin gridi?
 should the number of weeks be shown on top of the calendar	calendar	fi	Näytetäänkö viikon lukumäärä kalenterin yläpuolella?
 should the number of weeks be shown on top of the calendar (only if offset = 0)	calendar	fi	Näytetäänkö viikon lukumäärä kalenterin yläpuolella? (vain jos offset = 0)
@@ -375,6 +390,8 @@ submit to repository	calendar	fi	Lähetä varastoon
 sun	calendar	fi	Su
 tentative	calendar	fi	Alustavat
 test import (show importable records <u>only</u> in browser)	calendar	fi	Testi Tuonti (näytä tuotavat taulut <u>vain</u> selaimessa)
+the exceptions are deleted together with the series.	calendar	fi	Poikkeukset on poistettu yhdessä tapahtumasarjan kanssa
+the original series will be terminated today and a new series be created.	calendar	fi	Alkuperäinen tapahtumasarja päättyy tähän päivään ja uusi sarja luodaan.
 the resource you selected is already overbooked:	calendar	fi	Valitsemasi resurssi on jo varattu
 this day is shown as first day in the week or month view.	calendar	fi	Valitsemasi päivä näytetään viikon tai kuukausinäkymän ensimmäisenä päivänä
 this defines the end of your dayview. events after this time, are shown below the dayview.	calendar	fi	Määrittele päivänäkymän päättymisaika. Tämän ajan jälkeiset tapahtumat näytetään päivänäkymän alaosassa.

From f67a9e4a56150f89d0c30d014da6c9497cd3c72a Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 16 Jul 2010 12:04:02 +0000
Subject: [PATCH 63/91] option/configuration to enforce the use of
 emailadminprofiles only for notifications

---
 notifications/templates/default/config.tpl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/notifications/templates/default/config.tpl b/notifications/templates/default/config.tpl
index bda08019d4..8d9d242fb7 100644
--- a/notifications/templates/default/config.tpl
+++ b/notifications/templates/default/config.tpl
@@ -66,6 +66,15 @@
      </select>
     </td>
    </tr>
+   <tr class="row_on">
+    <td>{lang_choose_from_mailsettings_used_for_notification}</td>
+    <td>
+     <select name="newsettings[dontUseUserDefinedProfiles]">
+      <option value=""{selected_dontUseUserDefinedProfiles_False}>{lang_Check_both_(first_try_(active)_User_defined_account,_if_none_use_emailadmin_profile)}</option>
+      <option value="True"{selected_dontUseUserDefinedProfiles_True}>{lang_Emailadmin_Profile_only_(Do_not_use_User_defined_(active)_Mail_Profiles_for_Notification)}</option>
+     </select>
+    </td>
+   </tr>
    <!-- END body -->
 <!-- BEGIN footer -->
   <tr valign="bottom" style="height: 30px;">

From f71cd37af633ee9328d6e103be8c993f86702366 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 16 Jul 2010 12:04:51 +0000
Subject: [PATCH 64/91] use notifications option/configuration to enforce the
 use of emailadminprofiles only for notifications

---
 phpgwapi/inc/class.send.inc.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index 4b83c1db19..c17ac2c9fc 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -56,11 +56,15 @@
 			}
 			$this->SetLanguage($lang,$lang_path);
 			$this->IsSmtp();
-
-			$bopreferences    =& CreateObject('felamimail.bopreferences');
+			$restoreSession = $getUserDefinedProfiles = true;
+			// if dontUseUserDefinedProfiles is set to yes/true/1 dont restore the session AND dont retrieve UserdefinedAccount settings
+			$notification_config = config::read('notifications');
+			if ($notification_config['dontUseUserDefinedProfiles']) $restoreSession = $getUserDefinedProfiles = false;
+			$bopreferences    =& CreateObject('felamimail.bopreferences',$restoreSession);
 			if ($bopreferences) {
 				if ($this->debug) error_log(__METHOD__." using felamimail preferences for mailing.");
-				$preferences  = $bopreferences->getPreferences();
+				// if dontUseUserDefinedProfiles is set to yes/true/1  dont retrieve UserdefinedAccount settings
+				$preferences  = $bopreferences->getPreferences($getUserDefinedProfiles);
 				if ($preferences) {
 					$ogServer = $preferences->getOutgoingServer(0);
 					if ($ogServer) {

From 294e46ca74784d6a57edd8ab8bfc771d83b56d9d Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 16 Jul 2010 12:17:12 +0000
Subject: [PATCH 65/91] translations for new option/configuration

---
 notifications/lang/egw_de.lang | 3 +++
 notifications/lang/egw_en.lang | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/notifications/lang/egw_de.lang b/notifications/lang/egw_de.lang
index f1ef9b42e6..d76facad37 100644
--- a/notifications/lang/egw_de.lang
+++ b/notifications/lang/egw_de.lang
@@ -1,5 +1,7 @@
 all possible notification backends	notifications	de	alle verfügbaren Benachrichtigungs-Schnittstellen
+check both (first try (active) user defined account, if none use emailadmin profile)	admin	de	Prüfe beides (wenn vorhanden verwende das aktive Benutzerdefinierte Konto, sonst das Emailadminprofil)
 choose a notification-chain. you will be notified over the backends included in the chain.<br />note: if a notification-chain is marked as "disabled", your administrator does not allow one or more of the backends included in the chain and notifications falls back to "e-mail" while notifying you.	notifications	de	Wählen Sie eine Benachrichtigungskette. Sie werden über die Schnittstellen benachrichtigt, die in der Kette enthalten sind.<br />Bitte beachten: Wenn eine Benachrichtigungskette als "deaktiviert" markiert ist oder Ihr Administrator erlaubt ein oder mehrere Schnittstellen nicht, die in der Kette enthalten sind, so weicht die EGroupware-Benachrichtigung auf die Methode "E-Mail" aus.
+choose from mailsettings used for notification	admin	de	Auswahl der für die Benachrichtigung per eMail verwendeten Mailprofile
 common chains	notifications	de	Einfache Ketten
 disabled chains	notifications	de	Deaktivierte Ketten
 do not notify me at all	notifications	de	benachrichtige mich niemals
@@ -12,6 +14,7 @@ egroupware-popup first, if that fails notify me by e-mail	notifications	de	zuers
 egroupware-popup first, if that fails notify me by sms	notifications	de	zuerst EGroupware-Popup. Wenn dies fehl schlägt, benachrichtige mich per SMS.
 egroupware-popup only	notifications	de	nur EGroupware-Popup
 egroupware-popup verbosity	notifications	de	EGroupware-Popup Mitteilungspriorität
+emailadmin profile only (do not use user defined (active) mail profiles for notification)	admin	de	Nur Emailadmin Profil (aktive Benutzerdefinierte Konten werden nicht für die Notifizierung per eMail verwendet)
 enable egroupware-popup backend	admin	de	EGroupware-Popup Schnittstelle aktivieren
 enable sms backend	admin	de	SMS Schnittstelle aktivieren
 enable windows-popup backend	admin	de	Windows-Popup Schnittstelle aktivieren
diff --git a/notifications/lang/egw_en.lang b/notifications/lang/egw_en.lang
index 20d4c9955d..f3df0ea794 100644
--- a/notifications/lang/egw_en.lang
+++ b/notifications/lang/egw_en.lang
@@ -1,5 +1,7 @@
 all possible notification backends	notifications	en	all possible notification backends
+check both (first try (active) user defined account, if none use emailadmin profile)	admin	en	Check both (first try (active) User defined account, if none use emailadmin profile)
 choose a notification-chain. you will be notified over the backends included in the chain.<br />note: if a notification-chain is marked as "disabled", your administrator does not allow one or more of the backends included in the chain and notifications falls back to "e-mail" while notifying you.	notifications	en	Choose a notification-chain. You will be notified over the backends included in the chain.<br />Note: If a notification-chain is marked as "disabled", your Administrator does not allow one or more of the backends included in the chain, the notifications falls back to "E-Mail" while notifying you.
+choose from mailsettings used for notification	admin	en	choose from mailsettings used for email notification
 common chains	notifications	en	common chains
 disabled chains	notifications	en	disabled chains
 do not notify me at all	notifications	en	do not notify me at all
@@ -12,6 +14,7 @@ egroupware-popup first, if that fails notify me by e-mail	notifications	en	EGrou
 egroupware-popup first, if that fails notify me by sms	notifications	en	EGroupware-Popup first, if that fails notify me by SMS
 egroupware-popup only	notifications	en	EGroupware-Popup only
 egroupware-popup verbosity	notifications	en	EGroupware-Popup verbosity
+emailadmin profile only (do not use user defined (active) mail profiles for notification)	admin	en	Emailadmin Profile only (Do not use User defined (active) Mail Profiles for Notification)
 enable egroupware-popup backend	admin	en	enable EGroupware-Popup backend
 enable sms backend	admin	en	enable SMS backend
 enable windows-popup backend	admin	en	enable Windows-Popup backend

From 3ed7a8445f282c20a698d3ff90a938e15a741c62 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 16 Jul 2010 12:26:06 +0000
Subject: [PATCH 66/91] provide the new option with a new section

---
 notifications/lang/egw_de.lang             | 1 +
 notifications/lang/egw_en.lang             | 1 +
 notifications/templates/default/config.tpl | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/notifications/lang/egw_de.lang b/notifications/lang/egw_de.lang
index d76facad37..a1a07aaf34 100644
--- a/notifications/lang/egw_de.lang
+++ b/notifications/lang/egw_de.lang
@@ -24,6 +24,7 @@ from	notifications	de	von
 how verbose should the egroupware-popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled!<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself	notifications	de	Wie hoch soll das EGroupware-Popup die Priorität setzen wenn eine Benachrichtigung an den Benutzer gesendet wird:<br />Niedrig: Es wird nur die Benachrichtigungsglocke im Topmenü angezeigt - das Topmenü muss hierfür eingeschaltet sein!<br />Mittel: Holt das Benachrichtigungsfenster in den Vordergrund<br />Hoch: Holt das Benachrichtigungsfenster in den Vordergrund und aktiviert den Browser zur besseren Erkennung der Benachrichtigung.
 if set, embedded links get rendered special for external clients	notifications	de	Wenn diese Option aktiviert ist, werden in der Benachrichtigungs-E-Mail "eingebettete Links" für externe E-Mail-Clients besondert behandelt.
 linked entries:	common	de	Verknüpfte Einträge:
+mail backend	admin	de	Mail Schnittstelle
 maximum sms messages per notification	admin	de	Maximale Anzahl an SMS Nachrichten pro Benachrichtigung
 message from	notifications	de	Nachricht von
 minutes	notifications	de	Minuten
diff --git a/notifications/lang/egw_en.lang b/notifications/lang/egw_en.lang
index f3df0ea794..77d1b06c96 100644
--- a/notifications/lang/egw_en.lang
+++ b/notifications/lang/egw_en.lang
@@ -24,6 +24,7 @@ from	notifications	en	from
 how verbose should the egroupware-popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled!<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself	notifications	en	How verbose should the EGroupware-Popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled!<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself
 if set, embedded links get rendered special for external clients	notifications	en	If set, embedded links get rendered special for external clients
 linked entries:	common	en	linked entries:
+mail backend	admin	en	Mail backend
 maximum sms messages per notification	admin	en	maximum SMS messages per notification
 message from	notifications	en	message from
 minutes	notifications	en	minutes
diff --git a/notifications/templates/default/config.tpl b/notifications/templates/default/config.tpl
index 8d9d242fb7..1eac222768 100644
--- a/notifications/templates/default/config.tpl
+++ b/notifications/templates/default/config.tpl
@@ -66,6 +66,9 @@
      </select>
     </td>
    </tr>
+   <tr class="th">
+    <td colspan="2">&nbsp;<b>{lang_Mail_backend}</b></td>
+   </tr>
    <tr class="row_on">
     <td>{lang_choose_from_mailsettings_used_for_notification}</td>
     <td>

From 2b016955d999897b6ab56f28c9819a9de86a5741 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 17 Jul 2010 15:52:16 +0000
Subject: [PATCH 67/91] remove border and use black color for nicer printing of
 input elements

---
 phpgwapi/templates/idots/print.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/phpgwapi/templates/idots/print.css b/phpgwapi/templates/idots/print.css
index 720ebf3323..463ec4a79e 100644
--- a/phpgwapi/templates/idots/print.css
+++ b/phpgwapi/templates/idots/print.css
@@ -71,3 +71,11 @@ body {
 /* MSIE needs these styles to repeat table header and footer part on each page */
 thead { display: table-header-group; }
 tfoot { display: table-footer-group; }
+
+/**
+ * remove border and use black color for input elements
+ */
+input, select, textarea {
+	border: none;
+	color: black;
+}

From 7ad65804d57e0b80c26b5a4874fb084bfa37a314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Tue, 20 Jul 2010 10:20:32 +0000
Subject: [PATCH 68/91] Added onLoadFinish event to egw_json_response on the js
 side, which gets triggered when all javascript code which should be included
 has been loaded and evaluated on the client

---
 phpgwapi/js/egw_json.js      |   53 +
 phpgwapi/js/jquery/jquery.js | 6364 +++++++++++++++++++++++++++++++++-
 2 files changed, 6278 insertions(+), 139 deletions(-)

diff --git a/phpgwapi/js/egw_json.js b/phpgwapi/js/egw_json.js
index dc5858a521..d2950a27f7 100644
--- a/phpgwapi/js/egw_json.js
+++ b/phpgwapi/js/egw_json.js
@@ -200,6 +200,9 @@ function egw_json_request(_menuaction, _parameters, _context)
 	this.sender = null;
 	this.callback = null;
 	this.alertHandler = this.alertFunc;
+	this.onLoadFinish = null;
+	this.loadedJSFiles = {};
+	this.handleResponseDone = false;
 	if (window.egw_alertHandler)
 	{
 		this.alertHandler = window.egw_alertHandler;
@@ -272,6 +275,7 @@ egw_json_request.prototype.jsonError = function(_msg, _e)
 /* Internal function which handles the response from the server */
 egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRequest)
 {
+	this.handleResponseDone = false;
 	if (data && data.response)
 	{
 		var hasResponse = false;
@@ -406,7 +410,39 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
 								var scriptnode = document.createElement('script');
 								scriptnode.type = "text/javascript";
 								scriptnode.src = res.data;
+								scriptnode._originalSrc = res.data;
 								headID.appendChild(scriptnode);
+
+								//Increment the includedJSFiles count
+								this.loadedJSFiles[res.data] = false;
+
+								if (typeof console != 'undefined')
+									console.log("Requested JS file '%s' from server", [res.data]);
+
+								var self = this;
+
+								//FF, Opera, Chrome
+								scriptnode.onload = function(e) {
+									var file = e.target._originalSrc;
+									if (typeof console != 'undefined')
+										console.log("Retrieved JS file '%s' from server", [file]);
+
+									self.loadedJSFiles[file] = true;
+									self.checkLoadFinish();
+								};
+
+								//IE
+								scriptnode.onreadystatechange = function() {
+									var node = window.event.srcElement;
+									if (node.readyState == 'complete') {
+										var file = node._originalSrc;
+										if (typeof console != 'undefined')
+											console.log("Retrieved JS file '%s' from server", [file]);
+
+										self.loadedJSFiles[file] = true;
+										self.checkLoadFinish();
+									}
+								};
 							}
 							hasResponse = true;
 						} else
@@ -434,6 +470,23 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
 		{			
 			this.callback.call(this.sender, data.response[i].data);			
 		}
+
+		this.handleResponseDone = true;
+
+		this.checkLoadFinish();
+	}
+}
+
+egw_json_request.prototype.checkLoadFinish = function()
+{
+	var complete = true;
+	for (var key in this.loadedJSFiles)
+		complete = complete && this.loadedJSFiles[key];
+
+	if (complete && this.onLoadFinish && this.handleResponseDone)
+	{
+		console.log("Call onLoadFinish");
+		this.onLoadFinish.call(this.sender);
 	}
 }
 
diff --git a/phpgwapi/js/jquery/jquery.js b/phpgwapi/js/jquery/jquery.js
index 7c24308023..fff6776433 100644
--- a/phpgwapi/js/jquery/jquery.js
+++ b/phpgwapi/js/jquery/jquery.js
@@ -13,142 +13,6228 @@
  *
  * Date: Sat Feb 13 22:33:48 2010 -0500
  */
-(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
-e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
-j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
-"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
-true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
-Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
-(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
-a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
-"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(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(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
-function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
-c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
-L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
-"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
-a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
-d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
-a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
-!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
-true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
-parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
-false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
-s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
-applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
-else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
-a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
-w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
-cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
-i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
-" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
-this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
-e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
-c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
-a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
-function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
-k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
-C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
-null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
-e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
-f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
-if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.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 originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
-"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
-a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
-isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
-{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
-if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
-e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
-"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
-d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
-!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
-toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
-u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.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){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
-if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
-t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
-g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
-for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
-1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=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|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
-relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
-l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
-h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
-CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
-g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
-text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
-setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
-h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
-m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
-"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
-h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
-!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
-h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
-q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
-if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
-(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
-function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
-gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
-c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
-{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
-"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
-d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
-a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
-1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
-a:b+"></"+d+">"},F={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,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
-c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
-wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
-prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(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,false,function(b){this.parentNode.insertBefore(b,
-this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
-return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
-""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
-this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
-u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
-1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
-return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
-""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
-c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
-c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
-function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
-Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
-"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
-a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
-a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
-"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
-serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
-function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
-global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
-e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
-"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
-false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
-false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
-c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
-d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
-g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
-1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
-"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
-if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
-this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
-"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
-animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
-j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
-this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
-"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
-c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
-this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
-this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
-e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
-c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(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;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
-function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
-this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
-k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
-f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<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>";
-a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
-c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
-d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
-"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
-e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
+(function( window, undefined ) {
+
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context );
+	},
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// Use the correct document accordingly with window argument (sandbox)
+	document = window.document,
+
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// A simple way to check for HTML strings or ID strings
+	// (both of which we optimize for)
+	quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,
+
+	// Is it a simple selector
+	isSimple = /^.[^:#\[\.,]*$/,
+
+	// Check if a string has a non-whitespace character in it
+	rnotwhite = /\S/,
+
+	// Used for trimming whitespace
+	rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+
+	// Keep a UserAgent string for use with jQuery.browser
+	userAgent = navigator.userAgent,
+
+	// For matching the engine and version of the browser
+	browserMatch,
+	
+	// Has the ready events already been bound?
+	readyBound = false,
+	
+	// The functions to execute on DOM ready
+	readyList = [],
+
+	// The ready event handler
+	DOMContentLoaded,
+
+	// Save a reference to some core methods
+	toString = Object.prototype.toString,
+	hasOwnProperty = Object.prototype.hasOwnProperty,
+	push = Array.prototype.push,
+	slice = Array.prototype.slice,
+	indexOf = Array.prototype.indexOf;
+
+jQuery.fn = jQuery.prototype = {
+	init: function( selector, context ) {
+		var match, elem, ret, doc;
+
+		// Handle $(""), $(null), or $(undefined)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle $(DOMElement)
+		if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+		}
+		
+		// The body element only exists once, optimize finding it
+		if ( selector === "body" && !context ) {
+			this.context = document;
+			this[0] = document.body;
+			this.selector = "body";
+			this.length = 1;
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			// Are we dealing with HTML string or an ID?
+			match = quickExpr.exec( selector );
+
+			// Verify a match, and that no context was specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					doc = (context ? context.ownerDocument || context : document);
+
+					// If a single string is passed in and it's a single tag
+					// just do a createElement and skip the rest
+					ret = rsingleTag.exec( selector );
+
+					if ( ret ) {
+						if ( jQuery.isPlainObject( context ) ) {
+							selector = [ document.createElement( ret[1] ) ];
+							jQuery.fn.attr.call( selector, context, true );
+
+						} else {
+							selector = [ doc.createElement( ret[1] ) ];
+						}
+
+					} else {
+						ret = buildFragment( [ match[1] ], [ doc ] );
+						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
+					}
+					
+					return jQuery.merge( this, selector );
+					
+				// HANDLE: $("#id")
+				} else {
+					elem = document.getElementById( match[2] );
+
+					if ( elem ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $("TAG")
+			} else if ( !context && /^\w+$/.test( selector ) ) {
+				this.selector = selector;
+				this.context = document;
+				selector = document.getElementsByTagName( selector );
+				return jQuery.merge( this, selector );
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return (context || rootjQuery).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return jQuery( context ).find( selector );
+			}
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
+
+		if (selector.selector !== undefined) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	},
+
+	// Start with an empty selector
+	selector: "",
+
+	// The current version of jQuery being used
+	jquery: "1.4.2",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	// The number of elements contained in the matched element set
+	size: function() {
+		return this.length;
+	},
+
+	toArray: function() {
+		return slice.call( this, 0 );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num == null ?
+
+			// Return a 'clean' array
+			this.toArray() :
+
+			// Return just the object
+			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems, name, selector ) {
+		// Build a new jQuery matched element set
+		var ret = jQuery();
+
+		if ( jQuery.isArray( elems ) ) {
+			push.apply( ret, elems );
+		
+		} else {
+			jQuery.merge( ret, elems );
+		}
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+
+		ret.context = this.context;
+
+		if ( name === "find" ) {
+			ret.selector = this.selector + (this.selector ? " " : "") + selector;
+		} else if ( name ) {
+			ret.selector = this.selector + "." + name + "(" + selector + ")";
+		}
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+	
+	ready: function( fn ) {
+		// Attach the listeners
+		jQuery.bindReady();
+
+		// If the DOM is already ready
+		if ( jQuery.isReady ) {
+			// Execute the function immediately
+			fn.call( document, jQuery );
+
+		// Otherwise, remember the function for later
+		} else if ( readyList ) {
+			// Add the function to the wait list
+			readyList.push( fn );
+		}
+
+		return this;
+	},
+	
+	eq: function( i ) {
+		return i === -1 ?
+			this.slice( i ) :
+			this.slice( i, +i + 1 );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ),
+			"slice", slice.call(arguments).join(",") );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+	
+	end: function() {
+		return this.prevObject || jQuery(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: [].sort,
+	splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+	// copy reference to target object
+	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( length === i ) {
+		target = this;
+		--i;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging object literal values or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) {
+					var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src
+						: jQuery.isArray(copy) ? [] : {};
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	noConflict: function( deep ) {
+		window.$ = _$;
+
+		if ( deep ) {
+			window.jQuery = _jQuery;
+		}
+
+		return jQuery;
+	},
+	
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+	
+	// Handle when the DOM is ready
+	ready: function() {
+		// Make sure that the DOM is not already loaded
+		if ( !jQuery.isReady ) {
+			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+			if ( !document.body ) {
+				return setTimeout( jQuery.ready, 13 );
+			}
+
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
+
+			// If there are functions bound, to execute
+			if ( readyList ) {
+				// Execute all of them
+				var fn, i = 0;
+				while ( (fn = readyList[ i++ ]) ) {
+					fn.call( document, jQuery );
+				}
+
+				// Reset the list of functions
+				readyList = null;
+			}
+
+			// Trigger any bound ready events
+			if ( jQuery.fn.triggerHandler ) {
+				jQuery( document ).triggerHandler( "ready" );
+			}
+		}
+	},
+	
+	bindReady: function() {
+		if ( readyBound ) {
+			return;
+		}
+
+		readyBound = true;
+
+		// Catch cases where $(document).ready() is called after the
+		// browser event has already occurred.
+		if ( document.readyState === "complete" ) {
+			return jQuery.ready();
+		}
+
+		// Mozilla, Opera and webkit nightlies currently support this event
+		if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+			
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", jQuery.ready, false );
+
+		// If IE event model is used
+		} else if ( document.attachEvent ) {
+			// ensure firing before onload,
+			// maybe late but safe also for iframes
+			document.attachEvent("onreadystatechange", DOMContentLoaded);
+			
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", jQuery.ready );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var toplevel = false;
+
+			try {
+				toplevel = window.frameElement == null;
+			} catch(e) {}
+
+			if ( document.documentElement.doScroll && toplevel ) {
+				doScrollCheck();
+			}
+		}
+	},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return toString.call(obj) === "[object Function]";
+	},
+
+	isArray: function( obj ) {
+		return toString.call(obj) === "[object Array]";
+	},
+
+	isPlainObject: function( obj ) {
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) {
+			return false;
+		}
+		
+		// Not own constructor property must be Object
+		if ( obj.constructor
+			&& !hasOwnProperty.call(obj, "constructor")
+			&& !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
+			return false;
+		}
+		
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+	
+		var key;
+		for ( key in obj ) {}
+		
+		return key === undefined || hasOwnProperty.call( obj, key );
+	},
+
+	isEmptyObject: function( obj ) {
+		for ( var name in obj ) {
+			return false;
+		}
+		return true;
+	},
+	
+	error: function( msg ) {
+		throw msg;
+	},
+	
+	parseJSON: function( data ) {
+		if ( typeof data !== "string" || !data ) {
+			return null;
+		}
+
+		// Make sure leading/trailing whitespace is removed (IE can't handle it)
+		data = jQuery.trim( data );
+		
+		// Make sure the incoming data is actual JSON
+		// Logic borrowed from http://json.org/json2.js
+		if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
+			.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
+			.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
+
+			// Try to use the native JSON parser first
+			return window.JSON && window.JSON.parse ?
+				window.JSON.parse( data ) :
+				(new Function("return " + data))();
+
+		} else {
+			jQuery.error( "Invalid JSON: " + data );
+		}
+	},
+
+	noop: function() {},
+
+	// Evalulates a script in a global context
+	globalEval: function( data ) {
+		if ( data && rnotwhite.test(data) ) {
+			// Inspired by code by Andrea Giammarchi
+			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
+			var head = document.getElementsByTagName("head")[0] || document.documentElement,
+				script = document.createElement("script");
+
+			script.type = "text/javascript";
+
+			if ( jQuery.support.scriptEval ) {
+				script.appendChild( document.createTextNode( data ) );
+			} else {
+				script.text = data;
+			}
+
+			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709).
+			head.insertBefore( script, head.firstChild );
+			head.removeChild( script );
+		}
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+	},
+
+	// args is for internal usage only
+	each: function( object, callback, args ) {
+		var name, i = 0,
+			length = object.length,
+			isObj = length === undefined || jQuery.isFunction(object);
+
+		if ( args ) {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.apply( object[ name ], args ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.apply( object[ i++ ], args ) === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( var value = object[0];
+					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
+			}
+		}
+
+		return object;
+	},
+
+	trim: function( text ) {
+		return (text || "").replace( rtrim, "" );
+	},
+
+	// results is for internal usage only
+	makeArray: function( array, results ) {
+		var ret = results || [];
+
+		if ( array != null ) {
+			// The window, strings (and functions) also have 'length'
+			// The extra typeof function check is to prevent crashes
+			// in Safari 2 (See: #3039)
+			if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
+				push.call( ret, array );
+			} else {
+				jQuery.merge( ret, array );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, array ) {
+		if ( array.indexOf ) {
+			return array.indexOf( elem );
+		}
+
+		for ( var i = 0, length = array.length; i < length; i++ ) {
+			if ( array[ i ] === elem ) {
+				return i;
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var i = first.length, j = 0;
+
+		if ( typeof second.length === "number" ) {
+			for ( var l = second.length; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+		
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, inv ) {
+		var ret = [];
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			if ( !inv !== !callback( elems[ i ], i ) ) {
+				ret.push( elems[ i ] );
+			}
+		}
+
+		return ret;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var ret = [], value;
+
+		// Go through the array, translating each of the items to their
+		// new value (or values).
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			value = callback( elems[ i ], i, arg );
+
+			if ( value != null ) {
+				ret[ ret.length ] = value;
+			}
+		}
+
+		return ret.concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	proxy: function( fn, proxy, thisObject ) {
+		if ( arguments.length === 2 ) {
+			if ( typeof proxy === "string" ) {
+				thisObject = fn;
+				fn = thisObject[ proxy ];
+				proxy = undefined;
+
+			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
+				thisObject = proxy;
+				proxy = undefined;
+			}
+		}
+
+		if ( !proxy && fn ) {
+			proxy = function() {
+				return fn.apply( thisObject || this, arguments );
+			};
+		}
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		if ( fn ) {
+			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+		}
+
+		// So proxy can be declared as an argument
+		return proxy;
+	},
+
+	// Use of jQuery.browser is frowned upon.
+	// More details: http://docs.jquery.com/Utilities/jQuery.browser
+	uaMatch: function( ua ) {
+		ua = ua.toLowerCase();
+
+		var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+			/(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) ||
+			/(msie) ([\w.]+)/.exec( ua ) ||
+			!/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) ||
+		  	[];
+
+		return { browser: match[1] || "", version: match[2] || "0" };
+	},
+
+	browser: {}
+});
+
+browserMatch = jQuery.uaMatch( userAgent );
+if ( browserMatch.browser ) {
+	jQuery.browser[ browserMatch.browser ] = true;
+	jQuery.browser.version = browserMatch.version;
+}
+
+// Deprecated, use jQuery.browser.webkit instead
+if ( jQuery.browser.webkit ) {
+	jQuery.browser.safari = true;
+}
+
+if ( indexOf ) {
+	jQuery.inArray = function( elem, array ) {
+		return indexOf.call( array, elem );
+	};
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+
+// Cleanup functions for the document ready method
+if ( document.addEventListener ) {
+	DOMContentLoaded = function() {
+		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+		jQuery.ready();
+	};
+
+} else if ( document.attachEvent ) {
+	DOMContentLoaded = function() {
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( document.readyState === "complete" ) {
+			document.detachEvent( "onreadystatechange", DOMContentLoaded );
+			jQuery.ready();
+		}
+	};
+}
+
+// The DOM ready check for Internet Explorer
+function doScrollCheck() {
+	if ( jQuery.isReady ) {
+		return;
+	}
+
+	try {
+		// If IE is used, use the trick by Diego Perini
+		// http://javascript.nwbox.com/IEContentLoaded/
+		document.documentElement.doScroll("left");
+	} catch( error ) {
+		setTimeout( doScrollCheck, 1 );
+		return;
+	}
+
+	// and execute any waiting functions
+	jQuery.ready();
+}
+
+function evalScript( i, elem ) {
+	if ( elem.src ) {
+		jQuery.ajax({
+			url: elem.src,
+			async: false,
+			dataType: "script"
+		});
+	} else {
+		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+	}
+
+	if ( elem.parentNode ) {
+		elem.parentNode.removeChild( elem );
+	}
+}
+
+// Mutifunctional method to get and set values to a collection
+// The value/s can be optionally by executed if its a function
+function access( elems, key, value, exec, fn, pass ) {
+	var length = elems.length;
+	
+	// Setting many attributes
+	if ( typeof key === "object" ) {
+		for ( var k in key ) {
+			access( elems, k, key[k], exec, fn, value );
+		}
+		return elems;
+	}
+	
+	// Setting one attribute
+	if ( value !== undefined ) {
+		// Optionally, function values get executed if exec is true
+		exec = !pass && exec && jQuery.isFunction(value);
+		
+		for ( var i = 0; i < length; i++ ) {
+			fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+		}
+		
+		return elems;
+	}
+	
+	// Getting an attribute
+	return length ? fn( elems[0], key ) : undefined;
+}
+
+function now() {
+	return (new Date).getTime();
+}
+(function() {
+
+	jQuery.support = {};
+
+	var root = document.documentElement,
+		script = document.createElement("script"),
+		div = document.createElement("div"),
+		id = "script" + now();
+
+	div.style.display = "none";
+	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+
+	var all = div.getElementsByTagName("*"),
+		a = div.getElementsByTagName("a")[0];
+
+	// Can't get basic test support
+	if ( !all || !all.length || !a ) {
+		return;
+	}
+
+	jQuery.support = {
+		// IE strips leading whitespace when .innerHTML is used
+		leadingWhitespace: div.firstChild.nodeType === 3,
+
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		tbody: !div.getElementsByTagName("tbody").length,
+
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		htmlSerialize: !!div.getElementsByTagName("link").length,
+
+		// Get the style information from getAttribute
+		// (IE uses .cssText insted)
+		style: /red/.test( a.getAttribute("style") ),
+
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		hrefNormalized: a.getAttribute("href") === "/a",
+
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		// Use a regex to work around a WebKit issue. See #5145
+		opacity: /^0.55$/.test( a.style.opacity ),
+
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		cssFloat: !!a.style.cssFloat,
+
+		// Make sure that if no value is specified for a checkbox
+		// that it defaults to "on".
+		// (WebKit defaults to "" instead)
+		checkOn: div.getElementsByTagName("input")[0].value === "on",
+
+		// Make sure that a selected-by-default option has a working selected property.
+		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+		optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected,
+
+		parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null,
+
+		// Will be defined later
+		deleteExpando: true,
+		checkClone: false,
+		scriptEval: false,
+		noCloneEvent: true,
+		boxModel: null
+	};
+
+	script.type = "text/javascript";
+	try {
+		script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
+	} catch(e) {}
+
+	root.insertBefore( script, root.firstChild );
+
+	// Make sure that the execution of code works by injecting a script
+	// tag with appendChild/createTextNode
+	// (IE doesn't support this, fails, and uses .text instead)
+	if ( window[ id ] ) {
+		jQuery.support.scriptEval = true;
+		delete window[ id ];
+	}
+
+	// Test to see if it's possible to delete an expando from an element
+	// Fails in Internet Explorer
+	try {
+		delete script.test;
+	
+	} catch(e) {
+		jQuery.support.deleteExpando = false;
+	}
+
+	root.removeChild( script );
+
+	if ( div.attachEvent && div.fireEvent ) {
+		div.attachEvent("onclick", function click() {
+			// Cloning a node shouldn't copy over any
+			// bound event handlers (IE does this)
+			jQuery.support.noCloneEvent = false;
+			div.detachEvent("onclick", click);
+		});
+		div.cloneNode(true).fireEvent("onclick");
+	}
+
+	div = document.createElement("div");
+	div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
+
+	var fragment = document.createDocumentFragment();
+	fragment.appendChild( div.firstChild );
+
+	// WebKit doesn't clone checked state correctly in fragments
+	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
+
+	// Figure out if the W3C box model works as expected
+	// document.body must exist before we can do this
+	jQuery(function() {
+		var div = document.createElement("div");
+		div.style.width = div.style.paddingLeft = "1px";
+
+		document.body.appendChild( div );
+		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
+		document.body.removeChild( div ).style.display = 'none';
+
+		div = null;
+	});
+
+	// Technique from Juriy Zaytsev
+	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
+	var eventSupported = function( eventName ) { 
+		var el = document.createElement("div"); 
+		eventName = "on" + eventName; 
+
+		var isSupported = (eventName in el); 
+		if ( !isSupported ) { 
+			el.setAttribute(eventName, "return;"); 
+			isSupported = typeof el[eventName] === "function"; 
+		} 
+		el = null; 
+
+		return isSupported; 
+	};
+	
+	jQuery.support.submitBubbles = eventSupported("submit");
+	jQuery.support.changeBubbles = eventSupported("change");
+
+	// release memory in IE
+	root = script = div = all = a = null;
+})();
+
+jQuery.props = {
+	"for": "htmlFor",
+	"class": "className",
+	readonly: "readOnly",
+	maxlength: "maxLength",
+	cellspacing: "cellSpacing",
+	rowspan: "rowSpan",
+	colspan: "colSpan",
+	tabindex: "tabIndex",
+	usemap: "useMap",
+	frameborder: "frameBorder"
+};
+var expando = "jQuery" + now(), uuid = 0, windowData = {};
+
+jQuery.extend({
+	cache: {},
+	
+	expando:expando,
+
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"embed": true,
+		"object": true,
+		"applet": true
+	},
+
+	data: function( elem, name, data ) {
+		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+			return;
+		}
+
+		elem = elem == window ?
+			windowData :
+			elem;
+
+		var id = elem[ expando ], cache = jQuery.cache, thisCache;
+
+		if ( !id && typeof name === "string" && data === undefined ) {
+			return null;
+		}
+
+		// Compute a unique ID for the element
+		if ( !id ) { 
+			id = ++uuid;
+		}
+
+		// Avoid generating a new cache unless none exists and we
+		// want to manipulate it.
+		if ( typeof name === "object" ) {
+			elem[ expando ] = id;
+			thisCache = cache[ id ] = jQuery.extend(true, {}, name);
+
+		} else if ( !cache[ id ] ) {
+			elem[ expando ] = id;
+			cache[ id ] = {};
+		}
+
+		thisCache = cache[ id ];
+
+		// Prevent overriding the named cache with undefined values
+		if ( data !== undefined ) {
+			thisCache[ name ] = data;
+		}
+
+		return typeof name === "string" ? thisCache[ name ] : thisCache;
+	},
+
+	removeData: function( elem, name ) {
+		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+			return;
+		}
+
+		elem = elem == window ?
+			windowData :
+			elem;
+
+		var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
+
+		// If we want to remove a specific section of the element's data
+		if ( name ) {
+			if ( thisCache ) {
+				// Remove the section of cache data
+				delete thisCache[ name ];
+
+				// If we've removed all the data, remove the element's cache
+				if ( jQuery.isEmptyObject(thisCache) ) {
+					jQuery.removeData( elem );
+				}
+			}
+
+		// Otherwise, we want to remove all of the element's data
+		} else {
+			if ( jQuery.support.deleteExpando ) {
+				delete elem[ jQuery.expando ];
+
+			} else if ( elem.removeAttribute ) {
+				elem.removeAttribute( jQuery.expando );
+			}
+
+			// Completely remove the data cache
+			delete cache[ id ];
+		}
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		if ( typeof key === "undefined" && this.length ) {
+			return jQuery.data( this[0] );
+
+		} else if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		var parts = key.split(".");
+		parts[1] = parts[1] ? "." + parts[1] : "";
+
+		if ( value === undefined ) {
+			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+			if ( data === undefined && this.length ) {
+				data = jQuery.data( this[0], key );
+			}
+			return data === undefined && parts[1] ?
+				this.data( parts[0] ) :
+				data;
+		} else {
+			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
+				jQuery.data( this, key, value );
+			});
+		}
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+jQuery.extend({
+	queue: function( elem, type, data ) {
+		if ( !elem ) {
+			return;
+		}
+
+		type = (type || "fx") + "queue";
+		var q = jQuery.data( elem, type );
+
+		// Speed up dequeue by getting out quickly if this is just a lookup
+		if ( !data ) {
+			return q || [];
+		}
+
+		if ( !q || jQuery.isArray(data) ) {
+			q = jQuery.data( elem, type, jQuery.makeArray(data) );
+
+		} else {
+			q.push( data );
+		}
+
+		return q;
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ), fn = queue.shift();
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+		}
+
+		if ( fn ) {
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift("inprogress");
+			}
+
+			fn.call(elem, function() {
+				jQuery.dequeue(elem, type);
+			});
+		}
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+		}
+
+		if ( data === undefined ) {
+			return jQuery.queue( this[0], type );
+		}
+		return this.each(function( i, elem ) {
+			var queue = jQuery.queue( this, type, data );
+
+			if ( type === "fx" && queue[0] !== "inprogress" ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+
+	// Based off of the plugin by Clint Helfers, with permission.
+	// http://blindsignals.com/index.php/2009/07/jquery-delay/
+	delay: function( time, type ) {
+		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
+		type = type || "fx";
+
+		return this.queue( type, function() {
+			var elem = this;
+			setTimeout(function() {
+				jQuery.dequeue( elem, type );
+			}, time );
+		});
+	},
+
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	}
+});
+var rclass = /[\n\t]/g,
+	rspace = /\s+/,
+	rreturn = /\r/g,
+	rspecialurl = /href|src|style/,
+	rtype = /(button|input)/i,
+	rfocusable = /(button|input|object|select|textarea)/i,
+	rclickable = /^(a|area)$/i,
+	rradiocheck = /radio|checkbox/;
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return access( this, name, value, true, jQuery.attr );
+	},
+
+	removeAttr: function( name, fn ) {
+		return this.each(function(){
+			jQuery.attr( this, name, "" );
+			if ( this.nodeType === 1 ) {
+				this.removeAttribute( name );
+			}
+		});
+	},
+
+	addClass: function( value ) {
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.addClass( value.call(this, i, self.attr("class")) );
+			});
+		}
+
+		if ( value && typeof value === "string" ) {
+			var classNames = (value || "").split( rspace );
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
+
+				if ( elem.nodeType === 1 ) {
+					if ( !elem.className ) {
+						elem.className = value;
+
+					} else {
+						var className = " " + elem.className + " ", setClass = elem.className;
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
+								setClass += " " + classNames[c];
+							}
+						}
+						elem.className = jQuery.trim( setClass );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.removeClass( value.call(this, i, self.attr("class")) );
+			});
+		}
+
+		if ( (value && typeof value === "string") || value === undefined ) {
+			var classNames = (value || "").split(rspace);
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
+
+				if ( elem.nodeType === 1 && elem.className ) {
+					if ( value ) {
+						var className = (" " + elem.className + " ").replace(rclass, " ");
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							className = className.replace(" " + classNames[c] + " ", " ");
+						}
+						elem.className = jQuery.trim( className );
+
+					} else {
+						elem.className = "";
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value, isBool = typeof stateVal === "boolean";
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className, i = 0, self = jQuery(this),
+					state = stateVal,
+					classNames = value.split( rspace );
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space seperated list
+					state = isBool ? state : !self.hasClass( className );
+					self[ state ? "addClass" : "removeClass" ]( className );
+				}
+
+			} else if ( type === "undefined" || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery.data( this, "__className__", this.className );
+				}
+
+				// toggle whole className
+				this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ";
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	val: function( value ) {
+		if ( value === undefined ) {
+			var elem = this[0];
+
+			if ( elem ) {
+				if ( jQuery.nodeName( elem, "option" ) ) {
+					return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+				}
+
+				// We need to handle select boxes special
+				if ( jQuery.nodeName( elem, "select" ) ) {
+					var index = elem.selectedIndex,
+						values = [],
+						options = elem.options,
+						one = elem.type === "select-one";
+
+					// Nothing was selected
+					if ( index < 0 ) {
+						return null;
+					}
+
+					// Loop through all the selected options
+					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+						var option = options[ i ];
+
+						if ( option.selected ) {
+							// Get the specifc value for the option
+							value = jQuery(option).val();
+
+							// We don't need an array for one selects
+							if ( one ) {
+								return value;
+							}
+
+							// Multi-Selects return an array
+							values.push( value );
+						}
+					}
+
+					return values;
+				}
+
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
+					return elem.getAttribute("value") === null ? "on" : elem.value;
+				}
+				
+
+				// Everything else, we just grab the value
+				return (elem.value || "").replace(rreturn, "");
+
+			}
+
+			return undefined;
+		}
+
+		var isFunction = jQuery.isFunction(value);
+
+		return this.each(function(i) {
+			var self = jQuery(this), val = value;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call(this, i, self.val());
+			}
+
+			// Typecast each time if the value is a Function and the appended
+			// value is therefore different each time.
+			if ( typeof val === "number" ) {
+				val += "";
+			}
+
+			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
+				this.checked = jQuery.inArray( self.val(), val ) >= 0;
+
+			} else if ( jQuery.nodeName( this, "select" ) ) {
+				var values = jQuery.makeArray(val);
+
+				jQuery( "option", this ).each(function() {
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+				});
+
+				if ( !values.length ) {
+					this.selectedIndex = -1;
+				}
+
+			} else {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	attrFn: {
+		val: true,
+		css: true,
+		html: true,
+		text: true,
+		data: true,
+		width: true,
+		height: true,
+		offset: true
+	},
+		
+	attr: function( elem, name, value, pass ) {
+		// don't set attributes on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return undefined;
+		}
+
+		if ( pass && name in jQuery.attrFn ) {
+			return jQuery(elem)[name](value);
+		}
+
+		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
+			// Whether we are setting (or getting)
+			set = value !== undefined;
+
+		// Try to normalize/fix the name
+		name = notxml && jQuery.props[ name ] || name;
+
+		// Only do all the following if this is a node (faster for style)
+		if ( elem.nodeType === 1 ) {
+			// These attributes require special treatment
+			var special = rspecialurl.test( name );
+
+			// Safari mis-reports the default selected property of an option
+			// Accessing the parent's selectedIndex property fixes it
+			if ( name === "selected" && !jQuery.support.optSelected ) {
+				var parent = elem.parentNode;
+				if ( parent ) {
+					parent.selectedIndex;
+	
+					// Make sure that it also works with optgroups, see #5701
+					if ( parent.parentNode ) {
+						parent.parentNode.selectedIndex;
+					}
+				}
+			}
+
+			// If applicable, access the attribute via the DOM 0 way
+			if ( name in elem && notxml && !special ) {
+				if ( set ) {
+					// We can't allow the type property to be changed (since it causes problems in IE)
+					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
+						jQuery.error( "type property can't be changed" );
+					}
+
+					elem[ name ] = value;
+				}
+
+				// browsers index elements by id/name on forms, give priority to attributes.
+				if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
+					return elem.getAttributeNode( name ).nodeValue;
+				}
+
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				if ( name === "tabIndex" ) {
+					var attributeNode = elem.getAttributeNode( "tabIndex" );
+
+					return attributeNode && attributeNode.specified ?
+						attributeNode.value :
+						rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+							0 :
+							undefined;
+				}
+
+				return elem[ name ];
+			}
+
+			if ( !jQuery.support.style && notxml && name === "style" ) {
+				if ( set ) {
+					elem.style.cssText = "" + value;
+				}
+
+				return elem.style.cssText;
+			}
+
+			if ( set ) {
+				// convert the value to a string (all browsers do this but IE) see #1070
+				elem.setAttribute( name, "" + value );
+			}
+
+			var attr = !jQuery.support.hrefNormalized && notxml && special ?
+					// Some attributes require a special call on IE
+					elem.getAttribute( name, 2 ) :
+					elem.getAttribute( name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return attr === null ? undefined : attr;
+		}
+
+		// elem is actually elem.style ... set the style
+		// Using attr for specific style information is now deprecated. Use style instead.
+		return jQuery.style( elem, name, value );
+	}
+});
+var rnamespaces = /\.(.*)$/,
+	fcleanup = function( nm ) {
+		return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
+			return "\\" + ch;
+		});
+	};
+
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code originated from
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+	// Bind an event to an element
+	// Original by Dean Edwards
+	add: function( elem, types, handler, data ) {
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// For whatever reason, IE has trouble passing the window object
+		// around, causing it to be cloned in the process
+		if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) {
+			elem = window;
+		}
+
+		var handleObjIn, handleObj;
+
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+		}
+
+		// Make sure that the function being executed has a unique ID
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure
+		var elemData = jQuery.data( elem );
+
+		// If no elemData is found then we must be trying to bind to one of the
+		// banned noData elements
+		if ( !elemData ) {
+			return;
+		}
+
+		var events = elemData.events = elemData.events || {},
+			eventHandle = elemData.handle, eventHandle;
+
+		if ( !eventHandle ) {
+			elemData.handle = eventHandle = function() {
+				// Handle the second event of a trigger and when
+				// an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+		}
+
+		// Add elem as a property of the handle function
+		// This is to prevent a memory leak with non-native events in IE.
+		eventHandle.elem = elem;
+
+		// Handle multiple events separated by a space
+		// jQuery(...).bind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		var type, i = 0, namespaces;
+
+		while ( (type = types[ i++ ]) ) {
+			handleObj = handleObjIn ?
+				jQuery.extend({}, handleObjIn) :
+				{ handler: handler, data: data };
+
+			// Namespaced event handlers
+			if ( type.indexOf(".") > -1 ) {
+				namespaces = type.split(".");
+				type = namespaces.shift();
+				handleObj.namespace = namespaces.slice(0).sort().join(".");
+
+			} else {
+				namespaces = [];
+				handleObj.namespace = "";
+			}
+
+			handleObj.type = type;
+			handleObj.guid = handler.guid;
+
+			// Get the current list of functions bound to this event
+			var handlers = events[ type ],
+				special = jQuery.event.special[ type ] || {};
+
+			// Init the event handler queue
+			if ( !handlers ) {
+				handlers = events[ type ] = [];
+
+				// Check for a special event handler
+				// Only use addEventListener/attachEvent if the special
+				// events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+			
+			if ( special.add ) { 
+				special.add.call( elem, handleObj ); 
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add the function to the element's handler list
+			handlers.push( handleObj );
+
+			// Keep track of which events have been used, for global triggering
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	global: {},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, pos ) {
+		// don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
+			elemData = jQuery.data( elem ),
+			events = elemData && elemData.events;
+
+		if ( !elemData || !events ) {
+			return;
+		}
+
+		// types is actually an event object here
+		if ( types && types.type ) {
+			handler = types.handler;
+			types = types.type;
+		}
+
+		// Unbind all events for the element
+		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
+			types = types || "";
+
+			for ( type in events ) {
+				jQuery.event.remove( elem, type + types );
+			}
+
+			return;
+		}
+
+		// Handle multiple events separated by a space
+		// jQuery(...).unbind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		while ( (type = types[ i++ ]) ) {
+			origType = type;
+			handleObj = null;
+			all = type.indexOf(".") < 0;
+			namespaces = [];
+
+			if ( !all ) {
+				// Namespaced event handlers
+				namespaces = type.split(".");
+				type = namespaces.shift();
+
+				namespace = new RegExp("(^|\\.)" + 
+					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)")
+			}
+
+			eventType = events[ type ];
+
+			if ( !eventType ) {
+				continue;
+			}
+
+			if ( !handler ) {
+				for ( var j = 0; j < eventType.length; j++ ) {
+					handleObj = eventType[ j ];
+
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						jQuery.event.remove( elem, origType, handleObj.handler, j );
+						eventType.splice( j--, 1 );
+					}
+				}
+
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+
+			for ( var j = pos || 0; j < eventType.length; j++ ) {
+				handleObj = eventType[ j ];
+
+				if ( handler.guid === handleObj.guid ) {
+					// remove the given handler for the given type
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						if ( pos == null ) {
+							eventType.splice( j--, 1 );
+						}
+
+						if ( special.remove ) {
+							special.remove.call( elem, handleObj );
+						}
+					}
+
+					if ( pos != null ) {
+						break;
+					}
+				}
+			}
+
+			// remove generic event handler if no more handlers exist
+			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
+					removeEvent( elem, type, elemData.handle );
+				}
+
+				ret = null;
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			var handle = elemData.handle;
+			if ( handle ) {
+				handle.elem = null;
+			}
+
+			delete elemData.events;
+			delete elemData.handle;
+
+			if ( jQuery.isEmptyObject( elemData ) ) {
+				jQuery.removeData( elem );
+			}
+		}
+	},
+
+	// bubbling is internal
+	trigger: function( event, data, elem /*, bubbling */ ) {
+		// Event object or event type
+		var type = event.type || event,
+			bubbling = arguments[3];
+
+		if ( !bubbling ) {
+			event = typeof event === "object" ?
+				// jQuery.Event object
+				event[expando] ? event :
+				// Object literal
+				jQuery.extend( jQuery.Event(type), event ) :
+				// Just the event type (string)
+				jQuery.Event(type);
+
+			if ( type.indexOf("!") >= 0 ) {
+				event.type = type = type.slice(0, -1);
+				event.exclusive = true;
+			}
+
+			// Handle a global trigger
+			if ( !elem ) {
+				// Don't bubble custom events when global (to avoid too much overhead)
+				event.stopPropagation();
+
+				// Only trigger if we've ever bound an event for it
+				if ( jQuery.event.global[ type ] ) {
+					jQuery.each( jQuery.cache, function() {
+						if ( this.events && this.events[type] ) {
+							jQuery.event.trigger( event, data, this.handle.elem );
+						}
+					});
+				}
+			}
+
+			// Handle triggering a single element
+
+			// don't do events on text and comment nodes
+			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+				return undefined;
+			}
+
+			// Clean up in case it is reused
+			event.result = undefined;
+			event.target = elem;
+
+			// Clone the incoming data, if any
+			data = jQuery.makeArray( data );
+			data.unshift( event );
+		}
+
+		event.currentTarget = elem;
+
+		// Trigger the event, it is assumed that "handle" is a function
+		var handle = jQuery.data( elem, "handle" );
+		if ( handle ) {
+			handle.apply( elem, data );
+		}
+
+		var parent = elem.parentNode || elem.ownerDocument;
+
+		// Trigger an inline bound script
+		try {
+			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
+				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
+					event.result = false;
+				}
+			}
+
+		// prevent IE from throwing an error for some elements with some event types, see #3533
+		} catch (e) {}
+
+		if ( !event.isPropagationStopped() && parent ) {
+			jQuery.event.trigger( event, data, parent, true );
+
+		} else if ( !event.isDefaultPrevented() ) {
+			var target = event.target, old,
+				isClick = jQuery.nodeName(target, "a") && type === "click",
+				special = jQuery.event.special[ type ] || {};
+
+			if ( (!special._default || special._default.call( elem, event ) === false) && 
+				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
+
+				try {
+					if ( target[ type ] ) {
+						// Make sure that we don't accidentally re-trigger the onFOO events
+						old = target[ "on" + type ];
+
+						if ( old ) {
+							target[ "on" + type ] = null;
+						}
+
+						jQuery.event.triggered = true;
+						target[ type ]();
+					}
+
+				// prevent IE from throwing an error for some elements with some event types, see #3533
+				} catch (e) {}
+
+				if ( old ) {
+					target[ "on" + type ] = old;
+				}
+
+				jQuery.event.triggered = false;
+			}
+		}
+	},
+
+	handle: function( event ) {
+		var all, handlers, namespaces, namespace, events;
+
+		event = arguments[0] = jQuery.event.fix( event || window.event );
+		event.currentTarget = this;
+
+		// Namespaced event handlers
+		all = event.type.indexOf(".") < 0 && !event.exclusive;
+
+		if ( !all ) {
+			namespaces = event.type.split(".");
+			event.type = namespaces.shift();
+			namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
+		}
+
+		var events = jQuery.data(this, "events"), handlers = events[ event.type ];
+
+		if ( events && handlers ) {
+			// Clone the handlers to prevent manipulation
+			handlers = handlers.slice(0);
+
+			for ( var j = 0, l = handlers.length; j < l; j++ ) {
+				var handleObj = handlers[ j ];
+
+				// Filter the functions by class
+				if ( all || namespace.test( handleObj.namespace ) ) {
+					// Pass in a reference to the handler function itself
+					// So that we can later remove it
+					event.handler = handleObj.handler;
+					event.data = handleObj.data;
+					event.handleObj = handleObj;
+	
+					var ret = handleObj.handler.apply( this, arguments );
+
+					if ( ret !== undefined ) {
+						event.result = ret;
+						if ( ret === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+
+					if ( event.isImmediatePropagationStopped() ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return event.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 originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+
+	fix: function( event ) {
+		if ( event[ expando ] ) {
+			return event;
+		}
+
+		// store a copy of the original event object
+		// and "clone" to set read-only properties
+		var originalEvent = event;
+		event = jQuery.Event( originalEvent );
+
+		for ( var i = this.props.length, prop; i; ) {
+			prop = this.props[ --i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Fix target property, if necessary
+		if ( !event.target ) {
+			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
+		}
+
+		// check if target is a textnode (safari)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// Add relatedTarget, if necessary
+		if ( !event.relatedTarget && event.fromElement ) {
+			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
+		}
+
+		// Calculate pageX/Y if missing and clientX/Y available
+		if ( event.pageX == null && event.clientX != null ) {
+			var doc = document.documentElement, body = document.body;
+			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
+		}
+
+		// Add which for key events
+		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) {
+			event.which = event.charCode || event.keyCode;
+		}
+
+		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+		if ( !event.metaKey && event.ctrlKey ) {
+			event.metaKey = event.ctrlKey;
+		}
+
+		// Add which for click: 1 === left; 2 === middle; 3 === right
+		// Note: button is not normalized, so don't use it
+		if ( !event.which && event.button !== undefined ) {
+			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+		}
+
+		return event;
+	},
+
+	// Deprecated, use jQuery.guid instead
+	guid: 1E8,
+
+	// Deprecated, use jQuery.proxy instead
+	proxy: jQuery.proxy,
+
+	special: {
+		ready: {
+			// Make sure the ready event is setup
+			setup: jQuery.bindReady,
+			teardown: jQuery.noop
+		},
+
+		live: {
+			add: function( handleObj ) {
+				jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); 
+			},
+
+			remove: function( handleObj ) {
+				var remove = true,
+					type = handleObj.origType.replace(rnamespaces, "");
+				
+				jQuery.each( jQuery.data(this, "events").live || [], function() {
+					if ( type === this.origType.replace(rnamespaces, "") ) {
+						remove = false;
+						return false;
+					}
+				});
+
+				if ( remove ) {
+					jQuery.event.remove( this, handleObj.origType, liveHandler );
+				}
+			}
+
+		},
+
+		beforeunload: {
+			setup: function( data, namespaces, eventHandle ) {
+				// We only want to do this special case on windows
+				if ( this.setInterval ) {
+					this.onbeforeunload = eventHandle;
+				}
+
+				return false;
+			},
+			teardown: function( namespaces, eventHandle ) {
+				if ( this.onbeforeunload === eventHandle ) {
+					this.onbeforeunload = null;
+				}
+			}
+		}
+	}
+};
+
+var removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		elem.removeEventListener( type, handle, false );
+	} : 
+	function( elem, type, handle ) {
+		elem.detachEvent( "on" + type, handle );
+	};
+
+jQuery.Event = function( src ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !this.preventDefault ) {
+		return new jQuery.Event( src );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// timeStamp is buggy for some events on Firefox(#3843)
+	// So we won't rely on the native value
+	this.timeStamp = now();
+
+	// Mark it as fixed
+	this[ expando ] = true;
+};
+
+function returnFalse() {
+	return false;
+}
+function returnTrue() {
+	return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	preventDefault: function() {
+		this.isDefaultPrevented = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		
+		// if preventDefault exists run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+		}
+		// otherwise set the returnValue property of the original event to false (IE)
+		e.returnValue = false;
+	},
+	stopPropagation: function() {
+		this.isPropagationStopped = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		// if stopPropagation exists run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+		// otherwise set the cancelBubble property of the original event to true (IE)
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	},
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse
+};
+
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function( event ) {
+	// Check if mouse(over|out) are still within the same parent element
+	var parent = event.relatedTarget;
+
+	// Firefox sometimes assigns relatedTarget a XUL element
+	// which we cannot access the parentNode property of
+	try {
+		// Traverse up the tree
+		while ( parent && parent !== this ) {
+			parent = parent.parentNode;
+		}
+
+		if ( parent !== this ) {
+			// set the correct event type
+			event.type = event.data;
+
+			// handle event if we actually just moused on to a non sub-element
+			jQuery.event.handle.apply( this, arguments );
+		}
+
+	// assuming we've left the element since we most likely mousedover a xul element
+	} catch(e) { }
+},
+
+// In case of event delegation, we only need to rename the event.type,
+// liveHandler will take care of the rest.
+delegate = function( event ) {
+	event.type = event.data;
+	jQuery.event.handle.apply( this, arguments );
+};
+
+// Create mouseenter and mouseleave events
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		setup: function( data ) {
+			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
+		},
+		teardown: function( data ) {
+			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
+		}
+	};
+});
+
+// submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function( data, namespaces ) {
+			if ( this.nodeName.toLowerCase() !== "form" ) {
+				jQuery.event.add(this, "click.specialSubmit", function( e ) {
+					var elem = e.target, type = elem.type;
+
+					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
+						return trigger( "submit", this, arguments );
+					}
+				});
+	 
+				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
+					var elem = e.target, type = elem.type;
+
+					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
+						return trigger( "submit", this, arguments );
+					}
+				});
+
+			} else {
+				return false;
+			}
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialSubmit" );
+		}
+	};
+
+}
+
+// change delegation, happens here so we have bind.
+if ( !jQuery.support.changeBubbles ) {
+
+	var formElems = /textarea|input|select/i,
+
+	changeFilters,
+
+	getVal = function( elem ) {
+		var type = elem.type, val = elem.value;
+
+		if ( type === "radio" || type === "checkbox" ) {
+			val = elem.checked;
+
+		} else if ( type === "select-multiple" ) {
+			val = elem.selectedIndex > -1 ?
+				jQuery.map( elem.options, function( elem ) {
+					return elem.selected;
+				}).join("-") :
+				"";
+
+		} else if ( elem.nodeName.toLowerCase() === "select" ) {
+			val = elem.selectedIndex;
+		}
+
+		return val;
+	},
+
+	testChange = function testChange( e ) {
+		var elem = e.target, data, val;
+
+		if ( !formElems.test( elem.nodeName ) || elem.readOnly ) {
+			return;
+		}
+
+		data = jQuery.data( elem, "_change_data" );
+		val = getVal(elem);
+
+		// the current data will be also retrieved by beforeactivate
+		if ( e.type !== "focusout" || elem.type !== "radio" ) {
+			jQuery.data( elem, "_change_data", val );
+		}
+		
+		if ( data === undefined || val === data ) {
+			return;
+		}
+
+		if ( data != null || val ) {
+			e.type = "change";
+			return jQuery.event.trigger( e, arguments[1], elem );
+		}
+	};
+
+	jQuery.event.special.change = {
+		filters: {
+			focusout: testChange, 
+
+			click: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
+					return testChange.call( this, e );
+				}
+			},
+
+			// Change has to be called before submit
+			// Keydown will be called before keypress, which is used in submit-event delegation
+			keydown: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
+					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
+					type === "select-multiple" ) {
+					return testChange.call( this, e );
+				}
+			},
+
+			// Beforeactivate happens also before the previous element is blurred
+			// with this event you can't trigger a change event, but you can store
+			// information/focus[in] is not needed anymore
+			beforeactivate: function( e ) {
+				var elem = e.target;
+				jQuery.data( elem, "_change_data", getVal(elem) );
+			}
+		},
+
+		setup: function( data, namespaces ) {
+			if ( this.type === "file" ) {
+				return false;
+			}
+
+			for ( var type in changeFilters ) {
+				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
+			}
+
+			return formElems.test( this.nodeName );
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialChange" );
+
+			return formElems.test( this.nodeName );
+		}
+	};
+
+	changeFilters = jQuery.event.special.change.filters;
+}
+
+function trigger( type, elem, args ) {
+	args[0].type = type;
+	return jQuery.event.handle.apply( elem, args );
+}
+
+// Create "bubbling" focus and blur events
+if ( document.addEventListener ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				this.addEventListener( orig, handler, true );
+			}, 
+			teardown: function() { 
+				this.removeEventListener( orig, handler, true );
+			}
+		};
+
+		function handler( e ) { 
+			e = jQuery.event.fix( e );
+			e.type = fix;
+			return jQuery.event.handle.call( this, e );
+		}
+	});
+}
+
+jQuery.each(["bind", "one"], function( i, name ) {
+	jQuery.fn[ name ] = function( type, data, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" ) {
+			for ( var key in type ) {
+				this[ name ](key, data, type[key], fn);
+			}
+			return this;
+		}
+		
+		if ( jQuery.isFunction( data ) ) {
+			fn = data;
+			data = undefined;
+		}
+
+		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
+			jQuery( this ).unbind( event, handler );
+			return fn.apply( this, arguments );
+		}) : fn;
+
+		if ( type === "unload" && name !== "one" ) {
+			this.one( type, data, fn );
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.add( this[i], type, handler, data );
+			}
+		}
+
+		return this;
+	};
+});
+
+jQuery.fn.extend({
+	unbind: function( type, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" && !type.preventDefault ) {
+			for ( var key in type ) {
+				this.unbind(key, type[key]);
+			}
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.remove( this[i], type, fn );
+			}
+		}
+
+		return this;
+	},
+	
+	delegate: function( selector, types, data, fn ) {
+		return this.live( types, data, fn, selector );
+	},
+	
+	undelegate: function( selector, types, fn ) {
+		if ( arguments.length === 0 ) {
+				return this.unbind( "live" );
+		
+		} else {
+			return this.die( types, null, fn, selector );
+		}
+	},
+	
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+
+	triggerHandler: function( type, data ) {
+		if ( this[0] ) {
+			var event = jQuery.Event( type );
+			event.preventDefault();
+			event.stopPropagation();
+			jQuery.event.trigger( event, data, this[0] );
+			return event.result;
+		}
+	},
+
+	toggle: function( fn ) {
+		// Save reference to arguments for access in closure
+		var args = arguments, i = 1;
+
+		// link all the functions, so any of them can unbind this click handler
+		while ( i < args.length ) {
+			jQuery.proxy( fn, args[ i++ ] );
+		}
+
+		return this.click( jQuery.proxy( fn, function( event ) {
+			// Figure out which function to execute
+			var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+			jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+			// Make sure that clicks stop
+			event.preventDefault();
+
+			// and execute the function
+			return args[ lastToggle ].apply( this, arguments ) || false;
+		}));
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+});
+
+var liveMap = {
+	focus: "focusin",
+	blur: "focusout",
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+};
+
+jQuery.each(["live", "die"], function( i, name ) {
+	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
+		var type, i = 0, match, namespaces, preType,
+			selector = origSelector || this.selector,
+			context = origSelector ? this : jQuery( this.context );
+
+		if ( jQuery.isFunction( data ) ) {
+			fn = data;
+			data = undefined;
+		}
+
+		types = (types || "").split(" ");
+
+		while ( (type = types[ i++ ]) != null ) {
+			match = rnamespaces.exec( type );
+			namespaces = "";
+
+			if ( match )  {
+				namespaces = match[0];
+				type = type.replace( rnamespaces, "" );
+			}
+
+			if ( type === "hover" ) {
+				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
+				continue;
+			}
+
+			preType = type;
+
+			if ( type === "focus" || type === "blur" ) {
+				types.push( liveMap[ type ] + namespaces );
+				type = type + namespaces;
+
+			} else {
+				type = (liveMap[ type ] || type) + namespaces;
+			}
+
+			if ( name === "live" ) {
+				// bind live handler
+				context.each(function(){
+					jQuery.event.add( this, liveConvert( type, selector ),
+						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
+				});
+
+			} else {
+				// unbind live handler
+				context.unbind( liveConvert( type, selector ), fn );
+			}
+		}
+		
+		return this;
+	}
+});
+
+function liveHandler( event ) {
+	var stop, elems = [], selectors = [], args = arguments,
+		related, match, handleObj, elem, j, i, l, data,
+		events = jQuery.data( this, "events" );
+
+	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
+	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
+		return;
+	}
+
+	event.liveFired = this;
+
+	var live = events.live.slice(0);
+
+	for ( j = 0; j < live.length; j++ ) {
+		handleObj = live[j];
+
+		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
+			selectors.push( handleObj.selector );
+
+		} else {
+			live.splice( j--, 1 );
+		}
+	}
+
+	match = jQuery( event.target ).closest( selectors, event.currentTarget );
+
+	for ( i = 0, l = match.length; i < l; i++ ) {
+		for ( j = 0; j < live.length; j++ ) {
+			handleObj = live[j];
+
+			if ( match[i].selector === handleObj.selector ) {
+				elem = match[i].elem;
+				related = null;
+
+				// Those two events require additional checking
+				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
+					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
+				}
+
+				if ( !related || related !== elem ) {
+					elems.push({ elem: elem, handleObj: handleObj });
+				}
+			}
+		}
+	}
+
+	for ( i = 0, l = elems.length; i < l; i++ ) {
+		match = elems[i];
+		event.currentTarget = match.elem;
+		event.data = match.handleObj.data;
+		event.handleObj = match.handleObj;
+
+		if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) {
+			stop = false;
+			break;
+		}
+	}
+
+	return stop;
+}
+
+function liveConvert( type, selector ) {
+	return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");
+}
+
+jQuery.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( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( fn ) {
+		return fn ? this.bind( name, fn ) : this.trigger( name );
+	};
+
+	if ( jQuery.attrFn ) {
+		jQuery.attrFn[ name ] = true;
+	}
+});
+
+// Prevent memory leaks in IE
+// Window isn't included so as not to unbind existing unload events
+// More info:
+//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
+if ( window.attachEvent && !window.addEventListener ) {
+	window.attachEvent("onunload", function() {
+		for ( var id in jQuery.cache ) {
+			if ( jQuery.cache[ id ].handle ) {
+				// Try/Catch is to handle iframes being unloaded, see #4280
+				try {
+					jQuery.event.remove( jQuery.cache[ id ].handle.elem );
+				} catch(e) {}
+			}
+		}
+	});
+}
+/*!
+ * Sizzle CSS Selector Engine - v1.0
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true;
+
+// Here we check if the JavaScript engine is using some sort of
+// optimization where it does not always call our comparision
+// function. If that is the case, discard the hasDuplicate value.
+//   Thus far that includes Google Chrome.
+[0, 0].sort(function(){
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function(selector, context, results, seed) {
+	results = results || [];
+	var origContext = context = context || document;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+	
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context),
+		soFar = selector;
+	
+	// Reset the position of the chunker regexp (start from head)
+	while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) {
+		soFar = m[3];
+		
+		parts.push( m[1] );
+		
+		if ( m[2] ) {
+			extra = m[3];
+			break;
+		}
+	}
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context );
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] ) {
+					selector += parts.shift();
+				}
+				
+				set = posProcess( selector, set );
+			}
+		}
+	} else {
+		// Take a shortcut and set the context if the root selector is an ID
+		// (but not if it'll be faster if the inner selector is an ID)
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+			var ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
+		}
+
+		if ( context ) {
+			var ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+			set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray(set);
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				var cur = parts.pop(), pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		Sizzle.error( cur || selector );
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+		} else if ( context && context.nodeType === 1 ) {
+			for ( var i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+		} else {
+			for ( var i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function(results){
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort(sortOrder);
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[i-1] ) {
+					results.splice(i--, 1);
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function(expr, set){
+	return Sizzle(expr, null, null, set);
+};
+
+Sizzle.find = function(expr, context, isXML){
+	var set, match;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var type = Expr.order[i], match;
+		
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			var left = match[1];
+			match.splice(1,1);
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace(/\\/g, "");
+				set = Expr.find[ type ]( match, context, isXML );
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = context.getElementsByTagName("*");
+	}
+
+	return {set: set, expr: expr};
+};
+
+Sizzle.filter = function(expr, set, inplace, not){
+	var old = expr, result = [], curLoop = set, match, anyFound,
+		isXMLFilter = set && set[0] && isXML(set[0]);
+
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+				var filter = Expr.filter[ type ], found, item, left = match[1];
+				anyFound = false;
+
+				match.splice(1,1);
+
+				if ( left.substr( left.length - 1 ) === "\\" ) {
+					continue;
+				}
+
+				if ( curLoop === result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							var pass = not ^ !!found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+								} else {
+									curLoop[i] = false;
+								}
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		// Improper expression
+		if ( expr === old ) {
+			if ( anyFound == null ) {
+				Sizzle.error( expr );
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+Sizzle.error = function( msg ) {
+	throw "Syntax error, unrecognized expression: " + msg;
+};
+
+var Expr = Sizzle.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|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+	},
+	leftMatch: {},
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+	attrHandle: {
+		href: function(elem){
+			return elem.getAttribute("href");
+		}
+	},
+	relative: {
+		"+": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !/\W/.test(part),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag ) {
+				part = part.toLowerCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+		">": function(checkSet, part){
+			var isPartStr = typeof part === "string";
+
+			if ( isPartStr && !/\W/.test(part) ) {
+				part = part.toLowerCase();
+
+				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+					var elem = checkSet[i];
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+					}
+				}
+			} else {
+				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+					var elem = checkSet[i];
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+		"": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				var nodeCheck = part = part.toLowerCase();
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+		},
+		"~": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				var nodeCheck = part = part.toLowerCase();
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+		}
+	},
+	find: {
+		ID: function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				return m ? [m] : [];
+			}
+		},
+		NAME: function(match, context){
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [], results = context.getElementsByName(match[1]);
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+		TAG: function(match, context){
+			return context.getElementsByTagName(match[1]);
+		}
+	},
+	preFilter: {
+		CLASS: function(match, curLoop, inplace, result, not, isXML){
+			match = " " + match[1].replace(/\\/g, "") + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
+						if ( !inplace ) {
+							result.push( elem );
+						}
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+		ID: function(match){
+			return match[1].replace(/\\/g, "");
+		},
+		TAG: function(match, curLoop){
+			return match[1].toLowerCase();
+		},
+		CHILD: function(match){
+			if ( match[1] === "nth" ) {
+				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = done++;
+
+			return match;
+		},
+		ATTR: function(match, curLoop, inplace, result, not, isXML){
+			var name = match[1].replace(/\\/g, "");
+			
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+		PSEUDO: function(match, curLoop, inplace, result, not){
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+					return false;
+				}
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+			
+			return match;
+		},
+		POS: function(match){
+			match.unshift( true );
+			return match;
+		}
+	},
+	filters: {
+		enabled: function(elem){
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+		disabled: function(elem){
+			return elem.disabled === true;
+		},
+		checked: function(elem){
+			return elem.checked === true;
+		},
+		selected: function(elem){
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			elem.parentNode.selectedIndex;
+			return elem.selected === true;
+		},
+		parent: function(elem){
+			return !!elem.firstChild;
+		},
+		empty: function(elem){
+			return !elem.firstChild;
+		},
+		has: function(elem, i, match){
+			return !!Sizzle( match[3], elem ).length;
+		},
+		header: function(elem){
+			return /h\d/i.test( elem.nodeName );
+		},
+		text: function(elem){
+			return "text" === elem.type;
+		},
+		radio: function(elem){
+			return "radio" === elem.type;
+		},
+		checkbox: function(elem){
+			return "checkbox" === elem.type;
+		},
+		file: function(elem){
+			return "file" === elem.type;
+		},
+		password: function(elem){
+			return "password" === elem.type;
+		},
+		submit: function(elem){
+			return "submit" === elem.type;
+		},
+		image: function(elem){
+			return "image" === elem.type;
+		},
+		reset: function(elem){
+			return "reset" === elem.type;
+		},
+		button: function(elem){
+			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
+		},
+		input: function(elem){
+			return /input|select|textarea|button/i.test(elem.nodeName);
+		}
+	},
+	setFilters: {
+		first: function(elem, i){
+			return i === 0;
+		},
+		last: function(elem, i, match, array){
+			return i === array.length - 1;
+		},
+		even: function(elem, i){
+			return i % 2 === 0;
+		},
+		odd: function(elem, i){
+			return i % 2 === 1;
+		},
+		lt: function(elem, i, match){
+			return i < match[3] - 0;
+		},
+		gt: function(elem, i, match){
+			return i > match[3] - 0;
+		},
+		nth: function(elem, i, match){
+			return match[3] - 0 === i;
+		},
+		eq: function(elem, i, match){
+			return match[3] - 0 === i;
+		}
+	},
+	filter: {
+		PSEUDO: function(elem, match, i, array){
+			var name = match[1], filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var i = 0, l = not.length; i < l; i++ ) {
+					if ( not[i] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+			} else {
+				Sizzle.error( "Syntax error, unrecognized expression: " + name );
+			}
+		},
+		CHILD: function(elem, match){
+			var type = match[1], node = elem;
+			switch (type) {
+				case 'only':
+				case 'first':
+					while ( (node = node.previousSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+					if ( type === "first" ) { 
+						return true; 
+					}
+					node = elem;
+				case 'last':
+					while ( (node = node.nextSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+					return true;
+				case 'nth':
+					var first = match[2], last = match[3];
+
+					if ( first === 1 && last === 0 ) {
+						return true;
+					}
+					
+					var doneName = match[0],
+						parent = elem.parentNode;
+	
+					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+						var count = 0;
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						} 
+						parent.sizcache = doneName;
+					}
+					
+					var diff = elem.nodeIndex - last;
+					if ( first === 0 ) {
+						return diff === 0;
+					} else {
+						return ( diff % first === 0 && diff / first >= 0 );
+					}
+			}
+		},
+		ID: function(elem, match){
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+		TAG: function(elem, match){
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
+		},
+		CLASS: function(elem, match){
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+		ATTR: function(elem, match){
+			var name = match[1],
+				result = Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value !== check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+		POS: function(elem, match, i, array){
+			var name = match[2], filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS;
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, function(all, num){
+		return "\\" + (num - 0 + 1);
+	}));
+}
+
+var makeArray = function(array, results) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+	
+	return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+// Also verifies that the returned array holds DOM nodes
+// (which is not the case in the Blackberry browser)
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+
+// Provide a fallback method if it does not work
+} catch(e){
+	makeArray = function(array, results) {
+		var ret = results || [];
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var i = 0, l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+			} else {
+				for ( var i = 0; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var sortOrder;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return a.compareDocumentPosition ? -1 : 1;
+		}
+
+		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+} else if ( "sourceIndex" in document.documentElement ) {
+	sortOrder = function( a, b ) {
+		if ( !a.sourceIndex || !b.sourceIndex ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return a.sourceIndex ? -1 : 1;
+		}
+
+		var ret = a.sourceIndex - b.sourceIndex;
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+} else if ( document.createRange ) {
+	sortOrder = function( a, b ) {
+		if ( !a.ownerDocument || !b.ownerDocument ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return a.ownerDocument ? -1 : 1;
+		}
+
+		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
+		aRange.setStart(a, 0);
+		aRange.setEnd(a, 0);
+		bRange.setStart(b, 0);
+		bRange.setEnd(b, 0);
+		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+}
+
+// Utility function for retreiving the text value of an array of DOM nodes
+function getText( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+}
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+	// We're going to inject a fake input element with a specified name
+	var form = document.createElement("div"),
+		id = "script" + (new Date).getTime();
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	var root = document.documentElement;
+	root.insertBefore( form, root.firstChild );
+
+	// The workaround has to do additional checks after a getElementById
+	// Which slows things down for other browsers (hence the branching)
+	if ( document.getElementById( id ) ) {
+		Expr.find.ID = function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
+			}
+		};
+
+		Expr.filter.ID = function(elem, match){
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+	root = form = null; // release memory in IE
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function(match, context){
+			var results = context.getElementsByTagName(match[1]);
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+		Expr.attrHandle.href = function(elem){
+			return elem.getAttribute("href", 2);
+		};
+	}
+
+	div = null; // release memory in IE
+})();
+
+if ( document.querySelectorAll ) {
+	(function(){
+		var oldSizzle = Sizzle, div = document.createElement("div");
+		div.innerHTML = "<p class='TEST'></p>";
+
+		// Safari can't handle uppercase or unicode characters when
+		// in quirks mode.
+		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+			return;
+		}
+	
+		Sizzle = function(query, context, extra, seed){
+			context = context || document;
+
+			// Only use querySelectorAll on non-XML documents
+			// (ID selectors don't work in non-HTML documents)
+			if ( !seed && context.nodeType === 9 && !isXML(context) ) {
+				try {
+					return makeArray( context.querySelectorAll(query), extra );
+				} catch(e){}
+			}
+		
+			return oldSizzle(query, context, extra, seed);
+		};
+
+		for ( var prop in oldSizzle ) {
+			Sizzle[ prop ] = oldSizzle[ prop ];
+		}
+
+		div = null; // release memory in IE
+	})();
+}
+
+(function(){
+	var div = document.createElement("div");
+
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	// Opera can't find a second classname (in 9.6)
+	// Also, make sure that getElementsByClassName actually exists
+	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
+		return;
+	}
+
+	// Safari caches class attributes, doesn't catch changes (in 3.2)
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 ) {
+		return;
+	}
+	
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function(match, context, isXML) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	div = null; // release memory in IE
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem.sizcache = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName.toLowerCase() === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem.sizcache = doneName;
+						elem.sizset = i;
+					}
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+var contains = document.compareDocumentPosition ? function(a, b){
+	return !!(a.compareDocumentPosition(b) & 16);
+} : function(a, b){
+	return a !== b && (a.contains ? a.contains(b) : true);
+};
+
+var isXML = function(elem){
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833) 
+	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+var posProcess = function(selector, context){
+	var tmpSet = [], later = "", match,
+		root = context.nodeType ? [context] : context;
+
+	// Position selectors must be done after the filter
+	// And so must :not(positional) so we move all PSEUDOs to the end
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = getText;
+jQuery.isXMLDoc = isXML;
+jQuery.contains = contains;
+
+return;
+
+window.Sizzle = Sizzle;
+
+})();
+var runtil = /Until$/,
+	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+	// Note: This RegExp should be improved, or likely pulled from Sizzle
+	rmultiselector = /,/,
+	slice = Array.prototype.slice;
+
+// Implement the identical functionality for filter and not
+var winnow = function( elements, qualifier, keep ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return !!qualifier.call( elem, i, elem ) === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return (elem === qualifier) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem, i ) {
+		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
+	});
+};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var ret = this.pushStack( "", "find", selector ), length = 0;
+
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			length = ret.length;
+			jQuery.find( selector, this[i], ret );
+
+			if ( i > 0 ) {
+				// Make sure that the results are unique
+				for ( var n = length; n < ret.length; n++ ) {
+					for ( var r = 0; r < length; r++ ) {
+						if ( ret[r] === ret[n] ) {
+							ret.splice(n--, 1);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	has: function( target ) {
+		var targets = jQuery( target );
+		return this.filter(function() {
+			for ( var i = 0, l = targets.length; i < l; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector, false), "not", selector);
+	},
+
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector, true), "filter", selector );
+	},
+	
+	is: function( selector ) {
+		return !!selector && jQuery.filter( selector, this ).length > 0;
+	},
+
+	closest: function( selectors, context ) {
+		if ( jQuery.isArray( selectors ) ) {
+			var ret = [], cur = this[0], match, matches = {}, selector;
+
+			if ( cur && selectors.length ) {
+				for ( var i = 0, l = selectors.length; i < l; i++ ) {
+					selector = selectors[i];
+
+					if ( !matches[selector] ) {
+						matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
+							jQuery( selector, context || this.context ) :
+							selector;
+					}
+				}
+
+				while ( cur && cur.ownerDocument && cur !== context ) {
+					for ( selector in matches ) {
+						match = matches[selector];
+
+						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
+							ret.push({ selector: selector, elem: cur });
+							delete matches[selector];
+						}
+					}
+					cur = cur.parentNode;
+				}
+			}
+
+			return ret;
+		}
+
+		var pos = jQuery.expr.match.POS.test( selectors ) ? 
+			jQuery( selectors, context || this.context ) : null;
+
+		return this.map(function( i, cur ) {
+			while ( cur && cur.ownerDocument && cur !== context ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
+					return cur;
+				}
+				cur = cur.parentNode;
+			}
+			return null;
+		});
+	},
+	
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+		if ( !elem || typeof elem === "string" ) {
+			return jQuery.inArray( this[0],
+				// If it receives a string, the selector is used
+				// If it receives nothing, the siblings are used
+				elem ? jQuery( elem ) : this.parent().children() );
+		}
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		var set = typeof selector === "string" ?
+				jQuery( selector, context || this.context ) :
+				jQuery.makeArray( selector ),
+			all = jQuery.merge( this.get(), set );
+
+		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+			all :
+			jQuery.unique( all ) );
+	},
+
+	andSelf: function() {
+		return this.add( this.prevObject );
+	}
+});
+
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+	return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return jQuery.nth( elem, 2, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return jQuery.nth( elem, 2, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( elem.parentNode.firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.makeArray( elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+		
+		if ( !runtil.test( name ) ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		ret = this.length > 1 ? jQuery.unique( ret ) : ret;
+
+		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
+			ret = ret.reverse();
+		}
+
+		return this.pushStack( ret, name, slice.call(arguments).join(",") );
+	};
+});
+
+jQuery.extend({
+	filter: function( expr, elems, not ) {
+		if ( not ) {
+			expr = ":not(" + expr + ")";
+		}
+
+		return jQuery.find.matches(expr, elems);
+	},
+	
+	dir: function( elem, dir, until ) {
+		var matched = [], cur = elem[dir];
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	nth: function( cur, result, dir, elem ) {
+		result = result || 1;
+		var num = 0;
+
+		for ( ; cur; cur = cur[dir] ) {
+			if ( cur.nodeType === 1 && ++num === result ) {
+				break;
+			}
+		}
+
+		return cur;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g,
+	rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnocache = /<script|<object|<embed|<option|<style/i,
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,  // checked="checked" or checked (html5)
+	fcloseTag = function( all, front, tag ) {
+		return rselfClosing.test( tag ) ?
+			all :
+			front + "></" + tag + ">";
+	},
+	wrapMap = {
+		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, "", "" ]
+	};
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// IE can't serialize <link> and <script> tags normally
+if ( !jQuery.support.htmlSerialize ) {
+	wrapMap._default = [ 1, "div<div>", "</div>" ];
+}
+
+jQuery.fn.extend({
+	text: function( text ) {
+		if ( jQuery.isFunction(text) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.text( text.call(this, i, self.text()) );
+			});
+		}
+
+		if ( typeof text !== "object" && text !== undefined ) {
+			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+		}
+
+		return jQuery.text( this );
+	},
+
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append(this);
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ), contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		return this.each(function() {
+			jQuery( this ).wrapAll( html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	},
+
+	append: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.insertBefore( elem, this.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this );
+			});
+		} else if ( arguments.length ) {
+			var set = jQuery(arguments[0]);
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
+		}
+	},
+
+	after: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			});
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery(arguments[0]).toArray() );
+			return set;
+		}
+	},
+	
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
+				if ( !keepData && elem.nodeType === 1 ) {
+					jQuery.cleanData( elem.getElementsByTagName("*") );
+					jQuery.cleanData( [ elem ] );
+				}
+
+				if ( elem.parentNode ) {
+					 elem.parentNode.removeChild( elem );
+				}
+			}
+		}
+		
+		return this;
+	},
+
+	empty: function() {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( elem.getElementsByTagName("*") );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+		}
+		
+		return this;
+	},
+
+	clone: function( events ) {
+		// Do the clone
+		var ret = this.map(function() {
+			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
+				// IE copies events bound via attachEvent when
+				// using cloneNode. Calling detachEvent on the
+				// clone will also remove the events from the orignal
+				// In order to get around this, we use innerHTML.
+				// Unfortunately, this means some modifications to
+				// attributes in IE that are actually only stored
+				// as properties will not be copied (such as the
+				// the name attribute on an input).
+				var html = this.outerHTML, ownerDocument = this.ownerDocument;
+				if ( !html ) {
+					var div = ownerDocument.createElement("div");
+					div.appendChild( this.cloneNode(true) );
+					html = div.innerHTML;
+				}
+
+				return jQuery.clean([html.replace(rinlinejQuery, "")
+					// Handle the case in IE 8 where action=/test/> self-closes a tag
+					.replace(/=([^="'>\s]+\/)>/g, '="$1">')
+					.replace(rleadingWhitespace, "")], ownerDocument)[0];
+			} else {
+				return this.cloneNode(true);
+			}
+		});
+
+		// Copy the events from the original to the clone
+		if ( events === true ) {
+			cloneCopyEvent( this, ret );
+			cloneCopyEvent( this.find("*"), ret.find("*") );
+		}
+
+		// Return the cloned set
+		return ret;
+	},
+
+	html: function( value ) {
+		if ( value === undefined ) {
+			return this[0] && this[0].nodeType === 1 ?
+				this[0].innerHTML.replace(rinlinejQuery, "") :
+				null;
+
+		// See if we can take a shortcut and just use innerHTML
+		} else if ( typeof value === "string" && !rnocache.test( value ) &&
+			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
+			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+
+			value = value.replace(rxhtmlTag, fcloseTag);
+
+			try {
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					// Remove element nodes and prevent memory leaks
+					if ( this[i].nodeType === 1 ) {
+						jQuery.cleanData( this[i].getElementsByTagName("*") );
+						this[i].innerHTML = value;
+					}
+				}
+
+			// If using innerHTML throws an exception, use the fallback method
+			} catch(e) {
+				this.empty().append( value );
+			}
+
+		} else if ( jQuery.isFunction( value ) ) {
+			this.each(function(i){
+				var self = jQuery(this), old = self.html();
+				self.empty().append(function(){
+					return value.call( this, i, old );
+				});
+			});
+
+		} else {
+			this.empty().append( value );
+		}
+
+		return this;
+	},
+
+	replaceWith: function( value ) {
+		if ( this[0] && this[0].parentNode ) {
+			// Make sure that the elements are removed from the DOM before they are inserted
+			// this can help fix replacing a parent with child elements
+			if ( jQuery.isFunction( value ) ) {
+				return this.each(function(i) {
+					var self = jQuery(this), old = self.html();
+					self.replaceWith( value.call( this, i, old ) );
+				});
+			}
+
+			if ( typeof value !== "string" ) {
+				value = jQuery(value).detach();
+			}
+
+			return this.each(function() {
+				var next = this.nextSibling, parent = this.parentNode;
+
+				jQuery(this).remove();
+
+				if ( next ) {
+					jQuery(next).before( value );
+				} else {
+					jQuery(parent).append( value );
+				}
+			});
+		} else {
+			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+		}
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, table, callback ) {
+		var results, first, value = args[0], scripts = [], fragment, parent;
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
+			return this.each(function() {
+				jQuery(this).domManip( args, table, callback, true );
+			});
+		}
+
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				args[0] = value.call(this, i, table ? self.html() : undefined);
+				self.domManip( args, table, callback );
+			});
+		}
+
+		if ( this[0] ) {
+			parent = value && value.parentNode;
+
+			// If we're in a fragment, just use that instead of building a new one
+			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
+				results = { fragment: parent };
+
+			} else {
+				results = buildFragment( args, this, scripts );
+			}
+			
+			fragment = results.fragment;
+			
+			if ( fragment.childNodes.length === 1 ) {
+				first = fragment = fragment.firstChild;
+			} else {
+				first = fragment.firstChild;
+			}
+
+			if ( first ) {
+				table = table && jQuery.nodeName( first, "tr" );
+
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					callback.call(
+						table ?
+							root(this[i], first) :
+							this[i],
+						i > 0 || results.cacheable || this.length > 1  ?
+							fragment.cloneNode(true) :
+							fragment
+					);
+				}
+			}
+
+			if ( scripts.length ) {
+				jQuery.each( scripts, evalScript );
+			}
+		}
+
+		return this;
+
+		function root( elem, cur ) {
+			return jQuery.nodeName(elem, "table") ?
+				(elem.getElementsByTagName("tbody")[0] ||
+				elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+				elem;
+		}
+	}
+});
+
+function cloneCopyEvent(orig, ret) {
+	var i = 0;
+
+	ret.each(function() {
+		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
+			return;
+		}
+
+		var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData && oldData.events;
+
+		if ( events ) {
+			delete curData.handle;
+			curData.events = {};
+
+			for ( var type in events ) {
+				for ( var handler in events[ type ] ) {
+					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
+				}
+			}
+		}
+	});
+}
+
+function buildFragment( args, nodes, scripts ) {
+	var fragment, cacheable, cacheresults,
+		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+
+	// Only cache "small" (1/2 KB) strings that are associated with the main document
+	// Cloning options loses the selected state, so don't cache them
+	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
+		!rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
+
+		cacheable = true;
+		cacheresults = jQuery.fragments[ args[0] ];
+		if ( cacheresults ) {
+			if ( cacheresults !== 1 ) {
+				fragment = cacheresults;
+			}
+		}
+	}
+
+	if ( !fragment ) {
+		fragment = doc.createDocumentFragment();
+		jQuery.clean( args, doc, fragment, scripts );
+	}
+
+	if ( cacheable ) {
+		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
+	}
+
+	return { fragment: fragment, cacheable: cacheable };
+}
+
+jQuery.fragments = {};
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var ret = [], insert = jQuery( selector ),
+			parent = this.length === 1 && this[0].parentNode;
+		
+		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
+			insert[ original ]( this[0] );
+			return this;
+			
+		} else {
+			for ( var i = 0, l = insert.length; i < l; i++ ) {
+				var elems = (i > 0 ? this.clone(true) : this).get();
+				jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
+				ret = ret.concat( elems );
+			}
+		
+			return this.pushStack( ret, name, insert.selector );
+		}
+	};
+});
+
+jQuery.extend({
+	clean: function( elems, context, fragment, scripts ) {
+		context = context || document;
+
+		// !context.createElement fails in IE with an error but returns typeof 'object'
+		if ( typeof context.createElement === "undefined" ) {
+			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+		}
+
+		var ret = [];
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( typeof elem === "number" ) {
+				elem += "";
+			}
+
+			if ( !elem ) {
+				continue;
+			}
+
+			// Convert html string into DOM nodes
+			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
+				elem = context.createTextNode( elem );
+
+			} else if ( typeof elem === "string" ) {
+				// Fix "XHTML"-style tags in all browsers
+				elem = elem.replace(rxhtmlTag, fcloseTag);
+
+				// Trim whitespace, otherwise indexOf won't work as expected
+				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
+					wrap = wrapMap[ tag ] || wrapMap._default,
+					depth = wrap[0],
+					div = context.createElement("div");
+
+				// Go to html and back, then peel off extra wrappers
+				div.innerHTML = wrap[1] + elem + wrap[2];
+
+				// Move to the right depth
+				while ( depth-- ) {
+					div = div.lastChild;
+				}
+
+				// Remove IE's autoinserted <tbody> from table fragments
+				if ( !jQuery.support.tbody ) {
+
+					// String was a <table>, *may* have spurious <tbody>
+					var hasBody = rtbody.test(elem),
+						tbody = tag === "table" && !hasBody ?
+							div.firstChild && div.firstChild.childNodes :
+
+							// String was a bare <thead> or <tfoot>
+							wrap[1] === "<table>" && !hasBody ?
+								div.childNodes :
+								[];
+
+					for ( var j = tbody.length - 1; j >= 0 ; --j ) {
+						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+							tbody[ j ].parentNode.removeChild( tbody[ j ] );
+						}
+					}
+
+				}
+
+				// IE completely kills leading whitespace when innerHTML is used
+				if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+					div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+				}
+
+				elem = div.childNodes;
+			}
+
+			if ( elem.nodeType ) {
+				ret.push( elem );
+			} else {
+				ret = jQuery.merge( ret, elem );
+			}
+		}
+
+		if ( fragment ) {
+			for ( var i = 0; ret[i]; i++ ) {
+				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+				
+				} else {
+					if ( ret[i].nodeType === 1 ) {
+						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
+					}
+					fragment.appendChild( ret[i] );
+				}
+			}
+		}
+
+		return ret;
+	},
+	
+	cleanData: function( elems ) {
+		var data, id, cache = jQuery.cache,
+			special = jQuery.event.special,
+			deleteExpando = jQuery.support.deleteExpando;
+		
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			id = elem[ jQuery.expando ];
+			
+			if ( id ) {
+				data = cache[ id ];
+				
+				if ( data.events ) {
+					for ( var type in data.events ) {
+						if ( special[ type ] ) {
+							jQuery.event.remove( elem, type );
+
+						} else {
+							removeEvent( elem, type, data.handle );
+						}
+					}
+				}
+				
+				if ( deleteExpando ) {
+					delete elem[ jQuery.expando ];
+
+				} else if ( elem.removeAttribute ) {
+					elem.removeAttribute( jQuery.expando );
+				}
+				
+				delete cache[ id ];
+			}
+		}
+	}
+});
+// exclude the following css properties to add px
+var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+	ralpha = /alpha\([^)]*\)/,
+	ropacity = /opacity=([^)]*)/,
+	rfloat = /float/i,
+	rdashAlpha = /-([a-z])/ig,
+	rupper = /([A-Z])/g,
+	rnumpx = /^-?\d+(?:px)?$/i,
+	rnum = /^-?\d/,
+
+	cssShow = { position: "absolute", visibility: "hidden", display:"block" },
+	cssWidth = [ "Left", "Right" ],
+	cssHeight = [ "Top", "Bottom" ],
+
+	// cache check for defaultView.getComputedStyle
+	getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
+	// normalize float css property
+	styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat",
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	};
+
+jQuery.fn.css = function( name, value ) {
+	return access( this, name, value, true, function( elem, name, value ) {
+		if ( value === undefined ) {
+			return jQuery.curCSS( elem, name );
+		}
+		
+		if ( typeof value === "number" && !rexclude.test(name) ) {
+			value += "px";
+		}
+
+		jQuery.style( elem, name, value );
+	});
+};
+
+jQuery.extend({
+	style: function( elem, name, value ) {
+		// don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return undefined;
+		}
+
+		// ignore negative width and height values #1599
+		if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) {
+			value = undefined;
+		}
+
+		var style = elem.style || elem, set = value !== undefined;
+
+		// IE uses filters for opacity
+		if ( !jQuery.support.opacity && name === "opacity" ) {
+			if ( set ) {
+				// IE has trouble with opacity if it does not have layout
+				// Force it by setting the zoom level
+				style.zoom = 1;
+
+				// Set the alpha filter to set the opacity
+				var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
+				var filter = style.filter || jQuery.curCSS( elem, "filter" ) || "";
+				style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
+			}
+
+			return style.filter && style.filter.indexOf("opacity=") >= 0 ?
+				(parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "":
+				"";
+		}
+
+		// Make sure we're using the right name for getting the float value
+		if ( rfloat.test( name ) ) {
+			name = styleFloat;
+		}
+
+		name = name.replace(rdashAlpha, fcamelCase);
+
+		if ( set ) {
+			style[ name ] = value;
+		}
+
+		return style[ name ];
+	},
+
+	css: function( elem, name, force, extra ) {
+		if ( name === "width" || name === "height" ) {
+			var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight;
+
+			function getWH() {
+				val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+
+				if ( extra === "border" ) {
+					return;
+				}
+
+				jQuery.each( which, function() {
+					if ( !extra ) {
+						val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
+					}
+
+					if ( extra === "margin" ) {
+						val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
+					} else {
+						val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+					}
+				});
+			}
+
+			if ( elem.offsetWidth !== 0 ) {
+				getWH();
+			} else {
+				jQuery.swap( elem, props, getWH );
+			}
+
+			return Math.max(0, Math.round(val));
+		}
+
+		return jQuery.curCSS( elem, name, force );
+	},
+
+	curCSS: function( elem, name, force ) {
+		var ret, style = elem.style, filter;
+
+		// IE uses filters for opacity
+		if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
+			ret = ropacity.test(elem.currentStyle.filter || "") ?
+				(parseFloat(RegExp.$1) / 100) + "" :
+				"";
+
+			return ret === "" ?
+				"1" :
+				ret;
+		}
+
+		// Make sure we're using the right name for getting the float value
+		if ( rfloat.test( name ) ) {
+			name = styleFloat;
+		}
+
+		if ( !force && style && style[ name ] ) {
+			ret = style[ name ];
+
+		} else if ( getComputedStyle ) {
+
+			// Only "float" is needed here
+			if ( rfloat.test( name ) ) {
+				name = "float";
+			}
+
+			name = name.replace( rupper, "-$1" ).toLowerCase();
+
+			var defaultView = elem.ownerDocument.defaultView;
+
+			if ( !defaultView ) {
+				return null;
+			}
+
+			var computedStyle = defaultView.getComputedStyle( elem, null );
+
+			if ( computedStyle ) {
+				ret = computedStyle.getPropertyValue( name );
+			}
+
+			// We should always get a number back from opacity
+			if ( name === "opacity" && ret === "" ) {
+				ret = "1";
+			}
+
+		} else if ( elem.currentStyle ) {
+			var camelCase = name.replace(rdashAlpha, fcamelCase);
+
+			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
+
+			// From the awesome hack by Dean Edwards
+			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+			// If we're not dealing with a regular pixel number
+			// but a number that has a weird ending, we need to convert it to pixels
+			if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+				// Remember the original values
+				var left = style.left, rsLeft = elem.runtimeStyle.left;
+
+				// Put in the new values to get a computed value out
+				elem.runtimeStyle.left = elem.currentStyle.left;
+				style.left = camelCase === "fontSize" ? "1em" : (ret || 0);
+				ret = style.pixelLeft + "px";
+
+				// Revert the changed values
+				style.left = left;
+				elem.runtimeStyle.left = rsLeft;
+			}
+		}
+
+		return ret;
+	},
+
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var old = {};
+
+		// Remember the old values, and insert the new ones
+		for ( var name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		callback.call( elem );
+
+		// Revert the old values
+		for ( var name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+	}
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.hidden = function( elem ) {
+		var width = elem.offsetWidth, height = elem.offsetHeight,
+			skip = elem.nodeName.toLowerCase() === "tr";
+
+		return width === 0 && height === 0 && !skip ?
+			true :
+			width > 0 && height > 0 && !skip ?
+				false :
+				jQuery.curCSS(elem, "display") === "none";
+	};
+
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
+	};
+}
+var jsc = now(),
+	rscript = /<script(.|\s)*?\/script>/gi,
+	rselectTextarea = /select|textarea/i,
+	rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,
+	jsre = /=\?(&|$)/,
+	rquery = /\?/,
+	rts = /(\?|&)_=.*?(&|$)/,
+	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
+	r20 = /%20/g,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load;
+
+jQuery.fn.extend({
+	load: function( url, params, callback ) {
+		if ( typeof url !== "string" ) {
+			return _load.call( this, url );
+
+		// Don't do a request if no elements are being requested
+		} else if ( !this.length ) {
+			return this;
+		}
+
+		var off = url.indexOf(" ");
+		if ( off >= 0 ) {
+			var selector = url.slice(off, url.length);
+			url = url.slice(0, off);
+		}
+
+		// Default to a GET request
+		var type = "GET";
+
+		// If the second parameter was provided
+		if ( params ) {
+			// If it's a function
+			if ( jQuery.isFunction( params ) ) {
+				// We assume that it's the callback
+				callback = params;
+				params = null;
+
+			// Otherwise, build a param string
+			} else if ( typeof params === "object" ) {
+				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
+				type = "POST";
+			}
+		}
+
+		var self = this;
+
+		// Request the remote document
+		jQuery.ajax({
+			url: url,
+			type: type,
+			dataType: "html",
+			data: params,
+			complete: function( res, status ) {
+				// If successful, inject the HTML into all the matched elements
+				if ( status === "success" || status === "notmodified" ) {
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div />")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(res.responseText.replace(rscript, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						res.responseText );
+				}
+
+				if ( callback ) {
+					self.each( callback, [res.responseText, status, res] );
+				}
+			}
+		});
+
+		return this;
+	},
+
+	serialize: function() {
+		return jQuery.param(this.serializeArray());
+	},
+	serializeArray: function() {
+		return this.map(function() {
+			return this.elements ? jQuery.makeArray(this.elements) : this;
+		})
+		.filter(function() {
+			return this.name && !this.disabled &&
+				(this.checked || rselectTextarea.test(this.nodeName) ||
+					rinput.test(this.type));
+		})
+		.map(function( i, elem ) {
+			var val = jQuery(this).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray(val) ?
+					jQuery.map( val, function( val, i ) {
+						return { name: elem.name, value: val };
+					}) :
+					{ name: elem.name, value: val };
+		}).get();
+	}
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function( i, o ) {
+	jQuery.fn[o] = function( f ) {
+		return this.bind(o, f);
+	};
+});
+
+jQuery.extend({
+
+	get: function( url, data, callback, type ) {
+		// shift arguments if data argument was omited
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = null;
+		}
+
+		return jQuery.ajax({
+			type: "GET",
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	},
+
+	getScript: function( url, callback ) {
+		return jQuery.get(url, null, callback, "script");
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get(url, data, callback, "json");
+	},
+
+	post: function( url, data, callback, type ) {
+		// shift arguments if data argument was omited
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = {};
+		}
+
+		return jQuery.ajax({
+			type: "POST",
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	},
+
+	ajaxSetup: function( settings ) {
+		jQuery.extend( jQuery.ajaxSettings, settings );
+	},
+
+	ajaxSettings: {
+		url: location.href,
+		global: true,
+		type: "GET",
+		contentType: "application/x-www-form-urlencoded",
+		processData: true,
+		async: true,
+		/*
+		timeout: 0,
+		data: null,
+		username: null,
+		password: null,
+		traditional: false,
+		*/
+		// Create the request object; Microsoft failed to properly
+		// implement the XMLHttpRequest in IE7 (can't request local files),
+		// so we use the ActiveXObject when it is available
+		// This function can be overriden by calling jQuery.ajaxSetup
+		xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
+			function() {
+				return new window.XMLHttpRequest();
+			} :
+			function() {
+				try {
+					return new window.ActiveXObject("Microsoft.XMLHTTP");
+				} catch(e) {}
+			},
+		accepts: {
+			xml: "application/xml, text/xml",
+			html: "text/html",
+			script: "text/javascript, application/javascript",
+			json: "application/json, text/javascript",
+			text: "text/plain",
+			_default: "*/*"
+		}
+	},
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {},
+
+	ajax: function( origSettings ) {
+		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings);
+		
+		var jsonp, status, data,
+			callbackContext = origSettings && origSettings.context || s,
+			type = s.type.toUpperCase();
+
+		// convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Handle JSONP Parameter Callbacks
+		if ( s.dataType === "jsonp" ) {
+			if ( type === "GET" ) {
+				if ( !jsre.test( s.url ) ) {
+					s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+				}
+			} else if ( !s.data || !jsre.test(s.data) ) {
+				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
+			}
+			s.dataType = "json";
+		}
+
+		// Build temporary JSONP function
+		if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
+			jsonp = s.jsonpCallback || ("jsonp" + jsc++);
+
+			// Replace the =? sequence both in the query string and the data
+			if ( s.data ) {
+				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
+			}
+
+			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
+
+			// We need to make sure
+			// that a JSONP style response is executed properly
+			s.dataType = "script";
+
+			// Handle JSONP-style loading
+			window[ jsonp ] = window[ jsonp ] || function( tmp ) {
+				data = tmp;
+				success();
+				complete();
+				// Garbage collect
+				window[ jsonp ] = undefined;
+
+				try {
+					delete window[ jsonp ];
+				} catch(e) {}
+
+				if ( head ) {
+					head.removeChild( script );
+				}
+			};
+		}
+
+		if ( s.dataType === "script" && s.cache === null ) {
+			s.cache = false;
+		}
+
+		if ( s.cache === false && type === "GET" ) {
+			var ts = now();
+
+			// try replacing _= if it is there
+			var ret = s.url.replace(rts, "$1_=" + ts + "$2");
+
+			// if nothing was replaced, add timestamp to the end
+			s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
+		}
+
+		// If data is available, append data to url for get requests
+		if ( s.data && type === "GET" ) {
+			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
+		}
+
+		// Watch for a new set of requests
+		if ( s.global && ! jQuery.active++ ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+
+		// Matches an absolute URL, and saves the domain
+		var parts = rurl.exec( s.url ),
+			remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
+
+		// If we're requesting a remote document
+		// and trying to load JSON or Script with a GET
+		if ( s.dataType === "script" && type === "GET" && remote ) {
+			var head = document.getElementsByTagName("head")[0] || document.documentElement;
+			var script = document.createElement("script");
+			script.src = s.url;
+			if ( s.scriptCharset ) {
+				script.charset = s.scriptCharset;
+			}
+
+			// Handle Script loading
+			if ( !jsonp ) {
+				var done = false;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function() {
+					if ( !done && (!this.readyState ||
+							this.readyState === "loaded" || this.readyState === "complete") ) {
+						done = true;
+						success();
+						complete();
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+						if ( head && script.parentNode ) {
+							head.removeChild( script );
+						}
+					}
+				};
+			}
+
+			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709 and #4378).
+			head.insertBefore( script, head.firstChild );
+
+			// We handle everything using the script element injection
+			return undefined;
+		}
+
+		var requestDone = false;
+
+		// Create the request object
+		var xhr = s.xhr();
+
+		if ( !xhr ) {
+			return;
+		}
+
+		// Open the socket
+		// Passing null username, generates a login popup on Opera (#2865)
+		if ( s.username ) {
+			xhr.open(type, s.url, s.async, s.username, s.password);
+		} else {
+			xhr.open(type, s.url, s.async);
+		}
+
+		// Need an extra try/catch for cross domain requests in Firefox 3
+		try {
+			// Set the correct header, if data is being sent
+			if ( s.data || origSettings && origSettings.contentType ) {
+				xhr.setRequestHeader("Content-Type", s.contentType);
+			}
+
+			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+			if ( s.ifModified ) {
+				if ( jQuery.lastModified[s.url] ) {
+					xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
+				}
+
+				if ( jQuery.etag[s.url] ) {
+					xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
+				}
+			}
+
+			// Set header so the called script knows that it's an XMLHttpRequest
+			// Only send the header if it's not a remote XHR
+			if ( !remote ) {
+				xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+			}
+
+			// Set the Accepts header for the server, depending on the dataType
+			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
+				s.accepts[ s.dataType ] + ", */*" :
+				s.accepts._default );
+		} catch(e) {}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) {
+			// Handle the global AJAX counter
+			if ( s.global && ! --jQuery.active ) {
+				jQuery.event.trigger( "ajaxStop" );
+			}
+
+			// close opended socket
+			xhr.abort();
+			return false;
+		}
+
+		if ( s.global ) {
+			trigger("ajaxSend", [xhr, s]);
+		}
+
+		// Wait for a response to come back
+		var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
+			// The request was aborted
+			if ( !xhr || xhr.readyState === 0 || isTimeout === "abort" ) {
+				// Opera doesn't call onreadystatechange before this point
+				// so we simulate the call
+				if ( !requestDone ) {
+					complete();
+				}
+
+				requestDone = true;
+				if ( xhr ) {
+					xhr.onreadystatechange = jQuery.noop;
+				}
+
+			// The transfer is complete and the data is available, or the request timed out
+			} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
+				requestDone = true;
+				xhr.onreadystatechange = jQuery.noop;
+
+				status = isTimeout === "timeout" ?
+					"timeout" :
+					!jQuery.httpSuccess( xhr ) ?
+						"error" :
+						s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
+							"notmodified" :
+							"success";
+
+				var errMsg;
+
+				if ( status === "success" ) {
+					// Watch for, and catch, XML document parse errors
+					try {
+						// process the data (runs the xml through httpData regardless of callback)
+						data = jQuery.httpData( xhr, s.dataType, s );
+					} catch(err) {
+						status = "parsererror";
+						errMsg = err;
+					}
+				}
+
+				// Make sure that the request was successful or notmodified
+				if ( status === "success" || status === "notmodified" ) {
+					// JSONP handles its own success callback
+					if ( !jsonp ) {
+						success();
+					}
+				} else {
+					jQuery.handleError(s, xhr, status, errMsg);
+				}
+
+				// Fire the complete handlers
+				complete();
+
+				if ( isTimeout === "timeout" ) {
+					xhr.abort();
+				}
+
+				// Stop memory leaks
+				if ( s.async ) {
+					xhr = null;
+				}
+			}
+		};
+
+		// Override the abort handler, if we can (IE doesn't allow it, but that's OK)
+		// Opera doesn't fire onreadystatechange at all on abort
+		try {
+			var oldAbort = xhr.abort;
+			xhr.abort = function() {
+				if ( xhr ) {
+					oldAbort.call( xhr );
+				}
+
+				onreadystatechange( "abort" );
+			};
+		} catch(e) { }
+
+		// Timeout checker
+		if ( s.async && s.timeout > 0 ) {
+			setTimeout(function() {
+				// Check to see if the request is still happening
+				if ( xhr && !requestDone ) {
+					onreadystatechange( "timeout" );
+				}
+			}, s.timeout);
+		}
+
+		// Send the data
+		try {
+			xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null );
+		} catch(e) {
+			jQuery.handleError(s, xhr, null, e);
+			// Fire the complete handlers
+			complete();
+		}
+
+		// firefox 1.5 doesn't fire statechange for sync requests
+		if ( !s.async ) {
+			onreadystatechange();
+		}
+
+		function success() {
+			// If a local callback was specified, fire it and pass it the data
+			if ( s.success ) {
+				s.success.call( callbackContext, data, status, xhr );
+			}
+
+			// Fire the global callback
+			if ( s.global ) {
+				trigger( "ajaxSuccess", [xhr, s] );
+			}
+		}
+
+		function complete() {
+			// Process result
+			if ( s.complete ) {
+				s.complete.call( callbackContext, xhr, status);
+			}
+
+			// The request was completed
+			if ( s.global ) {
+				trigger( "ajaxComplete", [xhr, s] );
+			}
+
+			// Handle the global AJAX counter
+			if ( s.global && ! --jQuery.active ) {
+				jQuery.event.trigger( "ajaxStop" );
+			}
+		}
+		
+		function trigger(type, args) {
+			(s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
+		}
+
+		// return XMLHttpRequest to allow aborting the request etc.
+		return xhr;
+	},
+
+	handleError: function( s, xhr, status, e ) {
+		// If a local callback was specified, fire it
+		if ( s.error ) {
+			s.error.call( s.context || s, xhr, status, e );
+		}
+
+		// Fire the global callback
+		if ( s.global ) {
+			(s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] );
+		}
+	},
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Determines if an XMLHttpRequest was successful or not
+	httpSuccess: function( xhr ) {
+		try {
+			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
+			return !xhr.status && location.protocol === "file:" ||
+				// Opera returns 0 when status is 304
+				( xhr.status >= 200 && xhr.status < 300 ) ||
+				xhr.status === 304 || xhr.status === 1223 || xhr.status === 0;
+		} catch(e) {}
+
+		return false;
+	},
+
+	// Determines if an XMLHttpRequest returns NotModified
+	httpNotModified: function( xhr, url ) {
+		var lastModified = xhr.getResponseHeader("Last-Modified"),
+			etag = xhr.getResponseHeader("Etag");
+
+		if ( lastModified ) {
+			jQuery.lastModified[url] = lastModified;
+		}
+
+		if ( etag ) {
+			jQuery.etag[url] = etag;
+		}
+
+		// Opera returns 0 when status is 304
+		return xhr.status === 304 || xhr.status === 0;
+	},
+
+	httpData: function( xhr, type, s ) {
+		var ct = xhr.getResponseHeader("content-type") || "",
+			xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
+			data = xml ? xhr.responseXML : xhr.responseText;
+
+		if ( xml && data.documentElement.nodeName === "parsererror" ) {
+			jQuery.error( "parsererror" );
+		}
+
+		// Allow a pre-filtering function to sanitize the response
+		// s is checked to keep backwards compatibility
+		if ( s && s.dataFilter ) {
+			data = s.dataFilter( data, type );
+		}
+
+		// The filter can actually parse the response
+		if ( typeof data === "string" ) {
+			// Get the JavaScript object, if JSON is used.
+			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
+				data = jQuery.parseJSON( data );
+
+			// If the type is "script", eval it in global context
+			} else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
+				jQuery.globalEval( data );
+			}
+		}
+
+		return data;
+	},
+
+	// Serialize an array of form elements or a set of
+	// key/values into a query string
+	param: function( a, traditional ) {
+		var s = [];
+		
+		// Set traditional to true for jQuery <= 1.3.2 behavior.
+		if ( traditional === undefined ) {
+			traditional = jQuery.ajaxSettings.traditional;
+		}
+		
+		// If an array was passed in, assume that it is an array of form elements.
+		if ( jQuery.isArray(a) || a.jquery ) {
+			// Serialize the form elements
+			jQuery.each( a, function() {
+				add( this.name, this.value );
+			});
+			
+		} else {
+			// If traditional, encode the "old" way (the way 1.3.2 or older
+			// did it), otherwise encode params recursively.
+			for ( var prefix in a ) {
+				buildParams( prefix, a[prefix] );
+			}
+		}
+
+		// Return the resulting serialization
+		return s.join("&").replace(r20, "+");
+
+		function buildParams( prefix, obj ) {
+			if ( jQuery.isArray(obj) ) {
+				// Serialize array item.
+				jQuery.each( obj, function( i, v ) {
+					if ( traditional || /\[\]$/.test( prefix ) ) {
+						// Treat each array item as a scalar.
+						add( prefix, v );
+					} else {
+						// If array item is non-scalar (array or object), encode its
+						// numeric index to resolve deserialization ambiguity issues.
+						// Note that rack (as of 1.0.0) can't currently deserialize
+						// nested arrays properly, and attempting to do so may cause
+						// a server error. Possible fixes are to modify rack's
+						// deserialization algorithm or to provide an option or flag
+						// to force array serialization to be shallow.
+						buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v );
+					}
+				});
+					
+			} else if ( !traditional && obj != null && typeof obj === "object" ) {
+				// Serialize object item.
+				jQuery.each( obj, function( k, v ) {
+					buildParams( prefix + "[" + k + "]", v );
+				});
+					
+			} else {
+				// Serialize scalar item.
+				add( prefix, obj );
+			}
+		}
+
+		function add( key, value ) {
+			// If value is a function, invoke it and return its value
+			value = jQuery.isFunction(value) ? value() : value;
+			s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
+		}
+	}
+});
+var elemdisplay = {},
+	rfxtypes = /toggle|show|hide/,
+	rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/,
+	timerId,
+	fxAttrs = [
+		// height animations
+		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+		// width animations
+		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+		// opacity animations
+		[ "opacity" ]
+	];
+
+jQuery.fn.extend({
+	show: function( speed, callback ) {
+		if ( speed || speed === 0) {
+			return this.animate( genFx("show", 3), speed, callback);
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var old = jQuery.data(this[i], "olddisplay");
+
+				this[i].style.display = old || "";
+
+				if ( jQuery.css(this[i], "display") === "none" ) {
+					var nodeName = this[i].nodeName, display;
+
+					if ( elemdisplay[ nodeName ] ) {
+						display = elemdisplay[ nodeName ];
+
+					} else {
+						var elem = jQuery("<" + nodeName + " />").appendTo("body");
+
+						display = elem.css("display");
+
+						if ( display === "none" ) {
+							display = "block";
+						}
+
+						elem.remove();
+
+						elemdisplay[ nodeName ] = display;
+					}
+
+					jQuery.data(this[i], "olddisplay", display);
+				}
+			}
+
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( var j = 0, k = this.length; j < k; j++ ) {
+				this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
+			}
+
+			return this;
+		}
+	},
+
+	hide: function( speed, callback ) {
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("hide", 3), speed, callback);
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var old = jQuery.data(this[i], "olddisplay");
+				if ( !old && old !== "none" ) {
+					jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
+				}
+			}
+
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( var j = 0, k = this.length; j < k; j++ ) {
+				this[j].style.display = "none";
+			}
+
+			return this;
+		}
+	},
+
+	// Save the old toggle function
+	_toggle: jQuery.fn.toggle,
+
+	toggle: function( fn, fn2 ) {
+		var bool = typeof fn === "boolean";
+
+		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
+			this._toggle.apply( this, arguments );
+
+		} else if ( fn == null || bool ) {
+			this.each(function() {
+				var state = bool ? fn : jQuery(this).is(":hidden");
+				jQuery(this)[ state ? "show" : "hide" ]();
+			});
+
+		} else {
+			this.animate(genFx("toggle", 3), fn, fn2);
+		}
+
+		return this;
+	},
+
+	fadeTo: function( speed, to, callback ) {
+		return this.filter(":hidden").css("opacity", 0).show().end()
+					.animate({opacity: to}, speed, callback);
+	},
+
+	animate: function( prop, speed, easing, callback ) {
+		var optall = jQuery.speed(speed, easing, callback);
+
+		if ( jQuery.isEmptyObject( prop ) ) {
+			return this.each( optall.complete );
+		}
+
+		return this[ optall.queue === false ? "each" : "queue" ](function() {
+			var opt = jQuery.extend({}, optall), p,
+				hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
+				self = this;
+
+			for ( p in prop ) {
+				var name = p.replace(rdashAlpha, fcamelCase);
+
+				if ( p !== name ) {
+					prop[ name ] = prop[ p ];
+					delete prop[ p ];
+					p = name;
+				}
+
+				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
+					return opt.complete.call(this);
+				}
+
+				if ( ( p === "height" || p === "width" ) && this.style ) {
+					// Store display property
+					opt.display = jQuery.css(this, "display");
+
+					// Make sure that nothing sneaks out
+					opt.overflow = this.style.overflow;
+				}
+
+				if ( jQuery.isArray( prop[p] ) ) {
+					// Create (if needed) and add to specialEasing
+					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
+					prop[p] = prop[p][0];
+				}
+			}
+
+			if ( opt.overflow != null ) {
+				this.style.overflow = "hidden";
+			}
+
+			opt.curAnim = jQuery.extend({}, prop);
+
+			jQuery.each( prop, function( name, val ) {
+				var e = new jQuery.fx( self, opt, name );
+
+				if ( rfxtypes.test(val) ) {
+					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+
+				} else {
+					var parts = rfxnum.exec(val),
+						start = e.cur(true) || 0;
+
+					if ( parts ) {
+						var end = parseFloat( parts[2] ),
+							unit = parts[3] || "px";
+
+						// We need to compute starting value
+						if ( unit !== "px" ) {
+							self.style[ name ] = (end || 1) + unit;
+							start = ((end || 1) / e.cur(true)) * start;
+							self.style[ name ] = start + unit;
+						}
+
+						// If a +=/-= token was provided, we're doing a relative animation
+						if ( parts[1] ) {
+							end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
+						}
+
+						e.custom( start, end, unit );
+
+					} else {
+						e.custom( start, val, "" );
+					}
+				}
+			});
+
+			// For JS strict compliance
+			return true;
+		});
+	},
+
+	stop: function( clearQueue, gotoEnd ) {
+		var timers = jQuery.timers;
+
+		if ( clearQueue ) {
+			this.queue([]);
+		}
+
+		this.each(function() {
+			// go in reverse order so anything added to the queue during the loop is ignored
+			for ( var i = timers.length - 1; i >= 0; i-- ) {
+				if ( timers[i].elem === this ) {
+					if (gotoEnd) {
+						// force the next step to be the last
+						timers[i](true);
+					}
+
+					timers.splice(i, 1);
+				}
+			}
+		});
+
+		// start the next in the queue if the last step wasn't forced
+		if ( !gotoEnd ) {
+			this.dequeue();
+		}
+
+		return this;
+	}
+
+});
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show", 1),
+	slideUp: genFx("hide", 1),
+	slideToggle: genFx("toggle", 1),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, callback ) {
+		return this.animate( props, speed, callback );
+	};
+});
+
+jQuery.extend({
+	speed: function( speed, easing, fn ) {
+		var opt = speed && typeof speed === "object" ? speed : {
+			complete: fn || !fn && easing ||
+				jQuery.isFunction( speed ) && speed,
+			duration: speed,
+			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+		};
+
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
+
+		// Queueing
+		opt.old = opt.complete;
+		opt.complete = function() {
+			if ( opt.queue !== false ) {
+				jQuery(this).dequeue();
+			}
+			if ( jQuery.isFunction( opt.old ) ) {
+				opt.old.call( this );
+			}
+		};
+
+		return opt;
+	},
+
+	easing: {
+		linear: function( p, n, firstNum, diff ) {
+			return firstNum + diff * p;
+		},
+		swing: function( p, n, firstNum, diff ) {
+			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+		}
+	},
+
+	timers: [],
+
+	fx: function( elem, options, prop ) {
+		this.options = options;
+		this.elem = elem;
+		this.prop = prop;
+
+		if ( !options.orig ) {
+			options.orig = {};
+		}
+	}
+
+});
+
+jQuery.fx.prototype = {
+	// Simple function for setting a style value
+	update: function() {
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+
+		// Set display property to block for height/width animations
+		if ( ( this.prop === "height" || this.prop === "width" ) && this.elem.style ) {
+			this.elem.style.display = "block";
+		}
+	},
+
+	// Get the current size
+	cur: function( force ) {
+		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
+			return this.elem[ this.prop ];
+		}
+
+		var r = parseFloat(jQuery.css(this.elem, this.prop, force));
+		return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
+	},
+
+	// Start an animation from one number to another
+	custom: function( from, to, unit ) {
+		this.startTime = now();
+		this.start = from;
+		this.end = to;
+		this.unit = unit || this.unit || "px";
+		this.now = this.start;
+		this.pos = this.state = 0;
+
+		var self = this;
+		function t( gotoEnd ) {
+			return self.step(gotoEnd);
+		}
+
+		t.elem = this.elem;
+
+		if ( t() && jQuery.timers.push(t) && !timerId ) {
+			timerId = setInterval(jQuery.fx.tick, 13);
+		}
+	},
+
+	// Simple 'show' function
+	show: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.show = true;
+
+		// Begin the animation
+		// Make sure that we start at a small width/height to avoid any
+		// flash of content
+		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
+
+		// Start by showing the element
+		jQuery( this.elem ).show();
+	},
+
+	// Simple 'hide' function
+	hide: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.hide = true;
+
+		// Begin the animation
+		this.custom(this.cur(), 0);
+	},
+
+	// Each step of an animation
+	step: function( gotoEnd ) {
+		var t = now(), done = true;
+
+		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
+			this.now = this.end;
+			this.pos = this.state = 1;
+			this.update();
+
+			this.options.curAnim[ this.prop ] = true;
+
+			for ( var i in this.options.curAnim ) {
+				if ( this.options.curAnim[i] !== true ) {
+					done = false;
+				}
+			}
+
+			if ( done ) {
+				if ( this.options.display != null ) {
+					// Reset the overflow
+					this.elem.style.overflow = this.options.overflow;
+
+					// Reset the display
+					var old = jQuery.data(this.elem, "olddisplay");
+					this.elem.style.display = old ? old : this.options.display;
+
+					if ( jQuery.css(this.elem, "display") === "none" ) {
+						this.elem.style.display = "block";
+					}
+				}
+
+				// Hide the element if the "hide" operation was done
+				if ( this.options.hide ) {
+					jQuery(this.elem).hide();
+				}
+
+				// Reset the properties, if the item has been hidden or shown
+				if ( this.options.hide || this.options.show ) {
+					for ( var p in this.options.curAnim ) {
+						jQuery.style(this.elem, p, this.options.orig[p]);
+					}
+				}
+
+				// Execute the complete function
+				this.options.complete.call( this.elem );
+			}
+
+			return false;
+
+		} else {
+			var n = t - this.startTime;
+			this.state = n / this.options.duration;
+
+			// Perform the easing function, defaults to swing
+			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
+			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
+			this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
+			this.now = this.start + ((this.end - this.start) * this.pos);
+
+			// Perform the next step of the animation
+			this.update();
+		}
+
+		return true;
+	}
+};
+
+jQuery.extend( jQuery.fx, {
+	tick: function() {
+		var timers = jQuery.timers;
+
+		for ( var i = 0; i < timers.length; i++ ) {
+			if ( !timers[i]() ) {
+				timers.splice(i--, 1);
+			}
+		}
+
+		if ( !timers.length ) {
+			jQuery.fx.stop();
+		}
+	},
+		
+	stop: function() {
+		clearInterval( timerId );
+		timerId = null;
+	},
+	
+	speeds: {
+		slow: 600,
+ 		fast: 200,
+ 		// Default speed
+ 		_default: 400
+	},
+
+	step: {
+		opacity: function( fx ) {
+			jQuery.style(fx.elem, "opacity", fx.now);
+		},
+
+		_default: function( fx ) {
+			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
+				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
+			} else {
+				fx.elem[ fx.prop ] = fx.now;
+			}
+		}
+	}
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function( elem ) {
+		return jQuery.grep(jQuery.timers, function( fn ) {
+			return elem === fn.elem;
+		}).length;
+	};
+}
+
+function genFx( type, num ) {
+	var obj = {};
+
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+		obj[ this ] = type;
+	});
+
+	return obj;
+}
+if ( "getBoundingClientRect" in document.documentElement ) {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0];
+
+		if ( options ) { 
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
+			clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			top  = box.top  + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ) - clientTop,
+			left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+
+		return { top: top, left: left };
+	};
+
+} else {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0];
+
+		if ( options ) { 
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		jQuery.offset.initialize();
+
+		var offsetParent = elem.offsetParent, prevOffsetParent = elem,
+			doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
+			body = doc.body, defaultView = doc.defaultView,
+			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
+			top = elem.offsetTop, left = elem.offsetLeft;
+
+		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+				break;
+			}
+
+			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+			top  -= elem.scrollTop;
+			left -= elem.scrollLeft;
+
+			if ( elem === offsetParent ) {
+				top  += elem.offsetTop;
+				left += elem.offsetLeft;
+
+				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
+					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+				}
+
+				prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
+			}
+
+			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+			}
+
+			prevComputedStyle = computedStyle;
+		}
+
+		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
+			top  += body.offsetTop;
+			left += body.offsetLeft;
+		}
+
+		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+			top  += Math.max( docElem.scrollTop, body.scrollTop );
+			left += Math.max( docElem.scrollLeft, body.scrollLeft );
+		}
+
+		return { top: top, left: left };
+	};
+}
+
+jQuery.offset = {
+	initialize: function() {
+		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0,
+			html = "<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>";
+
+		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
+
+		container.innerHTML = html;
+		body.insertBefore( container, body.firstChild );
+		innerDiv = container.firstChild;
+		checkDiv = innerDiv.firstChild;
+		td = innerDiv.nextSibling.firstChild.firstChild;
+
+		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
+		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
+
+		checkDiv.style.position = "fixed", checkDiv.style.top = "20px";
+		// safari subtracts parent border width here which is 5px
+		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
+		checkDiv.style.position = checkDiv.style.top = "";
+
+		innerDiv.style.overflow = "hidden", innerDiv.style.position = "relative";
+		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
+
+		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
+
+		body.removeChild( container );
+		body = container = innerDiv = checkDiv = table = td = null;
+		jQuery.offset.initialize = jQuery.noop;
+	},
+
+	bodyOffset: function( body ) {
+		var top = body.offsetTop, left = body.offsetLeft;
+
+		jQuery.offset.initialize();
+
+		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
+			top  += parseFloat( jQuery.curCSS(body, "marginTop",  true) ) || 0;
+			left += parseFloat( jQuery.curCSS(body, "marginLeft", true) ) || 0;
+		}
+
+		return { top: top, left: left };
+	},
+	
+	setOffset: function( elem, options, i ) {
+		// set position first, in-case top/left are set even on static elem
+		if ( /static/.test( jQuery.curCSS( elem, "position" ) ) ) {
+			elem.style.position = "relative";
+		}
+		var curElem   = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curTop    = parseInt( jQuery.curCSS( elem, "top",  true ), 10 ) || 0,
+			curLeft   = parseInt( jQuery.curCSS( elem, "left", true ), 10 ) || 0;
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		var props = {
+			top:  (options.top  - curOffset.top)  + curTop,
+			left: (options.left - curOffset.left) + curLeft
+		};
+		
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+
+jQuery.fn.extend({
+	position: function() {
+		if ( !this[0] ) {
+			return null;
+		}
+
+		var elem = this[0],
+
+		// Get *real* offsetParent
+		offsetParent = this.offsetParent(),
+
+		// Get correct offsets
+		offset       = this.offset(),
+		parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+		// Subtract element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		offset.top  -= parseFloat( jQuery.curCSS(elem, "marginTop",  true) ) || 0;
+		offset.left -= parseFloat( jQuery.curCSS(elem, "marginLeft", true) ) || 0;
+
+		// Add offsetParent borders
+		parentOffset.top  += parseFloat( jQuery.curCSS(offsetParent[0], "borderTopWidth",  true) ) || 0;
+		parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], "borderLeftWidth", true) ) || 0;
+
+		// Subtract the two offsets
+		return {
+			top:  offset.top  - parentOffset.top,
+			left: offset.left - parentOffset.left
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || document.body;
+			while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent;
+		});
+	}
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ["Left", "Top"], function( i, name ) {
+	var method = "scroll" + name;
+
+	jQuery.fn[ method ] = function(val) {
+		var elem = this[0], win;
+		
+		if ( !elem ) {
+			return null;
+		}
+
+		if ( val !== undefined ) {
+			// Set the scroll offset
+			return this.each(function() {
+				win = getWindow( this );
+
+				if ( win ) {
+					win.scrollTo(
+						!i ? val : jQuery(win).scrollLeft(),
+						 i ? val : jQuery(win).scrollTop()
+					);
+
+				} else {
+					this[ method ] = val;
+				}
+			});
+		} else {
+			win = getWindow( elem );
+
+			// Return the scroll offset
+			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
+				jQuery.support.boxModel && win.document.documentElement[ method ] ||
+					win.document.body[ method ] :
+				elem[ method ];
+		}
+	};
+});
+
+function getWindow( elem ) {
+	return ("scrollTo" in elem && elem.document) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function( i, name ) {
+
+	var type = name.toLowerCase();
+
+	// innerHeight and innerWidth
+	jQuery.fn["inner" + name] = function() {
+		return this[0] ?
+			jQuery.css( this[0], type, false, "padding" ) :
+			null;
+	};
+
+	// outerHeight and outerWidth
+	jQuery.fn["outer" + name] = function( margin ) {
+		return this[0] ?
+			jQuery.css( this[0], type, false, margin ? "margin" : "border" ) :
+			null;
+	};
+
+	jQuery.fn[ type ] = function( size ) {
+		// Get window width or height
+		var elem = this[0];
+		if ( !elem ) {
+			return size == null ? null : this;
+		}
+		
+		if ( jQuery.isFunction( size ) ) {
+			return this.each(function( i ) {
+				var self = jQuery( this );
+				self[ type ]( size.call( this, i, self[ type ]() ) );
+			});
+		}
+
+		return ("scrollTo" in elem && elem.document) ? // does it walk and quack like a window?
+			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+			elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
+			elem.document.body[ "client" + name ] :
+
+			// Get document width or height
+			(elem.nodeType === 9) ? // is it a document
+				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+				Math.max(
+					elem.documentElement["client" + name],
+					elem.body["scroll" + name], elem.documentElement["scroll" + name],
+					elem.body["offset" + name], elem.documentElement["offset" + name]
+				) :
+
+				// Get or set width or height on the element
+				size === undefined ?
+					// Get width or height on the element
+					jQuery.css( elem, type ) :
+
+					// Set the width or height on the element (default to pixels if value is unitless)
+					this.css( type, typeof size === "string" ? size : size + "px" );
+	};
+
+});
+// Expose jQuery to the global object
+window.jQuery = window.$ = jQuery;
+
+})(window);

From 70319aefd6f7d585c481bc3307594324e22f0284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Tue, 20 Jul 2010 10:54:56 +0000
Subject: [PATCH 69/91] Added some docu and checks for console.log being
 defined

---
 phpgwapi/js/egw_json.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/js/egw_json.js b/phpgwapi/js/egw_json.js
index d2950a27f7..5cb2677f28 100644
--- a/phpgwapi/js/egw_json.js
+++ b/phpgwapi/js/egw_json.js
@@ -416,7 +416,7 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
 								//Increment the includedJSFiles count
 								this.loadedJSFiles[res.data] = false;
 
-								if (typeof console != 'undefined')
+								if (typeof console != 'undefined' && typeof console.log != 'undefined')
 									console.log("Requested JS file '%s' from server", [res.data]);
 
 								var self = this;
@@ -424,7 +424,7 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
 								//FF, Opera, Chrome
 								scriptnode.onload = function(e) {
 									var file = e.target._originalSrc;
-									if (typeof console != 'undefined')
+									if (typeof console != 'undefined' && typeof console.log != 'undefined')
 										console.log("Retrieved JS file '%s' from server", [file]);
 
 									self.loadedJSFiles[file] = true;
@@ -436,7 +436,7 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
 									var node = window.event.srcElement;
 									if (node.readyState == 'complete') {
 										var file = node._originalSrc;
-										if (typeof console != 'undefined')
+										if (typeof console != 'undefined' && typeof console.log != 'undefined')
 											console.log("Retrieved JS file '%s' from server", [file]);
 
 										self.loadedJSFiles[file] = true;
@@ -477,6 +477,10 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
 	}
 }
 
+/**
+ * The "onLoadFinish" handler gets called after all JS-files have been loaded
+ * successfully
+ */
 egw_json_request.prototype.checkLoadFinish = function()
 {
 	var complete = true;
@@ -485,7 +489,6 @@ egw_json_request.prototype.checkLoadFinish = function()
 
 	if (complete && this.onLoadFinish && this.handleResponseDone)
 	{
-		console.log("Call onLoadFinish");
 		this.onLoadFinish.call(this.sender);
 	}
 }

From 0d3cfae3b9f6c65dd34962a71e5da272050c31d7 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 20 Jul 2010 13:34:53 +0000
Subject: [PATCH 70/91] disable SCAYT too (switch autostart off), if you
 disable spellchecker in admin

---
 phpgwapi/inc/class.egw_ckeditor_config.inc.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
index f36595e111..db74364031 100644
--- a/phpgwapi/inc/class.egw_ckeditor_config.inc.php
+++ b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
@@ -187,6 +187,10 @@ class egw_ckeditor_config
 				$config['scayt_sLang'] = self::get_lang().'_'.self::get_country();
 			}
 		}
+		else
+		{
+			$config['scayt_autoStartup'] = false;
+		}
 	}
 
 	/**

From 14722e5060a723c61836411ed8c44feeef3351a2 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 20 Jul 2010 13:49:11 +0000
Subject: [PATCH 71/91] enable SCAYT  (switch autostart on), no matter which
 spellchecker you are using

---
 phpgwapi/inc/class.egw_ckeditor_config.inc.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
index db74364031..811662c02f 100644
--- a/phpgwapi/inc/class.egw_ckeditor_config.inc.php
+++ b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
@@ -179,13 +179,10 @@ class egw_ckeditor_config
 			{
 				$spellchecker_button = 'SpellCheck';
 				$config['extraPlugins'] = "aspell";
-				$config['scayt_autoStartup'] = false;
-			}
-			else
-			{
-				$config['scayt_autoStartup'] = true;
-				$config['scayt_sLang'] = self::get_lang().'_'.self::get_country();
 			}
+			$config['scayt_autoStartup'] = true;
+			$config['scayt_sLang'] = self::get_lang().'_'.self::get_country();
+			
 		}
 		else
 		{

From 4ad95007b5c2534a027eacc5ed7da3e00493053e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 20 Jul 2010 14:34:20 +0000
Subject: [PATCH 72/91] using call_user_func instead of depricated
 call_user_method, which seems at least under PHP5.3 not to allow static calls

---
 etemplate/inc/class.etemplate_request.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/inc/class.etemplate_request.inc.php b/etemplate/inc/class.etemplate_request.inc.php
index 01e7ab1f46..5f57a38ed0 100644
--- a/etemplate/inc/class.etemplate_request.inc.php
+++ b/etemplate/inc/class.etemplate_request.inc.php
@@ -108,7 +108,7 @@ class etemplate_request
 		}
 		if (self::$request_class != __CLASS__)
 		{
-			return call_user_method('read',self::$request_class,$id);
+			return call_user_func(array(self::$request_class,'read'),$id);
 		}
 		$request = new etemplate_request();
 

From 09719babaf7803d7f2688a9d008accbc87117344 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 20 Jul 2010 16:47:11 +0000
Subject: [PATCH 73/91] replace deprecated call_user_method(_array) with
 call_user_func(_array)

---
 doc/fix_depricated.php                 | 7 +++++++
 phpgwapi/inc/class.schema_proc.inc.php | 2 +-
 phpgwapi/inc/class.soap_server.inc.php | 8 ++++----
 phpgwapi/inc/class.xml.inc.php         | 4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/doc/fix_depricated.php b/doc/fix_depricated.php
index a33d9085ca..3be382d768 100755
--- a/doc/fix_depricated.php
+++ b/doc/fix_depricated.php
@@ -119,6 +119,13 @@ function fix_depricated($file,$replace_file=false)
 
 	// fix call to not longer existing PDO method $result->fetchSingle()
 	$lines = str_replace('->fetchSingle(','->fetchColumn(',$lines);
+	
+	// fix calls to deprecated call_user_method(_array)?(method,object[,args])
+	if (preg_match('/call_user_method(_array)?\(/',$lines,$matches))
+	{
+		$lines = preg_replace('/call_user_method\(([^,]+),([^,\)]+)([,)])/','call_user_func(array(\\2,\\1)\\3',$lines);
+		$lines = preg_replace('/call_user_method_array\(([^,]+),([^,\)]+)([,)])/','call_user_func_array(array(\\2,\\1)\\3',$lines);
+	}
 
 	if ($lines != $orig)
 	{
diff --git a/phpgwapi/inc/class.schema_proc.inc.php b/phpgwapi/inc/class.schema_proc.inc.php
index bb3614cda0..d5ec9ae0fe 100644
--- a/phpgwapi/inc/class.schema_proc.inc.php
+++ b/phpgwapi/inc/class.schema_proc.inc.php
@@ -858,7 +858,7 @@ class schema_proc
 			$debug_params = func_get_args();
 			array_shift($debug_params);
 			array_shift($debug_params);
-			call_user_method_array('debug_message',$this,$debug_params);
+			call_user_func_array(array($this,'debug_message'),$debug_params);
 			if ($retval < 2 && !$this->dict->debug)
 			{
 				echo '<p><b>'.$this->adodb->ErrorMsg()."</b></p>\n";
diff --git a/phpgwapi/inc/class.soap_server.inc.php b/phpgwapi/inc/class.soap_server.inc.php
index 0861ebe3db..196997a2f9 100644
--- a/phpgwapi/inc/class.soap_server.inc.php
+++ b/phpgwapi/inc/class.soap_server.inc.php
@@ -193,7 +193,7 @@
 							{
 								if (is_object($obj))
 								{
-									$code = "\$method_response = call_user_method($method,$obj,";
+									$code = "\$method_response = call_user_func(array($obj,$method),";
 									$this->debug("about to call object method '$class\-\>$method' with args");
 								}
 								else
@@ -234,7 +234,7 @@
 								if (is_object($obj))
 								{
 									$this->debug("about to call object method '$obj\-\>$method'");
-									if(!$method_response = call_user_method($method,$obj))
+									if(!$method_response = call_user_func(array($obj,$method)))
 									{
 										$this->make_fault("Server","Method call failed for '$obj->method' with no params");
 										return $this->fault();
@@ -257,7 +257,7 @@
 							if($request_data)
 							{
 								/* call method with parameters */
-								$code = "\$method_response = call_user_method(\$method,\$obj,";
+								$code = "\$method_response = call_user_func(array(\$obj,\$method),";
 								while(list($x,$y) = each($request_data))
 								{
 									$code .= "\$request_data[$x]" . ',';
@@ -272,7 +272,7 @@
 								if(is_object($obj))
 								{
 									$this->debug("about to call object method '$obj\-\>$method'");
-									call_user_method($method,$obj);
+									call_user_func(array($obj,$method));
 								}
 								else
 								{
diff --git a/phpgwapi/inc/class.xml.inc.php b/phpgwapi/inc/class.xml.inc.php
index e67033b26a..8a62791908 100644
--- a/phpgwapi/inc/class.xml.inc.php
+++ b/phpgwapi/inc/class.xml.inc.php
@@ -1346,7 +1346,7 @@ class XML
                 }
             
                 // Perform an axis action.
-                $contexts = call_user_method($method, &$this, $axis, $context);
+                $contexts = call_user_func(array( &$this,$method), $axis, $context);
             
                 // Check whether there are predicates.
                 if ( count($axis["predicate"]) > 0 )
@@ -1411,7 +1411,7 @@ class XML
         }
         
         // Return the result of the function.
-        return call_user_method($method, &$this, $node, $arguments);
+        return call_user_func(array( &$this,$method), $node, $arguments);
     }
     
     /**

From 4da973400c86afb0e3ce2fe37129d38a8b8780de Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 21 Jul 2010 08:21:42 +0000
Subject: [PATCH 74/91] allow and validate needed (required) attribute for file
 uploads, checkboxes and radio buttons

---
 etemplate/inc/class.etemplate.inc.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 90693b812e..18291bed0e 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1336,6 +1336,7 @@ class etemplate extends boetemplate
 						self::$request->set_to_process($form_name,$cell['type'],array(
 							'unset_value' => $unset_val,
 							'multiple'    => $multiple,
+							'needed'      => $cell['needed'],
 						));
 					}
 					self::$request->set_to_process_attribute($form_name,'values',$set_val,true);
@@ -1361,7 +1362,9 @@ class etemplate extends boetemplate
 				else
 				{
 					$html .= html::input($form_name,$set_val,'RADIO',$options);
-					self::$request->set_to_process($form_name,$cell['type']);
+					self::$request->set_to_process($form_name,$cell['type'],array(
+						'needed' => $cell['needed'],
+					));
 				}
 				break;
 			case 'button':
@@ -1636,7 +1639,9 @@ class etemplate extends boetemplate
 						self::$form_options = " enctype=\"multipart/form-data\" onsubmit=\"set_element2(this,'$path_name','$form_name')\"";
 					}
 					$html .= html::input($form_name,'','file',$options);
-					self::$request->set_to_process($form_name,$cell['type']);
+					self::$request->set_to_process($form_name,$cell['type'],array(
+						'needed' => $cell['needed'],
+					));
 				}
 				break;
 			case 'vbox':
@@ -2243,8 +2248,12 @@ class etemplate extends boetemplate
 					self::set_array($content,$form_name,$value);
 					break;
 				case 'checkbox':
-					if ($value === false)	// get_array() returns false for not set
+					if (!$value)
 					{
+						if ($attr['needed'])
+						{
+							self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+						}
 						self::set_array($content,$form_name,$attr['multiple'] ? array() : $attr['unset_value']);	// need to be reported too
 					}
 					else
@@ -2296,6 +2305,10 @@ class etemplate extends boetemplate
 					//echo $form_name; _debug_array($value);
 					// fall-throught
 				default:
+					if ($attr['needed'] && !$value)
+					{
+						self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+					}
 					self::set_array($content,$form_name,$value);
 					break;
 			}

From 9615c33fe8d1f7175f53817c68aad07e152165f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Wed, 21 Jul 2010 10:26:54 +0000
Subject: [PATCH 75/91] Fixed JS loadFinished notification on IE

---
 phpgwapi/js/egw_json.js | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/phpgwapi/js/egw_json.js b/phpgwapi/js/egw_json.js
index 5cb2677f28..84ae4d455e 100644
--- a/phpgwapi/js/egw_json.js
+++ b/phpgwapi/js/egw_json.js
@@ -432,17 +432,28 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
 								};
 
 								//IE
-								scriptnode.onreadystatechange = function() {
-									var node = window.event.srcElement;
-									if (node.readyState == 'complete') {
-										var file = node._originalSrc;
-										if (typeof console != 'undefined' && typeof console.log != 'undefined')
-											console.log("Retrieved JS file '%s' from server", [file]);
+								if (typeof scriptnode.readyState != 'undefined')
+								{
+									if (scriptnode.readyState != 'complete' &&
+									    scriptnode.readyState != 'loaded')
+									{
+										scriptnode.onreadystatechange = function() {
+											var node = window.event.srcElement;
+											if (node.readyState == 'complete' || node.readState == 'loaded') {
+												var file = node._originalSrc;
+												if (typeof console != 'undefined' && typeof console.log != 'undefined')
+													console.log("Retrieved JS file '%s' from server", [file]);
 
-										self.loadedJSFiles[file] = true;
-										self.checkLoadFinish();
+												self.loadedJSFiles[file] = true;
+												self.checkLoadFinish();
+											}
+										};
 									}
-								};
+									else
+									{
+										this.loadedJSFiles[res.data] = true;
+									}
+								}								
 							}
 							hasResponse = true;
 						} else

From 408a9ece4f0218aec0de252ffb00c979733a527e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Wed, 21 Jul 2010 10:52:18 +0000
Subject: [PATCH 76/91] Fixed typo which prevented IE js load from working
 correctly

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

diff --git a/phpgwapi/js/egw_json.js b/phpgwapi/js/egw_json.js
index 84ae4d455e..26a7629832 100644
--- a/phpgwapi/js/egw_json.js
+++ b/phpgwapi/js/egw_json.js
@@ -439,7 +439,7 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
 									{
 										scriptnode.onreadystatechange = function() {
 											var node = window.event.srcElement;
-											if (node.readyState == 'complete' || node.readState == 'loaded') {
+											if (node.readyState == 'complete' || node.readyState == 'loaded') {
 												var file = node._originalSrc;
 												if (typeof console != 'undefined' && typeof console.log != 'undefined')
 													console.log("Retrieved JS file '%s' from server", [file]);

From da54059fd175ccd4d25cd9e26a2a56299a1f275f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Wed, 21 Jul 2010 11:45:05 +0000
Subject: [PATCH 77/91] Fixed problem with toolbar not being expanded and
 removed bottom breadcrumb bar

---
 phpgwapi/inc/class.egw_ckeditor_config.inc.php | 2 ++
 phpgwapi/inc/class.html.inc.php                | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
index 811662c02f..323ee1a8e6 100644
--- a/phpgwapi/inc/class.egw_ckeditor_config.inc.php
+++ b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
@@ -154,6 +154,8 @@ class egw_ckeditor_config
 		$config['editingBlock'] = true;
 		$config['disableNativeSpellChecker'] = true;
 
+		$config['removePlugins'] = 'elementspath';
+
 		$config['toolbarStartupExpanded'] = $expanded_toolbar;
 
 		$config['filebrowserBrowseUrl'] = self::get_filebrowserBrowseUrl($start_path);
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index b48ee5f2d8..6148051de9 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -595,8 +595,8 @@ class html
 			$_content = self::purify($_content);
 
 		// By default the editor start expanded
-		$expanded = isset($_options['toolbarStartupExpanded']) ?
-			$_options['toolbarStartupExpanded'] != 'false' : true;
+		$expanded = isset($_options['toolbar_expanded']) ?
+			$_options['toolbar_expanded'] == 'true' : true;
 
 		//Get the height in pixels from the pixels parameter
 		$pxheight = (strpos('px', $_height) === false) ?

From 3dfa4e5fe67fa47bcc47b3cb4da83e99798cd3a5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 21 Jul 2010 13:16:36 +0000
Subject: [PATCH 78/91] allow null as value in assign()

---
 phpgwapi/inc/class.egw_json.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_json.inc.php b/phpgwapi/inc/class.egw_json.inc.php
index 8f0b882854..0a6ba7bf76 100644
--- a/phpgwapi/inc/class.egw_json.inc.php
+++ b/phpgwapi/inc/class.egw_json.inc.php
@@ -327,7 +327,7 @@ class egw_json_response
 	 */
 	public function assign($id, $key, $value)
 	{
-		if (is_string($id) && is_string($key) && (is_string($value) || is_numeric($value)))
+		if (is_string($id) && is_string($key) && (is_string($value) || is_numeric($value) || is_null($value)))
 		{
 			$this->addGeneric('assign', array(
 				'id' => $id,

From f597385a9cc1fc77a96e35f04c40e4596178795c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 21 Jul 2010 13:50:29 +0000
Subject: [PATCH 79/91] fixed caching of etemplates: - never read timestamp of
 last import from cache - check timestamps only once per session and app

---
 etemplate/inc/class.boetemplate.inc.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index 16fe0e58c9..a2a0e13c52 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -845,7 +845,7 @@ class boetemplate extends soetemplate
 		egw_cache::unsetInstance('etemplate',$this->cache_name());
 	}
 
-	static private $import_tested = array();
+	static private $import_tested;
 
 	/**
 	 * Test if new template-import necessary for app and does the import
@@ -861,15 +861,20 @@ class boetemplate extends soetemplate
 		if (is_array($app)) $app = $app['name'];
 		list($app) = explode('.',$app);
 
+		if (is_null(self::$import_tested))
+		{
+			self::$import_tested =& egw_cache::getSession('etemplate','import_tested');
+			if (is_null(self::$import_tested)) self::$import_tested = array();
+		}
 		if (!$app || self::$import_tested[$app])
 		{
-			return '';	// ensure test is done only once per call and app
+			return '';	// ensure test is done only once per session and app
 		}
 		self::$import_tested[$app] = True;	// need to be done before new ...
 
 		$path = EGW_SERVER_ROOT."/$app/setup/etemplates.inc.php";
 
-		if ($time = @filemtime($path))
+		if (($time = @filemtime($path)))
 		{
 			$templ = new boetemplate(array('name' => '.'.$app,'lang' => '##'));
 			if ($templ->lang != '##' || $templ->modified < $time) // need to import
@@ -932,13 +937,18 @@ class boetemplate extends soetemplate
 		// check if new import necessary, currently on every request
 		$msg = self::test_import($name);
 		//if ($msg) echo "<p>".__METHOD__."($name,$template,$lang,$group,$version) self::test_import($name) returning $msg</p>\n";
-
-		$data = egw_cache::getInstance('etemplate',$cname=self::cache_name($name,$template,$lang));
+		
 		if (is_array($name))
 		{
 			$version = $name['version'];
+			$lang = $name['lang'];
+			$template = $name['template'];
 			$name = $name['name'];
 		}
+		// templates starting with . (as the import timestamp) never use the cache
+		if ($name[0] == '.') return false;
+
+		$data = egw_cache::getInstance('etemplate',$cname=self::cache_name($name,$template,$lang));
 		//echo "<p>".__METHOD__.'('.array2string($name).",$template,$lang,$group,$version) egw_cache::getInstance('etemplate','$cname')=".array2string(array('name'=>$data['name'],'version'=>$data['version'],'modified'=>$data['modified']))."</p>\n";
 
 		if (!is_null($data) && (empty($version) || $data['version'] == $version))

From f7c1f243ae1519a45550ee21661144ccd1977ecc Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 21 Jul 2010 14:20:31 +0000
Subject: [PATCH 80/91] fixed PHP warning: Illegal offset type in
 phpgwapi/inc/class.accounts_ldap.inc.php on line 1100 and not working update
 of group mail addresses

---
 phpgwapi/inc/class.accounts_ldap.inc.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index e07a18be33..271e89b860 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -1093,11 +1093,14 @@ class accounts_ldap
 		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-
+			if (is_array($forward)) list($forward,$extra_attr) = each($forward);
+			
 			$to_write[$forward] = array();
+			if ($extra_attr) $to_write[$extra_attr] = array();
 			foreach($members as $key => $member)
 			{
 				if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+				if ($extra_attr && ($uid = $this->id2name($member,'account_lid'))) $to_write[$extra_attr] = $uid;
 			}
 		}
 		if (!ldap_modify($this->ds,'cn='.ldap::quote($cn).','.$this->group_context,$to_write))

From 8ef7201027466b701818ffa8d0c21fecfdee4cca Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 21 Jul 2010 14:39:07 +0000
Subject: [PATCH 81/91] fixed wrong extraction of the extra_attr, eg. uid

---
 phpgwapi/inc/class.accounts_ldap.inc.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index 271e89b860..08fed7c1f0 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -272,7 +272,7 @@ class accounts_ldap
 					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old['mail']))
 				{
 					$extra_attr = false;
-					if (is_array($forward)) list($forward,$extra_attr) = each($forward);
+					if (is_array($forward)) list($forward,$extra_attr) = $forward;
 					if ($data_utf8['account_email'])	// setting an email
 					{
 						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
@@ -1093,14 +1093,13 @@ class accounts_ldap
 		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-			if (is_array($forward)) list($forward,$extra_attr) = each($forward);
+			if (is_array($forward)) list($forward,$extra_attr) = $forward;
+			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
 			
 			$to_write[$forward] = array();
-			if ($extra_attr) $to_write[$extra_attr] = array();
 			foreach($members as $key => $member)
 			{
 				if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
-				if ($extra_attr && ($uid = $this->id2name($member,'account_lid'))) $to_write[$extra_attr] = $uid;
 			}
 		}
 		if (!ldap_modify($this->ds,'cn='.ldap::quote($cn).','.$this->group_context,$to_write))

From b9bfd285a54a5bf00726e2957d79c21c575cd352 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 22 Jul 2010 13:09:33 +0000
Subject: [PATCH 82/91] fixed not working checkboxes after r31472

---
 etemplate/inc/class.etemplate.inc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 18291bed0e..9a433c7005 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -2248,12 +2248,12 @@ class etemplate extends boetemplate
 					self::set_array($content,$form_name,$value);
 					break;
 				case 'checkbox':
-					if (!$value)
+					if (!$value && $attr['needed'])
+					{
+						self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+					}
+					if ($value === false)
 					{
-						if ($attr['needed'])
-						{
-							self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
-						}
 						self::set_array($content,$form_name,$attr['multiple'] ? array() : $attr['unset_value']);	// need to be reported too
 					}
 					else

From 72610fb3ad51ff18c0ca4fdd195a23ba6d6c94cf Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 23 Jul 2010 12:10:52 +0000
Subject: [PATCH 83/91] allow minus and underscore in validation as part of the
 LocalPart of the eMailaddress; even directly in front of the @ sign

---
 etemplate/inc/class.url_widget.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/inc/class.url_widget.inc.php b/etemplate/inc/class.url_widget.inc.php
index 9154a5b08a..e000f4ddc4 100644
--- a/etemplate/inc/class.url_widget.inc.php
+++ b/etemplate/inc/class.url_widget.inc.php
@@ -62,7 +62,7 @@ class url_widget
 	 * has to be used case insensitive: /i
 	 */
 	//const EMAIL_PREG = '([a-z0-9][a-z0-9._-]*)?[a-z0-9]@([a-z0-9](|[a-z0-9_-]*[a-z0-9])\.)+[a-z]{2,6}';
-	const EMAIL_PREG = '([a-z0-9][a-z0-9._-]*)?[a-z0-9]@([a-z0-9ÄÖÜäöüß](|[a-z0-9ÄÖÜäöüß_-]*[a-z0-9ÄÖÜäöüß])\.)+[a-z]{2,6}';
+	const EMAIL_PREG = '([a-z0-9][a-z0-9._-]*)?[a-z0-9_-]@([a-z0-9ÄÖÜäöüß](|[a-z0-9ÄÖÜäöüß_-]*[a-z0-9ÄÖÜäöüß])\.)+[a-z]{2,6}';
 
 	/**
 	 * pre-processing of the extension

From 37fed349727d0b9883bc5316647edfeb6ce40754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Fri, 23 Jul 2010 18:06:18 +0000
Subject: [PATCH 84/91] Allow moving of existing cantacts between adressbooks

---
 addressbook/inc/class.addressbook_groupdav.inc.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php
index 67b545af8b..443cc2a203 100644
--- a/addressbook/inc/class.addressbook_groupdav.inc.php
+++ b/addressbook/inc/class.addressbook_groupdav.inc.php
@@ -342,13 +342,11 @@ class addressbook_groupdav extends groupdav_handler
 			$contact['id'] = $oldContact['id'];
 			// dont allow the client to overwrite certain values
 			$contact['uid'] = $oldContact['uid'];
-			$contact['owner'] = $oldContact['owner'];
+			//$contact['owner'] = $oldContact['owner'];
 			$contact['private'] = $oldContact['private'];
 		}
-		else
-		{
-			$contact['owner'] = $user;
-		}
+		
+		$contact['owner'] = $user;
 
 		if ($this->http_if_match) $contact['etag'] = self::etag2value($this->http_if_match);
 

From f0488300c8dc399d29f4836f061bb3684ac1c854 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 25 Jul 2010 09:08:24 +0000
Subject: [PATCH 85/91] avoiding deprecated warning under php5.3

---
 setup/config.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup/config.php b/setup/config.php
index 76f4500b3b..19417b73b8 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -34,8 +34,10 @@ $setup_tpl->set_file(array(
 ));
 
 /* Following to ensure windows file paths are saved correctly */
-set_magic_quotes_runtime(0);
-
+if (function_exists('get_magic_quotes_runtime') && get_magic_quotes_runtime())
+{
+	set_magic_quotes_runtime(0);
+}
 $GLOBALS['egw_setup']->loaddb();
 
 /* Check api version, use correct table */

From f8a2efe8dff4d62af687b41967d8ce29a889acef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sun, 25 Jul 2010 18:08:20 +0000
Subject: [PATCH 86/91] Fix syncml:metinf and syncml:devinf namespace issue
 (#2696)

---
 phpgwapi/inc/horde/Horde/SyncML/State.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpgwapi/inc/horde/Horde/SyncML/State.php b/phpgwapi/inc/horde/Horde/SyncML/State.php
index eca8b74a78..735830b9fa 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State.php
@@ -138,12 +138,12 @@ define('RESPONSE_ATOMIC_RESPONSE_TOO_LARGE', 517);
 define('NAME_SPACE_URI_SYNCML_1_0', 'syncml:syncml1.0');
 define('NAME_SPACE_URI_SYNCML_1_1', 'syncml:syncml1.1');
 define('NAME_SPACE_URI_SYNCML_1_2', 'syncml:syncml1.2');
-define('NAME_SPACE_URI_METINF_1_0', 'syncml:metinf1.0');
-define('NAME_SPACE_URI_METINF_1_1', 'syncml:metinf1.1');
-define('NAME_SPACE_URI_METINF_1_2', 'syncml:metinf1.2');
-define('NAME_SPACE_URI_DEVINF_1_0', 'syncml:devinf1.0');
-define('NAME_SPACE_URI_DEVINF_1_1', 'syncml:devinf1.1');
-define('NAME_SPACE_URI_DEVINF_1_2', 'syncml:devinf1.2');
+define('NAME_SPACE_URI_METINF_1_0', 'syncml:metinf');
+define('NAME_SPACE_URI_METINF_1_1', 'syncml:metinf');
+define('NAME_SPACE_URI_METINF_1_2', 'syncml:metinf');
+define('NAME_SPACE_URI_DEVINF_1_0', 'syncml:devinf');
+define('NAME_SPACE_URI_DEVINF_1_1', 'syncml:devinf');
+define('NAME_SPACE_URI_DEVINF_1_2', 'syncml:devinf');
 
 define('CLIENT_SYNC_STARTED',		1);
 define('CLIENT_SYNC_FINNISHED',		2);

From 58993cfb7bf20128c7f08db18e14fcfde2288275 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 26 Jul 2010 08:20:14 +0000
Subject: [PATCH 87/91] - using EGW_*_ROOT instead of .., to allow running from
 different directories - allow running setup_cmd_admin directly via the
 command line with regular syntax (was already possible under special syntax)
 - limiting database names to 16 chars, which is the limit in mysql

---
 setup/inc/class.setup_cmd.inc.php          | 2 +-
 setup/inc/class.setup_cmd_admin.inc.php    | 5 +++++
 setup/inc/class.setup_cmd_database.inc.php | 5 +++--
 setup/inc/class.setup_detection.inc.php    | 2 +-
 setup/setup-cli.php                        | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/setup/inc/class.setup_cmd.inc.php b/setup/inc/class.setup_cmd.inc.php
index 24df36983a..dabfe411c0 100644
--- a/setup/inc/class.setup_cmd.inc.php
+++ b/setup/inc/class.setup_cmd.inc.php
@@ -231,7 +231,7 @@ abstract class setup_cmd extends admin_cmd
 
 		if (!$versions['phpgwapi'])
 		{
-			if (!include('../phpgwapi/setup/setup.inc.php'))
+			if (!include(EGW_INCLUDE_ROOT.'/phpgwapi/setup/setup.inc.php'))
 			{
 				throw new egw_exception_wrong_userinput(lang("eGroupWare sources in '%1' are not complete, file '%2' missing !!!",realpath('..'),'phpgwapi/setup/setup.inc.php'),99);	// should not happen ;-)
 			}
diff --git a/setup/inc/class.setup_cmd_admin.inc.php b/setup/inc/class.setup_cmd_admin.inc.php
index d16826b1b9..99ef65e997 100644
--- a/setup/inc/class.setup_cmd_admin.inc.php
+++ b/setup/inc/class.setup_cmd_admin.inc.php
@@ -17,6 +17,11 @@
  */
 class setup_cmd_admin extends setup_cmd
 {
+	/**
+	 * Allow to run this command via setup-cli
+	 */
+	const SETUP_CLI_CALLABLE = true;
+
 	/**
 	 * Constructor
 	 *
diff --git a/setup/inc/class.setup_cmd_database.inc.php b/setup/inc/class.setup_cmd_database.inc.php
index 938f94503e..87f031e19e 100644
--- a/setup/inc/class.setup_cmd_database.inc.php
+++ b/setup/inc/class.setup_cmd_database.inc.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package setup
- * @copyright (c) 2007 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2007-10 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -262,7 +262,8 @@ class setup_cmd_database extends setup_cmd
 			}
 			if (strpos($this->$name,'$domain') !== false)
 			{
-				$this->set_defaults[$name] = $this->$name = str_replace(array('$domain','.','-'),array($this->domain,'_','_'),$this->$name);
+				// limit names to 16 chars (16 char is user-name limit in MySQL)
+				$this->set_defaults[$name] = $this->$name = substr(str_replace(array('$domain','.','-'),array($this->domain,'_','_'),$this->$name),0,16);
 			}
 		}
 	}
diff --git a/setup/inc/class.setup_detection.inc.php b/setup/inc/class.setup_detection.inc.php
index 87ae54ebf6..dbf9c76072 100755
--- a/setup/inc/class.setup_detection.inc.php
+++ b/setup/inc/class.setup_detection.inc.php
@@ -247,7 +247,7 @@ class setup_detection
 	 */
 	function check_header()
 	{
-		if(!file_exists('../header.inc.php'))
+		if(!file_exists(EGW_SERVER_ROOT.'/header.inc.php'))
 		{
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One';
 			return '1';
diff --git a/setup/setup-cli.php b/setup/setup-cli.php
index b26d0f21b1..b6edc9d8fb 100755
--- a/setup/setup-cli.php
+++ b/setup/setup-cli.php
@@ -110,7 +110,7 @@ switch($action)
 	default:
 		// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
 		if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
-			is_subclass_of($class,'admin_cmd') && constant($class.'::SETUP_CLI_CALLABLE'))
+			is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
 		{
 			$args = array();
 			$args['domain'] = array_shift($arguments);	// domain must be first argument, to ensure right domain get's selected in header-include

From 98383800aec1f73d32031bb6c540baf7bdbb1e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Mon, 26 Jul 2010 15:30:23 +0000
Subject: [PATCH 88/91] Added currently unused find_iterator which allows less
 memory intensive file 'find' operations

---
 phpgwapi/inc/class.egw_find_iterator.inc.php | 738 +++++++++++++++++++
 1 file changed, 738 insertions(+)
 create mode 100644 phpgwapi/inc/class.egw_find_iterator.inc.php

diff --git a/phpgwapi/inc/class.egw_find_iterator.inc.php b/phpgwapi/inc/class.egw_find_iterator.inc.php
new file mode 100644
index 0000000000..01241822f3
--- /dev/null
+++ b/phpgwapi/inc/class.egw_find_iterator.inc.php
@@ -0,0 +1,738 @@
+<?php
+/**
+ * eGroupWare API: Find Iterator - classes to iterate over large directory trees
+ * This is a rewrite of the original egw_vfs::find function, original author
+ * Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage vfs
+ * @author Andreas Stoeckel
+ * @copyright (c) 2010 by Andreas Stoeckel
+ * @version $Id$
+ */
+
+define("FILTER_NOFOLLOW", 2); //Display the element but do not follow
+define("FILTER_OK", 1); //The filter has passed
+define("FILTER_DISPLAY", -1); //The element filtered should not be returned to the caller of find, it should not be displayed
+define("FILTER_ALL", -2); //The element didn't pass the filter
+
+function translate_path($path, $isurl) {
+	return $isurl ? $path : egw_vfs::PREFIX.parse_url($path, PHP_URL_PATH);
+}
+
+class egw_find_file
+{
+	private $isurl = false;
+	private $need_mime = false;
+	private $base_path = "";
+	
+	private $stat = null;
+	private $mime = null;
+	private $props = null;
+	private $result = null;
+	
+	public $filename = ''; //< The filename including the file path, e.g. /home/user/example.file
+	public $path = ''; //< The filename, e.g. example.file
+	public $name = ''; //< The file path, e.g. /home/user/
+	public $isdot = false;
+	public $filterstate = FILTER_ALL;
+
+	public function __construct($path, $isurl, $need_mime)
+	{
+		//Copy the given parameters
+		$this->isurl = $isurl;
+		$this->need_mime = $need_mime;
+		$this->pair_result = $pair_result;
+		$this->base_path = $path;
+		
+		//Set filename, path and path + name as this information will most likely
+		//be needed
+		$paths = $this->isurl ? explode('/', $path) : explode('/', parse_url($path, PHP_URL_PATH));
+		$this->name = implode('/',$paths);
+		$this->filename = array_pop($paths);
+		$this->path = implode('/',$paths).'/';
+		$this->is_dot = ($this->filename == '.') || ($this->filename == '..');
+	}
+	
+	public function get_stat()
+	{
+		//Check whether the stat data has already been created, if not, create it
+		if ($this->stat === null)
+		{
+			$this->stat = $this->isurl ? lstat($this->base_path) :
+				egw_vfs::url_stat($this->base_path, STREAM_URL_STAT_LINK);
+			
+			//Remove numerical indices 0-12
+			$this->stat = array_slice($this->stat, 13);
+		};
+		
+		return $this->stat;
+	}
+	
+	public function get_mime()
+	{
+		//Check if the mime data has already been read, if not, read it
+		if ($this->mime === null)
+			$res['mime'] = egw_vfs::mime_content_type($this->base_path);
+			
+		return $this->mime;
+	}
+	
+	public function get_props()
+	{
+		//Check whether props has already been read, if not, read it
+		if ($this->props === null)
+		{
+			$this->props = array(
+				"isfile" => is_file($this->base_path),
+				"isdir" => is_dir($this->base_path),
+				"islink" => is_link($this->base_path),
+			);
+			
+			if ($this->props['islink'])
+				$this->props['linktarget'] = readlink($this->base_path);
+		}
+		
+		return $this->props;
+	}
+	
+	public function get_result($pair_result)
+	{
+		//Check whether the result has already been produced, if not, produce it
+		if ($this->result === null)
+		{
+			//Check whether only the file name/path should be returned or the complete
+			//resultset
+			if ($pair_result)
+			{
+				//Copy the state and add some custom information
+				$this->result = $this->get_stat();
+				$this->result['path'] = $this->name;
+				$this->result['name'] = $this->filename;
+				if ($this->need_mime)
+					$this->result['mime'] = $this->get_mime();
+			}
+			else
+			{
+				$this->result = $this->name;
+			}
+		}
+		
+		return $this->result;
+	}
+	
+	public function translate_path()
+	{
+	  return translate_path($this->name, $this->isurl);
+	}
+	
+}
+
+/*
+ * egw_directory_iterator_filter filters files based on the options set supplied during
+ * construction. It is used by the RecursiveDirectoryIteratorWrapper and
+ * FindIterator classes. Filtering is performed by calling the "filter" function
+ * and passing an url_state array.
+ */
+class egw_directory_iterator_filter
+{
+	//Parsed options
+	private $hidden = false;
+	private $type = null;
+	private $name_preg = null;
+	private $path_preg = null;
+	private $curkey = 0;
+	private $lcur = null;
+	private $uid = null;
+	private $gid = null;
+	private $ctime = null;
+	private $mtime = null;
+	private $cmin = null;
+	private $mmin = null;
+	private $size = null;
+	private $empty = true;
+	private $follow = false;
+	private $mime = null;
+	
+	/*
+	 * check_num is internally used to compare strings/numerical values.
+	 * @param(value is an integer parameter)
+	 * @param(argument may be a string or an integer. If argument is an integer
+	 * the result gets true if argument equals value. If argument is a string, the
+	 * first char, which may be '+' or '-' defines whether the result gets true if
+	 * value is greater than argument (+) or when it is smaller than argument (-))	
+	 */
+	private static function check_num($value, $argument)
+	{
+		if (is_int($argument) && $argument >= 0 || $argument[0] != '-' && $argument[0] != '+')
+			return $value == $argument;
+		
+		if ($argument < 0)
+			return $value < abs($argument);
+		
+		return $value > (int) substr($argument,1);
+	}
+	
+	public function __construct($options)
+	{
+		//Preprocess the parameters		
+		$this->hidden = isset($options['hidden']) ? $options['hidden'] : false;
+		$this->type = isset($options['type']) ? $options['type'] : null;
+		$this->name_preg = isset($options['name_preg']) ? $options['name_preg'] : null;
+		$this->path_preg = isset($options['path_preg']) ? $options['path_preg'] : null;
+		
+		$this->cmin = isset($options['cmin']) ? $options['cmin'] : null;
+		$this->mmin = isset($options['mmin']) ? $options['mmin'] : null;
+		$this->ctime = isset($options['ctime']) ? $options['ctime'] : null;
+		$this->mtime = isset($options['mtime']) ? $options['mtime'] : null;
+		
+		$this->empty = isset($options['empty']) ? $options['empty'] : true;
+		$this->size = isset($options['size']) ? $options['size'] : null;
+		$this->follow = isset($options['follow']) ? $options['follow'] : false;
+		
+		$this->mime = isset($options['mime']) ? $options['mime'] : null;
+		
+		//Convert the (probably) given path/name filters to regular expressions
+		if (isset($options['name']) && !isset($options['name_preg'])) // change from simple *,? wildcards to preg regular expression once
+			$this->name_preg = '/^'.str_replace(array('\\?','\\*'),
+				array('.{1}','.*'), preg_quote($options['name'])).'$/i';
+		
+		if (isset($options['path']) && !isset($options['preg_path'])) // change from simple *,? wildcards to preg regular expression once
+			$this->path_preg = '/^'.str_replace(array('\\?','\\*'),
+				array('.{1}','.*'), preg_quote($options['path'])).'$/i';
+		
+		//Translate username to uid
+		if (!isset($options['uid']))
+		{
+			if (isset($options['user']))
+			{
+				$this->uid = $GLOBALS['egw']->accounts->name2id($options['user'],'account_lid','u');
+			}
+			elseif (isset($options['nouser']))
+			{
+				$this->uid = 0;
+			}
+		}
+		else
+		{
+			$this->uid = $options['uid'];
+		}
+		
+		//Translate groupid to gid
+		if (!isset($options['gid']))
+		{
+			if (isset($options['group']))
+			{
+				$this->gid = abs($GLOBALS['egw']->accounts->name2id($options['group'],'account_lid','g'));
+			}
+			elseif (isset($options['nogroup']))
+			{
+				$this->gid = 0;
+			}
+		}
+		else
+		{
+			$this->gid = $options['group'];
+		}
+	}
+	
+	public function filter($findfile)
+	{
+		if ($findfile)
+		{
+			//Exclude directory and parent directory
+			if ($findfile->isdot)
+				return FILTER_ALL;
+			
+			//Exclude hidden files			 
+			if (!$this->hidden && (($findfile->filename[0] == '.') || ($findfile->filename == 'Thumbs.db')))
+				return FILTER_ALL;
+			
+			//Read the file properties (like (is link etc.))
+			$props = $findfile->get_props();
+			
+			//If this is a directory, we probably need to keep this entry to crawl
+			//for files inside this directory. That's what FILTER_DISPLAY is for
+			if ($props['isdir'] && (!($props['islink']) || $this->follow))
+				$dir_filter = FILTER_DISPLAY; 
+			else
+				$dir_filter = FILTER_ALL;
+			
+			//Exclude files/directories based on the given regular expression
+			if ($this->name_preg && !preg_match($this->name_preg, $findfile->filename) || 
+				$this->path_preg && !preg_match($this->path_preg, $findfile->path))
+				return $dir_filter;
+			
+			//Exclude directories/symlinks/files			
+			if ($this->type && ($this->type == 'd') == !($props['isdir'] && !$props['islink']) ||
+				(($this->type == 'F') && ($props['isdir'] || $props['islink'])))
+				return $dir_filter;
+			
+			if (($this->cmin !== null) || ($this->mmin !== null) || 
+				($this->ctime !== null) || ($this->mtime !== null) ||
+				($this->size !== null) || (!$this->empty) || 
+				($this->gid !== null) || ($this->uid !== null))
+			{
+				//Check user/group
+				if (($this->gid !== null) && $stat['gid'] != $options['gid'] ||
+					($this->uid !== null) && $stat['uid'] != $options['uid'])
+				{
+					return FILTER_ALL; // wrong user or group
+				}
+				
+				//Retrieve the file stat
+				$stat = $this->get_stat();
+				
+				//Excludes files where the creation/last modification timestamps is greater than
+				//the given time
+				if ($this->cmin && !self::check_num(round((time()-$stat['ctime'])/60), $this->cmin) ||
+					$this->mmin && !self::check_num(round((time()-$stat['mtime'])/60), $this->mmin) ||
+					$this->ctime && !self::check_num(round((time()-$stat['ctime'])/86400), $this->ctime) ||
+					$this->mtime && !self::check_num(round((time()-$stat['mtime'])/86400), $this->mtime))
+				{
+					return $dir_filter;
+				}
+				
+				//Check filesize
+				if (($this->size !== null) && !self::check_num($stat['size'], $this->size) ||
+					(!$this->empty && $stat['size'] <= 0)) //TODO Check this
+				{
+					return $dir_filter;
+				}
+			}
+			
+			//Check the mime type and subtype. As loading the mime type takes the
+			//longest time, it is postponed as long as possible
+			if ($this->mime !== null) {
+				$mime = $findfile->get_mime();
+				if ($options['mime'] != $mime)
+				{
+					list($type, $subtype) = explode('/', $this->mime);
+					
+					// no subtype (eg. 'image') --> check only the main type
+					if ($sub_type || substr($this->mime, 0, strlen($type)+1) != $type.'/')
+						return $dir_filter; // wrong mime-type
+				}
+			}
+			
+			//Return FILTER_OK, if the filters have passed		 
+			return FILTER_OK;
+		}
+		else
+		{
+			return FILTER_ALL;
+		}
+	}
+}
+
+class egw_recursive_directory_iterator_wrapper implements RecursiveIterator
+{
+	private $base = "";
+	private $exec = null;
+	private $exec_params = null;
+	private $filter = null;
+
+	private $elements = null;
+	private $index = 0;
+	private $iterator = null;	
+	private $follow = false;
+	private $sortfunc;
+	private $sort = false;
+	private $url = false;
+	private $needmime = false;
+	
+	private function fillelemarray()
+	{
+		//Fill the "elements" array with all filestates
+		$this->elements = array();
+		
+		//Loop through each element of the recursive directory iterator
+		foreach($this->iterator as $key => $value)
+		{
+			//Create a new egw_find_file class for each entry and filter it
+			$findfile = new egw_find_file( 
+				$this->iterator->getPath().'/'.$this->iterator->getFilename(),
+				$this->url, $this->needmime);
+			
+			//Filter the element
+			$filterresult = $this->filter->filter($findfile);
+			if ($filterresult >= FILTER_DISPLAY)
+			{
+				$findfile->filterstate = $filterresult;
+				$this->elements[] = $findfile;
+			}
+		}
+		
+		//Sort the elements
+		if ($this->sort)
+		{
+			usort($this->elements, $this->sortfunc);
+		}
+	}
+
+	public function __construct($iterator, &$filter, $follow, $url, $needmime, 
+		$sort, $sortfunc)
+	{
+		$this->filter = $filter;
+		$this->iterator = $iterator;
+		if ($this->iterator->valid())
+		{
+			$this->base = $this->iterator->getPath();
+		}
+		$this->follow = $follow;
+		$this->sortfunc = $sortfunc;
+		$this->sort = $sort;
+		$this->url = $url;
+		$this->needmime = $needmime;
+		
+		//Get the element array. As this array only contains the current directory,
+		//and subdirectories are first loaded when they are accessed, a lot of memory
+		//is saved.
+		$this->fillelemarray();
+	}
+
+	public function valid()
+	{
+		return $this->index < count($this->elements);
+	}
+	
+	public function next()
+	{
+		$this->index++;
+	}
+	
+	public function current()
+	{
+		return $this->elements[$this->index];
+	}
+	
+	public function key()
+	{
+		return $this->elements[$this->index]['name'];
+	}
+
+	public function hasChildren()
+	{
+		$props = &$this->elements[$this->index]->get_props();
+		
+		//Only follow symlinks if we were ought to do so
+		if ($props['isdir'] && !$props['isdot'] && (!$props['islink'] || $this->follow))
+		{
+			//Check whether the link points on a file
+			if ($props['islink'])
+			{
+				$info = new SplFileInfo($props['linktarget']);
+				//Only follow the symlink if the symlink points to a directory.
+				//TODO: Recursion prevention?
+				return ($info->isDir());
+			}
+			else
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public function getChildren()
+	{
+		$it = new RecursiveDirectoryIterator($this->elements[$this->index]->translate_path());
+		return new egw_recursive_directory_iterator_wrapper($it, $this->filter,
+			$this->follow, $this->url, $this->needmime, $this->sort,
+			$this->sortfunc, false);
+	}
+
+	public function rewind()
+	{
+		$this->index = 0;
+	}
+}
+
+class egw_find_iterator implements Iterator
+{
+	private $filter = null;
+	private $follow = false;	
+	private $iterator_stack = array();
+	private $base = array();
+	private $base_index = 0;
+	private $current_cache = null;
+	private $needs_next = false;
+	private $rewind = false;
+	private $pairs = false;
+
+	private $numerical_sort = false;
+	private $dirsontop = true;
+	private $sort = 1;
+	private $order = null; 
+
+	private $index = 0;
+	private $lower_limit = 0;
+	private $upper_limit = null;
+	private $mindepth = null;
+	private $maxdepth = null;
+	private $depth = false;
+	private $url = false;
+	private $needmime = false;
+
+	private function push_root_iterator()
+	{
+		$root_iterator = new egw_recursive_directory_iterator_wrapper(
+			new RecursiveDirectoryIterator($this->base[$this->base_index]),
+				$this->filter, $this->follow, $this->url, $this->needmime,
+				($this->order !== null) || $this->dirsontop, array($this, "sort"), true);
+		array_push($this->iterator_stack, $root_iterator);
+	}
+	
+	public function sort($a, $b)
+	{
+		//TODO restore, make it much faster :-)
+		
+		/*if ($this->dirsontop)
+		{
+			if (($a['isdir'] != $b['isdir']) && ($a['isdir'] || $b['isdir']))
+				return $a['isdir'] ? -1:1;
+		}
+		
+		if ($this->numerical_sort)
+		{
+			$res = $a[$this->order] == $b[$this->order] ? 0 : ($a[$this->order] > $b[$this->order] ? -1:1);
+		}
+		else
+		{
+			$res = strcasecmp($a[$this->order], $b[$this->order]);
+		}
+		
+		//Always use name as second sort criteria
+		if (($res == 0) && ($this->order != 'name'))
+		{
+			$res = strcasecmp($a['name'], $b['name']); 
+		}*/
+		
+		return 0; //$res * $this->sort;
+	}
+	
+	private function cur_iterator()
+	{
+		$s = count($this->iterator_stack);
+		if ($s > 0)
+		{
+			return $this->iterator_stack[$s - 1];
+		}
+		else
+		{
+			return null;
+		}
+	}
+	
+	private function output_directory(&$findfile)
+	{
+		//If the element is visible, set $current_cache properly and return
+		if ($findfile->filterstate >= FILTER_OK)
+		{
+			$this->index++;
+			if (($this->index-1 >= $this->lower_limit) && 
+				(($this->mindepth === null) || count($this->iterator_stack) >= $this->mindepth))
+			{
+				$this->current_cache = $findfile->get_result($this->pairs);
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	private function prefetch_current()
+	{
+		//If needs_next is true, a new element has been requested by calling the
+		//"next()" function
+		if ($this->needs_next)
+		{
+			//Reset $current_cache
+			$this->needs_next = false;
+			$this->current_cache = null;
+			$this->rewind = false;
+			
+			$cur = $this->cur_iterator();
+			while (($cur != null) && (!$this->upper_limit || ($this->index <= $this->upper_limit)))
+			{
+				$skip = false;
+				if ($cur->valid()) 
+				{
+					//Get a copy of the current file state
+					$findfile = $cur->current();
+					
+					//Add the children elements, if some exist
+					if ($cur->hasChildren() && !($findfile->filterstate == FILTER_NOFOLLOW))
+					{
+						if (($this->maxdepth === null) || count($this->iterator_stack) < $this->maxdepth)
+						{
+							array_push($this->iterator_stack, $cur->getChildren());
+							$skip = $this->depth;
+						}
+					}
+					
+					//Step the current element one further and get the (probably) new iterator
+					if (!$skip)	
+						$cur->next();
+					$cur = $this->cur_iterator();
+					
+					if (!$skip && $this->output_directory($findfile))
+						break;
+				}
+				
+				//If the current iterator doesn't contain any valid element, we're at the
+				//end of the current directory. Switch to the last directory
+				if (!$cur->valid())
+				{
+					array_pop($this->iterator_stack);
+					$cur = $this->cur_iterator();
+					//If cur = null we're at the end of the current directory tree.
+					//Check whether there was another directory specified
+					if ($cur === null)
+					{
+						//Increment the base dir array index
+						$this->base_index++;
+						if ($this->base_index < count($this->base))
+						{
+							$this->push_root_iterator();
+							$cur = $this->cur_iterator();
+						}
+					}
+					else
+					{
+						//If the contents of the directory were listed before the directory itself
+						//output the directory name when it was popped from the iterator stack
+						if ($this->depth && $cur && $cur->valid())
+						{
+							$findfile = $cur->current();
+							$cur->next();
+							if ($this->output_directory($findfile))
+								break;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	private function parseoptions(&$options)
+	{
+		//If options is not set, make it an empty array
+		if (!$options)
+			$options = array();
+		
+		//Create the filter object (passed to other objects by reference) and
+		//parse some other options relevant for this base class		
+		$this->filter = new egw_directory_iterator_filter($options);
+		$this->follow = isset($options['follow']) ? $options['follow'] : false;
+		$this->mindepth = isset($options['mindepth']) ? $options['mindepth'] : null;
+		$this->maxdepth = isset($options['maxdepth']) ? $options['maxdepth'] : null;
+		$this->depth = isset($options['depth']) ? $options['depth'] : false;
+		$this->dirsontop = isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : 
+			(isset($options['maxdepth']) && $options['maxdepth']>0);
+		$this->sort = isset($options['sort']) ? (($options['sort'] == 'ASC') ? 1 : -1) : 1;
+		$this->order = isset($options['order']) ? $options['order'] : null;
+		
+		$this->numerical_sort = ($this->order == 'size' || $this->order == 'uid' ||
+			$this->order == 'gid' || $this->order == 'mode' || $this->order == 'ctime' ||
+			$this->order == 'mtime');
+		
+		$this->url = isset($options['url']) ? (boolean)$options['url'] : false;
+		
+		$this->needmime = isset($options['need_mime']) ? $options['need_mime'] : false;
+		$this->needmime = $this->needmime || isset($options['mime']) || ($this->order == 'mime');
+		
+		//Retrieve the limit parameters
+		if (isset($options['limit']))
+		{
+			$args = explode(',', $options['limit']);
+			$count = $args[0];
+			if (isset($args[1]))
+			{
+				$this->lower_limit = $args[1];
+			}
+			$this->upper_limit = $this->lower_limit + $count;
+		}
+	}
+	
+	public function __construct($base, $options=null, $pairs = false)
+	{
+		//_debug_array($options);
+		$this->pairs = $pairs;
+		
+		$this->parseoptions($options);
+		
+		//Make sure that base is an array with numeric keys
+		if (is_array($base))
+		{
+			$this->base = array_values($base);
+		}
+		else
+		{
+			$this->base[] = $base;
+		}
+		
+		//Add the default url prefix to every path if url is not set.
+		foreach($this->base as $key => $path)
+			$this->base[$key] = translate_path($path, $this->url);
+
+		$this->rewind();
+	}
+	
+	public function current()
+	{
+		$this->prefetch_current();
+		return $this->current_cache;
+	}
+	
+	public function key()
+	{
+		$this->prefetch_current();
+		if ($this->pairs)
+		{
+			return $this->current_cache->path;
+		}
+		else
+		{
+			return $this->index - 1 - $this->lower_limit;
+		}
+	}
+	
+	public function next()
+	{
+		$this->needs_next = true;
+		$this->prefetch_current();
+	}
+	
+	public function valid()
+	{
+		if (!$this->upper_limit || ($this->index <= $this->upper_limit))
+		{
+			$this->prefetch_current();
+			return $this->current_cache != null;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	public function rewind()
+	{
+		if (!$this->rewind)
+		{
+			//Empty the iterator stack
+			$this->iterator_stack = array();
+			$this->current_cache = null;
+			$this->needs_next = true;
+			$this->index = 0;
+			$this->base_index = 0;
+			$this->rewind = true;
+
+			//Create the root directory iterator
+			$this->push_root_iterator();
+		}
+	}
+}
+

From fda78788522da0697ae1c66b1056124b8eb3b7e5 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 27 Jul 2010 12:11:20 +0000
Subject: [PATCH 89/91] fix for bug MyStylite Tracker#773; Menu links:
 superfluous Scrollbar

---
 phpgwapi/templates/default/navbar.tpl | 2 +-
 phpgwapi/templates/jerryr/navbar.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/templates/default/navbar.tpl b/phpgwapi/templates/default/navbar.tpl
index 5fa6b37cb4..79d58e9933 100644
--- a/phpgwapi/templates/default/navbar.tpl
+++ b/phpgwapi/templates/default/navbar.tpl
@@ -128,7 +128,7 @@
 <div class="divSidebox">
 	<div class="divSideboxHeader"><span>{lang_title}</span></div>
 	<div>
-		<table width="100%" cellspacing="0" cellpadding="0">
+		<table width="99.9%" cellspacing="0" cellpadding="0">
 <!-- END extra_blocks_header -->
 
 
diff --git a/phpgwapi/templates/jerryr/navbar.tpl b/phpgwapi/templates/jerryr/navbar.tpl
index 03a1211919..aafbb7fd7d 100644
--- a/phpgwapi/templates/jerryr/navbar.tpl
+++ b/phpgwapi/templates/jerryr/navbar.tpl
@@ -149,7 +149,7 @@
                 </table>
         </div>
 	<div>
-		<table class="sideboxDrop" width="100%" cellspacing="0" cellpadding="0">
+		<table class="sideboxDrop" width="99.9%" cellspacing="0" cellpadding="0">
 <!-- END extra_blocks_header -->
 
 

From b9c0bea09529998b5942614b6c87ccd474585a00 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 27 Jul 2010 14:20:00 +0000
Subject: [PATCH 90/91] Keep CSV fields in definition, so editing definition
 doesn't require uploading a file each time

---
 .../inc/class.addressbook_wizard_import_contacts_csv.inc.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addressbook/inc/class.addressbook_wizard_import_contacts_csv.inc.php b/addressbook/inc/class.addressbook_wizard_import_contacts_csv.inc.php
index 7cbb35ab03..4349eab699 100644
--- a/addressbook/inc/class.addressbook_wizard_import_contacts_csv.inc.php
+++ b/addressbook/inc/class.addressbook_wizard_import_contacts_csv.inc.php
@@ -63,7 +63,6 @@ class addressbook_wizard_import_contacts_csv extends importexport_wizard_basic_i
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					unset($content['csv_fields']);
 					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
 				case 'previous' :
 					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);

From a5ba32b8b6cbfbb0fb3900e6897ab72a74d1871f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 27 Jul 2010 14:29:20 +0000
Subject: [PATCH 91/91] allow to change password without run rights for
 preferences via a new password app (part of preferences app, but separate to
 install)

---
 phpgwapi/inc/class.egw_framework.inc.php      |  12 +-
 .../idots/class.idots_framework.inc.php       |   2 +-
 preferences/inc/class.uipassword.inc.php      | 229 +++++++++---------
 preferences/password.php                      |  24 ++
 preferences/setup/setup.inc.php               |  15 ++
 5 files changed, 168 insertions(+), 114 deletions(-)
 create mode 100644 preferences/password.php

diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 50f23e5b66..ed6cac8dea 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -850,12 +850,20 @@ abstract class egw_framework
 		{
 			$this->_add_topmenu_item($apps['home']);
 		}
-
 		if($GLOBALS['egw_info']['user']['apps']['preferences'])
 		{
 			$this->_add_topmenu_item($apps['preferences']);
 		}
-
+		elseif(($pw_app = $GLOBALS['egw_info']['user']['apps']['password']) && 
+			!$GLOBALS['egw']->acl->check('nopasswordchange', 1))
+		{
+			$this->_add_topmenu_item(array(
+				'title' => $pw_app['title'],
+				'url'   => egw::link($pw_app['index']),
+				'icon'  => common::image($pw_app['icon'],$pw_app['icon_app']),
+			));
+		}
+		
 		if($GLOBALS['egw_info']['user']['apps']['manual'] && isset($apps['manual']))
 		{
 			$this->_add_topmenu_item($apps['manual']);
diff --git a/phpgwapi/templates/idots/class.idots_framework.inc.php b/phpgwapi/templates/idots/class.idots_framework.inc.php
index 7e57b2fb17..f3a8e2b281 100644
--- a/phpgwapi/templates/idots/class.idots_framework.inc.php
+++ b/phpgwapi/templates/idots/class.idots_framework.inc.php
@@ -567,7 +567,7 @@ class idots_framework extends egw_framework
 		$_item['url'] = $app_data['url'];
 		$_item['urlextra'] = $app_data['target'];
 		$_item['label'] = ($alt_label?$alt_label:$app_data['title']);
-		$this->tplsav2->menuitems[$app_data['name']] = $_item;
+		$this->tplsav2->menuitems[] = $_item;
 		$this->tplsav2->icon_or_star = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$this->template.'/images'.'/orange-ball.png';
 	}
 
diff --git a/preferences/inc/class.uipassword.inc.php b/preferences/inc/class.uipassword.inc.php
index 22e89cc8ff..054f50c16e 100644
--- a/preferences/inc/class.uipassword.inc.php
+++ b/preferences/inc/class.uipassword.inc.php
@@ -1,124 +1,131 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare - preferences                                                 *
-	* http://www.egroupware.org                                                *
-	* Written by Joseph Engo <jengo@phpgroupware.org>                          *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
+/**
+ * EGroupware preferences
+ *
+ * @package preferences
+ * @link http://www.egroupware.org
+ * @author Joseph Engo <jengo@phpgroupware.org>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-	/* $Id$ */
+class uipassword
+{
+	var $public_functions = array(
+		'change' => True
+	);
 
-	class uipassword
+	function uipassword()
 	{
-		var $public_functions = array(
-			'change' => True
-		);
+		$this->bo =& CreateObject('preferences.bopassword');
 
-		function uipassword()
+	}
+
+	function change()
+	{
+		$n_passwd   = $_POST['n_passwd'];
+		$n_passwd_2 = $_POST['n_passwd_2'];
+		$o_passwd_2 = $_POST['o_passwd_2'];
+
+		if($GLOBALS['egw']->acl->check('nopasswordchange', 1) || $_POST['cancel'])
 		{
-			$this->bo =& CreateObject('preferences.bopassword');
-
-		}
-
-		function change()
-		{
-			$n_passwd   = $_POST['n_passwd'];
-			$n_passwd_2 = $_POST['n_passwd_2'];
-			$o_passwd_2 = $_POST['o_passwd_2'];
-
-			if($GLOBALS['egw']->acl->check('nopasswordchange', 1) || $_POST['cancel'])
+			if ($GLOBALS['egw_info']['user']['apps']['preferences'])
 			{
-				 $GLOBALS['egw']->redirect_link('/preferences/index.php');
-				$GLOBALS['egw']->common->egw_exit();
-			}
-
-			$GLOBALS['egw']->template->set_file(array(
-				'form' => 'changepassword.tpl'
-			));
-			$GLOBALS['egw']->template->set_var('lang_enter_password',lang('Enter your new password'));
-			$GLOBALS['egw']->template->set_var('lang_reenter_password',lang('Re-enter your password'));
-			$GLOBALS['egw']->template->set_var('lang_enter_old_password',lang('Enter your old password'));
-			$GLOBALS['egw']->template->set_var('lang_change',lang('Change'));
-			$GLOBALS['egw']->template->set_var('lang_cancel',lang('Cancel'));
-			$GLOBALS['egw']->template->set_var('form_action',$GLOBALS['egw']->link('/index.php','menuaction=preferences.uipassword.change'));
-
-			if($GLOBALS['egw_info']['server']['auth_type'] != 'ldap')
-			{
-				$GLOBALS['egw']->template->set_var('sql_message',lang('note: This feature does *not* change your email password. This will '
-					. 'need to be done manually.'));
-			}
-
-			if($_POST['change'])
-			{
-				$o_passwd = $GLOBALS['egw_info']['user']['passwd'];
-
-				if($o_passwd != $o_passwd_2)
-				{
-					$errors[] = lang('The old password is not correct');
-				}
-
-				if($n_passwd != $n_passwd_2)
-				{
-					$errors[] = lang('The two passwords are not the same');
-				}
-
-				if(!$n_passwd)
-				{
-					$errors[] = lang('You must enter a password');
-				}
-				if($GLOBALS['egw_info']['server']['check_save_passwd'] && $error_msg = $GLOBALS['egw']->auth->crackcheck($n_passwd))
-				{
-					$errors[] = $error_msg;
-				}
-
-				if(is_array($errors))
-				{
-					$GLOBALS['egw']->common->egw_header();
-					echo parse_navbar();
-					$GLOBALS['egw']->template->set_var('messages',$GLOBALS['egw']->common->error_list($errors));
-					$GLOBALS['egw']->template->pfp('out','form');
-					$GLOBALS['egw']->common->egw_exit(True);
-				}
-
-				$passwd_changed = $this->bo->changepass($o_passwd, $n_passwd);
-				if(!$passwd_changed)
-				{
-					$errors[] = lang('Failed to change password.  Please contact your administrator.');
-					$GLOBALS['egw']->common->egw_header();
-					echo parse_navbar();
-					$GLOBALS['egw']->template->set_var('messages',$GLOBALS['egw']->common->error_list($errors));
-					$GLOBALS['egw']->template->pfp('out','form');
-					$GLOBALS['egw']->common->egw_exit(True);
-				}
-				else
-				{
-					$GLOBALS['egw']->session->appsession('password','phpgwapi',base64_encode($n_passwd));
-					$GLOBALS['egw_info']['user']['passwd'] = $n_passwd;
-					$GLOBALS['hook_values']['account_id'] = $GLOBALS['egw_info']['user']['account_id'];
-					$GLOBALS['hook_values']['old_passwd'] = $o_passwd;
-					$GLOBALS['hook_values']['new_passwd'] = $n_passwd;
-
-					// called for every app now, not only for the ones enabled for the user
-					$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array(
-						'location' => 'changepassword',
-					),False,True);
-					$GLOBALS['egw']->redirect_link('/preferences/index.php','cd=18');
-				}
+				egw::redirect_link('/preferences/index.php');
 			}
 			else
 			{
-				$GLOBALS['egw_info']['flags']['app_header'] = lang('Change your password');
-				$GLOBALS['egw']->common->egw_header();
-				echo parse_navbar();
-
-				$GLOBALS['egw']->template->set_var('messages',$_GET['message']);
-				$GLOBALS['egw']->template->pfp('out','form');
-				$GLOBALS['egw']->common->egw_footer();
+				egw::redirect_link('/index.php');	// redirect to start page
 			}
 		}
+
+		$GLOBALS['egw']->template->set_file(array(
+			'form' => 'changepassword.tpl'
+		));
+		$GLOBALS['egw']->template->set_var('lang_enter_password',lang('Enter your new password'));
+		$GLOBALS['egw']->template->set_var('lang_reenter_password',lang('Re-enter your password'));
+		$GLOBALS['egw']->template->set_var('lang_enter_old_password',lang('Enter your old password'));
+		$GLOBALS['egw']->template->set_var('lang_change',lang('Change'));
+		$GLOBALS['egw']->template->set_var('lang_cancel',lang('Cancel'));
+		$GLOBALS['egw']->template->set_var('form_action',
+			$GLOBALS['egw_info']['user']['apps']['preferences'] ?
+				egw::link('/index.php','menuaction=preferences.uipassword.change') :
+				egw::link('/preferences/password.php'));
+
+		if($GLOBALS['egw_info']['server']['auth_type'] != 'ldap')
+		{
+			$GLOBALS['egw']->template->set_var('sql_message',lang('note: This feature does *not* change your email password. This will '
+				. 'need to be done manually.'));
+		}
+
+		if($_POST['change'])
+		{
+			$o_passwd = $GLOBALS['egw_info']['user']['passwd'];
+
+			if($o_passwd != $o_passwd_2)
+			{
+				$errors[] = lang('The old password is not correct');
+			}
+
+			if($n_passwd != $n_passwd_2)
+			{
+				$errors[] = lang('The two passwords are not the same');
+			}
+
+			if(!$n_passwd)
+			{
+				$errors[] = lang('You must enter a password');
+			}
+			if($GLOBALS['egw_info']['server']['check_save_passwd'] && $error_msg = $GLOBALS['egw']->auth->crackcheck($n_passwd))
+			{
+				$errors[] = $error_msg;
+			}
+
+			if(is_array($errors))
+			{
+				common::egw_header();
+				echo parse_navbar();
+				$GLOBALS['egw']->template->set_var('messages',common::error_list($errors));
+				$GLOBALS['egw']->template->pfp('out','form');
+				common::egw_exit(True);
+			}
+
+			$passwd_changed = $this->bo->changepass($o_passwd, $n_passwd);
+			if(!$passwd_changed)
+			{
+				$errors[] = lang('Failed to change password.  Please contact your administrator.');
+				common::egw_header();
+				echo parse_navbar();
+				$GLOBALS['egw']->template->set_var('messages',common::error_list($errors));
+				$GLOBALS['egw']->template->pfp('out','form');
+				common::egw_exit(True);
+			}
+			else
+			{
+				$GLOBALS['egw']->session->appsession('password','phpgwapi',base64_encode($n_passwd));
+				$GLOBALS['egw_info']['user']['passwd'] = $n_passwd;
+				egw::invalidate_session_cache();
+				$GLOBALS['hook_values']['account_id'] = $GLOBALS['egw_info']['user']['account_id'];
+				$GLOBALS['hook_values']['old_passwd'] = $o_passwd;
+				$GLOBALS['hook_values']['new_passwd'] = $n_passwd;
+
+				// called for every app now, not only for the ones enabled for the user
+				$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array(
+					'location' => 'changepassword',
+				),False,True);
+				if ($GLOBALS['egw_info']['user']['apps']['preferences'])
+				{
+					egw::redirect_link('/preferences/index.php','cd=18');
+				}
+				$_GET['message'] = lang('Password changed');
+			}
+		}
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('Change your password');
+		common::egw_header();
+		echo parse_navbar();
+
+		$GLOBALS['egw']->template->set_var('messages','<span class="redItalic">'.htmlspecialchars($_GET['message']).'</span>');
+		$GLOBALS['egw']->template->pfp('out','form');
+		common::egw_footer();
 	}
-?>
+}
diff --git a/preferences/password.php b/preferences/password.php
new file mode 100644
index 0000000000..cbd8a3ecfc
--- /dev/null
+++ b/preferences/password.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * EGroupware preferences password change without preferences rights
+ *
+ * @package preferences
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <rb@stylite.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
+
+$GLOBALS['egw_info'] = array(
+	'flags' => array(
+		'noheader'   => True,
+		'nonavbar'   => True,
+		'currentapp' => 'password',
+	)
+);
+include('../header.inc.php');
+
+$GLOBALS['egw']->template = new Template(common::get_tpl_dir('preferences'));
+
+ExecMethod('preferences.uipassword.change');
+common::egw_footer();
diff --git a/preferences/setup/setup.inc.php b/preferences/setup/setup.inc.php
index dba7bd339e..1e96da59a6 100755
--- a/preferences/setup/setup.inc.php
+++ b/preferences/setup/setup.inc.php
@@ -29,3 +29,18 @@ $setup_info['preferences']['depends'][] = array(
 	'appname' => 'phpgwapi',
 	'versions' => Array('1.2','1.3','1.4','1.5','1.6','1.7')
 );
+
+/**
+ * Password change without preferences rights
+ */
+$setup_info['password']['name']      = 'password';
+$setup_info['password']['title']     = 'Password';
+$setup_info['password']['version']   = $setup_info['preferences']['version'];
+$setup_info['password']['app_order'] = 1;
+$setup_info['password']['tables']    = array();
+$setup_info['password']['enable']    = 2;
+$setup_info['password']['index']     = '/preferences/password.php';
+$setup_info['password']['author']    = $setup_info['preferences']['author']; 
+$setup_info['password']['maintainer']= $setup_info['preferences']['maintainer'];
+$setup_info['password']['license']   = $setup_info['preferences']['license'];
+$setup_info['password']['depends']   = $setup_info['preferences']['depends'];