Index: typo3/alt_doc.php
===================================================================
--- typo3/alt_doc.php	(revision 8132)
+++ typo3/alt_doc.php	(working copy)
@@ -862,7 +862,7 @@
 
 			// CLOSE button:
 		$buttons['close'] = '<a href="#" onclick="document.editform.closeDoc.value=1; document.editform.submit(); return false;" title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', TRUE) . '">' .
-					t3lib_iconWorks::getSpriteIcon('actions-document-close') . 
+					t3lib_iconWorks::getSpriteIcon('actions-document-close') .
 				'</a>';
 
 
@@ -874,7 +874,7 @@
 				if ($this->firstEl['deleteAccess'] && !$TCA[$this->firstEl['table']]['ctrl']['readOnly'] && !$this->getNewIconMode($this->firstEl['table'],'disableDelete')) {
 					$aOnClick = 'return deleteRecord(\''.$this->firstEl['table'].'\',\''.$this->firstEl['uid'].'\',unescape(\''.rawurlencode($this->retUrl).'\'));';
 					$buttons['delete'] = '<a href="#" onclick="'.htmlspecialchars($aOnClick).'" title="' . $LANG->getLL('deleteItem', TRUE) . '">' .
-							t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . 
+							t3lib_iconWorks::getSpriteIcon('actions-edit-delete') .
 							'</a>';
 				}
 
@@ -884,13 +884,13 @@
 					$aOnClick = 'window.location.href=\'show_rechis.php?element='.rawurlencode($this->firstEl['table'].':'.$this->firstEl['uid']).'&revert=ALL_FIELDS&sumUp=-1&returnUrl='.rawurlencode($this->R_URI).'\'; return false;';
 					$buttons['undo'] = '<a href="#" onclick="'.htmlspecialchars($aOnClick).'"'.
 						' title="' . htmlspecialchars(sprintf($LANG->getLL('undoLastChange'), t3lib_BEfunc::calcAge($GLOBALS['EXEC_TIME'] - $undoButtonR['tstamp'], $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.minutesHoursDaysYears')))) . '">' .
-							t3lib_iconWorks::getSpriteIcon('actions-edit-undo') . 
+							t3lib_iconWorks::getSpriteIcon('actions-edit-undo') .
 						'</a>';
 				}
 				if ($this->getNewIconMode($this->firstEl['table'],'showHistory'))	{
 					$aOnClick = 'window.location.href=\'show_rechis.php?element='.rawurlencode($this->firstEl['table'].':'.$this->firstEl['uid']).'&returnUrl='.rawurlencode($this->R_URI).'\'; return false;';
 					$buttons['history'] = '<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.
-							t3lib_iconWorks::getSpriteIcon('actions-document-history-open') . 
+							t3lib_iconWorks::getSpriteIcon('actions-document-history-open') .
 						'</a>';
 				}
 
Index: typo3/browse_links.php
===================================================================
--- typo3/browse_links.php	(revision 8132)
+++ typo3/browse_links.php	(working copy)
@@ -144,7 +144,7 @@
 		if ($tempDBmount) {
 	 		$altMountPoints = $tempDBmount;
 		}
-		
+
  		if ($altMountPoints) {
  			$GLOBALS['BE_USER']->groupData['webmounts'] = implode(',', array_unique(t3lib_div::intExplode(',', $altMountPoints)));
  			$GLOBALS['WEBMOUNTS'] = $GLOBALS['BE_USER']->returnWebmounts();
Index: typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
===================================================================
--- typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php	(revision 8132)
+++ typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php	(working copy)
@@ -835,7 +835,7 @@
 					);
 					$dbmount = $flashMessage->render();
 				}
-				
+
 				$content .= '
 			<!--
 				Wrapper table for page tree / record list:
Index: typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php
===================================================================
--- typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php	(revision 8132)
+++ typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php	(working copy)
@@ -126,7 +126,7 @@
 				$content .= $this->showLogin();
 			}
 		}
-		
+
 			// Process the redirect
 		if (($this->logintype === 'login' || $this->logintype === 'logout') && $this->redirectUrl && !$this->noRedirect) {
 			if (!$GLOBALS['TSFE']->fe_user->cookieId) {
Index: typo3/sysext/saltedpasswords/tests/tx_saltedpasswords_salts_blowfishTest.php
===================================================================
--- typo3/sysext/saltedpasswords/tests/tx_saltedpasswords_salts_blowfishTest.php	(revision 8132)
+++ typo3/sysext/saltedpasswords/tests/tx_saltedpasswords_salts_blowfishTest.php	(working copy)
@@ -178,10 +178,10 @@
 
 	/**
 	 * Tests authentication procedure with alphabet characters.
-	 * 
+	 *
 	 * Checks if a "plain-text password" is everytime mapped to the
-	 * same "salted password hash" when using the same salt. 
-	 * 
+	 * same "salted password hash" when using the same salt.
+	 *
 	 * @test
 	 */
 	public function authenticationWithValidAlphaCharClassPassword() {
@@ -237,7 +237,7 @@
 	 */
 	public function authenticationWithValidLatin1SpecialCharClassPassword() {
 		$this->skipTestIfBlowfishIsNotAvailable();
-		
+
 		$password = '';
 		for ($i = 160; $i <= 191; $i++) {
 			$password .= chr($i);
Index: typo3/sysext/saltedpasswords/sv1/class.tx_saltedpasswords_sv1.php
===================================================================
--- typo3/sysext/saltedpasswords/sv1/class.tx_saltedpasswords_sv1.php	(revision 8132)
+++ typo3/sysext/saltedpasswords/sv1/class.tx_saltedpasswords_sv1.php	(working copy)
@@ -196,7 +196,7 @@
 					// instanciate default method class
 				$this->objInstanceSaltedPW = tx_saltedpasswords_salts_factory::getSaltingInstance(NULL);
 				$this->updatePassword(
-					intval($user['uid']), 
+					intval($user['uid']),
 					array('password' => $this->objInstanceSaltedPW->getHashedPassword($password))
 				);
 			}
Index: typo3/sysext/taskcenter/task/conf.php
===================================================================
--- typo3/sysext/taskcenter/task/conf.php	(revision 8132)
+++ typo3/sysext/taskcenter/task/conf.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 	$MLANG['default']['tabs_images']['tab'] = 'task.gif';
 	$MLANG['default']['ll_ref']='LLL:EXT:taskcenter/task/locallang_mod.xml';
-	
+
 	$MCONF['script']='_DISPATCH';
 	$MCONF['access']='group,user';
 	$MCONF['name']='user_task';
Index: typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php
===================================================================
--- typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php	(revision 8132)
+++ typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php	(working copy)
@@ -64,7 +64,7 @@
 	 */
 	function tableRow($label, $data, $field)	{
 		$ret = '<tr><td>';
-		$ret.= '<a href="index.php?id=' . $this->pObj->id . '&e[' . $field . ']=1">' . 
+		$ret.= '<a href="index.php?id=' . $this->pObj->id . '&e[' . $field . ']=1">' .
 			t3lib_iconWorks::getSpriteIcon('actions-document-open', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:editField', true))) . '<strong>' . $label . '&nbsp;&nbsp;</strong></a>';
 		$ret .= '</td><td width="80%" class="bgColor4">' . $data . '&nbsp;</td></tr>';
 		return $ret;
@@ -498,7 +498,7 @@
 				// Edit all icon:
 			$outCode.= '<br /><a href="#" onClick="' . t3lib_BEfunc::editOnClick(rawurlencode('&createExtension=0') .
 				'&amp;edit[sys_template][' . $tplRow['uid'] . ']=edit', $BACK_PATH, '') . '"><strong>' .
-				t3lib_iconWorks::getSpriteIcon('actions-document-open', array('title'=> 
+				t3lib_iconWorks::getSpriteIcon('actions-document-open', array('title'=>
 				$GLOBALS['LANG']->getLL('editTemplateRecord') ))  . $GLOBALS['LANG']->getLL('editTemplateRecord') . '</strong></a>';
 			$theOutput.= $this->pObj->doc->section('', $outCode);
 
Index: typo3/sysext/install/mod/class.tx_install.php
===================================================================
--- typo3/sysext/install/mod/class.tx_install.php	(revision 8132)
+++ typo3/sysext/install/mod/class.tx_install.php	(working copy)
@@ -7859,7 +7859,7 @@
 					Change the Install Tool password.
 				</li>
 				<li>
-					Delete the ENABLE_INSTALL_TOOL file in the /typo3conf folder. This can be done 
+					Delete the ENABLE_INSTALL_TOOL file in the /typo3conf folder. This can be done
 					manually or through User tools &gt; User settings in the backend.
 				</li>
 				<li>
@@ -7933,7 +7933,7 @@
 	function messageBasicFinished() {
 		return '
 			<p>
-				You have completed the basic setup of the TYPO3 Content Management System. 
+				You have completed the basic setup of the TYPO3 Content Management System.
 				Choose between these options to continue:
 			</p>
 			<ul>
Index: typo3/sysext/install/updates/class.tx_coreupdates_compressionlevel.php
===================================================================
--- typo3/sysext/install/updates/class.tx_coreupdates_compressionlevel.php	(revision 8132)
+++ typo3/sysext/install/updates/class.tx_coreupdates_compressionlevel.php	(working copy)
@@ -43,7 +43,7 @@
 	 */
 	public function checkForUpdate(&$description) {
 		$description = '<strong>TYPO3_CONF_VARS[BE][compressionLevel] is enabled.</strong><br />
-		In TYPO3 4.4, compressionLevel was expanded to include automatic gzip compression of JavaScript and CSS stylessheet files. 
+		In TYPO3 4.4, compressionLevel was expanded to include automatic gzip compression of JavaScript and CSS stylessheet files.
 		<strong>To prevent the TYPO3 backend from being unusable, you must include the relevant lines from misc/advanced.htaccess.</strong>';
 		if (intval($GLOBALS['TYPO3_CONF_VARS']['BE']['compressionLevel']) > 0) {
 			return TRUE;
Index: typo3/sysext/install/updates/class.tx_coreupdates_statictemplates.php
===================================================================
--- typo3/sysext/install/updates/class.tx_coreupdates_statictemplates.php	(revision 8132)
+++ typo3/sysext/install/updates/class.tx_coreupdates_statictemplates.php	(working copy)
@@ -92,7 +92,7 @@
 				if ($message == 'continue') {
 					$customMessages[] = 'System Extension "statictemplates" was succesfully loaded, static templates are now supported.';
 					return TRUE;
-				} else { 
+				} else {
 					return FALSE;	// something went wrong
 				}
 			}
Index: typo3/sysext/fluid/Classes/ViewHelpers/Form/CheckboxViewHelper.php
===================================================================
--- typo3/sysext/fluid/Classes/ViewHelpers/Form/CheckboxViewHelper.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/ViewHelpers/Form/CheckboxViewHelper.php	(working copy)
@@ -115,11 +115,11 @@
 		$hiddenField = $this->renderHiddenFieldForEmptyValue();
 		return $hiddenField . $this->tag->render();
 	}
-	
+
 	/**
 	 * Renders a hidden field with the same name as the element, to make sure the empty value is submitted
 	 * in case the checkbox is not selected.
-	 * 
+	 *
 	 * @return string the hidden field.
 	 */
 	protected function renderHiddenFieldForEmptyValue() {
@@ -133,7 +133,7 @@
 		if (!in_array($nameOfElement, $checkboxFieldNames)) {
 			$checkboxFieldNames[] = $nameOfElement;
 			$this->viewHelperVariableContainer->addOrUpdate('Tx_Fluid_ViewHelpers_Form_CheckboxViewHelper', 'checkboxFieldNames', $checkboxFieldNames);
-			
+
 			$tagBuilder = t3lib_div::makeInstance('Tx_Fluid_Core_ViewHelper_TagBuilder', 'input');
 			$tagBuilder->addAttribute('type', 'hidden');
 			$tagBuilder->addAttribute('name', $nameOfElement);
Index: typo3/sysext/fluid/Classes/ViewHelpers/EscapeViewHelper.php
===================================================================
--- typo3/sysext/fluid/Classes/ViewHelpers/EscapeViewHelper.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/ViewHelpers/EscapeViewHelper.php	(working copy)
@@ -96,7 +96,7 @@
 
 	/**
 	 * Resolve the default encoding. If none is set in Frontend or Backend, uses UTF-8.
-	 * 
+	 *
 	 * @return string the encoding
 	 */
 	protected function resolveDefaultEncoding() {
Index: typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php
===================================================================
--- typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php	(working copy)
@@ -25,7 +25,7 @@
 	 * Wrapper for TYPO3s famous debug()
 	 *
 	 * @param string $title
-	 * @return string the altered string. 
+	 * @return string the altered string.
 	 * @author Bastian Waidelich <bastian@typo3.org>
 	 */
 	public function render($title = NULL) {
Index: typo3/sysext/fluid/Classes/ViewHelpers/LayoutViewHelper.php
===================================================================
--- typo3/sysext/fluid/Classes/ViewHelpers/LayoutViewHelper.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/ViewHelpers/LayoutViewHelper.php	(working copy)
@@ -23,9 +23,9 @@
 /**
  * With this tag, you can select a layout to be used..
  * <code><f:layout name="main" /></code>
- * 
  *
  *
+ *
  * @version $Id: LayoutViewHelper.php 1734 2009-11-25 21:53:57Z stucki $
  * @package Fluid
  * @subpackage ViewHelpers
Index: typo3/sysext/fluid/Classes/ViewHelpers/ElseViewHelper.php
===================================================================
--- typo3/sysext/fluid/Classes/ViewHelpers/ElseViewHelper.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/ViewHelpers/ElseViewHelper.php	(working copy)
@@ -22,7 +22,7 @@
 
 /**
  * Else-Branch of a condition. Only has an effect inside of "If". See the If-ViewHelper for documentation.
- * 
+ *
  * @see Tx_Fluid_ViewHelpers_IfViewHelper
  *
  * @version $Id: ElseViewHelper.php 1734 2009-11-25 21:53:57Z stucki $
Index: typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php
===================================================================
--- typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php	(working copy)
@@ -359,7 +359,7 @@
 
 		return 'tx_' . strtolower($extensionName) . '_' . strtolower($pluginName);
 	}
-	
+
 	/**
 	 * Remove Checkbox field names from ViewHelper variable container, to start from scratch when a new form starts.
 	 */
Index: typo3/sysext/fluid/Classes/ViewHelpers/Link/ExternalViewHelper.php
===================================================================
--- typo3/sysext/fluid/Classes/ViewHelpers/Link/ExternalViewHelper.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/ViewHelpers/Link/ExternalViewHelper.php	(working copy)
@@ -17,7 +17,7 @@
  * A view helper for creating links to external targets.
  *
  * = Examples =
- * 
+ *
  * <code>
  * <f:link.external uri="http://www.typo3.org" target="_blank">external link</f:link.external>
  * </code>
Index: typo3/sysext/fluid/Classes/ViewHelpers/Uri/ExternalViewHelper.php
===================================================================
--- typo3/sysext/fluid/Classes/ViewHelpers/Uri/ExternalViewHelper.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/ViewHelpers/Uri/ExternalViewHelper.php	(working copy)
@@ -18,7 +18,7 @@
  * Currently the specified URI is simply passed through.
  *
  * = Examples =
- * 
+ *
  * <code>
  * <f:uri.external uri="http://www.typo3.org" />
  * </code>
Index: typo3/sysext/fluid/Classes/ViewHelpers/AliasViewHelper.php
===================================================================
--- typo3/sysext/fluid/Classes/ViewHelpers/AliasViewHelper.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/ViewHelpers/AliasViewHelper.php	(working copy)
@@ -57,7 +57,7 @@
 
 	/**
 	 *
-	 * @param array $map 
+	 * @param array $map
 	 * @return string Rendered string
 	 * @author Bastian Waidelich <bastian@typo3.org>
 	 * @api
Index: typo3/sysext/fluid/Classes/View/TemplateView.php
===================================================================
--- typo3/sysext/fluid/Classes/View/TemplateView.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/View/TemplateView.php	(working copy)
@@ -190,7 +190,7 @@
 		$parserConfiguration = $this->objectManager->create('Tx_Fluid_Core_Parser_Configuration');
 		if ($this->controllerContext->getRequest()->getFormat() === 'html') {
 			$parserConfiguration->addInterceptor($this->objectManager->get('Tx_Fluid_Core_Parser_Interceptor_Escape'));
-			
+
 		}
 		return $parserConfiguration;
 	}
Index: typo3/sysext/fluid/Classes/Core/Parser/Configuration.php
===================================================================
--- typo3/sysext/fluid/Classes/Core/Parser/Configuration.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/Core/Parser/Configuration.php	(working copy)
@@ -78,7 +78,7 @@
 				$this->interceptors[$interceptionPoint]->detach($interceptor);
 			}
 		}
-		
+
 	}
 
 	/**
Index: typo3/sysext/fluid/Classes/Core/Parser/TemplateParser.php
===================================================================
--- typo3/sysext/fluid/Classes/Core/Parser/TemplateParser.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/Core/Parser/TemplateParser.php	(working copy)
@@ -581,7 +581,7 @@
 
 			// Object Accessor
 		if (strlen($objectAccessorString) > 0) {
-			
+
 			$node = $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode', $objectAccessorString);
 			$this->callInterceptor($node, Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_OBJECTACCESSOR);
 
@@ -809,7 +809,7 @@
 	protected function textHandler(Tx_Fluid_Core_Parser_ParsingState $state, $text) {
 		$node = $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_TextNode', $text);
 		$this->callInterceptor($node, Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_TEXT);
-		
+
 		$state->getNodeFromStack()->addChildNode($node);
 	}
 
Index: typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php
===================================================================
--- typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php	(revision 8132)
+++ typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php	(working copy)
@@ -39,11 +39,11 @@
 	/**
 	 * A stack of ViewHelperNodes which currently disable the interceptor.
 	 * Needed to enable the interceptor again.
-	 * 
+	 *
 	 * @var array<Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface>
 	 */
 	protected $viewHelperNodesWhichDisableTheInterceptor = array();
-	
+
 	/**
 	 * Inject object factory
 	 *
Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Fixtures/ConstraintSyntaxTreeNode.php
===================================================================
--- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Fixtures/ConstraintSyntaxTreeNode.php	(revision 8132)
+++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Fixtures/ConstraintSyntaxTreeNode.php	(working copy)
@@ -30,11 +30,11 @@
  */
 class Tx_Fluid_ViewHelpers_Fixtures_ConstraintSyntaxTreeNode extends Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode {
 	public $callProtocol = array();
-	
+
 	public function __construct(Tx_Fluid_Core_ViewHelper_TemplateVariableContainer $variableContainer) {
 		$this->variableContainer = $variableContainer;
 	}
-	
+
 	public function evaluateChildNodes() {
 		$identifiers = $this->variableContainer->getAllIdentifiers();
 		$callElement = array();
@@ -43,7 +43,7 @@
 		}
 		$this->callProtocol[] = $callElement;
 	}
-	
+
 	public function evaluate() {}
 }
 
Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php
===================================================================
--- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php	(revision 8132)
+++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php	(working copy)
@@ -84,7 +84,7 @@
 		$actual = $formViewHelper->_call('getName');
 		$this->assertSame($expected, $actual);
 	}
-	
+
 	/**
 	 * @test
 	 * @author Sebastian Kurfürst <sebastian@typo3.org>
@@ -372,7 +372,7 @@
 
 		$formViewHelper->_call('setErrorClassAttribute');
 	}
-	
+
 	/**
 	 * @test
 	 * @author Sebastian Kurfürst <sebastian@typo3.org>
@@ -385,7 +385,7 @@
 		$formFieldViewHelper->_set('arguments', $arguments);
 		$formFieldViewHelper->_call('addAdditionalIdentityPropertiesIfNeeded');
 	}
-	
+
 	/**
 	 * @test
 	 * @author Sebastian Kurfürst <sebastian@typo3.org>
@@ -406,19 +406,19 @@
 		$property = 'value.something';
 		$formName = 'myForm';
 		$expectedProperty = 'myForm[value]';
-		
+
 		$formFieldViewHelper = $this->getAccessibleMock('Tx_Fluid_ViewHelpers_Form_AbstractFormFieldViewHelper', array('renderHiddenIdentityField'), array(), '', FALSE);
 		$this->injectDependenciesIntoViewHelper($formFieldViewHelper);
 		$arguments = new Tx_Fluid_Core_ViewHelper_Arguments(array('property' => $property));
 		$formFieldViewHelper->_set('arguments', $arguments);
 		$this->viewHelperVariableContainer->expects($this->at(0))->method('get')->with('Tx_Fluid_ViewHelpers_FormViewHelper', 'formObject')->will($this->returnValue($mockFormObject));
 		$this->viewHelperVariableContainer->expects($this->at(1))->method('get')->with('Tx_Fluid_ViewHelpers_FormViewHelper', 'formName')->will($this->returnValue($formName));
-		
+
 		$formFieldViewHelper->expects($this->once())->method('renderHiddenIdentityField')->with($mockFormObject, $expectedProperty);
-		
+
 		$formFieldViewHelper->_call('addAdditionalIdentityPropertiesIfNeeded');
 	}
-	
+
 	/**
 	 * @test
 	 * @author Sebastian Kurfürst <sebastian@typo3.org>
@@ -440,17 +440,17 @@
 		$formName = 'myForm';
 		$expectedProperty1 = 'myForm[value]';
 		$expectedProperty2 = 'myForm[value][value]';
-		
+
 		$formFieldViewHelper = $this->getAccessibleMock('Tx_Fluid_ViewHelpers_Form_AbstractFormFieldViewHelper', array('renderHiddenIdentityField'), array(), '', FALSE);
 		$this->injectDependenciesIntoViewHelper($formFieldViewHelper);
 		$arguments = new Tx_Fluid_Core_ViewHelper_Arguments(array('property' => $property));
 		$formFieldViewHelper->_set('arguments', $arguments);
 		$this->viewHelperVariableContainer->expects($this->at(0))->method('get')->with('Tx_Fluid_ViewHelpers_FormViewHelper', 'formObject')->will($this->returnValue($mockFormObject));
 		$this->viewHelperVariableContainer->expects($this->at(1))->method('get')->with('Tx_Fluid_ViewHelpers_FormViewHelper', 'formName')->will($this->returnValue($formName));
-		
+
 		$formFieldViewHelper->expects($this->at(0))->method('renderHiddenIdentityField')->with($mockFormObject, $expectedProperty1);
 		$formFieldViewHelper->expects($this->at(1))->method('renderHiddenIdentityField')->with($mockFormObject, $expectedProperty2);
-		
+
 		$formFieldViewHelper->_call('addAdditionalIdentityPropertiesIfNeeded');
 	}
 }
Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/EmptySyntaxTreeNode.php
===================================================================
--- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/EmptySyntaxTreeNode.php	(revision 8132)
+++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/EmptySyntaxTreeNode.php	(working copy)
@@ -29,11 +29,11 @@
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  */
 class Tx_Fluid_ViewHelpers_Fixtures_EmptySyntaxTreeNode extends Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode {
-	
+
 	public function __construct() {
-		
+
 	}
-	
+
 }
 
 
Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PrintfViewHelperTest.php
===================================================================
--- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PrintfViewHelperTest.php	(revision 8132)
+++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PrintfViewHelperTest.php	(working copy)
@@ -45,6 +45,6 @@
 		$viewHelper->expects($this->once())->method('renderChildren')->will($this->returnValue('%2$s %1$d %3$s %2$s'));
 		$actualResult = $viewHelper->render(array(123, 'foo', 'bar'));
 		$this->assertEquals('foo 123 bar foo', $actualResult);
-	}	
+	}
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/fluid/Tests/Unit/View/Fixtures/TransparentSyntaxTreeNode.php
===================================================================
--- typo3/sysext/fluid/Tests/Unit/View/Fixtures/TransparentSyntaxTreeNode.php	(revision 8132)
+++ typo3/sysext/fluid/Tests/Unit/View/Fixtures/TransparentSyntaxTreeNode.php	(working copy)
@@ -30,7 +30,7 @@
  */
 class Tx_Fluid_View_Fixture_TransparentSyntaxTreeNode extends Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode {
 	public $variableContainer;
-	
+
 	public function evaluate() {
 	}
 }
Index: typo3/sysext/fluid/Tests/Unit/View/TemplateViewTest.php
===================================================================
--- typo3/sysext/fluid/Tests/Unit/View/TemplateViewTest.php	(revision 8132)
+++ typo3/sysext/fluid/Tests/Unit/View/TemplateViewTest.php	(working copy)
@@ -335,7 +335,7 @@
 		$templateView->setLayoutRootPath('MyLayouts');
 
 		$this->assertSame('vfs://MyTemplates/MyCoolAction.html', $templateView->_call('resolveTemplatePathAndFilename', 'myCoolAction'));
-		
+
 	}
 
 	/**
Index: typo3/sysext/fluid/Tests/Unit/Core/Parser/TemplateParserTest.php
===================================================================
--- typo3/sysext/fluid/Tests/Unit/Core/Parser/TemplateParserTest.php	(revision 8132)
+++ typo3/sysext/fluid/Tests/Unit/Core/Parser/TemplateParserTest.php	(working copy)
@@ -50,7 +50,7 @@
 	 * extractNamespaceDefinitions($templateString)
 	 * splitTemplateAtDynamicTags($templateString)
 	 * buildObjectTree($splitTemplate)
-	 * 
+	 *
 	 * @test
 	 * @author Karsten Dambekalns <karsten@typo3.org>
 	 */
Index: typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TemplateVariableContainerTest.php
===================================================================
--- typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TemplateVariableContainerTest.php	(revision 8132)
+++ typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TemplateVariableContainerTest.php	(working copy)
@@ -61,7 +61,7 @@
 		$this->assertSame($this->variableContainer->get('variable'), $object);
 		$this->assertSame($this->variableContainer['variable'], $object);
 	}
-	
+
 	/**
 	 * @test
 	 * @author Sebastian Kurfürst <sebastian@typo3.org>
@@ -72,7 +72,7 @@
 		$this->assertTrue($this->variableContainer->exists('variable'));
 		$this->assertTrue(isset($this->variableContainer['variable']));
 	}
-	
+
 	/**
 	 * @test
 	 * @author Sebastian Kurfürst <sebastian@typo3.org>
@@ -82,7 +82,7 @@
 		$this->variableContainer->add("variable", $object);
 		$this->assertEquals($this->variableContainer->getAllIdentifiers(), array('variable'), 'Added key is not visible in getAllIdentifiers');
 	}
-	
+
 	/**
 	 * @test
 	 * @expectedException Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException
@@ -110,7 +110,7 @@
 	public function gettingNonexistentValueThrowsException() {
 		$this->variableContainer->get('nonexistent');
 	}
-	
+
 	/**
 	 * @test
 	 * @expectedException Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException
@@ -119,7 +119,7 @@
 	public function deletingNonexistentValueThrowsException() {
 		$this->variableContainer->remove('nonexistent');
 	}
-	
+
 	/**
 	 * @test
 	 * @expectedException Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException
Index: typo3/sysext/belog/mod/index.php
===================================================================
--- typo3/sysext/belog/mod/index.php	(revision 8132)
+++ typo3/sysext/belog/mod/index.php	(working copy)
@@ -263,7 +263,7 @@
 			array(
 				array($GLOBALS['LANG']->getLL('users'), $menuU),
 				array($GLOBALS['LANG']->getLL('time'), $menuT . ($this->MOD_SETTINGS['time'] == 30 ?
-				'<br />' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:from', true) . ' ' . $inputDate . $pickerInputDate . 
+				'<br />' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:from', true) . ' ' . $inputDate . $pickerInputDate .
 				' ' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:to', true) . ' ' . $inputDate_end . $pickerInputDate_end . '&nbsp;' . $setButton : ''))
 			),
 			array(
Index: typo3/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php
===================================================================
--- typo3/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php	(revision 8132)
+++ typo3/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php	(working copy)
@@ -129,12 +129,12 @@
 					$tce->start($data,array());
 					$tce->process_datamap();
 					t3lib_BEfunc::setUpdateSignal('updatePageTree');
-					
+
 					$flashMessage = t3lib_div::makeInstance(
 						't3lib_FlashMessage',
 						'',
 						$GLOBALS['LANG']->getLL('wiz_newPages_create')
-					);					
+					);
 				} else {
 					$flashMessage = t3lib_div::makeInstance(
 						't3lib_FlashMessage',
@@ -143,7 +143,7 @@
 						t3lib_FlashMessage::ERROR
 					);
 				}
-				
+
 				$theCode.= $flashMessage->render();
 
 					// Display result:
Index: typo3/sysext/version/cm1/index.php
===================================================================
--- typo3/sysext/version/cm1/index.php	(revision 8132)
+++ typo3/sysext/version/cm1/index.php	(working copy)
@@ -162,7 +162,7 @@
 			),
 			'diff' => ''
 		);
-		
+
 		if($this->showDraftWorkspace === TRUE) {
 			$this->MOD_MENU['display'][-1] = $GLOBALS['LANG']->getLL('defaultDraft');
 		}
@@ -188,7 +188,7 @@
 	 */
 	function main()	{
 		global $BE_USER,$LANG,$BACK_PATH,$TCA_DESCR,$TCA,$CLIENT,$TYPO3_CONF_VARS;
-		
+
 			// Template markers
 		$markers = array(
 			'CSH' => '',
Index: typo3/sysext/beuser/mod/index.php
===================================================================
--- typo3/sysext/beuser/mod/index.php	(revision 8132)
+++ typo3/sysext/beuser/mod/index.php	(working copy)
@@ -1376,7 +1376,7 @@
 			$allCells = array();
 
 			$link_createNewUser='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick('&edit[be_users][0]=new',$this->doc->backPath,-1)).'" title="' . $GLOBALS['LANG']->getLL('newUser', true) . '">'.
-					t3lib_iconWorks::getSpriteIcon('actions-document-new') . 
+					t3lib_iconWorks::getSpriteIcon('actions-document-new') .
 				'</a>';
 
 			$allCells['USERS'] = '<table border="0" cellspacing="0" cellpadding="0" width="100%"><tr><td><strong>' . $GLOBALS['LANG']->getLL('usernames', TRUE) . '</strong></td><td width="12">' . $link_createNewUser . '</td></tr></table>';
@@ -1399,10 +1399,10 @@
 					if ($curUid != $uDat['uid'] && !$uDat['disable'] && ($uDat['starttime'] == 0 ||
 						$uDat['starttime'] < $GLOBALS['EXEC_TIME']) && ($uDat['endtime'] == 0 ||
 						$uDat['endtime'] > $GLOBALS['EXEC_TIME'])) {
-						$uItem .= '<a href="' . t3lib_div::linkThisScript(array('SwitchUser'=>$uDat['uid'])) . '" target="_top" title="' . htmlspecialchars($GLOBALS['LANG']->getLL('switchUserTo', true) . ' ' . $uDat['username']) . ' ' . $GLOBALS['LANG']->getLL('changeToMode', TRUE) . '">' . 
+						$uItem .= '<a href="' . t3lib_div::linkThisScript(array('SwitchUser'=>$uDat['uid'])) . '" target="_top" title="' . htmlspecialchars($GLOBALS['LANG']->getLL('switchUserTo', true) . ' ' . $uDat['username']) . ' ' . $GLOBALS['LANG']->getLL('changeToMode', TRUE) . '">' .
 								t3lib_iconWorks::getSpriteIcon('actions-system-backend-user-switch') .
 							'</a>'.
-							'<a href="' . t3lib_div::linkThisScript(array('SwitchUser'=>$uDat['uid'], 'switchBackUser' => 1)) . '" target="_top" title="' . htmlspecialchars($GLOBALS['LANG']->getLL('switchUserTo', true) . ' ' . $uDat['username']) . ' ' . $GLOBALS['LANG']->getLL('switchBackMode', TRUE) . '">' . 
+							'<a href="' . t3lib_div::linkThisScript(array('SwitchUser'=>$uDat['uid'], 'switchBackUser' => 1)) . '" target="_top" title="' . htmlspecialchars($GLOBALS['LANG']->getLL('switchUserTo', true) . ' ' . $uDat['username']) . ' ' . $GLOBALS['LANG']->getLL('switchBackMode', TRUE) . '">' .
 								t3lib_iconWorks::getSpriteIcon('actions-system-backend-user-emulate') .
 							'</a>';
 					}
@@ -1477,14 +1477,14 @@
 			'</a>';
 		} else {
 			$params='&data[' . $table . '][' . $row['uid'] . '][' . $hiddenField . ']=1';
-			$cells[]='<a href="' . $this->doc->issueCommand($params) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:disable', true) . '">' . 
+			$cells[]='<a href="' . $this->doc->issueCommand($params) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:disable', true) . '">' .
 				t3lib_iconWorks::getSpriteIcon('actions-edit-hide') .
 			'</a>';
 		}
 
 			// Delete
 		$params='&cmd[' . $table . '][' . $row['uid'] . '][delete]=1';
-		$cells[]='<a href="' . $this->doc->issueCommand($params) . '" onclick="return confirm(unescape(\'' . rawurlencode($GLOBALS['LANG']->getLL('sureToDelete', TRUE)) . '\'));" title="' . $GLOBALS['LANG']->getLL('delete', TRUE) . '">' . 
+		$cells[]='<a href="' . $this->doc->issueCommand($params) . '" onclick="return confirm(unescape(\'' . rawurlencode($GLOBALS['LANG']->getLL('sureToDelete', TRUE)) . '\'));" title="' . $GLOBALS['LANG']->getLL('delete', TRUE) . '">' .
 				t3lib_iconWorks::getSpriteIcon('actions-edit-delete') .
 			'</a>';
 
Index: typo3/sysext/lang/lang.php
===================================================================
--- typo3/sysext/lang/lang.php	(revision 8132)
+++ typo3/sysext/lang/lang.php	(working copy)
@@ -24,7 +24,7 @@
 *
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
-/**	
+/**
  * Contains the TYPO3 Backend Language class
  *
  * $Id$
@@ -73,8 +73,8 @@
 class language {
 		// This is set to the language that is currently running for the user
 	public $lang = 'default';
-		// Values like the labels in the tables.php-document are split by '|'. 
-		// This values defines which language is represented by which position 
+		// Values like the labels in the tables.php-document are split by '|'.
+		// This values defines which language is represented by which position
 		// in the resulting array after splitting a value. (NOTICE: Obsolete concept!)
 	public $langSplit = 'default';
 
@@ -209,7 +209,7 @@
 	 * @access public
 	 */
 	public function hscAndCharConv($lStr, $hsc) {
-			// labels returned from a locallang file used to be in the language of the charset. 
+			// labels returned from a locallang file used to be in the language of the charset.
 			// Since TYPO3 4.1 they are always in the charset of the BE.
 		if ($hsc) {
 			return htmlspecialchars($lStr);
@@ -219,12 +219,12 @@
 	}
 
 	/**
-	 * Will convert the input strings special chars (all above 127) to entities. 
+	 * Will convert the input strings special chars (all above 127) to entities.
 	 * The string is expected to be encoded in the charset, $this->charSet
 	 * This function is used to create strings that can be used in the Click Menu
-	 * (Context Sensitive Menus). The reason is that the values that are dynamically 
+	 * (Context Sensitive Menus). The reason is that the values that are dynamically
 	 * written into the <div> layer is decoded as iso-8859-1 no matter what charset
-	 * is used in the document otherwise (only MSIE, Mozilla is OK). 
+	 * is used in the document otherwise (only MSIE, Mozilla is OK).
 	 * So by converting we by-pass this problem.
 	 *
 	 * @param	string		Input string
@@ -288,7 +288,7 @@
 	}
 
 	/**
-	 * Works like ->getLL() but takes the $LOCAL_LANG array 
+	 * Works like ->getLL() but takes the $LOCAL_LANG array
 	 * used as the second argument instead of using the global array.
 	 *
 	 * @param	string		Label key
@@ -301,7 +301,7 @@
 			// Get Local Language
 		if (strcmp($LOCAL_LANG[$this->lang][$index], '')) {
 				// Returns local label if not blank.
-			$output = $this->hscAndCharConv($LOCAL_LANG[$this->lang][$index], $hsc);	
+			$output = $this->hscAndCharConv($LOCAL_LANG[$this->lang][$index], $hsc);
 		} else {
 				// Returns default label
 			$output = $this->hscAndCharConv($LOCAL_LANG['default'][$index], $hsc);
@@ -330,13 +330,13 @@
 			$t = explode('|', $input);
 			$out = $t[$this->langSplitIndex] ? $t[$this->langSplitIndex] : $t[0];
 			return $this->hscAndCharConv($out, $hsc);
-			// LOCAL_LANG:	
-		} else {	
+			// LOCAL_LANG:
+		} else {
 				// If cached label
 			if (!isset($this->LL_labels_cache[$this->lang][$input])) {
 				$restStr = trim(substr($input, 4));
 				$extPrfx = '';
-				
+
 					// ll-file refered to is found in an extension.
 				if (!strcmp(substr($restStr, 0, 4), 'EXT:')) {
 					$restStr = trim(substr($restStr, 4));
@@ -344,14 +344,14 @@
 				}
 				$parts = explode(':', $restStr);
 				$parts[0] = $extPrfx . $parts[0];
-				
+
 					// Getting data if not cached
 				if (!isset($this->LL_files_cache[$parts[0]])) {
 					$this->LL_files_cache[$parts[0]] = $this->readLLfile($parts[0]);
 
 						// If the current language is found in another file, load that as well:
 					$lFileRef = $this->localizedFileRef($parts[0]);
-					if ($lFileRef && is_string($this->LL_files_cache[$parts[0]][$this->lang]) 
+					if ($lFileRef && is_string($this->LL_files_cache[$parts[0]][$this->lang])
 							&& $this->LL_files_cache[$parts[0]][$this->lang] == 'EXT') {
 						$tempLL = $this->readLLfile($lFileRef);
 						$this->LL_files_cache[$parts[0]][$this->lang] = $tempLL[$this->lang];
@@ -379,7 +379,7 @@
 	}
 
 	/**
-	 * Loading $TCA_DESCR[$table]['columns'] with content from locallang files 
+	 * Loading $TCA_DESCR[$table]['columns'] with content from locallang files
 	 * as defined in $TCA_DESCR[$table]['refs']
 	 * $TCA_DESCR is a global var
 	 *
@@ -390,7 +390,7 @@
 	public function loadSingleTableDescription($table) {
 		global $TCA_DESCR;
 
-			// First the 'table' cannot already be loaded in [columns] 
+			// First the 'table' cannot already be loaded in [columns]
 			// and secondly there must be a references to locallang files available in [refs]
 		if (is_array($TCA_DESCR[$table])
 				&& !isset($TCA_DESCR[$table]['columns'])
Index: typo3/sysext/tstemplate/ts/index.php
===================================================================
--- typo3/sysext/tstemplate/ts/index.php	(revision 8132)
+++ typo3/sysext/tstemplate/ts/index.php	(working copy)
@@ -249,14 +249,14 @@
 		if ($this->id && $this->access) {
 				// View page
 			$buttons['view'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::viewOnClick($this->pageinfo['uid'], $GLOBALS['BACK_PATH'], t3lib_BEfunc::BEgetRootLine($this->pageinfo['uid']))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', TRUE) . '">' .
-						t3lib_iconWorks::getSpriteIcon('actions-document-view') . 
+						t3lib_iconWorks::getSpriteIcon('actions-document-view') .
 					'</a>';
 
 				// If access to Web>List for user, then link to that module.
 			if ($GLOBALS['BE_USER']->check('modules', 'web_list')) {
 				$href = $GLOBALS['BACK_PATH'] . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'));
 				$buttons['record_list'] = '<a href="' . htmlspecialchars($href) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList', TRUE) . '">' .
-							t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . 
+							t3lib_iconWorks::getSpriteIcon('actions-system-list-open') .
 						'</a>';
 			}
 
@@ -272,8 +272,8 @@
 					$buttons['save'] = t3lib_iconWorks::getSpriteIcon('actions-document-save',
 						array(
 							'html' => '<input type="image" class="c-inputButton" name="submit" src="clear.gif" ' .
-								'title="'. $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', TRUE) .'" ' . 
-								'value="'. $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', TRUE) .'" ' . 
+								'title="'. $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', TRUE) .'" ' .
+								'value="'. $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', TRUE) .'" ' .
 								'/>'
 						));
 
@@ -289,7 +289,7 @@
 						// CLOSE button
 					$buttons['close'] = t3lib_iconWorks::getSpriteIcon('actions-document-close',
 						array(
-							'html' => '<input type="image" class="c-inputButton" name="abort" src="clear.gif" ' . 
+							'html' => '<input type="image" class="c-inputButton" name="abort" src="clear.gif" ' .
 								'title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', TRUE) . '" ' .
 								'value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', TRUE) . '" ' .
 								'/>'
@@ -307,7 +307,7 @@
 				if(!empty($this->sObj)) {
 						// BACK
 					$buttons['back'] = '<a href="index.php?id=' . $this->id . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.goBack', TRUE) . '">' .
-									t3lib_iconWorks::getSpriteIcon('actions-view-go-back') . 
+									t3lib_iconWorks::getSpriteIcon('actions-view-go-back') .
 								'</a>';
 				}
 			}
@@ -372,7 +372,7 @@
 
 			// No template
 		$theOutput .= $this->doc->spacer(10);
-		
+
 		$flashMessage = t3lib_div::makeInstance(
 			't3lib_FlashMessage',
 			$GLOBALS['LANG']->getLL('noTemplateDescription') . '<br />' . $GLOBALS['LANG']->getLL('createTemplateToEditConfiguration'),
@@ -380,8 +380,8 @@
 			t3lib_FlashMessage::INFO
 		);
 		$theOutput .= $flashMessage->render();
-		
-		
+
+
 			// New standard?
 		if ($newStandardTemplate) {
 			if (t3lib_extMgm::isLoaded('statictemplates')) { // check wether statictemplates are supported
@@ -402,7 +402,7 @@
 				// Extension?
 			$theOutput .= $this->doc->spacer(10);
 			$theOutput .= $this->doc->section($GLOBALS['LANG']->getLL('newWebsite') . $staticsText, $GLOBALS['LANG']->getLL('newWebsiteDescription') . '<br /><br />' .
-			$selector . 
+			$selector .
 			'<input type="Submit" name="newWebsite" value="' . $GLOBALS['LANG']->getLL('newWebsiteAction') . '" />', 0, 1);
 		}
 			// Extension?
Index: typo3/sysext/css_styled_content/ext_localconf.php
===================================================================
--- typo3/sysext/css_styled_content/ext_localconf.php	(revision 8132)
+++ typo3/sysext/css_styled_content/ext_localconf.php	(working copy)
@@ -36,7 +36,7 @@
 );
 $TYPO3_CONF_VARS['SC_OPTIONS']['ext/install']['compat_version']['tx_cssstyledcontent_clearerdivsafterintexttextpicelements'] = array(
 	'title' => 'CSS Styled Content: clear divs, changed row space, corrected margins',
-	'version' => 4004000, 
+	'version' => 4004000,
 	'description' => '<ul><li>Clear divs will be generated by default for in-text right or left positioned textpic elements.</li><li>The default row space changes to 10px, to be in line with col space and text margin.</li><li>Rendering bugs with wrong margins were fixed (Default CSS changed).</li></ul>',
 );
 
Index: typo3/sysext/sys_action/ext_tables.php
===================================================================
--- typo3/sysext/sys_action/ext_tables.php	(revision 8132)
+++ typo3/sysext/sys_action/ext_tables.php	(working copy)
@@ -22,7 +22,7 @@
 			),
 			'typeicon_classes' => array(
 				'default' => 'mimetypes-x-sys_action',
-			), 
+			),
 			'type' => 'type',
 			'iconfile' => t3lib_extMgm::extRelPath($_EXTKEY).'x-sys_action.png',
 			'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php'
Index: typo3/sysext/statictemplates/class.tx_statictemplates.php
===================================================================
--- typo3/sysext/statictemplates/class.tx_statictemplates.php	(revision 8132)
+++ typo3/sysext/statictemplates/class.tx_statictemplates.php	(working copy)
@@ -39,7 +39,7 @@
 	 * @return	void
 	 */
 	public function includeStaticTypoScriptSources(&$params, &$pObj) {
-			// Static Template Records (static_template): include_static is a 
+			// Static Template Records (static_template): include_static is a
 			// list of static templates to include
 		if (trim($params['row']['include_static'])) {
 			$includeStaticArr = t3lib_div::intExplode(',', $params['row']['include_static']);
Index: typo3/sysext/impexp/app/index.php
===================================================================
--- typo3/sysext/impexp/app/index.php	(revision 8132)
+++ typo3/sysext/impexp/app/index.php	(working copy)
@@ -388,14 +388,14 @@
 				if (is_array($this->pageinfo) && $this->pageinfo['uid']) {
 					// View
 					$buttons['view'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::viewOnClick($this->pageinfo['uid'], $this->doc->backPath, t3lib_BEfunc::BEgetRootLine($this->pageinfo['uid']))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', TRUE) . '">' .
-						t3lib_iconWorks::getSpriteIcon('actions-document-view') . 
+						t3lib_iconWorks::getSpriteIcon('actions-document-view') .
 				  '</a>';
 
 					// Record list
 					if ($GLOBALS['BE_USER']->check('modules', 'web_list')) {
 						$href = $this->doc->backPath . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'));
 						$buttons['record_list'] = '<a href="' . htmlspecialchars($href) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList', TRUE) . '">' .
-							t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . 
+							t3lib_iconWorks::getSpriteIcon('actions-system-list-open') .
 					  '</a>';
 					}
 				}
Index: typo3/sysext/t3editor/classes/class.tx_t3editor.php
===================================================================
--- typo3/sysext/t3editor/classes/class.tx_t3editor.php	(revision 8132)
+++ typo3/sysext/t3editor/classes/class.tx_t3editor.php	(working copy)
@@ -42,7 +42,7 @@
 	const MODE_XML = 'xml';
 
 	protected $mode = '';
-	
+
 	/**
 	 * counts the editors on the current page
 	 *
@@ -148,7 +148,7 @@
 				'T3editor.PATH_t3e = "' . $GLOBALS['BACK_PATH'] . t3lib_extmgm::extRelPath('t3editor') . '"; ' . LF.
 				'T3editor.URL_typo3 = "' . htmlspecialchars(t3lib_div::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir) . '"; ' .LF.
 				'T3editor.template = '. $this->getPreparedTemplate() .';' .LF.
-				'T3editor.parserfile = ' . $this->getParserfileByMode($this->mode) . ';' .LF. 
+				'T3editor.parserfile = ' . $this->getParserfileByMode($this->mode) . ';' .LF.
 				'T3editor.stylesheet = ' . $this->getStylesheetByMode($this->mode) . ';'
 			);
 		}
Index: typo3/sysext/cms/layout/class.tx_cms_layout.php
===================================================================
--- typo3/sysext/cms/layout/class.tx_cms_layout.php	(revision 8132)
+++ typo3/sysext/cms/layout/class.tx_cms_layout.php	(working copy)
@@ -33,7 +33,7 @@
  *
  * @author	Kasper Skaarhoj <kasperYYYY@typo3.com>
  */
- 
+
 /**
  * [CLASS/FUNCTION INDEX of SCRIPT]
  *
@@ -234,18 +234,18 @@
 	 * @return	string		HTML for the listing
 	 */
 	function getExternalTables($id, $table)	{
- 
+
 		$type = $GLOBALS['SOBE']->MOD_SETTINGS[$table];
 		if (!isset($type)) {
 			$type = 0;
 		}
-		
-		$fList = $this->externalTables[$table][$type]['fList'];	// eg. "name;title;email;company,image" 
+
+		$fList = $this->externalTables[$table][$type]['fList'];	// eg. "name;title;email;company,image"
 															// The columns are separeted by comma ','.
-															// Values separated by semicolon ';' are shown in the same column. 
+															// Values separated by semicolon ';' are shown in the same column.
 		$icon = $this->externalTables[$table][$type]['icon'];
 		$addWhere = $this->externalTables[$table][$type]['addWhere'];
-		
+
 			// Create listing
 		$out = $this->makeOrdinaryList($table, $id, $fList, $icon, $addWhere);
 		return $out;
@@ -1222,7 +1222,7 @@
 						}
 						if ($this->doEdit)	{
 							$Nrow['__cmds__'].= '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath)).'" title="' . $GLOBALS['LANG']->getLL('edit', TRUE) . '">' .
-											t3lib_iconWorks::getSpriteIcon('actions-document-open') . 
+											t3lib_iconWorks::getSpriteIcon('actions-document-open') .
 										'</a>';
 						} else {
 							$Nrow['__cmds__'].= $this->noEditIcon();
@@ -1616,7 +1616,7 @@
 				$confirm = $GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->getLL('deleteWarning') .
 					t3lib_BEfunc::translationCount('tt_content', $row['uid'], ' ' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.translationsOfRecord')));
 				$out.='<a href="'.htmlspecialchars($GLOBALS['SOBE']->doc->issueCommand($params)).'" onclick="'.htmlspecialchars('return confirm('. $confirm .');').'" title="'.$GLOBALS['LANG']->getLL('deleteItem', TRUE).'">'.
-							t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . 
+							t3lib_iconWorks::getSpriteIcon('actions-edit-delete') .
 						'</a>';
 
 				if (!$disableMoveAndNewButtons) {
Index: typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php
===================================================================
--- typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php	(revision 8132)
+++ typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php	(working copy)
@@ -266,7 +266,7 @@
 
 		if (is_array($langRecUids[0]))	{
 			$params = '&edit[pages]['.implode(',',$langRecUids[0]).']=edit&columnsOnly=title,nav_title,l18n_cfg,hidden';
-			$editIco = '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$GLOBALS['BACK_PATH'])).'" title="' . $LANG->getLL('lang_renderl10n_editPageProperties', TRUE) . '">' . 
+			$editIco = '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$GLOBALS['BACK_PATH'])).'" title="' . $LANG->getLL('lang_renderl10n_editPageProperties', TRUE) . '">' .
 					t3lib_iconWorks::getSpriteIcon('actions-document-new') .
 				'</a>';
 		} else $editIco = '';
Index: typo3/sysext/cms/tslib/class.tslib_feuserauth.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_feuserauth.php	(revision 8132)
+++ typo3/sysext/cms/tslib/class.tslib_feuserauth.php	(working copy)
@@ -491,7 +491,7 @@
 	 */
 	function record_registration($recs,$maxSizeOfSessionData=0)	{
 
-			// Storing value ONLY if there is a confirmed cookie set (->cookieID), 
+			// Storing value ONLY if there is a confirmed cookie set (->cookieID),
 			// otherwise a shellscript could easily be spamming the fe_sessions table
 			// with bogus content and thus bloat the database
 		if (!$maxSizeOfSessionData || $this->cookieId) {
Index: typo3/sysext/cms/tslib/class.tslib_menu.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_menu.php	(revision 8132)
+++ typo3/sysext/cms/tslib/class.tslib_menu.php	(working copy)
@@ -514,7 +514,7 @@
 							} else {
 								$row = $loadDB->results['pages'][$val['id']];
 							}
-							
+
 								//Add versioning overlay for current page (to respect workspaces)
 							if (is_array($row)) {
 							    $this->sys_page->versionOL('pages', $row, true);
Index: typo3/sysext/dbal/class.ux_t3lib_db.php
===================================================================
--- typo3/sysext/dbal/class.ux_t3lib_db.php	(revision 8132)
+++ typo3/sysext/dbal/class.ux_t3lib_db.php	(working copy)
@@ -207,18 +207,18 @@
 
 	/**
 	 * Clears the cached field information file.
-	 * 
+	 *
 	 * @return void
 	 */
 	public function clearCachedFieldInfo() {
 		if (file_exists(PATH_typo3conf . 'temp_fieldInfo.php')) {
-			unlink(PATH_typo3conf . 'temp_fieldInfo.php');	
+			unlink(PATH_typo3conf . 'temp_fieldInfo.php');
 		}
 	}
 
 	/**
 	 * Caches the field information.
-	 * 
+	 *
 	 * @return void
 	 */
 	public function cacheFieldInfo() {
@@ -307,7 +307,7 @@
 					if (isset($mappedConf['mapFieldNames'][$fieldInfo['incFields'][$mappedTable]])) {
 						$fieldInfo['incFields'][$mappedTableAlias] = $mappedConf['mapFieldNames'][$fieldInfo['incFields'][$mappedTable]];
 					} else {
-						$fieldInfo['incFields'][$mappedTableAlias] = $fieldInfo['incFields'][$mappedTable];	
+						$fieldInfo['incFields'][$mappedTableAlias] = $fieldInfo['incFields'][$mappedTable];
 					}
 				}
 
@@ -324,7 +324,7 @@
 					if (isset($mappedConf['mapFieldNames'][$fieldInfo['primaryKeys'][$mappedTable]])) {
 						$fieldInfo['primaryKeys'][$mappedTableAlias] = $mappedConf['mapFieldNames'][$fieldInfo['primaryKeys'][$mappedTable]];
 					} else {
-						$fieldInfo['primaryKeys'][$mappedTableAlias] = $fieldInfo['primaryKeys'][$mappedTable];	
+						$fieldInfo['primaryKeys'][$mappedTableAlias] = $fieldInfo['primaryKeys'][$mappedTable];
 					}
 				}
 			}
@@ -755,7 +755,7 @@
 
 	/**
 	 * Truncates a table.
-	 * 
+	 *
 	 * @param	string		Database tablename
 	 * @return	mixed		Result from handler
 	 */
@@ -812,7 +812,7 @@
 	/**
 	 * Executes a query.
 	 * EXPERIMENTAL since TYPO3 4.4.
-	 * 
+	 *
 	 * @param array $queryParts SQL parsed by method parseSQL() of t3lib_sqlparser
 	 * @return pointer Result pointer / DBAL object
 	 * @see ux_t3lib_db::sql_query()
@@ -852,7 +852,7 @@
 					}
 				}
 				return $this->exec_INSERTquery($table, $values);
-				
+
 			case 'DELETE':
 				$table = $queryParts['TABLE'];
 				$whereClause = isset($queryParts['WHERE']) ? $this->SQLparser->compileWhereClause($queryParts['WHERE']) : '1=1';
@@ -1111,7 +1111,7 @@
 				$limit = $numrows . ' OFFSET ' . $offset;
 			}
 		}
-		
+
 		$select_fields = $this->quoteFieldNames($select_fields);
 		$from_table = $this->quoteFromTables($from_table);
 		$where_clause = $this->quoteWhereClause($where_clause);
@@ -1128,7 +1128,7 @@
 
 	/**
 	 * Creates a TRUNCATE TABLE SQL-statement
-	 * 
+	 *
 	 * @param	string		See exec_TRUNCATEquery()
 	 * @return	string		Full SQL query for TRUNCATE TABLE
 	 */
@@ -1154,7 +1154,7 @@
 
 	/**
 	 * Quotes components of a SELECT subquery.
-	 * 
+	 *
 	 * @param array $components	Array of SQL query components
 	 * @return array
 	 */
@@ -1226,7 +1226,7 @@
 					}
 					foreach ($select_fields[$k]['flow-control']['when'] as $key => $when) {
 						$select_fields[$k]['flow-control']['when'][$key]['when_value'] = $this->_quoteWhereClause($when['when_value']);
-					} 
+					}
 				}
 			}
 		}
@@ -1972,7 +1972,7 @@
 	 *
 	 * You should use exec_* function from this class instead!
 	 * If you don't, anything that does not use the _DEFAULT handler will probably break!
-	 * 
+	 *
 	 * This method was deprecated in TYPO3 4.1 but is considered experimental since TYPO3 4.4
 	 * as it tries to handle the query correctly anyway.
 	 *
@@ -2275,7 +2275,7 @@
 						$theKey['Table'] = $tableName;
 						$theKey['Non_unique'] = (int) !$theKey['unique'];
 						$theKey['Key_name'] = str_replace($tableName.'_','',$k);
-	
+
 							// the following are probably not needed anyway...
 						$theKey['Collation'] = '';
 						$theKey['Cardinality'] = '';
@@ -2284,7 +2284,7 @@
 						$theKey['Null'] = '';
 						$theKey['Index_type'] = '';
 						$theKey['Comment'] = '';
-	
+
 							// now map multiple fields into multiple rows (we mimic MySQL, remember...)
 						$keycols = $theKey['columns'];
 						while (list($c, $theCol) = each($keycols)) {
@@ -2299,7 +2299,7 @@
 				$theKey['Table'] = $tableName;
 				$theKey['Non_unique'] = 0;
 				$theKey['Key_name'] = 'PRIMARY';
-	
+
 					// the following are probably not needed anyway...
 				$theKey['Collation'] = '';
 				$theKey['Cardinality'] = '';
@@ -2308,7 +2308,7 @@
 				$theKey['Null'] = '';
 				$theKey['Index_type'] = '';
 				$theKey['Comment'] = '';
-	
+
 					// now map multiple fields into multiple rows (we mimic MySQL, remember...)
 				if ($priKeyRow !== FALSE) {
 					while (list($c, $theCol) = each($priKeyRow)) {
@@ -2801,7 +2801,7 @@
 						// Mapping withTable of the JOIN
 					$withTableKey = $this->getMappingKey($join['withTable']);
 					if ($this->mapping[$withTableKey]['mapTableName']) {
-						$tables[$k]['JOIN'][$joinCnt]['withTable'] = $this->mapping[$withTableKey]['mapTableName'];					
+						$tables[$k]['JOIN'][$joinCnt]['withTable'] = $this->mapping[$withTableKey]['mapTableName'];
 					}
 					$onPartsArray = array();
 						// Mapping ON parts of the JOIN
@@ -2987,7 +2987,7 @@
 						}
 
 							// Mapping flow-control statements
-						if (isset($sqlPartArray[$k]['flow-control'])) {							
+						if (isset($sqlPartArray[$k]['flow-control'])) {
 							if (isset($sqlPartArray[$k]['flow-control']['type'])) {
 								$temp = array($sqlPartArray[$k]['flow-control']);
 								$this->map_sqlParts($temp, $t);	// Call recursively!
@@ -3004,7 +3004,7 @@
 								$sqlPartArray[$k]['value']['args'][$argK]['table'] = $this->mapping[$tableKey]['mapTableName'];
 							}
 							if (is_array($this->mapping[$tableKey]['mapFieldNames']) && isset($this->mapping[$tableKey]['mapFieldNames'][$fieldDef['field']])) {
-								$sqlPartArray[$k]['value']['args'][$argK]['field'] = $this->mapping[$tableKey]['mapFieldNames'][$fieldDef['field']];	
+								$sqlPartArray[$k]['value']['args'][$argK]['field'] = $this->mapping[$tableKey]['mapFieldNames'][$fieldDef['field']];
 							}
 						}
 					}
Index: typo3/sysext/dbal/class.tx_dbal_autoloader.php
===================================================================
--- typo3/sysext/dbal/class.tx_dbal_autoloader.php	(revision 8132)
+++ typo3/sysext/dbal/class.tx_dbal_autoloader.php	(working copy)
@@ -143,7 +143,7 @@
 			$header = 'Error';
 			$message = $e->getMessage();
 			t3lib_timeTrack::debug_typo3PrintError($header, $message, FALSE, t3lib_div::getIndpEnv('TYPO3_SITE_URL'));
-			exit; 
+			exit;
 		}
 	}
 
Index: typo3/sysext/dbal/class.tx_dbal_installtool.php
===================================================================
--- typo3/sysext/dbal/class.tx_dbal_installtool.php	(revision 8132)
+++ typo3/sysext/dbal/class.tx_dbal_installtool.php	(working copy)
@@ -73,7 +73,7 @@
 
 	/**
 	 * Hooks into Installer to let a non-MySQL database to be configured.
-	 * 
+	 *
 	 * @param array $markers
 	 * @param integer $step
 	 * @param tx_install $instObj
@@ -92,7 +92,7 @@
 
 	/**
 	 * Hooks into Installer to modify lines to be written to localconf.php.
-	 * 
+	 *
 	 * @param array $lines
 	 * @param integer $step
 	 * @param tx_install $instObj
@@ -137,14 +137,14 @@
 
 	/**
 	 * Creates a specialized form to configure the DBMS connection.
-	 * 
+	 *
 	 * @param array $markers
 	 * @param tx_install $instObj
 	 * @return void
 	 */
 	protected function createConnectionForm(array &$markers, tx_install $instObj) {
 			// Normalize current driver
-		if (!$this->driver) {  
+		if (!$this->driver) {
 			$this->driver = $this->getDefaultDriver();
 		}
 
@@ -450,7 +450,7 @@
 
 	/**
 	 * Creates a specialized form to configure the database.
-	 * 
+	 *
 	 * @param array $markers
 	 * @param tx_install $instObj
 	 */
Index: typo3/sysext/dbal/tests/dbPostgresqlTest.php
===================================================================
--- typo3/sysext/dbal/tests/dbPostgresqlTest.php	(revision 8132)
+++ typo3/sysext/dbal/tests/dbPostgresqlTest.php	(working copy)
@@ -28,7 +28,7 @@
 
 /**
  * Testcase for class ux_t3lib_db. Testing PostgreSQL database handling.
- * 
+ *
  * $Id$
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
@@ -86,7 +86,7 @@
 
 	/**
 	 * Cleans a SQL query.
-	 *  
+	 *
 	 * @param mixed $sql
 	 * @return mixed (string or array)
 	 */
@@ -101,7 +101,7 @@
 	}
 
 	/**
-	 * @test 
+	 * @test
 	 */
 	public function configurationIsUsingAdodbAndDriverPostgres() {
 		$configuration = $GLOBALS['TYPO3_DB']->conf['handlerCfg'];
@@ -110,7 +110,7 @@
 		$this->assertTrue($GLOBALS['TYPO3_DB']->runningADOdbDriver('postgres') !== FALSE, 'Not using postgres driver');
 	}
 
-	/** 
+	/**
 	 * @test
 	 */
 	public function tablesWithMappingAreDetected() {
Index: typo3/sysext/dbal/tests/sqlParserGeneralTest.php
===================================================================
--- typo3/sysext/dbal/tests/sqlParserGeneralTest.php	(revision 8132)
+++ typo3/sysext/dbal/tests/sqlParserGeneralTest.php	(working copy)
@@ -27,7 +27,7 @@
 
 /**
  * Testcase for class ux_t3lib_sqlparser
- * 
+ *
  * $Id$
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
@@ -59,7 +59,7 @@
 
 	/**
 	 * Cleans a SQL query.
-	 *  
+	 *
 	 * @param mixed $sql
 	 * @return mixed (string or array)
 	 */
@@ -185,7 +185,7 @@
 	public function canSelectAllFieldsFromPages() {
 		$sql = 'SELECT * FROM pages';
 		$expected = $sql;
-		$actual = $this->cleanSql($this->fixture->debug_testSQL($sql)); 
+		$actual = $this->cleanSql($this->fixture->debug_testSQL($sql));
 
 		$this->assertEquals($expected, $actual);
 	}
@@ -434,7 +434,7 @@
 	public function canUseInnerJoinInSelect() {
 		$sql = 'SELECT pages.uid, be_users.username FROM be_users INNER JOIN pages ON pages.cruser_id = be_users.uid';
 		$expected = 'SELECT pages.uid, be_users.username FROM be_users INNER JOIN pages ON pages.cruser_id=be_users.uid';
-		$actual = $this->cleanSql($this->fixture->debug_testSQL($sql)); 
+		$actual = $this->cleanSql($this->fixture->debug_testSQL($sql));
 
 		$this->assertEquals($expected, $actual);
 	}
@@ -445,7 +445,7 @@
 	public function canUseMultipleInnerJoinsInSelect() {
 		$sql = 'SELECT * FROM tt_news_cat INNER JOIN tt_news_cat_mm ON tt_news_cat.uid = tt_news_cat_mm.uid_foreign INNER JOIN tt_news ON tt_news.uid = tt_news_cat_mm.uid_local';
 		$expected = 'SELECT * FROM tt_news_cat INNER JOIN tt_news_cat_mm ON tt_news_cat.uid=tt_news_cat_mm.uid_foreign INNER JOIN tt_news ON tt_news.uid=tt_news_cat_mm.uid_local';
-		$actual = $this->cleanSql($this->fixture->debug_testSQL($sql)); 
+		$actual = $this->cleanSql($this->fixture->debug_testSQL($sql));
 
 		$this->assertEquals($expected, $actual);
 	}
@@ -464,7 +464,7 @@
 
 	/**
 	 * @test
-	 * @see http://bugs.typo3.org/view.php?id=14182 
+	 * @see http://bugs.typo3.org/view.php?id=14182
 	 */
 	public function canParseMultipleJoinConditionsWithLessThanOperator() {
 		$sql = 'SELECT * FROM T1 LEFT OUTER JOIN T2 ON T2.size < 4 OR T2.pid = T1.uid WHERE T1.cr_userid = 1';
@@ -478,7 +478,7 @@
 	// Tests concerning DB management
 	///////////////////////////////////////
 
-	/** 
+	/**
 	 * @test
 	 * @see http://bugs.typo3.org/view.php?id=4466
 	 */
Index: typo3/sysext/dbal/tests/dbMssqlTest.php
===================================================================
--- typo3/sysext/dbal/tests/dbMssqlTest.php	(revision 8132)
+++ typo3/sysext/dbal/tests/dbMssqlTest.php	(working copy)
@@ -28,7 +28,7 @@
 
 /**
  * Testcase for class ux_t3lib_db. Testing MS SQL database handling.
- * 
+ *
  * $Id$
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
@@ -86,7 +86,7 @@
 
 	/**
 	 * Cleans a SQL query.
-	 *  
+	 *
 	 * @param mixed $sql
 	 * @return mixed (string or array)
 	 */
@@ -101,7 +101,7 @@
 	}
 
 	/**
-	 * @test 
+	 * @test
 	 */
 	public function configurationIsUsingAdodbAndDriverMssql() {
 		$configuration = $GLOBALS['TYPO3_DB']->conf['handlerCfg'];
@@ -110,7 +110,7 @@
 		$this->assertTrue($GLOBALS['TYPO3_DB']->runningADOdbDriver('mssql') !== FALSE, 'Not using mssql driver');
 	}
 
-	/** 
+	/**
 	 * @test
 	 */
 	public function tablesWithMappingAreDetected() {
@@ -162,7 +162,7 @@
 		$query = $this->cleanSql($GLOBALS['TYPO3_DB']->SELECTquery(
 			'*, CASE WHEN' .
 				' LOCATE(' . $GLOBALS['TYPO3_DB']->fullQuoteStr('(fce)', 'tx_templavoila_tmplobj') . ', datastructure)>0 THEN 2' .
-				' ELSE 1' . 
+				' ELSE 1' .
 			' END AS scope',
 			'tx_templavoila_tmplobj',
 			'1=1'
@@ -179,7 +179,7 @@
 		$query = $this->cleanSql($GLOBALS['TYPO3_DB']->SELECTquery(
 			'*, CASE WHEN' .
 				' LOCATE(' . $GLOBALS['TYPO3_DB']->fullQuoteStr('(fce)', 'tx_templavoila_tmplobj') . ', datastructure, 4)>0 THEN 2' .
-				' ELSE 1' . 
+				' ELSE 1' .
 			' END AS scope',
 			'tx_templavoila_tmplobj',
 			'1=1'
@@ -195,7 +195,7 @@
 	public function locateStatementIsProperlyRemapped() {
 		$selectFields = '*, CASE WHEN' .
 				' LOCATE(' . $GLOBALS['TYPO3_DB']->fullQuoteStr('(fce)', 'tx_templavoila_tmplobj') . ', datastructure, 4)>0 THEN 2' .
-				' ELSE 1' . 
+				' ELSE 1' .
 			' END AS scope';
 		$fromTables   = 'tx_templavoila_tmplobj';
 		$whereClause  = '1=1';
@@ -216,7 +216,7 @@
 	public function locateStatementWithExternalTableIsProperlyRemapped() {
 		$selectFields = '*, CASE WHEN' .
 				' LOCATE(' . $GLOBALS['TYPO3_DB']->fullQuoteStr('(fce)', 'tx_templavoila_tmplobj') . ', tx_templavoila_tmplobj.datastructure, 4)>0 THEN 2' .
-				' ELSE 1' . 
+				' ELSE 1' .
 			' END AS scope';
 		$fromTables   = 'tx_templavoila_tmplobj';
 		$whereClause  = '1=1';
Index: typo3/sysext/dbal/tests/dbOracleTest.php
===================================================================
--- typo3/sysext/dbal/tests/dbOracleTest.php	(revision 8132)
+++ typo3/sysext/dbal/tests/dbOracleTest.php	(working copy)
@@ -28,7 +28,7 @@
 
 /**
  * Testcase for class ux_t3lib_db. Testing Oracle database handling.
- * 
+ *
  * $Id$
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
@@ -86,7 +86,7 @@
 
 	/**
 	 * Cleans a SQL query.
-	 *  
+	 *
 	 * @param mixed $sql
 	 * @return mixed (string or array)
 	 */
@@ -101,7 +101,7 @@
 	}
 
 	/**
-	 * @test 
+	 * @test
 	 */
 	public function configurationIsUsingAdodbAndDriverOci8() {
 		$configuration = $GLOBALS['TYPO3_DB']->conf['handlerCfg'];
@@ -110,7 +110,7 @@
 		$this->assertTrue($GLOBALS['TYPO3_DB']->runningADOdbDriver('oci8') !== FALSE, 'Not using oci8 driver');
 	}
 
-	/** 
+	/**
 	 * @test
 	 */
 	public function tablesWithMappingAreDetected() {
@@ -269,7 +269,7 @@
 		$this->assertEquals($expected, $query);
 	}
 
-	/** 
+	/**
 	 * @test
 	 * @see http://bugs.typo3.org/view.php?id=6198
 	 */
@@ -500,7 +500,7 @@
 		$groupBy      = '';
 		$orderBy      = '';
 
-			// First call to possibly alter (in memory) the mapping from localconf.php 
+			// First call to possibly alter (in memory) the mapping from localconf.php
 		$GLOBALS['TYPO3_DB']->_callRef('map_remapSELECTQueryParts', $selectFields, $fromTables, $whereClause, $groupBy, $orderBy);
 
 		$selectFields = 'uid';
@@ -687,7 +687,7 @@
 		$expected .= ' OR (instr("tt_content"."fe_group", \'-1,\',1,1) > 0)';
 		$expected .= ' OR (instr("tt_content"."fe_group", \',-1\',1,1) > 0)';
 		$expected .= ' OR "tt_content"."fe_group" = \'-1\'))';
-		$this->assertEquals($expected, $select); 
+		$this->assertEquals($expected, $select);
 	}
 
 	///////////////////////////////////////
@@ -755,7 +755,7 @@
 				firstname varchar(60) DEFAULT \'\' NOT NULL,
 				language varchar(2) NOT NULL,
 				tstamp int(11) DEFAULT \'0\' NOT NULL,
-				
+
 				PRIMARY KEY (uid),
 				KEY name (name)
 			);
@@ -763,7 +763,7 @@
 
 		$components = $GLOBALS['TYPO3_DB']->SQLparser->_callRef('parseCREATETABLE', $parseString);
 		$this->assertTrue(is_array($components), 'Not an array: ' . $components);
-	
+
 		$sqlCommands = $GLOBALS['TYPO3_DB']->SQLparser->_call('compileCREATETABLE', $components);
 		$this->assertTrue(is_array($sqlCommands), 'Not an array: ' . $sqlCommands);
 		$this->assertEquals(2, count($sqlCommands));
@@ -866,7 +866,7 @@
 				$table = $GLOBALS['TYPO3_DB']->mapping[$table]['mapTableName'];
 			}
 		}
-		
+
 		$query = $this->cleanSql($GLOBALS['TYPO3_DB']->DELETEquery($table, $where));
 		$expected = 'DELETE FROM "cf_cache_hash_tags" WHERE "identifier" IN (';
 		$expected .= 'SELECT "identifier" FROM "cf_cache_pages" WHERE "crdate"+"lifetime" < ' . $currentTime . ' AND "lifetime" > 0';
@@ -935,7 +935,7 @@
 			'process_id, CASE active' .
 				' WHEN 1 THEN ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('one', 'tx_crawler_process') .
 				' WHEN 2 THEN ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('two', 'tx_crawler_process') .
-				' ELSE ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('out of range', 'tx_crawler_process') . 
+				' ELSE ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('out of range', 'tx_crawler_process') .
 			' END AS number',
 			'tx_crawler_process',
 			'1=1'
@@ -952,7 +952,7 @@
 		$selectFields = 'process_id, CASE active' .
 				' WHEN 1 THEN ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('one', 'tx_crawler_process') .
 				' WHEN 2 THEN ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('two', 'tx_crawler_process') .
-				' ELSE ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('out of range', 'tx_crawler_process') . 
+				' ELSE ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('out of range', 'tx_crawler_process') .
 			' END AS number';
 		$fromTables   = 'tx_crawler_process';
 		$whereClause  = '1=1';
@@ -975,7 +975,7 @@
 		$selectFields = 'process_id, CASE tt_news.uid' .
 				' WHEN 1 THEN ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('one', 'tt_news') .
 				' WHEN 2 THEN ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('two', 'tt_news') .
-				' ELSE ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('out of range', 'tt_news') . 
+				' ELSE ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('out of range', 'tt_news') .
 			' END AS number';
 		$fromTables   = 'tx_crawler_process, tt_news';
 		$whereClause  = '1=1';
@@ -998,7 +998,7 @@
 		$query = $this->cleanSql($GLOBALS['TYPO3_DB']->SELECTquery(
 			'*, CASE WHEN' .
 				' LOCATE(' . $GLOBALS['TYPO3_DB']->fullQuoteStr('(fce)', 'tx_templavoila_tmplobj') . ', datastructure)>0 THEN 2' .
-				' ELSE 1' . 
+				' ELSE 1' .
 			' END AS scope',
 			'tx_templavoila_tmplobj',
 			'1=1'
@@ -1015,7 +1015,7 @@
 		$query = $this->cleanSql($GLOBALS['TYPO3_DB']->SELECTquery(
 			'*, CASE WHEN' .
 				' LOCATE(' . $GLOBALS['TYPO3_DB']->fullQuoteStr('(fce)', 'tx_templavoila_tmplobj') . ', datastructure, 4)>0 THEN 2' .
-				' ELSE 1' . 
+				' ELSE 1' .
 			' END AS scope',
 			'tx_templavoila_tmplobj',
 			'1=1'
Index: typo3/sysext/dbal/tests/FakeDbConnection.php
===================================================================
--- typo3/sysext/dbal/tests/FakeDbConnection.php	(revision 8132)
+++ typo3/sysext/dbal/tests/FakeDbConnection.php	(working copy)
@@ -25,7 +25,7 @@
 
 /**
  * Fake ADOdb connection factory.
- * 
+ *
  * $Id: FakeDbConnection.php 27006 2009-11-25 22:08:07Z xperseguers $
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
@@ -37,7 +37,7 @@
 
 	/**
 	 * Creates a fake database connection.
-	 * 
+	 *
 	 * @param ux_t3lib_db $db
 	 * @param string $databaseType Type of the database (e.g., 'oracle')
 	 * @param string $driver Driver to use (e.g., 'oci8')
Index: typo3/sysext/dbal/tests/dbGeneralTest.php
===================================================================
--- typo3/sysext/dbal/tests/dbGeneralTest.php	(revision 8132)
+++ typo3/sysext/dbal/tests/dbGeneralTest.php	(working copy)
@@ -27,7 +27,7 @@
 
 /**
  * Testcase for class ux_t3lib_db.
- * 
+ *
  * $Id$
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
@@ -47,7 +47,7 @@
 	 */
 	protected $loadedExtensions;
 
-	/** 
+	/**
 	 * @var array
 	 */
 	protected $temporaryFiles;
@@ -83,7 +83,7 @@
 
 	/**
 	 * Cleans a SQL query.
-	 *  
+	 *
 	 * @param mixed $sql
 	 * @return mixed (string or array)
 	 */
@@ -99,7 +99,7 @@
 
 	/**
 	 * Creates a fake extension with a given table definition.
-	 * 
+	 *
 	 * @param string $tableDefinition SQL script to create the extension's tables
 	 * @return void
 	 */
Index: typo3/sysext/dbal/tests/fixtures/postgresql.config.php
===================================================================
--- typo3/sysext/dbal/tests/fixtures/postgresql.config.php	(revision 8132)
+++ typo3/sysext/dbal/tests/fixtures/postgresql.config.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 /**
  * PostgreSQL configuration
- * 
+ *
  * $Id$
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
@@ -12,11 +12,11 @@
 global $TYPO3_CONF_VARS;
 
 $TYPO3_CONF_VARS['EXTCONF']['dbal']['handlerCfg'] = array(
-	'_DEFAULT' => array( 
-		'type' => 'adodb', 
+	'_DEFAULT' => array(
+		'type' => 'adodb',
 		'config' => array(
 			'driver' => 'postgres',
 		),
-	), 
+	),
 );
 ?>
\ No newline at end of file
Index: typo3/sysext/dbal/tests/fixtures/mssql.config.php
===================================================================
--- typo3/sysext/dbal/tests/fixtures/mssql.config.php	(revision 8132)
+++ typo3/sysext/dbal/tests/fixtures/mssql.config.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 /**
  * MS SQL configuration
- * 
+ *
  * $Id: mssql.config.php 29886 2010-02-09 21:39:29Z xperseguers $
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
@@ -12,13 +12,13 @@
 global $TYPO3_CONF_VARS;
 
 $TYPO3_CONF_VARS['EXTCONF']['dbal']['handlerCfg'] = array(
-	'_DEFAULT' => array( 
-		'type' => 'adodb', 
+	'_DEFAULT' => array(
+		'type' => 'adodb',
 		'config' => array(
 			'driver' => 'mssql',
 			'useNameQuote' => FALSE,
 		),
-	), 
+	),
 );
 
 $TYPO3_CONF_VARS['EXTCONF']['dbal']['mapping'] = array(
Index: typo3/sysext/dbal/tests/fixtures/oci8.config.php
===================================================================
--- typo3/sysext/dbal/tests/fixtures/oci8.config.php	(revision 8132)
+++ typo3/sysext/dbal/tests/fixtures/oci8.config.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 /**
  * Oracle configuration
- * 
+ *
  * $Id: oci8.config.php 27125 2009-11-29 17:21:28Z xperseguers $
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
@@ -12,12 +12,12 @@
 global $TYPO3_CONF_VARS;
 
 $TYPO3_CONF_VARS['EXTCONF']['dbal']['handlerCfg'] = array(
-	'_DEFAULT' => array( 
-		'type' => 'adodb', 
+	'_DEFAULT' => array(
+		'type' => 'adodb',
 		'config' => array(
 			'driver' => 'oci8',
 		),
-	), 
+	),
 );
 
 $TYPO3_CONF_VARS['EXTCONF']['dbal']['mapping'] = array(
Index: typo3/sysext/dbal/tests/BaseTestCase.php
===================================================================
--- typo3/sysext/dbal/tests/BaseTestCase.php	(revision 8132)
+++ typo3/sysext/dbal/tests/BaseTestCase.php	(working copy)
@@ -27,11 +27,11 @@
  *
  * Subclass this base class if you want to take advantage of the framework
  * capabilities.
- * 
+ *
  * $Id: BaseTestCase.php 27006 2009-11-25 22:08:07Z xperseguers $
- * 
+ *
  * @author Robert Lemke <robert@typo3.org>
- * 
+ *
  * This method is backported from FLOW3's BaseTestCase class.
  * @link https://svn.typo3.org/FLOW3/Packages/Testing/trunk/Classes/BaseTestCase.php
  *
Index: typo3/sysext/dbal/class.ux_t3lib_sqlparser.php
===================================================================
--- typo3/sysext/dbal/class.ux_t3lib_sqlparser.php	(revision 8132)
+++ typo3/sysext/dbal/class.ux_t3lib_sqlparser.php	(working copy)
@@ -67,7 +67,7 @@
 				if (is_array($selectFields)) {
 					$outputParts = array();
 					foreach ($selectFields as $k => $v) {
-		
+
 							// Detecting type:
 						switch($v['type'])	{
 							case 'function':
@@ -82,12 +82,12 @@
 								$outputParts[$k] = ($v['distinct'] ? $v['distinct'] : '') . ($v['table'] ? $v['table'] . '.' : '') . $v['field'];
 								break;
 						}
-		
+
 							// Alias:
 						if ($v['as']) {
 							$outputParts[$k] .= ' ' . $v['as_keyword'] . ' ' . $v['as'];
 						}
-		
+
 							// Specifically for ORDER BY and GROUP BY field lists:
 						if ($v['sortDir']) {
 							$outputParts[$k] .= ' ' . $v['sortDir'];
@@ -100,10 +100,10 @@
 					$output .= implode(', ', $outputParts);
 				}
 				break;
-		}	
+		}
 		return $output;
 	}
- 
+
  	/**
 	 * Compiles a CASE ... WHEN flow-control construct based on input array (made with ->parseCaseStatement())
 	 *
@@ -152,7 +152,7 @@
 	protected function compileAddslashes($str) {
 		return $str;
 	}
-	
+
 	/*************************
 	 *
 	 * Compiling queries
@@ -494,7 +494,7 @@
 
 									// Set field/table with modifying prefix if any:
 								$output .= ' ' . trim($v['modifier']) . ' ';
-	
+
 									// DBAL-specific: Set calculation, if any:
 								if ($v['calc'] === '&' && $functionMapping) {
 									switch(TRUE) {
@@ -531,7 +531,7 @@
 												}
 												$compareValue = ' ' . $v['value']['operator'] . '(' . implode(',', $values) . ')';
 											} else {
-												$compareValue = $v['value'][1] . $this->compileAddslashes(trim($v['value'][0], '%')) . $v['value'][1]; 
+												$compareValue = $v['value'][1] . $this->compileAddslashes(trim($v['value'][0], '%')) . $v['value'][1];
 											}
 												// To be on the safe side
 											$isLob = TRUE;
@@ -554,7 +554,7 @@
 											// Detecting value type; list or plain:
 										if (t3lib_div::inList('NOTIN,IN', strtoupper(str_replace(array(' ', "\t", "\r", "\n"), '', $v['comparator'])))) {
 											if (isset($v['subquery'])) {
-												$output .= ' (' . $this->compileSELECT($v['subquery']) . ')';	
+												$output .= ' (' . $this->compileSELECT($v['subquery']) . ')';
 											} else {
 												$valueBuffer = array();
 												foreach ($v['value'] as $realValue) {
Index: typo3/sysext/dbal/lib/class.tx_dbal_tsparserext.php
===================================================================
--- typo3/sysext/dbal/lib/class.tx_dbal_tsparserext.php	(revision 8132)
+++ typo3/sysext/dbal/lib/class.tx_dbal_tsparserext.php	(working copy)
@@ -39,7 +39,7 @@
 
 	/**
 	 * Renders a message for EM.
-	 * 
+	 *
 	 * @param array $params
 	 * @param t3lib_tsStyleConfig $tsObj
 	 * @return string
Index: typo3/sysext/info_pagetsconfig/class.tx_infopagetsconfig_webinfo.php
===================================================================
--- typo3/sysext/info_pagetsconfig/class.tx_infopagetsconfig_webinfo.php	(revision 8132)
+++ typo3/sysext/info_pagetsconfig/class.tx_infopagetsconfig_webinfo.php	(working copy)
@@ -119,7 +119,7 @@
 						$params = '&edit[pages]['.$editIdList.']=edit&columnsOnly=TSconfig';
 						$onclickUrl = t3lib_BEfunc::editOnClick($params,$GLOBALS['BACK_PATH'],'');
 						$editIcon = '<a href="#" onclick="'.htmlspecialchars($onclickUrl).'" title="'.$GLOBALS['LANG']->getLL('editTSconfig',1).'">'.
-									t3lib_iconWorks::getSpriteIcon('actions-document-open') . 
+									t3lib_iconWorks::getSpriteIcon('actions-document-open') .
 								'</a>';
 					}
 
Index: typo3/sysext/setup/mod/index.php
===================================================================
--- typo3/sysext/setup/mod/index.php	(revision 8132)
+++ typo3/sysext/setup/mod/index.php	(working copy)
@@ -895,10 +895,10 @@
 		}
 		return t3lib_BEfunc::cshItem('_MOD_user_setup', $str, $this->doc->backPath, '|', false, 'margin-bottom:0px;');
 	}
-	
+
 	/**
 	 * Returns array with fields defined in $GLOBALS['TYPO3_USER_SETTINGS']['showitem']
-	 * 
+	 *
 	 * @param	void
 	 * @return	array	array with fieldnames visible in form
 	 */
Index: typo3/sysext/adodb/adodb/contrib/toxmlrpc.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/contrib/toxmlrpc.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/contrib/toxmlrpc.inc.php	(working copy)
@@ -2,11 +2,11 @@
     /**
     * Helper functions to convert between ADODB recordset objects and XMLRPC values.
     * Uses John Lim's AdoDB and Edd Dumbill's phpxmlrpc libs
-    * 
+    *
     * @author Daniele Baroncelli
     * @author Gaetano Giunta
     * @copyright (c) 2003-2004 Giunta/Baroncelli. All rights reserved.
-    * 
+    *
     * @todo some more error checking here and there
     * @todo document the xmlrpc-struct used to encode recordset info
     * @todo verify if using xmlrpc_encode($rs->GetArray()) would work with:
@@ -16,10 +16,10 @@
 
     /**
     * Include the main libraries
-    */    
+    */
     require_once('xmlrpc.inc');
     if (!defined('ADODB_DIR')) require_once('adodb.inc.php');
-            
+
     /**
     * Builds an xmlrpc struct value out of an AdoDB recordset
     */
@@ -113,12 +113,12 @@
         }
         $body = new xmlrpcval ($rows, "array");
 
-        return $body;    
+        return $body;
     }
-    
+
     /**
     * Returns an xmlrpc struct value as string out of an AdoDB recordset
-    */    
+    */
     function rs2xmlrpcstring (&$adodbrs) {
         $xmlrpc = rs2xmlrpcval ($adodbrs);
         if ($xmlrpc)
@@ -129,24 +129,24 @@
 
     /**
     * Given a well-formed xmlrpc struct object returns an AdoDB object
-    * 
+    *
     * @todo add some error checking on the input value
     */
     function xmlrpcval2rs (&$xmlrpcval) {
 
         $fields_array = array();
         $data_array = array();
- 
-        // rebuild column information  
+
+        // rebuild column information
         $header = $xmlrpcval->structmem('header');
-        
+
         $numfields = $header->structmem('fieldcount');
         $numfields = $numfields->scalarval();
         $numrecords = $header->structmem('recordcount');
         $numrecords = $numrecords->scalarval();
         $sqlstring = $header->structmem('sql');
         $sqlstring = $sqlstring->scalarval();
-        
+
         $fieldinfo = $header->structmem('fieldinfo');
         for ($i = 0; $i < $numfields; $i++) {
             $temp = $fieldinfo->arraymem($i);
Index: typo3/sysext/adodb/adodb/adodb-errorhandler.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-errorhandler.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-errorhandler.inc.php	(working copy)
@@ -13,7 +13,7 @@
 
 
 // added Claudio Bustos  clbustos#entelchile.net
-if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
+if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
 
 if (!defined('ADODB_ERROR_HANDLER')) define('ADODB_ERROR_HANDLER','ADODB_Error_Handler');
 
@@ -74,6 +74,6 @@
 
 
 	//print "<p>$s</p>";
-	trigger_error($s,ADODB_ERROR_HANDLER_TYPE); 
+	trigger_error($s,ADODB_ERROR_HANDLER_TYPE);
 }
 ?>
Index: typo3/sysext/adodb/adodb/adodb-pager.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-pager.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-pager.inc.php	(working copy)
@@ -2,21 +2,21 @@
 
 /*
 	V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-	  Released under both BSD license and Lesser GPL library license. 
-	  Whenever there is any discrepancy between the two licenses, 
-	  the BSD license will take precedence. 
+	  Released under both BSD license and Lesser GPL library license.
+	  Whenever there is any discrepancy between the two licenses,
+	  the BSD license will take precedence.
 	  Set tabs to 4 for best viewing.
 
-  	This class provides recordset pagination with 
-	First/Prev/Next/Last links. 
-	
+  	This class provides recordset pagination with
+	First/Prev/Next/Last links.
+
 	Feel free to modify this class for your own use as
-	it is very basic. To learn how to use it, see the 
+	it is very basic. To learn how to use it, see the
 	example in adodb/tests/testpaging.php.
-	
+
 	"Pablo Costa" <pablo@cbsp.com.br> implemented Render_PageLinks().
-	
-	Please note, this class is entirely unsupported, 
+
+	Please note, this class is entirely unsupported,
 	and no free support requests except for bug reports
 	will be entertained by the author.
 
@@ -29,10 +29,10 @@
 	var $curr_page;	// current page number before Render() called, calculated in constructor
 	var $rows;		// number of rows per page
     var $linksPerPage=10; // number of links per page in navigation bar
-    var $showPageLinks; 
+    var $showPageLinks;
 
 	var $gridAttributes = 'width=100% border=1 bgcolor=white';
-	
+
 	// Localize text strings here
 	var $first = '<code>|&lt;</code>';
 	var $prev = '<code>&lt;&lt;</code>';
@@ -45,39 +45,39 @@
 	var $page = 'Page';
 	var $linkSelectedColor = 'red';
 	var $cache = 0;  #secs to cache with CachePageExecute()
-	
+
 	//----------------------------------------------
 	// constructor
 	//
 	// $db	adodb connection object
 	// $sql	sql statement
-	// $id	optional id to identify which pager, 
-	//		if you have multiple on 1 page. 
+	// $id	optional id to identify which pager,
+	//		if you have multiple on 1 page.
 	//		$id should be only be [a-z0-9]*
 	//
 	function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false)
 	{
 	global $PHP_SELF;
-	
+
 		$curr_page = $id.'_curr_page';
 		if (!empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks
-		
+
 		$this->sql = $sql;
 		$this->id = $id;
 		$this->db = $db;
 		$this->showPageLinks = $showPageLinks;
-		
-		$next_page = $id.'_next_page';	
-		
+
+		$next_page = $id.'_next_page';
+
 		if (isset($_GET[$next_page])) {
 			$_SESSION[$curr_page] = (integer) $_GET[$next_page];
 		}
 		if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page
-		
+
 		$this->curr_page = $_SESSION[$curr_page];
-		
+
 	}
-	
+
 	//---------------------------
 	// Display link to first page
 	function Render_First($anchor=true)
@@ -85,51 +85,51 @@
 	global $PHP_SELF;
 		if ($anchor) {
 	?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a> &nbsp; 
+		<a href="<?php echo $PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a> &nbsp;
 	<?php
 		} else {
 			print "$this->first &nbsp; ";
 		}
 	}
-	
+
 	//--------------------------
 	// Display link to next page
 	function render_next($anchor=true)
 	{
 	global $PHP_SELF;
-	
+
 		if ($anchor) {
 		?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php echo $this->next;?></a> &nbsp; 
+		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php echo $this->next;?></a> &nbsp;
 		<?php
 		} else {
 			print "$this->next &nbsp; ";
 		}
 	}
-	
+
 	//------------------
 	// Link to last page
-	// 
+	//
 	// for better performance with large recordsets, you can set
 	// $this->db->pageExecuteCountRows = false, which disables
 	// last page counting.
 	function render_last($anchor=true)
 	{
 	global $PHP_SELF;
-	
+
 		if (!$this->db->pageExecuteCountRows) return;
-		
+
 		if ($anchor) {
 		?>
-			<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo $this->last;?></a> &nbsp; 
+			<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo $this->last;?></a> &nbsp;
 		<?php
 		} else {
 			print "$this->last &nbsp; ";
 		}
 	}
-	
+
 	//---------------------------------------------------
-	// original code by "Pablo Costa" <pablo@cbsp.com.br> 
+	// original code by "Pablo Costa" <pablo@cbsp.com.br>
         function render_pagelinks()
         {
         global $PHP_SELF;
@@ -146,21 +146,21 @@
             $end = $start+$linksperpage-1;
 			$link = $this->id . "_next_page";
             if($end > $pages) $end = $pages;
-			
-			
+
+
 			if ($this->startLinks && $start > 1) {
 				$pos = $start - 1;
 				$numbers .= "<a href=$PHP_SELF?$link=$pos>$this->startLinks</a>  ";
-            } 
-			
+            }
+
 			for($i=$start; $i <= $end; $i++) {
                 if ($this->rs->AbsolutePage() == $i)
                     $numbers .= "<font color=$this->linkSelectedColor><strong>$i</strong></font>  ";
-                else 
+                else
                      $numbers .= "<a href=$PHP_SELF?$link=$i>$i</a>  ";
-            
+
             }
-			if ($this->moreLinks && $end < $pages) 
+			if ($this->moreLinks && $end < $pages)
 				$numbers .= "<a href=$PHP_SELF?$link=$i>$this->moreLinks</a>  ";
             print $numbers . ' &nbsp; ';
         }
@@ -170,13 +170,13 @@
 	global $PHP_SELF;
 		if ($anchor) {
 	?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php echo $this->prev;?></a> &nbsp; 
-	<?php 
+		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php echo $this->prev;?></a> &nbsp;
+	<?php
 		} else {
 			print "$this->prev &nbsp; ";
 		}
 	}
-	
+
 	//--------------------------------------------------------
 	// Simply rendering of grid. You should override this for
 	// better control over the format of the grid
@@ -193,7 +193,7 @@
 		ob_end_clean();
 		return $s;
 	}
-	
+
 	//-------------------------------------------------------
 	// Navigation bar
 	//
@@ -222,7 +222,7 @@
 		ob_end_clean();
 		return $s;
 	}
-	
+
 	//-------------------
 	// This is the footer
 	function RenderPageCount()
@@ -233,17 +233,17 @@
 		if ($this->curr_page > $lastPage) $this->curr_page = 1;
 		return "<font size=-1>$this->page ".$this->curr_page."/".$lastPage."</font>";
 	}
-	
+
 	//-----------------------------------
 	// Call this class to draw everything.
 	function Render($rows=10)
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		$this->rows = $rows;
-		
+
 		if ($this->db->dataProvider == 'informix') $this->db->cursorType = IFX_SCROLL;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
 		if ($this->cache)
@@ -251,27 +251,27 @@
 		else
 			$rs = $this->db->PageExecute($this->sql,$rows,$this->curr_page);
 		$ADODB_COUNTRECS = $savec;
-		
+
 		$this->rs = $rs;
 		if (!$rs) {
 			print "<h3>Query failed: $this->sql</h3>";
 			return;
 		}
-		
-		if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) 
+
+		if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage()))
 			$header = $this->RenderNav();
 		else
 			$header = "&nbsp;";
-		
+
 		$grid = $this->RenderGrid();
 		$footer = $this->RenderPageCount();
-		
+
 		$this->RenderLayout($header,$grid,$footer);
-		
+
 		$rs->Close();
 		$this->rs = false;
 	}
-	
+
 	//------------------------------------------------------
 	// override this to control overall layout and formating
 	function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige')
Index: typo3/sysext/adodb/adodb/adodb-time.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-time.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-time.inc.php	(working copy)
@@ -4,33 +4,33 @@
 Download: http://phplens.com/phpeverywhere/
 
 PHP native date functions use integer timestamps for computations.
-Because of this, dates are restricted to the years 1901-2038 on Unix 
-and 1970-2038 on Windows due to integer overflow for dates beyond 
-those years. This library overcomes these limitations by replacing the 
-native function's signed integers (normally 32-bits) with PHP floating 
+Because of this, dates are restricted to the years 1901-2038 on Unix
+and 1970-2038 on Windows due to integer overflow for dates beyond
+those years. This library overcomes these limitations by replacing the
+native function's signed integers (normally 32-bits) with PHP floating
 point numbers (normally 64-bits).
 
 Dates from 100 A.D. to 3000 A.D. and later
 have been tested. The minimum is 100 A.D. as <100 will invoke the
-2 => 4 digit year conversion. The maximum is billions of years in the 
-future, but this is a theoretical limit as the computation of that year 
+2 => 4 digit year conversion. The maximum is billions of years in the
+future, but this is a theoretical limit as the computation of that year
 would take too long with the current implementation of adodb_mktime().
 
 This library replaces native functions as follows:
 
-<pre>	
+<pre>
 	getdate()  with  adodb_getdate()
-	date()     with  adodb_date() 
+	date()     with  adodb_date()
 	gmdate()   with  adodb_gmdate()
 	mktime()   with  adodb_mktime()
 	gmmktime() with  adodb_gmmktime()
 	strftime() with  adodb_strftime()
 	strftime() with  adodb_gmstrftime()
 </pre>
-	
+
 The parameters are identical, except that adodb_date() accepts a subset
-of date()'s field formats. Mktime() will convert from local time to GMT, 
-and date() will convert from GMT to local time, but daylight savings is 
+of date()'s field formats. Mktime() will convert from local time to GMT,
+and date() will convert from GMT to local time, but daylight savings is
 not handled currently.
 
 This library is independant of the rest of ADOdb, and can be used
@@ -39,25 +39,25 @@
 PERFORMANCE
 
 For high speed, this library uses the native date functions where
-possible, and only switches to PHP code when the dates fall outside 
+possible, and only switches to PHP code when the dates fall outside
 the 32-bit signed integer range.
 
 GREGORIAN CORRECTION
 
-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday, 
-October 4, 1582 (Julian) was followed immediately by Friday, October 15, 
-1582 (Gregorian). 
+Pope Gregory shortened October of A.D. 1582 by ten days. Thursday,
+October 4, 1582 (Julian) was followed immediately by Friday, October 15,
+1582 (Gregorian).
 
 Since 0.06, we handle this correctly, so:
 
-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) 
+adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582)
 	== 24 * 3600 (1 day)
 
 =============================================================================
 
 COPYRIGHT
 
-(c) 2003-2005 John Lim and released under BSD-style license except for code by 
+(c) 2003-2005 John Lim and released under BSD-style license except for code by
 jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
 and originally found at http://www.php.net/manual/en/function.mktime.php
 
@@ -77,10 +77,10 @@
 ** FUNCTION adodb_getdate($date=false)
 
 Returns an array containing date information, as getdate(), but supports
-dates greater than 1901 to 2038. The local date/time format is derived from a 
-heuristic the first time adodb_getdate is called. 
-	 
-	 
+dates greater than 1901 to 2038. The local date/time format is derived from a
+heuristic the first time adodb_getdate is called.
+
+
 ** FUNCTION adodb_date($fmt, $timestamp = false)
 
 Convert a timestamp to a formatted local date. If $timestamp is not defined, the
@@ -90,45 +90,45 @@
 The format fields that adodb_date supports:
 
 <pre>
-	a - "am" or "pm" 
-	A - "AM" or "PM" 
-	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 
-	D - day of the week, textual, 3 letters; e.g. "Fri" 
-	F - month, textual, long; e.g. "January" 
-	g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 
-	G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 
-	h - hour, 12-hour format; i.e. "01" to "12" 
-	H - hour, 24-hour format; i.e. "00" to "23" 
-	i - minutes; i.e. "00" to "59" 
-	j - day of the month without leading zeros; i.e. "1" to "31" 
-	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"  
-	L - boolean for whether it is a leap year; i.e. "0" or "1" 
-	m - month; i.e. "01" to "12" 
-	M - month, textual, 3 letters; e.g. "Jan" 
-	n - month without leading zeros; i.e. "1" to "12" 
-	O - Difference to Greenwich time in hours; e.g. "+0200" 
-	Q - Quarter, as in 1, 2, 3, 4 
-	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" 
-	s - seconds; i.e. "00" to "59" 
-	S - English ordinal suffix for the day of the month, 2 characters; 
-	   			i.e. "st", "nd", "rd" or "th" 
+	a - "am" or "pm"
+	A - "AM" or "PM"
+	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31"
+	D - day of the week, textual, 3 letters; e.g. "Fri"
+	F - month, textual, long; e.g. "January"
+	g - hour, 12-hour format without leading zeros; i.e. "1" to "12"
+	G - hour, 24-hour format without leading zeros; i.e. "0" to "23"
+	h - hour, 12-hour format; i.e. "01" to "12"
+	H - hour, 24-hour format; i.e. "00" to "23"
+	i - minutes; i.e. "00" to "59"
+	j - day of the month without leading zeros; i.e. "1" to "31"
+	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"
+	L - boolean for whether it is a leap year; i.e. "0" or "1"
+	m - month; i.e. "01" to "12"
+	M - month, textual, 3 letters; e.g. "Jan"
+	n - month without leading zeros; i.e. "1" to "12"
+	O - Difference to Greenwich time in hours; e.g. "+0200"
+	Q - Quarter, as in 1, 2, 3, 4
+	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200"
+	s - seconds; i.e. "00" to "59"
+	S - English ordinal suffix for the day of the month, 2 characters;
+	   			i.e. "st", "nd", "rd" or "th"
 	t - number of days in the given month; i.e. "28" to "31"
-	T - Timezone setting of this machine; e.g. "EST" or "MDT" 
-	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)  
-	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 
-	Y - year, 4 digits; e.g. "1999" 
-	y - year, 2 digits; e.g. "99" 
-	z - day of the year; i.e. "0" to "365" 
-	Z - timezone offset in seconds (i.e. "-43200" to "43200"). 
-	   			The offset for timezones west of UTC is always negative, 
-				and for those east of UTC is always positive. 
+	T - Timezone setting of this machine; e.g. "EST" or "MDT"
+	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
+	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday)
+	Y - year, 4 digits; e.g. "1999"
+	y - year, 2 digits; e.g. "99"
+	z - day of the year; i.e. "0" to "365"
+	Z - timezone offset in seconds (i.e. "-43200" to "43200").
+	   			The offset for timezones west of UTC is always negative,
+				and for those east of UTC is always positive.
 </pre>
 
 Unsupported:
 <pre>
-	B - Swatch Internet time 
+	B - Swatch Internet time
 	I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
-	W - ISO-8601 week number of year, weeks starting on Monday 
+	W - ISO-8601 week number of year, weeks starting on Monday
 
 </pre>
 
@@ -138,7 +138,7 @@
 
   adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
 
-  
+
 ** FUNCTION adodb_gmdate($fmt, $timestamp = false)
 
 Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
@@ -163,7 +163,7 @@
 
 ** FUNCTION adodb_strftime($fmt, $timestamp = false)
 
-Convert a timestamp to a formatted local date. Internally converts $fmt into 
+Convert a timestamp to a formatted local date. Internally converts $fmt into
 adodb_date format, then echo result.
 
 For best results, you can define the local date format yourself. Define a global
@@ -171,56 +171,56 @@
 adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.
 
     eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
-	
+
 	Supported format codes:
 
 <pre>
-	%a - abbreviated weekday name according to the current locale 
-	%A - full weekday name according to the current locale 
-	%b - abbreviated month name according to the current locale 
-	%B - full month name according to the current locale 
-	%c - preferred date and time representation for the current locale 
-	%d - day of the month as a decimal number (range 01 to 31) 
-	%D - same as %m/%d/%y 
-	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31') 
+	%a - abbreviated weekday name according to the current locale
+	%A - full weekday name according to the current locale
+	%b - abbreviated month name according to the current locale
+	%B - full month name according to the current locale
+	%c - preferred date and time representation for the current locale
+	%d - day of the month as a decimal number (range 01 to 31)
+	%D - same as %m/%d/%y
+	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31')
 	%h - same as %b
-	%H - hour as a decimal number using a 24-hour clock (range 00 to 23) 
-	%I - hour as a decimal number using a 12-hour clock (range 01 to 12) 
-	%m - month as a decimal number (range 01 to 12) 
-	%M - minute as a decimal number 
-	%n - newline character 
-	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale 
-	%r - time in a.m. and p.m. notation 
-	%R - time in 24 hour notation 
-	%S - second as a decimal number 
-	%t - tab character 
-	%T - current time, equal to %H:%M:%S 
-	%x - preferred date representation for the current locale without the time 
-	%X - preferred time representation for the current locale without the date 
-	%y - year as a decimal number without a century (range 00 to 99) 
-	%Y - year as a decimal number including the century 
-	%Z - time zone or name or abbreviation 
-	%% - a literal `%' character 
-</pre>	
+	%H - hour as a decimal number using a 24-hour clock (range 00 to 23)
+	%I - hour as a decimal number using a 12-hour clock (range 01 to 12)
+	%m - month as a decimal number (range 01 to 12)
+	%M - minute as a decimal number
+	%n - newline character
+	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale
+	%r - time in a.m. and p.m. notation
+	%R - time in 24 hour notation
+	%S - second as a decimal number
+	%t - tab character
+	%T - current time, equal to %H:%M:%S
+	%x - preferred date representation for the current locale without the time
+	%X - preferred time representation for the current locale without the date
+	%y - year as a decimal number without a century (range 00 to 99)
+	%Y - year as a decimal number including the century
+	%Z - time zone or name or abbreviation
+	%% - a literal `%' character
+</pre>
 
 	Unsupported codes:
 <pre>
-	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99) 
-	%g - like %G, but without the century. 
-	%G - The 4-digit year corresponding to the ISO week number (see %V). 
-	     This has the same format and value as %Y, except that if the ISO week number belongs 
-		 to the previous or next year, that year is used instead. 
-	%j - day of the year as a decimal number (range 001 to 366) 
-	%u - weekday as a decimal number [1,7], with 1 representing Monday 
-	%U - week number of the current year as a decimal number, starting 
-	    with the first Sunday as the first day of the first week 
-	%V - The ISO 8601:1988 week number of the current year as a decimal number, 
-	     range 01 to 53, where week 1 is the first week that has at least 4 days in the 
-		 current year, and with Monday as the first day of the week. (Use %G or %g for 
-		 the year component that corresponds to the week number for the specified timestamp.) 
-	%w - day of the week as a decimal, Sunday being 0 
-	%W - week number of the current year as a decimal number, starting with the 
-	     first Monday as the first day of the first week 
+	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99)
+	%g - like %G, but without the century.
+	%G - The 4-digit year corresponding to the ISO week number (see %V).
+	     This has the same format and value as %Y, except that if the ISO week number belongs
+		 to the previous or next year, that year is used instead.
+	%j - day of the year as a decimal number (range 001 to 366)
+	%u - weekday as a decimal number [1,7], with 1 representing Monday
+	%U - week number of the current year as a decimal number, starting
+	    with the first Sunday as the first day of the first week
+	%V - The ISO 8601:1988 week number of the current year as a decimal number,
+	     range 01 to 53, where week 1 is the first week that has at least 4 days in the
+		 current year, and with Monday as the first day of the week. (Use %G or %g for
+		 the year component that corresponds to the week number for the specified timestamp.)
+	%w - day of the week as a decimal, Sunday being 0
+	%W - week number of the current year as a decimal number, starting with the
+	     first Monday as the first day of the first week
 </pre>
 
 =============================================================================
@@ -230,10 +230,10 @@
 Useful url for generating test timestamps:
 	http://www.4webhelp.net/us/timestamp.php
 
-Possible future optimizations include 
+Possible future optimizations include
 
-a. Using an algorithm similar to Plauger's in "The Standard C Library" 
-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not 
+a. Using an algorithm similar to Plauger's in "The Standard C Library"
+(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not
 work outside 32-bit signed range, so i decided not to implement it.
 
 b. Implement daylight savings, which looks awfully complicated, see
@@ -246,24 +246,24 @@
 * Bug in 0.32 fix for hour handling. Fixed.
 
 - 1 Feb 2008 0.32
-* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly. 
+* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly.
 
 - 10 Jan 2008 0.31
 * Now adodb_mktime(0,0,0,24,1,2037) works correctly.
 
 - 15 July 2007 0.30
-Added PHP 5.2.0 compatability fixes. 
+Added PHP 5.2.0 compatability fixes.
  * gmtime behaviour for 1970 has changed. We use the actual date if it is between 1970 to 2038 to get the
  * timezone, otherwise we use the current year as the baseline to retrieve the timezone.
- * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but 
+ * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but
    in 1970 it was +7:30, then php 5.2 return +7:30, while this library will use +8.
- * 
- 
+ *
+
 - 19 March 2006 0.24
 Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
 
 - 10 Feb 2006 0.23
-PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000. 
+PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000.
 	In PHP4, we will still use -0000 for 100% compat with PHP4.
 
 - 08 Sept 2005 0.22
@@ -277,7 +277,7 @@
 Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().
 
 - 21 Dec 2004 0.17
-In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false. 
+In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false.
 Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
 
 - 17 Nov 2004 0.16
@@ -286,7 +286,7 @@
 Suggested by Ryan.
 
 - 18 July 2004 0.15
-All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory. 
+All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory.
 This brings it more in line with mktime (still not identical).
 
 - 23 June 2004 0.14
@@ -304,22 +304,22 @@
 	if ($m == 6 || $m == 7) $arr['hours'] += 1;
 }
 
-This is only called by adodb_date() and not by adodb_mktime(). 
+This is only called by adodb_date() and not by adodb_mktime().
 
 The format of $arr is
-Array ( 
-   [seconds] => 0 
-   [minutes] => 0 
-   [hours] => 0 
+Array (
+   [seconds] => 0
+   [minutes] => 0
+   [hours] => 0
    [mday] => 1      # day of month, eg 1st day of the month
    [mon] => 2       # month (eg. Feb)
-   [year] => 2102 
+   [year] => 2102
    [yday] => 31     # days in current year
    [leap] =>        # true if leap year
    [ndays] => 28    # no of days in current month
-   ) 
-   
+   )
 
+
 - 28 Apr 2004 0.13
 Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
 
@@ -327,11 +327,11 @@
 Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
 
 - 26 Oct 2003 0.11
-Because of daylight savings problems (some systems apply daylight savings to 
+Because of daylight savings problems (some systems apply daylight savings to
 January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
 
 - 9 Aug 2003 0.10
-Fixed bug with dates after 2038. 
+Fixed bug with dates after 2038.
 See http://phplens.com/lens/lensforum/msgs.php?id=6980
 
 - 1 July 2003 0.09
@@ -361,14 +361,14 @@
 
 - 28 Jan 2003 0.04
 
-Gregorian correction handled. In PHP5, we might throw an error if 
+Gregorian correction handled. In PHP5, we might throw an error if
 mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
 Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
 
 - 27 Jan 2003 0.03
 
 Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.
-Fixed calculation of days since start of year for <1970. 
+Fixed calculation of days since start of year for <1970.
 
 - 27 Jan 2003 0.02
 
@@ -391,13 +391,13 @@
 $ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2);
 
 /*
-	This code was originally for windows. But apparently this problem happens 
+	This code was originally for windows. But apparently this problem happens
 	also with Linux, RH 7.3 and later!
-	
+
 	glibc-2.2.5-34 and greater has been changed to return -1 for dates <
 	1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0
 	echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1
-	
+
 	References:
 	 http://bugs.php.net/bug.php?id=20048&edit=2
 	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
@@ -423,74 +423,74 @@
 {
 	$s1 = strftime($fmt);
 	$s2 = adodb_strftime($fmt);
-	
+
 	if ($s1 == $s2) return true;
-	
+
 	echo "error for $fmt,  strftime=$s1, adodb=$s2<br>";
 	return false;
 }
 
 /**
 	 Test Suite
-*/	
+*/
 function adodb_date_test()
 {
-	
+
 	for ($m=-24; $m<=24; $m++)
 		echo "$m :",adodb_date('d-m-Y',adodb_mktime(0,0,0,1+$m,20,2040)),"<br>";
-	
+
 	error_reporting(E_ALL);
 	print "<h4>Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."</h4>";
 	@set_time_limit(0);
 	$fail = false;
-	
+
 	// This flag disables calling of PHP native functions, so we can properly test the code
 	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
-	
+
 	$t = time();
-	
-	
+
+
 	$fmt = 'Y-m-d H:i:s';
 	echo '<pre>';
 	echo 'adodb: ',adodb_date($fmt,$t),'<br>';
 	echo 'php  : ',date($fmt,$t),'<br>';
 	echo '</pre>';
-	
+
 	adodb_date_test_strftime('%Y %m %x %X');
 	adodb_date_test_strftime("%A %d %B %Y");
 	adodb_date_test_strftime("%H %M S");
-	
+
 	$t = adodb_mktime(0,0,0);
 	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'<br>';
-	
+
 	$t = adodb_mktime(0,0,0,6,1,2102);
 	if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
-	
+
 	$t = adodb_mktime(0,0,0,2,1,2102);
 	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
-	
-	
+
+
 	print "<p>Testing gregorian <=> julian conversion<p>";
 	$t = adodb_mktime(0,0,0,10,11,1492);
 	//http://www.holidayorigins.com/html/columbus_day.html - Friday check
 	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing<br>';
-	
+
 	$t = adodb_mktime(0,0,0,2,29,1500);
 	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years<br>';
-	
+
 	$t = adodb_mktime(0,0,0,2,29,1700);
 	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years<br>';
-	
+
 	print  adodb_mktime(0,0,0,10,4,1582).' ';
 	print adodb_mktime(0,0,0,10,15,1582);
 	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));
 	if ($diff != 3600*24) print " <strong>Error in gregorian correction = ".($diff/3600/24)." days </strong><br>";
-		
+
 	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : '<strong>Error</strong>')."<br>";
 	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : '<strong>Error</strong>')."<br>";
-	
+
 	print "<p>Testing overflow<p>";
-	
+
 	$t = adodb_mktime(0,0,0,3,33,1965);
 	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 <br>';
 	$t = adodb_mktime(0,0,0,4,33,1971);
@@ -503,7 +503,7 @@
 	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' <br>';
 	$t = adodb_mktime(0,0,0,13,3,1965);
 	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 <br>';
-	
+
 	print "Testing 2-digit => 4-digit year conversion<p>";
 	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000<br>";
 	if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010<br>";
@@ -512,10 +512,10 @@
 	if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940<br>";
 	if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950<br>";
 	if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990<br>";
-	
+
 	// Test string formating
 	print "<p>Testing date formating</p>";
-	
+
 	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003';
 	$s1 = date($fmt,0);
 	$s2 = adodb_date($fmt,0);
@@ -538,12 +538,12 @@
 					break;
 				}
 			}
-			print "<strong>Error date(): $ts<br><pre> 
+			print "<strong>Error date(): $ts<br><pre>
 &nbsp; \"$s1\" (date len=".strlen($s1).")
 &nbsp; \"$s2\" (adodb_date len=".strlen($s2).")</strong></pre><br>";
 			$fail = true;
 		}
-		
+
 		$a1 = getdate($ts);
 		$a2 = adodb_getdate($ts);
 		$rez = array_diff($a1,$a2);
@@ -556,7 +556,7 @@
 			$fail = true;
 		}
 	}
-	
+
 	// Test generation of dates outside 1901-2038
 	print "<p>Testing random dates between 100 and 4000</p>";
 	adodb_date_test_date(100,1);
@@ -564,7 +564,7 @@
 		$y1 = 100+rand(0,1970-100);
 		$m = rand(1,12);
 		adodb_date_test_date($y1,$m);
-		
+
 		$y1 = 3000-rand(0,3000-1970);
 		adodb_date_test_date($y1,$m);
 	}
@@ -575,7 +575,7 @@
 	$offset = 36000+rand(10000,60000);
 	$max = 365*$yrs*86400;
 	$lastyear = 0;
-	
+
 	// we generate a timestamp, convert it to a date, and convert it back to a timestamp
 	// and check if the roundtrip broke the original timestamp value.
 	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
@@ -602,58 +602,58 @@
 }
 
 /**
-	Returns day of week, 0 = Sunday,... 6=Saturday. 
+	Returns day of week, 0 = Sunday,... 6=Saturday.
 	Algorithm from PEAR::Date_Calc
 */
 function adodb_dow($year, $month, $day)
 {
 /*
-Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and 
-proclaimed that from that time onwards 3 days would be dropped from the calendar 
+Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and
+proclaimed that from that time onwards 3 days would be dropped from the calendar
 every 400 years.
 
-Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian). 
+Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian).
 */
 	if ($year <= 1582) {
-		if ($year < 1582 || 
+		if ($year < 1582 ||
 			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;
 		 else
 			$greg_correction = 0;
 	} else
 		$greg_correction = 0;
-	
+
 	if($month > 2)
 	    $month -= 2;
 	else {
 	    $month += 10;
 	    $year--;
 	}
-	
+
 	$day =  floor((13 * $month - 1) / 5) +
 	        $day + ($year % 100) +
 	        floor(($year % 100) / 4) +
 	        floor(($year / 100) / 4) - 2 *
 	        floor($year / 100) + 77 + $greg_correction;
-	
+
 	return $day - 7 * floor($day / 7);
 }
 
 
 /**
- Checks for leap year, returns true if it is. No 2-digit year check. Also 
+ Checks for leap year, returns true if it is. No 2-digit year check. Also
  handles julian calendar correctly.
 */
-function _adodb_is_leap_year($year) 
+function _adodb_is_leap_year($year)
 {
 	if ($year % 4 != 0) return false;
-	
+
 	if ($year % 400 == 0) {
 		return true;
 	// if gregorian calendar (>1582), century not-divisible by 400 is not leap
 	} else if ($year > 1582 && $year % 100 == 0 ) {
 		return false;
-	} 
-	
+	}
+
 	return true;
 }
 
@@ -661,7 +661,7 @@
 /**
  checks for leap year, returns true if it is. Has 2-digit year check
 */
-function adodb_is_leap_year($year) 
+function adodb_is_leap_year($year)
 {
 	return  _adodb_is_leap_year(adodb_year_digit_check($year));
 }
@@ -670,13 +670,13 @@
 	Fix 2-digit years. Works for any century.
  	Assumes that if 2-digit is more than 30 years in future, then previous century.
 */
-function adodb_year_digit_check($y) 
+function adodb_year_digit_check($y)
 {
 	if ($y < 100) {
-	
+
 		$yr = (integer) date("Y");
 		$century = (integer) ($yr /100);
-		
+
 		if ($yr%100 > 50) {
 			$c1 = $century + 1;
 			$c0 = $century;
@@ -693,24 +693,24 @@
 	return $y;
 }
 
-function adodb_get_gmt_diff_ts($ts) 
+function adodb_get_gmt_diff_ts($ts)
 {
 	if (0 <= $ts && $ts <= 0x7FFFFFFF) { // check if number in 32-bit signed range) {
 		$arr = getdate($ts);
 		$y = $arr['year'];
 		$m = $arr['mon'];
 		$d = $arr['mday'];
-		return adodb_get_gmt_diff($y,$m,$d);	
+		return adodb_get_gmt_diff($y,$m,$d);
 	} else {
 		return adodb_get_gmt_diff(false,false,false);
 	}
-	
+
 }
 
 /**
  get local time zone offset from GMT. Does not handle historical timezones before 1970.
 */
-function adodb_get_gmt_diff($y,$m,$d) 
+function adodb_get_gmt_diff($y,$m,$d)
 {
 static $TZ,$tzo;
 global $ADODB_DATETIME_CLASS;
@@ -731,7 +731,7 @@
 		$y = date('Y');
 		$TZ = mktime(0,0,0,12,2,$y,0) - gmmktime(0,0,0,12,2,$y,0);
 	}
-	
+
 	return $TZ;
 }
 
@@ -757,7 +757,7 @@
 
 	for ($i=1970; $i >= 1600; $i-=10) {
 		$s = adodb_gmmktime(0,0,0,1,1,$i);
-		echo "$i => $s,<br>";	
+		echo "$i => $s,<br>";
 	}
 }
 adodb_date_gentable();
@@ -773,22 +773,22 @@
 
 $_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 $_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 function adodb_validdate($y,$m,$d)
 {
 global $_month_table_normal,$_month_table_leaf;
 
 	if (_adodb_is_leap_year($y)) $marr = $_month_table_leaf;
 	else $marr = $_month_table_normal;
-	
+
 	if ($m > 12 || $m < 1) return false;
-	
+
 	if ($d > 31 || $d < 1) return false;
-	
+
 	if ($marr[$m] < $d) return false;
-	
+
 	if ($y < 1000 && $y > 3000) return false;
-	
+
 	return true;
 }
 
@@ -806,17 +806,17 @@
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
-	
-	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction 
-	
+
+	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction
+
 	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 	$d366 = $_day_power * 366;
 	$d365 = $_day_power * 365;
-	
+
 	if ($d < 0) {
-		
+
 		if (empty($YRS)) $YRS = array(
 			1970 => 0,
 			1960 => -315619200,
@@ -858,28 +858,28 @@
 			1600 => -11676096000);
 
 		if ($is_gmt) $origd = $d;
-		// The valid range of a 32bit signed timestamp is typically from 
+		// The valid range of a 32bit signed timestamp is typically from
 		// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
 		//
-		
+
 		# old algorithm iterates through all years. new algorithm does it in
 		# 10 year blocks
-		
+
 		/*
 		# old algo
 		for ($a = 1970 ; --$a >= 0;) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
 			else $d += $d365;
-			
+
 			if ($d >= 0) {
 				$year = $a;
 				break;
 			}
 		}
 		*/
-		
+
 		$lastsecs = 0;
 		$lastyear = 1970;
 		foreach($YRS as $year => $secs) {
@@ -890,27 +890,27 @@
 			$lastsecs = $secs;
 			$lastyear = $year;
 		}
-		
+
 		$d -= $lastsecs;
 		if (!isset($a)) $a = $lastyear;
-		
+
 		//echo ' yr=',$a,' ', $d,'.';
-		
+
 		for (; --$a >= 0;) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
 			else $d += $d365;
-			
+
 			if ($d >= 0) {
 				$year = $a;
 				break;
 			}
 		}
 		/**/
-		
+
 		$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
-		
+
 		$d = $lastd;
 		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
 		for ($a = 13 ; --$a > 0;) {
@@ -922,17 +922,17 @@
 				break;
 			}
 		}
-		
+
 		$d = $lastd;
 		$day = $ndays + ceil(($d+1) / ($_day_power));
 
 		$d += ($ndays - $day+1)* $_day_power;
 		$hour = floor($d/$_hour_power);
-	
+
 	} else {
 		for ($a = 1970 ;; $a++) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
 			else $d -= $d365;
 			if ($d < 0) {
@@ -957,7 +957,7 @@
 		$d = $d - ($day-1) * $_day_power;
 		$hour = floor($d /$_hour_power);
 	}
-	
+
 	$d -= $hour * $_hour_power;
 	$min = floor($d/$_min_power);
 	$secs = $d - $min * $_min_power;
@@ -974,8 +974,8 @@
 		'ndays' => $ndays
 		);
 	}
-	
-	
+
+
 	$dow = adodb_dow($year,$month,$day);
 
 	return array(
@@ -994,18 +994,18 @@
 }
 /*
 		if ($isphp5)
-				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
+				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36);
 			else
-				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36);
 			break;*/
 function adodb_tz_offset($gmt,$isphp5)
 {
 	$zhrs = abs($gmt)/3600;
 	$hrs = floor($zhrs);
-	if ($isphp5) 
-		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+	if ($isphp5)
+		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
 	else
-		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
 }
 
 
@@ -1018,17 +1018,17 @@
 function adodb_date2($fmt, $d=false, $is_gmt=false)
 {
 	if ($d !== false) {
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+		if (!preg_match(
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
 			($d), $rr)) return adodb_date($fmt,false,$is_gmt);
 
 		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);
-	
+
 		// h-m-s-MM-DD-YY
 		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1],false,$is_gmt);
 		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1],false,$is_gmt);
 	}
-	
+
 	return adodb_date($fmt,$d,$is_gmt);
 }
 
@@ -1050,31 +1050,31 @@
 		}
 	}
 	$_day_power = 86400;
-	
+
 	$arr = _adodb_getdate($d,true,$is_gmt);
-	
+
 	if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');
 	if ($daylight) adodb_daylight_sv($arr, $is_gmt);
-	
+
 	$year = $arr['year'];
 	$month = $arr['mon'];
 	$day = $arr['mday'];
 	$hour = $arr['hours'];
 	$min = $arr['minutes'];
 	$secs = $arr['seconds'];
-	
+
 	$max = strlen($fmt);
 	$dates = '';
-	
+
 	$isphp5 = PHP_VERSION >= 5;
-	
+
 	/*
 		at this point, we have the following integer vars to manipulate:
 		$year, $month, $day, $hour, $min, $secs
 	*/
 	for ($i=0; $i < $max; $i++) {
 		switch($fmt[$i]) {
-		case 'T': 
+		case 'T':
 			if ($ADODB_DATETIME_CLASS) {
 				$dt = new DateTime();
 				$dt->SetDate($year,$month,$day);
@@ -1085,23 +1085,23 @@
 		// YEAR
 		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
 		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
-		
+
 			// 4.3.11 uses '04 Jun 2004'
 			// 4.3.8 uses  ' 4 Jun 2004'
-			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
+			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '
 				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
-			
-			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
-			
+
+			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour;
+
 			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
-			
+
 			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
-			
+
 			$gmt = adodb_get_gmt_diff($year,$month,$day);
-			
+
 			$dates .= ' '.adodb_tz_offset($gmt,$isphp5);
 			break;
-			
+
 		case 'Y': $dates .= $year; break;
 		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
 		// MONTH
@@ -1118,47 +1118,47 @@
 		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
 		case 'j': $dates .= $day; break;
 		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
-		case 'S': 
+		case 'S':
 			$d10 = $day % 10;
 			if ($d10 == 1) $dates .= 'st';
 			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
 			else if ($d10 == 3) $dates .= 'rd';
 			else $dates .= 'th';
 			break;
-			
+
 		// HOUR
 		case 'Z':
 			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff($year,$month,$day); break;
-		case 'O': 
+		case 'O':
 			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day);
-			
+
 			$dates .= adodb_tz_offset($gmt,$isphp5);
 			break;
-			
-		case 'H': 
-			if ($hour < 10) $dates .= '0'.$hour; 
-			else $dates .= $hour; 
+
+		case 'H':
+			if ($hour < 10) $dates .= '0'.$hour;
+			else $dates .= $hour;
 			break;
-		case 'h': 
-			if ($hour > 12) $hh = $hour - 12; 
+		case 'h':
+			if ($hour > 12) $hh = $hour - 12;
 			else {
-				if ($hour == 0) $hh = '12'; 
+				if ($hour == 0) $hh = '12';
 				else $hh = $hour;
 			}
-			
+
 			if ($hh < 10) $dates .= '0'.$hh;
 			else $dates .= $hh;
 			break;
-			
-		case 'G': 
+
+		case 'G':
 			$dates .= $hour;
 			break;
-			
+
 		case 'g':
-			if ($hour > 12) $hh = $hour - 12; 
+			if ($hour > 12) $hh = $hour - 12;
 			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour; 
+				if ($hour == 0) $hh = '12';
+				else $hh = $hour;
 			}
 			$dates .= $hh;
 			break;
@@ -1180,7 +1180,7 @@
 		default:
 			$dates .= $fmt[$i]; break;
 		// ESCAPE
-		case "\\": 
+		case "\\":
 			$i++;
 			if ($i < $max) $dates .= $fmt[$i];
 			break;
@@ -1190,7 +1190,7 @@
 }
 
 /**
-	Returns a timestamp given a GMT/UTC time. 
+	Returns a timestamp given a GMT/UTC time.
 	Note that $is_dst is not implemented and is ignored.
 */
 function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)
@@ -1201,33 +1201,33 @@
 /**
 	Return a timestamp given a local time. Originally by jackbbs.
 	Note that $is_dst is not implemented and is ignored.
-	
+
 	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
 */
-function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false) 
+function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false)
 {
 	if (!defined('ADODB_TEST_DATES')) {
 
 		if ($mon === false) {
 			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
 		}
-		
-		// for windows, we don't check 1970 because with timezone differences, 
+
+		// for windows, we don't check 1970 because with timezone differences,
 		// 1 Jan 1970 could generate negative timestamp, which is illegal
 		$usephpfns = (1970 < $year && $year < 2038
 			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
-			); 
-			
-		
+			);
+
+
 		if ($usephpfns && ($year + $mon/12+$day/365.25+$hr/(24*365.25) >= 2038)) $usephpfns = false;
-			
+
 		if ($usephpfns) {
 				return $is_gmt ?
 					@gmmktime($hr,$min,$sec,$mon,$day,$year):
 					@mktime($hr,$min,$sec,$mon,$day,$year);
 		}
 	}
-	
+
 	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$mon,$day);
 
 	/*
@@ -1240,8 +1240,8 @@
 	$mon = intval($mon);
 	$day = intval($day);
 	$year = intval($year);
-	
-	
+
+
 	$year = adodb_year_digit_check($year);
 
 	if ($mon > 12) {
@@ -1253,14 +1253,14 @@
 		$year -= $y;
 		$mon += $y*12;
 	}
-	
+
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
-	
+
 	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 	$_total_date = 0;
 	if ($year >= 1970) {
 		for ($a = 1970 ; $a <= $year; $a++) {
@@ -1272,7 +1272,7 @@
 				$loop_table = $_month_table_normal;
 				$_add_date = 365;
 			}
-			if ($a < $year) { 
+			if ($a < $year) {
 				$_total_date += $_add_date;
 			} else {
 				for($b=1;$b<$mon;$b++) {
@@ -1282,7 +1282,7 @@
 		}
 		$_total_date +=$day-1;
 		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
-	
+
 	} else {
 		for ($a = 1969 ; $a >= $year; $a--) {
 			$leaf = _adodb_is_leap_year($a);
@@ -1301,13 +1301,13 @@
 			}
 		}
 		$_total_date += $loop_table[$mon] - $day;
-		
+
 		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
 		$_day_time = $_day_power - $_day_time;
 		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);
 		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction
 		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.
-	} 
+	}
 	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
 	return $ret;
 }
@@ -1329,7 +1329,7 @@
 
 		}
 	}
-	
+
 	if (empty($ADODB_DATE_LOCALE)) {
 	/*
 		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
@@ -1341,11 +1341,11 @@
 		$sep = substr($dstr,2,1);
 		$tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
 		$hasAM = strrpos($tstr,'M') !== false;
-		
+
 		$ADODB_DATE_LOCALE = array();
-		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';	
+		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';
 		$ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';
-			
+
 	}
 	$inpct = false;
 	$fmtdate = '';
@@ -1358,7 +1358,7 @@
 			} else
 				$inpct = true;
 		} else if ($inpct) {
-		
+
 			$inpct = false;
 			switch($ch) {
 			case '0':
@@ -1374,9 +1374,9 @@
 			case 'E':
 			case 'O':
 				/* ignore format modifiers */
-				$inpct = true; 
+				$inpct = true;
 				break;
-				
+
 			case 'a': $fmtdate .= 'D'; break;
 			case 'A': $fmtdate .= 'l'; break;
 			case 'h':
Index: typo3/sysext/adodb/adodb/adodb-lib.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-lib.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-lib.inc.php	(working copy)
@@ -9,16 +9,16 @@
 global $ADODB_INCLUDED_LIB;
 $ADODB_INCLUDED_LIB = 1;
 
-/* 
+/*
  @version V5.06 16 Oct 2008  (c) 2000-2009 John Lim (jlim\@natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
-  
-  Less commonly used functions are placed here to reduce size of adodb.inc.php. 
-*/ 
 
+  Less commonly used functions are placed here to reduce size of adodb.inc.php.
+*/
+
 function adodb_strip_order_by($sql)
 {
 	$rez = preg_match('/(\sORDER\s+BY\s[^)]*)/is',$sql,$arr);
@@ -39,7 +39,7 @@
 			}
 			$sql = substr($sql,0,$at).substr($sql,$i);
 		} else
-			$sql = str_replace($arr[0], '', $sql); 
+			$sql = str_replace($arr[0], '', $sql);
 	return $sql;
  }
 
@@ -55,8 +55,8 @@
 	$types = array();
 	if ($probe > sizeof($array)) $max = sizeof($array);
 	else $max = $probe;
-	
-	
+
+
 	for ($j=0;$j < $max; $j++) {
 		$row = $array[$j];
 		if (!$row) break;
@@ -65,16 +65,16 @@
 			$i += 1;
 
 			if (isset($types[$i]) && $types[$i]=='C') continue;
-			
+
 			//print " ($i ".$types[$i]. "$v) ";
 			$v = trim($v);
-			
+
 			if (!preg_match('/^[+-]{0,1}[0-9\.]+$/',$v)) {
 				$types[$i] = 'C'; // once C, always C
-				
+
 				continue;
 			}
-			if ($j == 0) { 
+			if ($j == 0) {
 			// If empty string, we presume is character
 			// test for integer for 1st row only
 			// after that it is up to testing other rows to prove
@@ -84,19 +84,19 @@
 				else  $types[$i] = 'I';
 				continue;
 			}
-			
+
 			if (strpos($v,'.') !== false) $types[$i] = 'N';
-			
+
 		}
 	}
-	
+
 }
 
 function  adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs)
 {
 	$oldX = sizeof(reset($arr));
-	$oldY = sizeof($arr);	
-	
+	$oldY = sizeof($arr);
+
 	if ($hdr) {
 		$startx = 1;
 		$hdr = array('Fields');
@@ -112,14 +112,14 @@
 			$newarr[] = array($o->name);
 		} else
 			$newarr[] = array();
-			
+
 		for ($y = 0; $y < $oldY; $y++) {
 			$newarr[$x-$startx][] = $arr[$y][$x];
 		}
 	}
 }
 
-// Force key to upper. 
+// Force key to upper.
 // See also http://www.php.net/manual/en/function.array-change-key-case.php
 function _array_change_key_case($an_array)
 {
@@ -139,7 +139,7 @@
 		if (count($fieldArray) == 0) return 0;
 		$first = true;
 		$uSet = '';
-		
+
 		if (!is_array($keyCol)) {
 			$keyCol = array($keyCol);
 		}
@@ -152,14 +152,14 @@
 				$fieldArray[$k] = $v;
 			}
 			if (in_array($k,$keyCol)) continue; // skip UPDATE if is key
-			
+
 			if ($first) {
-				$first = false;			
+				$first = false;
 				$uSet = "$k=$v";
 			} else
 				$uSet .= ",$k=$v";
 		}
-		
+
 		$where = false;
 		foreach ($keyCol as $v) {
 			if (isset($fieldArray[$v])) {
@@ -167,24 +167,24 @@
 				else $where = $v.'='.$fieldArray[$v];
 			}
 		}
-		
+
 		if ($uSet && $where) {
 			$update = "UPDATE $table SET $uSet WHERE $where";
 
 			$rs = $zthis->Execute($update);
-			
-			
+
+
 			if ($rs) {
 				if ($zthis->poorAffectedRows) {
 				/*
-				 The Select count(*) wipes out any errors that the update would have returned. 
+				 The Select count(*) wipes out any errors that the update would have returned.
 				http://phplens.com/lens/lensforum/msgs.php?id=5696
 				*/
 					if ($zthis->ErrorNo()<>0) return 0;
-					
+
 				# affected_rows == 0 if update field values identical to old values
-				# for mysql - which is silly. 
-			
+				# for mysql - which is silly.
+
 					$cnt = $zthis->GetOne("select count(*) from $table where $where");
 					if ($cnt > 0) return 1; // record already exists
 				} else {
@@ -193,22 +193,22 @@
 			} else
 				return 0;
 		}
-		
+
 	//	print "<p>Error=".$this->ErrorNo().'<p>';
 		$first = true;
 		foreach($fieldArray as $k => $v) {
 			if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col
-			
+
 			if ($first) {
-				$first = false;			
+				$first = false;
 				$iCols = "$k";
 				$iVals = "$v";
 			} else {
 				$iCols .= ",$k";
 				$iVals .= ",$v";
-			}				
+			}
 		}
-		$insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; 
+		$insert = "INSERT INTO $table ($iCols) VALUES ($iVals)";
 		$rs = $zthis->Execute($insert);
 		return ($rs) ? 2 : 0;
 }
@@ -225,9 +225,9 @@
 		if (!strpos($name,'[]')) $name .= '[]';
 	} else if ($size) $attr = ' size="'.$size.'"';
 	else $attr ='';
-	
+
 	$s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
-	if ($blank1stItem) 
+	if ($blank1stItem)
 		if (is_string($blank1stItem))  {
 			$barr = explode(':',$blank1stItem);
 			if (sizeof($barr) == 1) $barr[] = '';
@@ -236,7 +236,7 @@
 
 	if ($zthis->FieldCount() > 1) $hasvalue=true;
 	else $compareFields0 = true;
-	
+
 	$value = '';
     $optgroup = null;
     $firstgroup = true;
@@ -256,12 +256,12 @@
 				$zval2 = rtrim(next($zthis->fields));
 		}
 		$selected = ($compareFields0) ? $zval : $zval2;
-		
+
         $group = '';
 		if ($fieldsize > 2) {
             $group = rtrim($zthis->fields[2]);
         }
-/* 
+/*
         if ($optgroup != $group) {
             $optgroup = $group;
             if ($firstgroup) {
@@ -273,25 +273,25 @@
             }
 		}
 */
-		if ($hasvalue) 
+		if ($hasvalue)
 			$value = " value='".htmlspecialchars($zval2)."'";
-		
+
 		if (is_array($defstr))  {
-			
-			if (in_array($selected,$defstr)) 
+
+			if (in_array($selected,$defstr))
 				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else 
+			else
 				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
 		}
 		else {
-			if (strcasecmp($selected,$defstr)==0) 
+			if (strcasecmp($selected,$defstr)==0)
 				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
 			else
 				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
 		}
 		$zthis->MoveNext();
 	} // while
-	
+
     // closing last optgroup
     if($optgroup != null) {
         $s .= "\n</optgroup>";
@@ -311,9 +311,9 @@
 		if (!strpos($name,'[]')) $name .= '[]';
 	} else if ($size) $attr = ' size="'.$size.'"';
 	else $attr ='';
-	
+
 	$s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
-	if ($blank1stItem) 
+	if ($blank1stItem)
 		if (is_string($blank1stItem))  {
 			$barr = explode(':',$blank1stItem);
 			if (sizeof($barr) == 1) $barr[] = '';
@@ -322,7 +322,7 @@
 
 	if ($zthis->FieldCount() > 1) $hasvalue=true;
 	else $compareFields0 = true;
-	
+
 	$value = '';
     $optgroup = null;
     $firstgroup = true;
@@ -342,12 +342,12 @@
 				$zval2 = rtrim(next($zthis->fields));
 		}
 		$selected = ($compareFields0) ? $zval : $zval2;
-		
+
         $group = '';
 		if (isset($zthis->fields[2])) {
             $group = rtrim($zthis->fields[2]);
         }
- 
+
         if ($optgroup != $group) {
             $optgroup = $group;
             if ($firstgroup) {
@@ -358,26 +358,26 @@
                 $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
             }
 		}
-	
-		if ($hasvalue) 
+
+		if ($hasvalue)
 			$value = " value='".htmlspecialchars($zval2)."'";
-		
+
 		if (is_array($defstr))  {
-			
-			if (in_array($selected,$defstr)) 
+
+			if (in_array($selected,$defstr))
 				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else 
+			else
 				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
 		}
 		else {
-			if (strcasecmp($selected,$defstr)==0) 
+			if (strcasecmp($selected,$defstr)==0)
 				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
 			else
 				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
 		}
 		$zthis->MoveNext();
 	} // while
-	
+
     // closing last optgroup
     if($optgroup != null) {
         $s .= "\n</optgroup>";
@@ -389,34 +389,34 @@
 /*
 	Count the number of records this sql statement will return by using
 	query rewriting heuristics...
-	
+
 	Does not work with UNIONs, except with postgresql and oracle.
-	
+
 	Usage:
-	
+
 	$conn->Connect(...);
 	$cnt = _adodb_getcount($conn, $sql);
-	
+
 */
-function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) 
+function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
 {
 	$qryRecs = 0;
-	
-	 if (!empty($zthis->_nestedSQL) || preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || 
-	 	preg_match('/\s+GROUP\s+BY\s+/is',$sql) || 
+
+	 if (!empty($zthis->_nestedSQL) || preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) ||
+	 	preg_match('/\s+GROUP\s+BY\s+/is',$sql) ||
 		preg_match('/\s+UNION\s+/is',$sql)) {
-		
+
 		$rewritesql = adodb_strip_order_by($sql);
-		
+
 		// ok, has SELECT DISTINCT or GROUP BY so see if we can use a table alias
 		// but this is only supported by oracle and postgresql...
 		if ($zthis->dataProvider == 'oci8') {
 			// Allow Oracle hints to be used for query optimization, Chris Wrye
 			if (preg_match('#/\\*+.*?\\*\\/#', $sql, $hint)) {
-				$rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")"; 
+				$rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")";
 			} else
-				$rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")"; 
-			
+				$rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")";
+
 		} else if (strncmp($zthis->databaseType,'postgres',8) == 0 || strncmp($zthis->databaseType,'mysql',5) == 0)  {
 			$rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_";
 		} else {
@@ -426,20 +426,20 @@
 		// now replace SELECT ... FROM with SELECT COUNT(*) FROM
 		$rewritesql = preg_replace(
 					'/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql);
-		// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails 
+		// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails
 		// with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
 		// also see http://phplens.com/lens/lensforum/msgs.php?id=12752
 		$rewritesql = adodb_strip_order_by($rewritesql);
 	}
-	
+
 	if (isset($rewritesql) && $rewritesql != $sql) {
 		if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
-		 
+
 		if ($secs2cache) {
 			// we only use half the time of secs2cache because the count can quickly
 			// become inaccurate if new records are added
 			$qryRecs = $zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr);
-			
+
 		} else {
 			$qryRecs = $zthis->GetOne($rewritesql,$inputarr);
 	  	}
@@ -447,20 +447,20 @@
 	}
 	//--------------------------------------------
 	// query rewrite failed - so try slower way...
-	
-	
+
+
 	// strip off unneeded ORDER BY if no UNION
 	if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
-	else $rewritesql = $rewritesql = adodb_strip_order_by($sql); 
-	
+	else $rewritesql = $rewritesql = adodb_strip_order_by($sql);
+
 	if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
-		
+
 	$rstest = $zthis->Execute($rewritesql,$inputarr);
 	if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr);
-	
+
 	if ($rstest) {
 	  		$qryRecs = $rstest->RecordCount();
-		if ($qryRecs == -1) { 
+		if ($qryRecs == -1) {
 		global $ADODB_EXTENSION;
 		// some databases will return -1 on MoveLast() - change to MoveNext()
 			if ($ADODB_EXTENSION) {
@@ -483,53 +483,53 @@
 /*
  	Code originally from "Cornel G" <conyg@fx.ro>
 
-	This code might not work with SQL that has UNION in it	
-	
+	This code might not work with SQL that has UNION in it
+
 	Also if you are using CachePageExecute(), there is a strong possibility that
 	data will get out of synch. use CachePageExecute() only with tables that
 	rarely change.
 */
-function _adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, 
-						$inputarr=false, $secs2cache=0) 
+function _adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page,
+						$inputarr=false, $secs2cache=0)
 {
 	$atfirstpage = false;
 	$atlastpage = false;
 	$lastpageno=1;
 
-	// If an invalid nrows is supplied, 
+	// If an invalid nrows is supplied,
 	// we assume a default value of 10 rows per page
 	if (!isset($nrows) || $nrows <= 0) $nrows = 10;
 
 	$qryRecs = false; //count records for no offset
-	
+
 	$qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache);
 	$lastpageno = (int) ceil($qryRecs / $nrows);
 	$zthis->_maxRecordCount = $qryRecs;
-	
 
 
-	// ***** Here we check whether $page is the last page or 
-	// whether we are trying to retrieve 
+
+	// ***** Here we check whether $page is the last page or
+	// whether we are trying to retrieve
 	// a page number greater than the last page number.
 	if ($page >= $lastpageno) {
 		$page = $lastpageno;
 		$atlastpage = true;
 	}
-	
+
 	// If page number <= 1, then we are at the first page
-	if (empty($page) || $page <= 1) {	
+	if (empty($page) || $page <= 1) {
 		$page = 1;
 		$atfirstpage = true;
 	}
-	
+
 	// We get the data we want
 	$offset = $nrows * ($page-1);
-	if ($secs2cache > 0) 
+	if ($secs2cache > 0)
 		$rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr);
-	else 
+	else
 		$rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
 
-	
+
 	// Before returning the RecordSet, we set the pagination properties we need
 	if ($rsreturn) {
 		$rsreturn->_maxRecordCount = $qryRecs;
@@ -543,19 +543,19 @@
 }
 
 // Iván Oliva version
-function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
+function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0)
 {
 
 	$atfirstpage = false;
 	$atlastpage = false;
-	
+
 	if (!isset($page) || $page <= 1) {	// If page number <= 1, then we are at the first page
 		$page = 1;
 		$atfirstpage = true;
 	}
 	if ($nrows <= 0) $nrows = 10;	// If an invalid nrows is supplied, we assume a default value of 10 rows per page
-	
-	// ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than 
+
+	// ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than
 	// the last page number.
 	$pagecounter = $page + 1;
 	$pagecounteroffset = ($pagecounter * $nrows) - $nrows;
@@ -577,12 +577,12 @@
 		if ($page == 1) $atfirstpage = true;	// We have to do this again in case the last page is the same as the first
 			//... page, that is, the recordset has only 1 page.
 	}
-	
+
 	// We get the data we want
 	$offset = $nrows * ($page-1);
 	if ($secs2cache > 0) $rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr);
 	else $rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
-	
+
 	// Before returning the RecordSet, we set the pagination properties we need
 	if ($rsreturn) {
 		$rsreturn->rowsPerPage = $nrows;
@@ -601,13 +601,13 @@
 			printf(ADODB_BAD_RS,'GetUpdateSQL');
 			return false;
 		}
-	
+
 		$fieldUpdatedCount = 0;
 		$arrFields = _array_change_key_case($arrFields);
 
 		$hasnumeric = isset($rs->fields[0]);
 		$setFields = '';
-		
+
 		// Loop through all of the fields in the recordset
 		for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
 			// Get the field from the recordset
@@ -617,19 +617,19 @@
 			// of the fields passed in then process.
 			$upperfname = strtoupper($field->name);
 			if (adodb_key_exists($upperfname,$arrFields,$force)) {
-				
+
 				// If the existing field value in the recordset
 				// is different from the value passed in then
 				// go ahead and append the field name and new value to
 				// the update query.
-				
+
 				if ($hasnumeric) $val = $rs->fields[$i];
 				else if (isset($rs->fields[$upperfname])) $val = $rs->fields[$upperfname];
 				else if (isset($rs->fields[$field->name])) $val =  $rs->fields[$field->name];
 				else if (isset($rs->fields[strtolower($upperfname)])) $val =  $rs->fields[strtolower($upperfname)];
 				else $val = '';
-				
-			
+
+
 				if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) {
 					// Set the counter for the number of fields that will be updated.
 					$fieldUpdatedCount++;
@@ -637,18 +637,18 @@
 					// Based on the datatype of the field
 					// Format the value properly for the database
 					$type = $rs->MetaType($field->type);
-						
 
+
 					if ($type == 'null') {
 						$type = 'C';
 					}
-					
+
 					if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES))
 						$fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;
 					else
 						$fnameq = $upperfname;
-					
-					
+
+
                 // is_null requires php 4.0.4
                 //********************************************************//
                 if (is_null($arrFields[$upperfname])
@@ -666,7 +666,7 @@
                             //Set null
                             $setFields .= $field->name . " = null, ";
                         break;
-							
+
                         case 2:
                             //Set empty
                             $arrFields[$upperfname] = "";
@@ -685,7 +685,7 @@
                 //********************************************************//
                 } else {
 						//we do this so each driver can customize the sql for
-						//DB specific column types. 
+						//DB specific column types.
 						//Oracle needs BLOB types to be handled with a returning clause
 						//postgres has special needs as well
 						$setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,
@@ -706,7 +706,7 @@
 			// Get the full where clause excluding the word "WHERE" from
 			// the existing query.
 			preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause);
-			
+
 			$discard = false;
 			// not a good hack, improvements?
 			if ($whereClause) {
@@ -717,12 +717,12 @@
 				else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see http://sourceforge.net/tracker/index.php?func=detail&aid=1379638&group_id=42718&atid=433976
 			} else
 				$whereClause = array(false,false);
-				
+
 			if ($discard)
 				$whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1]));
-			
+
 			$sql = 'UPDATE '.$tableName.' SET '.substr($setFields, 0, -2);
-			if (strlen($whereClause[1]) > 0) 
+			if (strlen($whereClause[1]) > 0)
 				$sql .= ' WHERE '.$whereClause[1];
 
 			return $sql;
@@ -749,8 +749,8 @@
  * There is a special case of this function for the oci8 driver.
  * The proper way to handle an insert w/ a blob in oracle requires
  * a returning clause with bind variables and a descriptor blob.
- * 
- * 
+ *
+ *
  */
 function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2)
 {
@@ -765,19 +765,19 @@
 	$recordSet = null;
 	$arrFields = _array_change_key_case($arrFields);
 	$fieldInsertedCount = 0;
-	
+
 	if (is_string($rs)) {
 		//ok we have a table name
 		//try and get the column info ourself.
-		$tableName = $rs;			
-	
+		$tableName = $rs;
+
 		//we need an object for the recordSet
 		//because we have to call MetaType.
 		//php can't do a $rsclass::MetaType()
 		$rsclass = $zthis->rsPrefix.$zthis->databaseType;
 		$recordSet = new $rsclass(-1,$zthis->fetchMode);
 		$recordSet->connection = $zthis;
-		
+
 		if (is_string($cacheRS) && $cacheRS == $rs) {
 			$columns = $cacheCols;
 		} else {
@@ -789,21 +789,21 @@
 		if (isset($rs->insertSig) && is_integer($cacheRS) && $cacheRS == $rs->insertSig) {
 			$columns = $cacheCols;
 		} else {
-			for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) 
+			for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++)
 				$columns[] = $rs->FetchField($i);
 			$cacheRS = $cacheSig;
 			$cacheCols = $columns;
 			$rs->insertSig = $cacheSig++;
 		}
 		$recordSet = $rs;
-	
+
 	} else {
 		printf(ADODB_BAD_RS,'GetInsertSQL');
 		return false;
 	}
 
 	// Loop through all of the fields in the recordset
-	foreach( $columns as $field ) { 
+	foreach( $columns as $field ) {
 		$upperfname = strtoupper($field->name);
 		if (adodb_key_exists($upperfname,$arrFields,$force)) {
 			$bad = false;
@@ -811,9 +811,9 @@
 				$fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;
 			else
 				$fnameq = $upperfname;
-			
+
 			$type = $recordSet->MetaType($field->type);
-			
+
             /********************************************************/
             if (is_null($arrFields[$upperfname])
                 || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0)
@@ -825,11 +825,11 @@
                         case 0: // we must always set null if missing
 							$bad = true;
 							break;
-							
+
                         case 1:
                             $values  .= "null, ";
                         break;
-		
+
                         case 2:
                             //Set empty
                             $arrFields[$upperfname] = "";
@@ -839,7 +839,7 @@
 						default:
                         case 3:
                             //Set the value that was given in array, so you can give both null and empty values
-							if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) { 
+							if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) {
 								$values  .= "null, ";
 							} else {
                         		$values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields, $magicq);
@@ -850,18 +850,18 @@
             /*********************************************************/
 			} else {
 				//we do this so each driver can customize the sql for
-				//DB specific column types. 
+				//DB specific column types.
 				//Oracle needs BLOB types to be handled with a returning clause
 				//postgres has special needs as well
 				$values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq,
 											   $arrFields, $magicq);
 			}
-			
+
 			if ($bad) continue;
 			// Set the counter for the number of fields that will be inserted.
 			$fieldInsertedCount++;
-			
-			
+
+
 			// Get the name of the fields to insert
 			$fields .= $fnameq . ", ";
 		}
@@ -870,15 +870,15 @@
 
 	// If there were any inserted fields then build the rest of the insert query.
 	if ($fieldInsertedCount <= 0)  return false;
-	
+
 	// Get the table name from the existing query.
 	if (!$tableName) {
 		if (!empty($rs->tableName)) $tableName = $rs->tableName;
 		else if (preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName))
 			$tableName = $tableName[1];
-		else 
+		else
 			return false;
-	}		
+	}
 
 	// Strip off the comma and space on the end of both the fields
 	// and their values.
@@ -895,20 +895,20 @@
  * the update/sql which is generated by GetInsertSQL and GetUpdateSQL.
  * It handles the string construction of 1 column -> sql string based on
  * the column type.  We want to do 'safe' handling of BLOBs
- * 
+ *
  * @param string the type of sql we are trying to create
- *                'I' or 'U'. 
- * @param string column data type from the db::MetaType() method  
+ *                'I' or 'U'.
+ * @param string column data type from the db::MetaType() method
  * @param string the column name
  * @param array the column value
- * 
+ *
  * @return string
- * 
+ *
  */
-function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFields, $magicq) 
+function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFields, $magicq)
 {
     $sql = '';
-    
+
     // Based on the datatype of the field
     // Format the value properly for the database
     switch($type) {
@@ -916,7 +916,7 @@
         //in order to handle Blobs correctly, we need
         //to do some magic for Oracle
 
-        //we need to create a new descriptor to handle 
+        //we need to create a new descriptor to handle
         //this properly
         if (!empty($zthis->hasReturningInto)) {
             if ($action == 'I') {
@@ -933,7 +933,7 @@
                 $sql = 'empty_blob(), ';
             } else {
                 $sql = $fnameq. '=empty_blob(), ';
-            }            
+            }
         } else {
             //this is to maintain compatibility
             //with older adodb versions.
@@ -949,7 +949,7 @@
         //to avoid conflicts w/ dupes.
        if (!empty($zthis->hasReturningInto)) {
             if ($action == 'I') {
-                $sql = ':xx'.$fname.'xx, ';                
+                $sql = ':xx'.$fname.'xx, ';
             } else {
                 $sql = $fnameq.'=:xx'.$fname.'xx, ';
             }
@@ -961,18 +961,18 @@
             //this is to maintain compatibility
             //with older adodb versions.
             $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false);
-        }            
+        }
         break;
-        
+
     default:
         $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq,  $arrFields, $magicq,false);
         break;
     }
-    
+
     return $sql;
-}    
-	
-function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq, $recurse=true) 
+}
+
+function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq, $recurse=true)
 {
 
 	if ($recurse) {
@@ -982,10 +982,10 @@
 			break;
 		case 'oci8':
 			return _adodb_column_sql_oci8($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq);
-			
+
 		}
 	}
-		
+
 	switch($type) {
 		case "C":
 		case "X":
@@ -1000,7 +1000,7 @@
 		case "T":
 			$val = $zthis->DBTimeStamp($arrFields[$fname]);
 			break;
-			
+
 		case "N":
 		    $val = $arrFields[$fname];
 			if (!is_numeric($val)) $val = str_replace(',', '.', (float)$val);
@@ -1019,10 +1019,10 @@
 	}
 
 	if ($action == 'I') return $val . ", ";
-	
-	
+
+
 	return $fnameq . "=" . $val  . ", ";
-	
+
 }
 
 
@@ -1045,7 +1045,7 @@
 	*/
 	// check if running from browser or command-line
 	$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
-	
+
 	$dbt = $zthis->databaseType;
 	if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType;
 	if ($inBrowser) {
@@ -1063,31 +1063,31 @@
 	}
 
 	$qID = $zthis->_query($sql,$inputarr);
-	
-	/* 
+
+	/*
 		Alexios Fakios notes that ErrorMsg() must be called before ErrorNo() for mssql
 		because ErrorNo() calls Execute('SELECT @ERROR'), causing recursion
 	*/
-	if ($zthis->databaseType == 'mssql') { 
+	if ($zthis->databaseType == 'mssql') {
 	// ErrorNo is a slow function call in mssql, and not reliable in PHP 4.0.6
-	
+
 		if($emsg = $zthis->ErrorMsg()) {
 			if ($err = $zthis->ErrorNo()) {
-				if ($zthis->debug === -99) 
+				if ($zthis->debug === -99)
 					ADOConnection::outp( "<hr>\n($dbt): ".htmlspecialchars($sqlTxt)." &nbsp; $ss\n<hr>\n",false);
-		
+
 				ADOConnection::outp($err.': '.$emsg);
 			}
 		}
 	} else if (!$qID) {
-	
-		if ($zthis->debug === -99) 
+
+		if ($zthis->debug === -99)
 				if ($inBrowser) ADOConnection::outp( "<hr>\n($dbt): ".htmlspecialchars($sqlTxt)." &nbsp; $ss\n<hr>\n",false);
 				else ADOConnection::outp("-----<hr>\n($dbt): ".$sqlTxt."$ss\n-----<hr>\n",false);
-				
+
 		ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg());
 	}
-	
+
 	if ($zthis->debug === 99) _adodb_backtrace(true,9999,2);
 	return $qID;
 }
@@ -1096,27 +1096,27 @@
 function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0,$ishtml=null)
 {
 	if (!function_exists('debug_backtrace')) return '';
-	 
+
 	if ($ishtml === null) $html =  (isset($_SERVER['HTTP_USER_AGENT']));
 	else $html = $ishtml;
-	
+
 	$fmt =  ($html) ? "</font><font color=#808080 size=-1> %% line %4d, file: <a href=\"file:/%s\">%s</a></font>" : "%% line %4d, file: %s";
 
 	$MAXSTRLEN = 128;
 
 	$s = ($html) ? '<pre align=left>' : '';
-	
+
 	if (is_array($printOrArr)) $traceArr = $printOrArr;
 	else $traceArr = debug_backtrace();
 	array_shift($traceArr);
 	array_shift($traceArr);
 	$tabs = sizeof($traceArr)-2;
-	
+
 	foreach ($traceArr as $arr) {
 		if ($skippy) {$skippy -= 1; continue;}
 		$levels -= 1;
 		if ($levels < 0) break;
-		
+
 		$args = array();
 		for ($i=0; $i < $tabs; $i++) $s .=  ($html) ? ' &nbsp; ' : "\t";
 		$tabs -= 1;
@@ -1136,31 +1136,31 @@
 			}
 		}
 		$s .= $arr['function'].'('.implode(', ',$args).')';
-		
-		
+
+
 		$s .= @sprintf($fmt, $arr['line'],$arr['file'],basename($arr['file']));
-			
+
 		$s .= "\n";
-	}	
+	}
 	if ($html) $s .= '</pre>';
 	if ($printOrArr) print $s;
-	
+
 	return $s;
 }
 /*
-function _adodb_find_from($sql) 
+function _adodb_find_from($sql)
 {
 
 	$sql = str_replace(array("\n","\r"), ' ', $sql);
 	$charCount = strlen($sql);
-	
+
 	$inString = false;
 	$quote = '';
 	$parentheseCount = 0;
 	$prevChars = '';
 	$nextChars = '';
-	
 
+
 	for($i = 0; $i < $charCount; $i++) {
 
     	$char = substr($sql,$i,1);
Index: typo3/sysext/adodb/adodb/datadict/datadict-mssql.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-mssql.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-mssql.inc.php	(working copy)
@@ -2,37 +2,37 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 
 /*
 In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
 
-	Note Delimiters are for identifiers only. Delimiters cannot be used for keywords, 
+	Note Delimiters are for identifiers only. Delimiters cannot be used for keywords,
 	whether or not they are marked as reserved in SQL Server.
-	
+
 	Quoted identifiers are delimited by double quotation marks ("):
 	SELECT * FROM "Blanks in Table Name"
-	
+
 	Bracketed identifiers are delimited by brackets ([ ]):
 	SELECT * FROM [Blanks In Table Name]
-	
-	Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default, 
-	the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON 
-	when they connect. 
-	
-	In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER, 
+
+	Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default,
+	the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON
+	when they connect.
+
+	In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER,
 	the quoted identifier option of sp_dboption, or the user options option of sp_configure.
-	
+
 	When SET ANSI_DEFAULTS is ON, SET QUOTED_IDENTIFIER is enabled.
-	
+
 	Syntax
-	
+
 		SET QUOTED_IDENTIFIER { ON | OFF }
 
 
@@ -49,9 +49,9 @@
 
 	var $typeX = 'TEXT';  ## Alternatively, set it to VARCHAR(4000)
 	var $typeXL = 'TEXT';
-	
+
 	//var $alterCol = ' ALTER COLUMN ';
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -59,11 +59,11 @@
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
 		case 'R':
-		case 'INT': 
+		case 'INT':
 		case 'INTEGER': return  'I';
 		case 'BIT':
 		case 'TINYINT': return  'I1';
@@ -75,7 +75,7 @@
 		default: return parent::MetaType($t,$len,$fieldobj);
 		}
 	}
-	
+
 	function ActualType($meta)
 	{
 		switch(strtoupper($meta)) {
@@ -85,30 +85,30 @@
 		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'NTEXT';
-		
+
 		case 'B': return 'IMAGE';
-			
+
 		case 'D': return 'DATETIME';
-		
+
 		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'BIT';
-		
-		case 'R':		
-		case 'I': return 'INT'; 
+
+		case 'R':
+		case 'I': return 'INT';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'REAL';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
-	
+
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -122,7 +122,7 @@
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	/*
 	function AlterColumnSQL($tabname, $flds)
 	{
@@ -136,7 +136,7 @@
 		return $sql;
 	}
 	*/
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -151,10 +151,10 @@
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
@@ -163,110 +163,110 @@
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
+CREATE TABLE
+    [ database_name.[ owner ] . | owner. ] table_name
+    ( { < column_definition >
+        | column_name AS computed_column_expression
         | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
 
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+    )
 
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
 
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
+< column_definition > ::= { column_name data_type }
+    [ COLLATE < collation_name > ]
+    [ [ DEFAULT constant_expression ]
         | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
+    ]
+    [ ROWGUIDCOL]
+    [ < column_constraint > ] [ ...n ]
 
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ NULL | NOT NULL ]
+        | [ { PRIMARY KEY | UNIQUE }
+            [ CLUSTERED | NONCLUSTERED ]
+            [ WITH FILLFACTOR = fillfactor ]
+            [ON {filegroup | DEFAULT} ] ]
+        ]
+        | [ [ FOREIGN KEY ]
+            REFERENCES ref_table [ ( ref_column ) ]
+            [ ON DELETE { CASCADE | NO ACTION } ]
+            [ ON UPDATE { CASCADE | NO ACTION } ]
+            [ NOT FOR REPLICATION ]
+        ]
+        | CHECK [ NOT FOR REPLICATION ]
+        ( logical_expression )
+    }
 
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ { PRIMARY KEY | UNIQUE }
+        [ CLUSTERED | NONCLUSTERED ]
+        { ( column [ ASC | DESC ] [ ,...n ] ) }
+        [ WITH FILLFACTOR = fillfactor ]
+        [ ON { filegroup | DEFAULT } ]
+    ]
+    | FOREIGN KEY
+        [ ( column [ ,...n ] ) ]
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+        [ ON DELETE { CASCADE | NO ACTION } ]
+        [ ON UPDATE { CASCADE | NO ACTION } ]
+        [ NOT FOR REPLICATION ]
+    | CHECK [ NOT FOR REPLICATION ]
+        ( search_conditions )
+    }
 
 
 	*/
-	
+
 	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+		[ WITH < index_option > [ ,...n] ]
 		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
+		< index_option > :: =
+		    { PAD_INDEX |
+		        FILLFACTOR = fillfactor |
+		        IGNORE_DUP_KEY |
+		        DROP_EXISTING |
+		    STATISTICS_NORECOMPUTE |
+		    SORT_IN_TEMPDB
 		}
 */
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
 
+
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
-	
+
+
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
 		switch ($ftype) {
@@ -277,7 +277,7 @@
 			return $ftype;
 		}
     	if ($ty == 'T') return $ftype;
-    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);
 
 	}
 }
Index: typo3/sysext/adodb/adodb/datadict/datadict-access.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-access.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-access.inc.php	(working copy)
@@ -2,53 +2,53 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_access extends ADODB_DataDict {
-	
+
 	var $databaseType = 'access';
 	var $seqField = false;
-	
- 	
+
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'TEXT';
 		case 'XL':
-		case 'X': return 'MEMO'; 
-		
+		case 'X': return 'MEMO';
+
 		case 'C2': return 'TEXT'; // up to 32K
 		case 'X2': return 'MEMO';
-		
+
 		case 'B': return 'BINARY';
-		
+
 		case 'TS':
 		case 'D': return 'DATETIME';
 		case 'T': return 'DATETIME';
-		
+
 		case 'L': return 'BYTE';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'BYTE';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'INTEGER';
-		
+
 		case 'F': return 'DOUBLE';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
@@ -66,13 +66,13 @@
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	function CreateDatabase($dbname,$options=false)
 	{
 		return array();
 	}
-	
-	
+
+
 	function SetSchema($schema)
 	{
 	}
@@ -82,14 +82,14 @@
 		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
+
 }
 
 
Index: typo3/sysext/adodb/adodb/datadict/datadict-mysql.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-mysql.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-mysql.inc.php	(working copy)
@@ -2,12 +2,12 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 
 // security - hide paths
@@ -18,10 +18,10 @@
 	var $alterCol = ' MODIFY COLUMN';
 	var $alterTableAddIndex = true;
 	var $dropTable = 'DROP TABLE IF EXISTS %s'; // requires mysql 3.22 or later
-	
+
 	var $dropIndex = 'DROP INDEX %s ON %s';
 	var $renameColumn = 'ALTER TABLE %s CHANGE COLUMN %s %s %s';	// needs column-definition!
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -30,43 +30,43 @@
 			$len = $fieldobj->max_length;
 		}
 		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->auto_increment;
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'STRING': 
+		case 'STRING':
 		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
+		case 'VARCHAR':
+		case 'TINYBLOB':
+		case 'TINYTEXT':
+		case 'ENUM':
 		case 'SET':
 			if ($len <= $this->blobSize) return 'C';
-			
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 			return 'X';
-			
+
 		// php_mysql extension always returns 'blob' even if 'text'
 		// so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
 			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
+
 		case 'YEAR':
 		case 'DATE': return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP': return 'T';
-		
+
 		case 'FLOAT':
 		case 'DOUBLE':
 			return 'F';
-			
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER': return $is_serial ? 'R' : 'I';
 		case 'TINYINT': return $is_serial ? 'R' : 'I1';
 		case 'SMALLINT': return $is_serial ? 'R' : 'I2';
@@ -82,34 +82,34 @@
 		case 'C': return 'VARCHAR';
 		case 'XL':return 'LONGTEXT';
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'VARCHAR';
 		case 'X2': return 'LONGTEXT';
-		
+
 		case 'B': return 'LONGBLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'TINYINT';
-		
+
 		case 'R':
 		case 'I4':
 		case 'I': return 'INTEGER';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'DOUBLE';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if ($funsigned) $suffix .= ' UNSIGNED';
 		if ($fnotnull) $suffix .= ' NOT NULL';
@@ -118,7 +118,7 @@
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
 	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
 		[table_options] [select_statement]
@@ -134,16 +134,16 @@
 		[reference_definition]
 		or CHECK (expr)
 	*/
-	
+
 	/*
 	CREATE [UNIQUE|FULLTEXT] INDEX index_name
 		ON tbl_name (col_name[(length)],... )
 	*/
-	
+
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE $tabname DROP INDEX $idxname";
 			else $sql[] = sprintf($this->dropIndex, $idxname, $tabname);
@@ -151,11 +151,11 @@
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		if (isset($idxoptions['FULLTEXT'])) {
 			$unique = ' FULLTEXT';
 		} elseif (isset($idxoptions['UNIQUE'])) {
@@ -163,19 +163,19 @@
 		} else {
 			$unique = '';
 		}
-		
+
 		if ( is_array($flds) ) $flds = implode(', ',$flds);
-		
+
 		if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD $unique INDEX $idxname ";
 		else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname;
-		
+
 		$s .= ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
 }
Index: typo3/sysext/adodb/adodb/datadict/datadict-sapdb.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-sapdb.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-sapdb.inc.php	(working copy)
@@ -2,12 +2,12 @@
 
 /**
   V4.50 6 July 2004  (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
-  
+
   Modified from datadict-generic.inc.php for sapdb by RalfBecker-AT-outdoor-training.de
 */
 
@@ -15,41 +15,41 @@
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_sapdb extends ADODB_DataDict {
-	
+
 	var $databaseType = 'sapdb';
-	var $seqField = false;	
+	var $seqField = false;
 	var $renameColumn = 'RENAME COLUMN %s.%s TO %s';
- 	
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'LONG';
-		
+
 		case 'C2': return 'VARCHAR UNICODE';
 		case 'X2': return 'LONG UNICODE';
-		
+
 		case 'B': return 'LONG';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'BOOLEAN';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'FIXED(3)';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'FIXED(20)';
-		
+
 		case 'F': return 'FLOAT(38)';
 		case 'N': return 'FIXED';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -79,10 +79,10 @@
 
 		return $type;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if ($funsigned) $suffix .= ' UNSIGNED';
 		if ($fnotnull) $suffix .= ' NOT NULL';
@@ -99,7 +99,7 @@
 		list($lines,$pkey) = $this->_GenFields($flds);
 		return array( 'ALTER TABLE ' . $tabname . ' ADD (' . implode(', ',$lines) . ')' );
 	}
-	
+
 	function AlterColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -116,7 +116,7 @@
 			$flds[$k] = $this->NameQuote($v);
 		}
 		return array( 'ALTER TABLE ' . $tabname . ' DROP (' . implode(', ',$flds) . ')' );
-	}	
+	}
 }
 
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/datadict/datadict-sybase.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-sybase.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-sybase.inc.php	(working copy)
@@ -2,12 +2,12 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 
 // security - hide paths
@@ -15,9 +15,9 @@
 
 class ADODB2_sybase extends ADODB_DataDict {
 	var $databaseType = 'sybase';
-	
+
 	var $dropIndex = 'DROP INDEX %2$s.%1$s';
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -25,54 +25,54 @@
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
 
-		case 'INT': 
+		case 'INT':
 		case 'INTEGER': return  'I';
 		case 'BIT':
 		case 'TINYINT': return  'I1';
 		case 'SMALLINT': return 'I2';
 		case 'BIGINT':  return  'I8';
-		
+
 		case 'REAL':
 		case 'FLOAT': return 'F';
 		default: return parent::MetaType($t,$len,$fieldobj);
 		}
 	}
-	
+
 	function ActualType($meta)
 	{
 		switch(strtoupper($meta)) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'NTEXT';
-		
+
 		case 'B': return 'IMAGE';
-			
+
 		case 'D': return 'DATETIME';
 		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'BIT';
-		
-		case 'I': return 'INT'; 
+
+		case 'I': return 'INT';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'REAL';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
-	
+
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -86,7 +86,7 @@
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function AlterColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -98,7 +98,7 @@
 
 		return $sql;
 	}
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName($tabname);
@@ -112,10 +112,10 @@
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
@@ -124,105 +124,105 @@
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
+CREATE TABLE
+    [ database_name.[ owner ] . | owner. ] table_name
+    ( { < column_definition >
+        | column_name AS computed_column_expression
         | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
 
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+    )
 
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
 
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
+< column_definition > ::= { column_name data_type }
+    [ COLLATE < collation_name > ]
+    [ [ DEFAULT constant_expression ]
         | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
+    ]
+    [ ROWGUIDCOL]
+    [ < column_constraint > ] [ ...n ]
 
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ NULL | NOT NULL ]
+        | [ { PRIMARY KEY | UNIQUE }
+            [ CLUSTERED | NONCLUSTERED ]
+            [ WITH FILLFACTOR = fillfactor ]
+            [ON {filegroup | DEFAULT} ] ]
+        ]
+        | [ [ FOREIGN KEY ]
+            REFERENCES ref_table [ ( ref_column ) ]
+            [ ON DELETE { CASCADE | NO ACTION } ]
+            [ ON UPDATE { CASCADE | NO ACTION } ]
+            [ NOT FOR REPLICATION ]
+        ]
+        | CHECK [ NOT FOR REPLICATION ]
+        ( logical_expression )
+    }
 
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ { PRIMARY KEY | UNIQUE }
+        [ CLUSTERED | NONCLUSTERED ]
+        { ( column [ ASC | DESC ] [ ,...n ] ) }
+        [ WITH FILLFACTOR = fillfactor ]
+        [ ON { filegroup | DEFAULT } ]
+    ]
+    | FOREIGN KEY
+        [ ( column [ ,...n ] ) ]
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+        [ ON DELETE { CASCADE | NO ACTION } ]
+        [ ON UPDATE { CASCADE | NO ACTION } ]
+        [ NOT FOR REPLICATION ]
+    | CHECK [ NOT FOR REPLICATION ]
+        ( search_conditions )
+    }
 
 
 	*/
-	
+
 	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+		[ WITH < index_option > [ ,...n] ]
 		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
+		< index_option > :: =
+		    { PAD_INDEX |
+		        FILLFACTOR = fillfactor |
+		        IGNORE_DUP_KEY |
+		        DROP_EXISTING |
+		    STATISTICS_NORECOMPUTE |
+		    SORT_IN_TEMPDB
 		}
 */
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
 }
Index: typo3/sysext/adodb/adodb/datadict/datadict-ibase.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-ibase.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-ibase.inc.php	(working copy)
@@ -2,46 +2,46 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_ibase extends ADODB_DataDict {
-	
+
 	var $databaseType = 'ibase';
 	var $seqField = false;
-	
- 	
+
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
-		case 'X': return 'VARCHAR(4000)'; 
-		
+		case 'X': return 'VARCHAR(4000)';
+
 		case 'C2': return 'VARCHAR'; // up to 32K
 		case 'X2': return 'VARCHAR(4000)';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'INTEGER';
-		
+
 		case 'F': return 'DOUBLE PRECISION';
 		case 'N': return 'DECIMAL';
 		default:
@@ -54,14 +54,14 @@
 		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
+
 }
 
 
Index: typo3/sysext/adodb/adodb/datadict/datadict-firebird.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-firebird.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-firebird.inc.php	(working copy)
@@ -2,75 +2,75 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 
 class ADODB2_firebird extends ADODB_DataDict {
-	
+
 	var $databaseType = 'firebird';
 	var $seqField = false;
 	var $seqPrefix = 'gen_';
-	var $blobSize = 40000;	
- 	
+	var $blobSize = 40000;
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
-		case 'XL': return 'VARCHAR(32000)'; 
-		case 'X': return 'VARCHAR(4000)'; 
-		
+		case 'XL': return 'VARCHAR(32000)';
+		case 'X': return 'VARCHAR(4000)';
+
 		case 'C2': return 'VARCHAR'; // up to 32K
 		case 'X2': return 'VARCHAR(4000)';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'INTEGER';
-		
+
 		case 'F': return 'DOUBLE PRECISION';
 		case 'N': return 'DECIMAL';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	function NameQuote($name = NULL)
 	{
 		if (!is_string($name)) {
 			return FALSE;
 		}
-		
+
 		$name = trim($name);
-		
+
 		if ( !is_object($this->connection) ) {
 			return $name;
 		}
-		
+
 		$quote = $this->connection->nameQuote;
-		
+
 		// if name is of the form `name`, quote it
 		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
 			return $quote . $matches[1] . $quote;
 		}
-		
+
 		// if name contains special characters, quote it
 		if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
 			return $quote . $name . $quote;
 		}
-		
+
 		return $quote . $name . $quote;
 	}
 
@@ -78,12 +78,12 @@
 	{
 		$options = $this->_Options($options);
 		$sql = array();
-		
+
 		$sql[] = "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) RETURNS CSTRING(80) FREE_IT ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf'";
-		
+
 		return $sql;
 	}
-	
+
 	function _DropAutoIncrement($t)
 	{
 		if (strpos($t,'.') !== false) {
@@ -92,20 +92,20 @@
 		}
 		return 'DROP GENERATOR "GEN_'.$t;
 	}
-	
 
+
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
 		$suffix = '';
-		
+
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fnotnull) $suffix .= ' NOT NULL';
 		if ($fautoinc) $this->seqField = $fname;
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
+
 		return $suffix;
 	}
-	
+
 /*
 CREATE or replace TRIGGER jaddress_insert
 before insert on jaddress
@@ -116,9 +116,9 @@
 end;
 */
 	function _Triggers($tabname,$tableoptions)
-	{	
+	{
 		if (!$this->seqField) return array();
-		
+
 		$tab1 = preg_replace( '/"/', '', $tabname );
 		if ($this->schema) {
 			$t = strpos($tab1,'.');
@@ -141,7 +141,7 @@
 		{ $sql[] = "CREATE GENERATOR \"$seqname\"";
 		  $sql[] = "CREATE TRIGGER \"$trigname\" FOR $tabname BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
 		}
-		
+
 		$this->seqField = false;
 		return $sql;
 	}
Index: typo3/sysext/adodb/adodb/datadict/datadict-generic.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-generic.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-generic.inc.php	(working copy)
@@ -2,46 +2,46 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_generic extends ADODB_DataDict {
-	
+
 	var $databaseType = 'generic';
 	var $seqField = false;
-	
- 	
+
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'VARCHAR(250)';
-		
+
 		case 'C2': return 'VARCHAR';
 		case 'X2': return 'VARCHAR(250)';
-		
+
 		case 'B': return 'VARCHAR';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'DATE';
-		
+
 		case 'L': return 'DECIMAL(1)';
 		case 'I': return 'DECIMAL(10)';
 		case 'I1': return 'DECIMAL(3)';
 		case 'I2': return 'DECIMAL(5)';
 		case 'I4': return 'DECIMAL(10)';
 		case 'I8': return 'DECIMAL(20)';
-		
+
 		case 'F': return 'DECIMAL(32,8)';
 		case 'N': return 'DECIMAL';
 		default:
@@ -54,14 +54,14 @@
 		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
+
 }
 
 /*
@@ -70,52 +70,52 @@
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
-		case 'X': return 'VARCHAR'; 
-		
+		case 'X': return 'VARCHAR';
+
 		case 'C2': return 'VARCHAR'; // up to 32K
 		case 'X2': return 'VARCHAR';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'DOUBLE';
 		case 'N': return 'DECIMAL';
 		default:
 			return $meta;
 		}
 	}
-	
+
 // ifx
 function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';// 255
-		case 'X': return 'TEXT'; 
-		
+		case 'X': return 'TEXT';
+
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'TEXT';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'T': return 'DATETIME';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'DECIMAL(20)';
-		
+
 		case 'F': return 'FLOAT';
 		case 'N': return 'DECIMAL';
 		default:
Index: typo3/sysext/adodb/adodb/datadict/datadict-db2.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-db2.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-db2.inc.php	(working copy)
@@ -2,27 +2,27 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_db2 extends ADODB_DataDict {
-	
+
 	var $databaseType = 'db2';
 	var $seqField = false;
-	
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL': return 'CLOB';
-		case 'X': return 'VARCHAR(3600)'; 
+		case 'X': return 'VARCHAR(3600)';
 
 		case 'C2': return 'VARCHAR'; // up to 32K
 		case 'X2': return 'VARCHAR(3600)'; // up to 32000, but default page size too small
@@ -46,12 +46,12 @@
 			return $meta;
 		}
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
-		if ($fautoinc) return ' GENERATED ALWAYS AS IDENTITY'; # as identity start with 
+		if ($fautoinc) return ' GENERATED ALWAYS AS IDENTITY'; # as identity start with
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fnotnull) $suffix .= ' NOT NULL';
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
@@ -63,37 +63,37 @@
 		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function ChangeTableSQL($tablename, $flds, $tableoptions = false)
 	{
-		
+
 		/**
 		  Allow basic table changes to DB2 databases
-		  DB2 will fatally reject changes to non character columns 
+		  DB2 will fatally reject changes to non character columns
 
 		*/
-		
+
 		$validTypes = array("CHAR","VARC");
 		$invalidTypes = array("BIGI","BLOB","CLOB","DATE", "DECI","DOUB", "INTE", "REAL","SMAL", "TIME");
 		// check table exists
 		$cols = $this->MetaColumns($tablename);
-		if ( empty($cols)) { 
+		if ( empty($cols)) {
 			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
 		}
-		
+
 		// already exists, alter table instead
 		list($lines,$pkey) = $this->_GenFields($flds);
 		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
 		$sql = array();
-		
+
 		foreach ( $lines as $id => $v ) {
 			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
 				/**
@@ -110,10 +110,10 @@
 				for ($i=1;$i<sizeof($vargs);$i++)
 					if ($vargs[$i] != '')
 						break;
-				
+
 				// if $vargs[$i] is one of the following, we are trying to change the
 				// size of the field, if not allowed, simply ignore the request.
-				if (in_array(substr($vargs[$i],0,4),$invalidTypes)) 
+				if (in_array(substr($vargs[$i],0,4),$invalidTypes))
 					continue;
 				// insert the appropriate DB2 syntax
 				if (in_array(substr($vargs[$i],0,4),$validTypes)) {
@@ -128,16 +128,16 @@
 						break;
 					array_splice($vargs,$i,2,'');
 				}
-				$v = implode(' ',$vargs);	
+				$v = implode(' ',$vargs);
 				$sql[] = $alter . $this->alterCol . ' ' . $v;
 			} else {
 				$sql[] = $alter . $this->addCol . ' ' . $v;
 			}
 		}
-		
+
 		return $sql;
 	}
-	
+
 }
 
 
Index: typo3/sysext/adodb/adodb/datadict/datadict-postgres.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-postgres.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-postgres.inc.php	(working copy)
@@ -2,19 +2,19 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_postgres extends ADODB_DataDict {
-	
+
 	var $databaseType = 'postgres';
 	var $seqField = false;
 	var $seqPrefix = 'SEQ_';
@@ -22,7 +22,7 @@
 	var $quote = '"';
 	var $renameTable = 'ALTER TABLE %s RENAME TO %s'; // at least since 7.1
 	var $dropTable = 'DROP TABLE %s CASCADE';
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -30,9 +30,9 @@
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->unique && 
+		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->unique &&
 			$fieldobj->has_default && substr($fieldobj->default_value,0,8) == 'nextval(';
-		
+
 		switch (strtoupper($t)) {
 			case 'INTERVAL':
 			case 'CHAR':
@@ -41,84 +41,84 @@
 			case 'NAME':
 	   		case 'BPCHAR':
 				if ($len <= $this->blobSize) return 'C';
-			
+
 			case 'TEXT':
 				return 'X';
-	
+
 			case 'IMAGE': // user defined type
 			case 'BLOB': // user defined type
 			case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
 			case 'VARBIT':
 			case 'BYTEA':
 				return 'B';
-			
+
 			case 'BOOL':
 			case 'BOOLEAN':
 				return 'L';
-			
+
 			case 'DATE':
 				return 'D';
-			
+
 			case 'TIME':
 			case 'DATETIME':
 			case 'TIMESTAMP':
 			case 'TIMESTAMPTZ':
 				return 'T';
-			
+
 			case 'INTEGER': return !$is_serial ? 'I' : 'R';
-			case 'SMALLINT': 
+			case 'SMALLINT':
 			case 'INT2': return !$is_serial ? 'I2' : 'R';
 			case 'INT4': return !$is_serial ? 'I4' : 'R';
-			case 'BIGINT': 
+			case 'BIGINT':
 			case 'INT8': return !$is_serial ? 'I8' : 'R';
-				
+
 			case 'OID':
 			case 'SERIAL':
 				return 'R';
-			
+
 			case 'FLOAT4':
 			case 'FLOAT8':
 			case 'DOUBLE PRECISION':
 			case 'REAL':
 				return 'F';
-				
+
 			 default:
 			 	return 'N';
 		}
 	}
- 	
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'VARCHAR';
 		case 'X2': return 'TEXT';
-		
+
 		case 'B': return 'BYTEA';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'BOOLEAN';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'INT2';
 		case 'I4': return 'INT4';
 		case 'I8': return 'INT8';
-		
+
 		case 'F': return 'FLOAT8';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	/**
-	 * Adding a new Column 
+	 * Adding a new Column
 	 *
 	 * reimplementation of the default function as postgres does NOT allow to set the default in the same statement
 	 *
@@ -141,7 +141,7 @@
 				$sql[] = $alter . str_replace('DEFAULT '.$default,'',$v);
 				$sql[] = 'UPDATE '.$tabname.' SET '.$colname.'='.$default;
 				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-			} else {				
+			} else {
 				$sql[] = $alter . $v;
 			}
 			if ($not_null) {
@@ -157,7 +157,7 @@
 	{
 	   return array(sprintf($this->dropIndex, $this->TableName($idxname), $this->TableName($tabname)));
 	}
-	
+
 	/**
 	 * Change the definition of one column
 	 *
@@ -178,12 +178,12 @@
 		}
 		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
 	}*/
-	
+
 	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
 	   // Check if alter single column datatype available - works with 8.0+
 	   $has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
-	
+
 	   if ($has_alter_column) {
 	      $tabname = $this->TableName($tabname);
 	      $sql = array();
@@ -193,26 +193,26 @@
 	         if ($not_null = preg_match('/NOT NULL/i',$v)) {
 	            $v = preg_replace('/NOT NULL/i','',$v);
 	         }
-	         // this next block doesn't work - there is no way that I can see to 
+	         // this next block doesn't work - there is no way that I can see to
 	         // explicitly ask a column to be null using $flds
 	         else if ($set_null = preg_match('/NULL/i',$v)) {
 	            // if they didn't specify not null, see if they explicitely asked for null
 	            $v = preg_replace('/\sNULL/i','',$v);
 	         }
-	         
+
 	         if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
 	            list(,$colname,$default) = $matches;
 	            $v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v);
 	            $sql[] = $alter . $colname . ' TYPE ' . str_replace('DEFAULT '.$default,'',$v);
 	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-	         } 
+	         }
 	         else {
 	            // drop default?
 	            preg_match ('/^\s*(\S+)\s+(.*)$/',$v,$matches);
 	            list (,$colname,$rest) = $matches;
 	            $sql[] = $alter . $colname . ' TYPE ' . $rest;
 	         }
-	
+
 	         list($colname) = explode(' ',$v);
 	         if ($not_null) {
 	            // this does not error out if the column is already not null
@@ -225,7 +225,7 @@
 	      }
 	      return $sql;
 	   }
-	
+
 	   // does not have alter column
 	   if (!$tableflds) {
 	      if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
@@ -233,7 +233,7 @@
 	   }
 	   return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
 	}
-	
+
 	/**
 	 * Drop one column
 	 *
@@ -257,7 +257,7 @@
 		}
 		return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
 	}
-	
+
 	/**
 	 * Save the content into a temp. table, drop and recreate the original table and copy the content back in
 	 *
@@ -277,14 +277,14 @@
 		foreach($this->MetaColumns($tabname) as $fld) {
 			if (!$dropflds || !in_array($fld->name,$dropflds)) {
 				// we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
-				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) && 
+				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) &&
 					in_array($fld->type,array('varchar','char','text','bytea'))) {
 					$copyflds[] = "to_number($fld->name,'S9999999999999D99')";
 				} else {
 					$copyflds[] = $fld->name;
 				}
 				// identify the sequence name and the fld its on
-				if ($fld->primary_key && $fld->has_default && 
+				if ($fld->primary_key && $fld->has_default &&
 					preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
 					$seq_name = $matches[1];
 					$seq_fld = $fld->name;
@@ -292,7 +292,7 @@
 			}
 		}
 		$copyflds = implode(', ',$copyflds);
-		
+
 		$tempname = $tabname.'_tmp';
 		$aSql[] = 'BEGIN';		// we use a transaction, to make sure not to loose the content of the table
 		$aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM $tabname";
@@ -315,14 +315,14 @@
 		$aSql[] = 'COMMIT';
 		return $aSql;
 	}
-	
+
 	function DropTableSQL($tabname)
 	{
 		$sql = ADODB_DataDict::DropTableSQL($tabname);
-		
+
 		$drop_seq = $this->_DropAutoIncrement($tabname);
 		if ($drop_seq) $sql[] = $drop_seq;
-		
+
 		return $sql;
 	}
 
@@ -339,7 +339,7 @@
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	// search for a sequece for the given table (asumes the seqence-name contains the table-name!)
 	// if yes return sql to drop it
 	// this is still necessary if postgres < 7.3 or the SERIAL was created on an earlier version!!!
@@ -355,7 +355,7 @@
 		}
 		return "DROP SEQUENCE ".$seq;
 	}
-	
+
 	function RenameTableSQL($tabname,$newname)
 	{
 		if (!empty($this->schema)) {
@@ -369,7 +369,7 @@
 
 		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
 	}
-	
+
 	/*
 	CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
 	{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [, ... ] ]
@@ -393,8 +393,8 @@
 	[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
 	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
 	*/
-	
-	
+
+
 	/*
 	CREATE [ UNIQUE ] INDEX index_name ON table
 [ USING acc_method ] ( column [ ops_name ] [, ...] )
@@ -406,35 +406,35 @@
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		
+
 		$s = 'CREATE' . $unique . ' INDEX "' . $idxname . '" ON "' . $tabname . '" ';
-		
+
 		if (isset($idxoptions['HASH']))
 			$s .= 'USING HASH ';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		if ( is_array($flds) )
 			$flds = implode('", "',$flds);
 		$s .= '("' . $flds . '")';
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
+
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
 		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && $ty  != 'I' && strpos($ftype,'(') === false) {
Index: typo3/sysext/adodb/adodb/datadict/datadict-mssqlnative.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-mssqlnative.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-mssqlnative.inc.php	(working copy)
@@ -2,37 +2,37 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 
 /*
 In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
 
-	Note Delimiters are for identifiers only. Delimiters cannot be used for keywords, 
+	Note Delimiters are for identifiers only. Delimiters cannot be used for keywords,
 	whether or not they are marked as reserved in SQL Server.
-	
+
 	Quoted identifiers are delimited by double quotation marks ("):
 	SELECT * FROM "Blanks in Table Name"
-	
+
 	Bracketed identifiers are delimited by brackets ([ ]):
 	SELECT * FROM [Blanks In Table Name]
-	
-	Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default, 
-	the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON 
-	when they connect. 
-	
-	In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER, 
+
+	Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default,
+	the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON
+	when they connect.
+
+	In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER,
 	the quoted identifier option of sp_dboption, or the user options option of sp_configure.
-	
+
 	When SET ANSI_DEFAULTS is ON, SET QUOTED_IDENTIFIER is enabled.
-	
+
 	Syntax
-	
+
 		SET QUOTED_IDENTIFIER { ON | OFF }
 
 
@@ -49,9 +49,9 @@
 
 	var $typeX = 'TEXT';  ## Alternatively, set it to VARCHAR(4000)
 	var $typeXL = 'TEXT';
-	
+
 	//var $alterCol = ' ALTER COLUMN ';
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -59,23 +59,23 @@
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
 		case 'R':
-		case 'INT': 
+		case 'INT':
 		case 'INTEGER': return  'I';
 		case 'BIT':
 		case 'TINYINT': return  'I1';
 		case 'SMALLINT': return 'I2';
 		case 'BIGINT':  return  'I8';
-		
+
 		case 'REAL':
 		case 'FLOAT': return 'F';
 		default: return parent::MetaType($t,$len,$fieldobj);
 		}
 	}
-	
+
 	function ActualType($meta)
 	{
 		switch(strtoupper($meta)) {
@@ -85,28 +85,28 @@
 		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'NTEXT';
-		
+
 		case 'B': return 'IMAGE';
-			
+
 		case 'D': return 'DATETIME';
 		case 'T': return 'DATETIME';
 		case 'L': return 'BIT';
-		
-		case 'R':		
-		case 'I': return 'INT'; 
+
+		case 'R':
+		case 'I': return 'INT';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'REAL';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
-	
+
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -120,7 +120,7 @@
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	/*
 	function AlterColumnSQL($tabname, $flds)
 	{
@@ -134,7 +134,7 @@
 		return $sql;
 	}
 	*/
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -149,10 +149,10 @@
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
@@ -161,110 +161,110 @@
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
+CREATE TABLE
+    [ database_name.[ owner ] . | owner. ] table_name
+    ( { < column_definition >
+        | column_name AS computed_column_expression
         | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
 
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+    )
 
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
 
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
+< column_definition > ::= { column_name data_type }
+    [ COLLATE < collation_name > ]
+    [ [ DEFAULT constant_expression ]
         | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
+    ]
+    [ ROWGUIDCOL]
+    [ < column_constraint > ] [ ...n ]
 
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ NULL | NOT NULL ]
+        | [ { PRIMARY KEY | UNIQUE }
+            [ CLUSTERED | NONCLUSTERED ]
+            [ WITH FILLFACTOR = fillfactor ]
+            [ON {filegroup | DEFAULT} ] ]
+        ]
+        | [ [ FOREIGN KEY ]
+            REFERENCES ref_table [ ( ref_column ) ]
+            [ ON DELETE { CASCADE | NO ACTION } ]
+            [ ON UPDATE { CASCADE | NO ACTION } ]
+            [ NOT FOR REPLICATION ]
+        ]
+        | CHECK [ NOT FOR REPLICATION ]
+        ( logical_expression )
+    }
 
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ { PRIMARY KEY | UNIQUE }
+        [ CLUSTERED | NONCLUSTERED ]
+        { ( column [ ASC | DESC ] [ ,...n ] ) }
+        [ WITH FILLFACTOR = fillfactor ]
+        [ ON { filegroup | DEFAULT } ]
+    ]
+    | FOREIGN KEY
+        [ ( column [ ,...n ] ) ]
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+        [ ON DELETE { CASCADE | NO ACTION } ]
+        [ ON UPDATE { CASCADE | NO ACTION } ]
+        [ NOT FOR REPLICATION ]
+    | CHECK [ NOT FOR REPLICATION ]
+        ( search_conditions )
+    }
 
 
 	*/
-	
+
 	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+		[ WITH < index_option > [ ,...n] ]
 		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
+		< index_option > :: =
+		    { PAD_INDEX |
+		        FILLFACTOR = fillfactor |
+		        IGNORE_DUP_KEY |
+		        DROP_EXISTING |
+		    STATISTICS_NORECOMPUTE |
+		    SORT_IN_TEMPDB
 		}
 */
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
 
+
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
-	
+
+
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
 		switch ($ftype) {
@@ -275,7 +275,7 @@
 			return $ftype;
 		}
     	if ($ty == 'T') return $ftype;
-    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);
 
 	}
 }
Index: typo3/sysext/adodb/adodb/datadict/datadict-oci8.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-oci8.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-oci8.inc.php	(working copy)
@@ -2,19 +2,19 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_oci8 extends ADODB_DataDict {
-	
+
 	var $databaseType = 'oci8';
 	var $seqField = false;
 	var $seqPrefix = 'SEQ_';
@@ -23,7 +23,7 @@
 	var $alterCol = ' MODIFY ';
 	var $typeX = 'VARCHAR(4000)';
 	var $typeXL = 'CLOB';
-	
+
 	function MetaType($t,$len=-1)
 	{
 		if (is_object($t)) {
@@ -39,70 +39,70 @@
 		case 'BINARY':
 			if (isset($this) && $len <= $this->blobSize) return 'C';
 			return 'X';
-		
+
 		case 'NCHAR':
 		case 'NVARCHAR2':
 		case 'NVARCHAR':
 			if (isset($this) && $len <= $this->blobSize) return 'C2';
 			return 'X2';
-			
+
 		case 'NCLOB':
 		case 'CLOB':
 			return 'XL';
-		
+
 		case 'LONG RAW':
 		case 'LONG VARBINARY':
 		case 'BLOB':
 			return 'B';
-		
+
 		case 'TIMESTAMP':
 			return 'TS';
-			
-		case 'DATE': 
+
+		case 'DATE':
 			return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'SMALLINT':
-		case 'INTEGER': 
+		case 'INTEGER':
 			return 'I';
-			
+
 		default:
 			return 'N';
 		}
 	}
-	
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'X': return $this->typeX;
 		case 'XL': return $this->typeXL;
-		
+
 		case 'C2': return 'NVARCHAR2';
 		case 'X2': return 'NVARCHAR2(4000)';
-		
+
 		case 'B': return 'BLOB';
-		
+
 		case 'TS':
 				return 'TIMESTAMP';
-				
-		case 'D': 
+
+		case 'D':
 		case 'T': return 'DATE';
 		case 'L': return 'NUMBER(1)';
 		case 'I1': return 'NUMBER(3)';
 		case 'I2': return 'NUMBER(5)';
 		case 'I':
 		case 'I4': return 'NUMBER(10)';
-		
+
 		case 'I8': return 'NUMBER(20)';
 		case 'F': return 'NUMBER';
 		case 'N': return 'NUMBER';
 		case 'R': return 'NUMBER(20)';
 		default:
 			return $meta;
-		}	
+		}
 	}
-	
+
 	function CreateDatabase($dbname, $options=false)
 	{
 		$options = $this->_Options($options);
@@ -110,10 +110,10 @@
 		$tablespace = isset($options["TABLESPACE"]) ? " DEFAULT TABLESPACE ".$options["TABLESPACE"] : '';
 		$sql[] = "CREATE USER ".$dbname." IDENTIFIED BY ".$password.$tablespace;
 		$sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO $dbname";
-		
+
 		return $sql;
 	}
-	
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -123,12 +123,12 @@
 		foreach($lines as $v) {
 			$f[] = "\n $v";
 		}
-		
+
 		$s .= implode(', ',$f).')';
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function AlterColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -142,20 +142,20 @@
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
 		if (!is_array($flds)) $flds = explode(',',$flds);
 		foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);
-		
+
 		$sql = array();
 		$s = "ALTER TABLE $tabname DROP(";
 		$s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function _DropAutoIncrement($t)
 	{
 		if (strpos($t,'.') !== false) {
@@ -164,26 +164,26 @@
 		}
 		return "drop sequence seq_".$t;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
 		$suffix = '';
-		
+
 		if ($fdefault == "''" && $fnotnull) {// this is null in oracle
 			$fnotnull = false;
 			if ($this->debug) ADOConnection::outp("NOT NULL and DEFAULT='' illegal in Oracle");
 		}
-		
+
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fnotnull) $suffix .= ' NOT NULL';
-		
+
 		if ($fautoinc) $this->seqField = $fname;
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
+
 		return $suffix;
 	}
-	
+
 /*
 CREATE or replace TRIGGER jaddress_insert
 before insert on jaddress
@@ -195,7 +195,7 @@
 	function _Triggers($tabname,$tableoptions)
 	{
 		if (!$this->seqField) return array();
-		
+
 		if ($this->schema) {
 			$t = strpos($tabname,'.');
 			if ($t !== false) $tab = substr($tabname,$t+1);
@@ -206,7 +206,7 @@
 			$seqname = $this->seqPrefix.$tabname;
 			$trigname = $this->trigPrefix.$seqname;
 		}
-		
+
 		if (strlen($seqname) > 30) {
 			$seqname = $this->seqPrefix.uniqid('');
 		} // end if
@@ -223,11 +223,11 @@
 		if (isset($tableoptions['SEQUENCE_START'])){$seqIncr = ' START WITH '.$tableoptions['SEQUENCE_START'];}
 		$sql[] = "CREATE SEQUENCE $seqname $seqStart $seqIncr $seqCache";
 		$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField = 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
-		
+
 		$this->seqField = false;
 		return $sql;
 	}
-	
+
 	/*
 	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
 		[table_options] [select_statement]
@@ -243,54 +243,54 @@
 		[reference_definition]
 		or CHECK (expr)
 	*/
-	
 
-	
+
+
 	function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		if (isset($idxoptions['BITMAP'])) {
-			$unique = ' BITMAP'; 
+			$unique = ' BITMAP';
 		} elseif (isset($idxoptions['UNIQUE'])) {
 			$unique = ' UNIQUE';
 		} else {
 			$unique = '';
 		}
-		
+
 		if ( is_array($flds) )
 			$flds = implode('", "',$flds);
 		$s = 'CREATE' . $unique . ' INDEX "' . $idxname . '" ON "' .$tabname . '" ("' . $flds . '")';
 
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		if (isset($idxoptions['oci8']))
 			$s .= $idxoptions['oci8'];
-		
 
+
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
+
 	function GetCommentSQL($table,$col)
 	{
 		$table = $this->connection->qstr($table);
-		$col = $this->connection->qstr($col);	
+		$col = $this->connection->qstr($col);
 		return "select comments from USER_COL_COMMENTS where TABLE_NAME=$table and COLUMN_NAME=$col";
 	}
-	
+
 	function SetCommentSQL($table,$col,$cmt)
 	{
 		$cmt = $this->connection->qstr($cmt);
Index: typo3/sysext/adodb/adodb/datadict/datadict-informix.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/datadict/datadict-informix.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/datadict/datadict-informix.inc.php	(working copy)
@@ -2,46 +2,46 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_informix extends ADODB_DataDict {
-	
+
 	var $databaseType = 'informix';
 	var $seqField = false;
-	
- 	
+
+
 	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';// 255
 		case 'XL':
-		case 'X': return 'TEXT'; 
-		
+		case 'X': return 'TEXT';
+
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'TEXT';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'DATETIME YEAR TO SECOND';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'DECIMAL(20)';
-		
+
 		case 'F': return 'FLOAT';
 		case 'N': return 'DECIMAL';
 		default:
@@ -54,14 +54,14 @@
 		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
@@ -75,7 +75,7 @@
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 }
 
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/lang/adodb-esperanto.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/lang/adodb-esperanto.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/lang/adodb-esperanto.inc.php	(working copy)
@@ -1,5 +1,5 @@
 <?php
-// Vivu Esperanto cxiam! 
+// Vivu Esperanto cxiam!
 // Traduko fare de Antono Vasiljev (anders[#]brainactive.org)
 
 $ADODB_LANG_ARRAY = array (
Index: typo3/sysext/adodb/adodb/lang/adodb-it.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/lang/adodb-it.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/lang/adodb-it.inc.php	(working copy)
@@ -1,5 +1,5 @@
 <?php
-// Italian language file contributed by Tiraboschi Massimiliano aka TiMax  
+// Italian language file contributed by Tiraboschi Massimiliano aka TiMax
 // www.maxdev.com  timax@maxdev.com
 $ADODB_LANG_ARRAY = array (
             'LANG'                      => 'it',
Index: typo3/sysext/adodb/adodb/lang/adodb-pt-br.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/lang/adodb-pt-br.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/lang/adodb-pt-br.inc.php	(working copy)
@@ -21,7 +21,7 @@
             DB_ERROR_NOT_FOUND          => 'não encontrado',
             DB_ERROR_NOT_LOCKED         => 'não bloqueado',
             DB_ERROR_SYNTAX             => 'erro de sintaxe',
-            DB_ERROR_UNSUPPORTED        => 
+            DB_ERROR_UNSUPPORTED        =>
 'não suportado',
             DB_ERROR_VALUE_COUNT_ON_ROW => 'a quantidade de colunas não corresponde ao de valores',
             DB_ERROR_INVALID_DSN        => 'DSN inválido',
Index: typo3/sysext/adodb/adodb/adodb-iterator.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-iterator.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-iterator.inc.php	(working copy)
@@ -2,29 +2,29 @@
 
 /*
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-  
+
   Set tabs to 4.
-  
-  Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports iteration with 
+
+  Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports iteration with
   the ADODB_Iterator class.
-  
+
   		$rs = $db->Execute("select * from adoxyz");
 		foreach($rs as $k => $v) {
 			echo $k; print_r($v); echo "<br>";
 		}
-		
-		
+
+
 	Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
-	
-	
+
+
 	Moved to adodb.inc.php to improve performance.
  */
- 
 
 
 
 
+
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/adodb-csvlib.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-csvlib.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-csvlib.inc.php	(working copy)
@@ -6,19 +6,19 @@
 global $ADODB_INCLUDED_CSV;
 $ADODB_INCLUDED_CSV = 1;
 
-/* 
+/*
 
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
-  Library for CSV serialization. This is used by the csv/proxy driver and is the 
-  CacheExecute() serialization format. 
-  
+
+  Library for CSV serialization. This is used by the csv/proxy driver and is the
+  CacheExecute() serialization format.
+
   ==== NOTE ====
   Format documented at http://php.weblogs.com/ADODB_CSV
   ==============
@@ -34,61 +34,61 @@
 	function _rs2serialize(&$rs,$conn=false,$sql='')
 	{
 		$max = ($rs) ? $rs->FieldCount() : 0;
-		
+
 		if ($sql) $sql = urlencode($sql);
 		// metadata setup
-		
+
 		if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete
 			if (is_object($conn)) {
 				$sql .= ','.$conn->Affected_Rows();
 				$sql .= ','.$conn->Insert_ID();
 			} else
 				$sql .= ',,';
-			
+
 			$text = "====-1,0,$sql\n";
 			return $text;
 		}
 		$tt = ($rs->timeCreated) ? $rs->timeCreated : time();
-		
+
 		## changed format from ====0 to ====1
 		$line = "====1,$tt,$sql\n";
-		
+
 		if ($rs->databaseType == 'array') {
 			$rows = $rs->_array;
 		} else {
 			$rows = array();
-			while (!$rs->EOF) {	
+			while (!$rs->EOF) {
 				$rows[] = $rs->fields;
 				$rs->MoveNext();
-			} 
+			}
 		}
-		
+
 		for($i=0; $i < $max; $i++) {
 			$o = $rs->FetchField($i);
 			$flds[] = $o;
 		}
-	
+
 		$savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
 		$class = $rs->connection->arrayClass;
 		$rs2 = new $class();
 		$rs2->timeCreated = $rs->timeCreated; # memcache fix
 		$rs2->sql = $rs->sql;
-		$rs2->oldProvider = $rs->dataProvider; 
+		$rs2->oldProvider = $rs->dataProvider;
 		$rs2->InitArrayFields($rows,$flds);
 		$rs2->fetchMode = $savefetch;
 		return $line.serialize($rs2);
 	}
 
-	
+
 /**
-* Open CSV file and convert it into Data. 
+* Open CSV file and convert it into Data.
 *
 * @param url  		file/ftp/http url
 * @param err		returns the error message
 * @param timeout	dispose if recordset has been alive for $timeout secs
 *
 * @return		recordset, or false if error occured. If no
-*			error occurred in sql INSERT/UPDATE/DELETE, 
+*			error occurred in sql INSERT/UPDATE/DELETE,
 *			empty recordset is returned
 */
 	function csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array')
@@ -103,7 +103,7 @@
 		@flock($fp, LOCK_SH);
 		$arr = array();
 		$ttl = 0;
-		
+
 		if ($meta = fgetcsv($fp, 32000, ",")) {
 			// check if error message
 			if (strncmp($meta[0],'****',4) === 0) {
@@ -113,10 +113,10 @@
 			}
 			// check for meta data
 			// $meta[0] is -1 means return an empty recordset
-			// $meta[1] contains a time 
-	
+			// $meta[1] contains a time
+
 			if (strncmp($meta[0], '====',4) === 0) {
-			
+
 				if ($meta[0] == "====-1") {
 					if (sizeof($meta) < 5) {
 						$err = "Corrupt first line for format -1";
@@ -124,12 +124,12 @@
 						return $false;
 					}
 					fclose($fp);
-					
+
 					if ($timeout > 0) {
 						$err = " Illegal Timeout $timeout ";
 						return $false;
 					}
-					
+
 					$rs = new $rsclass($val=true);
 					$rs->fields = array();
 					$rs->timeCreated = $meta[1];
@@ -137,9 +137,9 @@
 					$rs->_numOfFields = 0;
 					$rs->sql = urldecode($meta[2]);
 					$rs->affectedrows = (integer)$meta[3];
-					$rs->insertid = $meta[4];	
+					$rs->insertid = $meta[4];
 					return $rs;
-				} 
+				}
 			# Under high volume loads, we want only 1 thread/process to _write_file
 			# so that we don't have 50 processes queueing to write the same data.
 			# We use probabilistic timeout, ahead of time.
@@ -149,7 +149,7 @@
 			# -1 sec after timeout give processes 1/4 chance of timing out
 			# +0 sec after timeout, give processes 100% chance of timing out
 				if (sizeof($meta) > 1) {
-					if($timeout >0){ 
+					if($timeout >0){
 						$tdiff = (integer)( $meta[1]+$timeout - time());
 						if ($tdiff <= 2) {
 							switch($tdiff) {
@@ -161,7 +161,7 @@
 									return $false;
 								}
 								break;
-							case 2: 
+							case 2:
 								if ((rand() & 15) == 0) {
 									fclose($fp);
 									$err = "Timeout 2";
@@ -175,12 +175,12 @@
 									return $false;
 								}
 								break;
-							default: 
+							default:
 								fclose($fp);
 								$err = "Timeout 0";
 								return $false;
 							} // switch
-							
+
 						} // if check flush cache
 					}// (timeout>0)
 					$ttl = $meta[1];
@@ -190,7 +190,7 @@
 				if ($meta[0] === '====1') {
 					// slurp in the data
 					$MAXSIZE = 128000;
-					
+
 					$text = fread($fp,$MAXSIZE);
 					if (strlen($text)) {
 						while ($txt = fread($fp,$MAXSIZE)) {
@@ -206,7 +206,7 @@
 					}
 					return $rs;
 				}
-				
+
 				$meta = false;
 				$meta = fgetcsv($fp, 32000, ",");
 				if (!$meta) {
@@ -236,15 +236,15 @@
 			$err = "Recordset had unexpected EOF 2";
 			return $false;
 		}
-		
+
 		// slurp in the data
 		$MAXSIZE = 128000;
-		
+
 		$text = '';
 		while ($txt = fread($fp,$MAXSIZE)) {
 			$text .= $txt;
 		}
-			
+
 		fclose($fp);
 		@$arr = unserialize($text);
 		//var_dump($arr);
@@ -258,18 +258,18 @@
 		$rs->InitArrayFields($arr,$flds);
 		return $rs;
 	}
-	
 
+
 	/**
 	* Save a file $filename and its $contents (normally for caching) with file locking
 	* Returns true if ok, false if fopen/fwrite error, 0 if rename error (eg. file is locked)
 	*/
 	function adodb_write_file($filename, $contents,$debug=false)
-	{ 
+	{
 	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
 	# So to simulate locking, we assume that rename is an atomic operation.
-	# First we delete $filename, then we create a $tempfile write to it and 
-	# rename to the desired $filename. If the rename works, then we successfully 
+	# First we delete $filename, then we create a $tempfile write to it and
+	# rename to the desired $filename. If the rename works, then we successfully
 	# modified the file exclusively.
 	# What a stupid need - having to simulate locking.
 	# Risks:
@@ -279,14 +279,14 @@
 	# 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and  cache updated
 		if (strncmp(PHP_OS,'WIN',3) === 0) {
 			// skip the decimal place
-			$mtime = substr(str_replace(' ','_',microtime()),2); 
+			$mtime = substr(str_replace(' ','_',microtime()),2);
 			// getmypid() actually returns 0 on Win98 - never mind!
 			$tmpname = $filename.uniqid($mtime).getmypid();
 			if (!($fd = @fopen($tmpname,'w'))) return false;
 			if (fwrite($fd,$contents)) $ok = true;
 			else $ok = false;
 			fclose($fd);
-			
+
 			if ($ok) {
 				@chmod($tmpname,0644);
 				// the tricky moment
@@ -312,7 +312,7 @@
 			if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename<br>\n");
 			$ok = false;
 		}
-	
+
 		return $ok;
 	}
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/adodb-pear.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-pear.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-pear.inc.php	(working copy)
@@ -1,12 +1,12 @@
 <?php
-/** 
+/**
  * @version V5.06 16 Oct 2008  (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
  *
  * Set tabs to 4 for best viewing.
- * 
+ *
  * PEAR DB Emulation Layer for ADODB.
  *
  * The following code is modelled on PEAR DB code by Stig Bakken <ssb@fast.no>								   |
@@ -15,7 +15,7 @@
 
  /*
  We support:
- 
+
  DB_Common
  ---------
  	query - returns PEAR_Error on error
@@ -27,13 +27,13 @@
 	quote
 	nextID
 	disconnect
-	
+
 	getOne
 	getAssoc
 	getRow
 	getCol
 	getAll
-	
+
  DB_Result
  ---------
  	numRows - returns -1 if not supported
@@ -42,7 +42,7 @@
 	fetchRows - does not support passing of fetchmode
 	free
  */
- 
+
 define('ADODB_PEAR',dirname(__FILE__));
 include_once "PEAR.php";
 include_once ADODB_PEAR."/adodb-errorpear.inc.php";
@@ -183,10 +183,10 @@
 
 		if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= ':'.$dsninfo['socket'];
 		else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= ':'.$dsninfo['port'];
-		
+
 		if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
 		else  $ok = $obj->Connect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
-		
+
 		if (!$ok) $obj = ADODB_PEAR_Error();
 		return $obj;
 	}
@@ -212,7 +212,7 @@
 	{
 		if (!is_object($value)) return false;
 		$class = strtolower(get_class($value));
-		return $class == 'pear_error' || is_subclass_of($value, 'pear_error') || 
+		return $class == 'pear_error' || is_subclass_of($value, 'pear_error') ||
 				$class == 'db_error' || is_subclass_of($value, 'db_error');
 	}
 
Index: typo3/sysext/adodb/adodb/adodb-errorpear.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-errorpear.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-errorpear.inc.php	(working copy)
@@ -1,14 +1,14 @@
 <?php
-/** 
+/**
  * @version V5.06 16 Oct 2008  (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+ * Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
  *
  * Set tabs to 4 for best viewing.
- * 
+ *
  * Latest version is available at http://php.weblogs.com
- * 
+ *
 */
 include_once('PEAR.php');
 
@@ -34,7 +34,7 @@
 *
 * @param $dbms		the RDBMS you are connecting to
 * @param $fn		the name of the calling function (in uppercase)
-* @param $errno		the native error number from the database 
+* @param $errno		the native error number from the database
 * @param $errmsg	the native error msg from the database
 * @param $p1		$fn specific parameter - see below
 * @param $P2		$fn specific parameter - see below
@@ -42,35 +42,35 @@
 function ADODB_Error_PEAR($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
 {
 global $ADODB_Last_PEAR_Error;
-	
+
 	if (error_reporting() == 0) return; // obey @ protocol
 	switch($fn) {
 	case 'EXECUTE':
 		$sql = $p1;
 		$inputparams = $p2;
-		
+
 		$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")";
 		break;
-		
+
 	case 'PCONNECT':
 	case 'CONNECT':
 		$host = $p1;
 		$database = $p2;
-		
+
 		$s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, '$database')";
 		break;
-		
+
 	default:
 		$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
 		break;
 	}
-	
+
 	$class = ADODB_PEAR_ERROR_CLASS;
 	$ADODB_Last_PEAR_Error = new $class($s, $errno,
 		$GLOBALS['_PEAR_default_error_mode'],
-		$GLOBALS['_PEAR_default_error_options'], 
+		$GLOBALS['_PEAR_default_error_options'],
 		$errmsg);
-		
+
 	//print "<p>!$s</p>";
 }
 
@@ -84,5 +84,5 @@
 
 	return $ADODB_Last_PEAR_Error;
 }
-		
+
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/adodb-error.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-error.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-error.inc.php	(working copy)
@@ -1,12 +1,12 @@
 <?php
-/** 
+/**
  * @version V5.06 16 Oct 2008  (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
  *
  * Set tabs to 4 for best viewing.
- * 
+ *
  * The following code is adapted from the PEAR DB error handling code.
  * Portions (c)1997-2002 The PHP Group.
  */
@@ -59,27 +59,27 @@
 {
 	//var_dump($errno);
 	if (is_numeric($errno) && $errno == 0) return 0;
-	switch($provider) { 
+	switch($provider) {
 	case 'mysql': $map = adodb_error_mysql(); break;
-	
+
 	case 'oracle':
 	case 'oci8': $map = adodb_error_oci8(); break;
-	
+
 	case 'ibase': $map = adodb_error_ibase(); break;
-	
+
 	case 'odbc': $map = adodb_error_odbc(); break;
-	
+
 	case 'mssql':
 	case 'sybase': $map = adodb_error_mssql(); break;
-	
+
 	case 'informix': $map = adodb_error_ifx(); break;
-	
+
 	case 'postgres': return adodb_error_pg($errno); break;
-	
+
 	case 'sqlite': return $map = adodb_error_sqlite(); break;
 	default:
 		return DB_ERROR;
-	}	
+	}
 	//print_r($map);
 	//var_dump($errno);
 	if (isset($map[$errno])) return $map[$errno];
@@ -99,7 +99,7 @@
             '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/i' => DB_ERROR_NOSUCHFIELD,
             '/parser: parse error at or near \"/i'   => DB_ERROR_SYNTAX,
             '/referential integrity violation/i'     => DB_ERROR_CONSTRAINT,
-			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key violates unique constraint/i'     
+			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key violates unique constraint/i'
 			 	 => DB_ERROR_ALREADY_EXISTS
         );
 	reset($error_regexps);
@@ -111,7 +111,7 @@
     // Fall back to DB_ERROR if there was no mapping.
     return DB_ERROR;
 }
-	
+
 function adodb_error_odbc()
 {
 static $MAP = array(
@@ -169,7 +169,7 @@
             -923 => DB_ERROR_CONNECT_FAILED,
             -924 => DB_ERROR_CONNECT_FAILED
         );
-		
+
 		return $MAP;
 }
 
@@ -187,7 +187,7 @@
             '-1210'   => DB_ERROR_INVALID_DATE,
             '-1212'   => DB_ERROR_INVALID_DATE
        );
-	   
+
 	   return $MAP;
 }
 
@@ -206,7 +206,7 @@
             2291 => DB_ERROR_CONSTRAINT,
             2449 => DB_ERROR_CONSTRAINT
         );
-	   
+
 	return $MAP;
 }
 
@@ -216,7 +216,7 @@
 		  208 => DB_ERROR_NOSUCHTABLE,
           2601 => DB_ERROR_ALREADY_EXISTS
        );
-	   
+
 	return $MAP;
 }
 
@@ -225,7 +225,7 @@
 static $MAP = array(
 		  1 => DB_ERROR_SYNTAX
        );
-	   
+
 	return $MAP;
 }
 
@@ -252,7 +252,7 @@
 		    2002 => DB_ERROR_CONNECT_FAILED,
 			2005 => DB_ERROR_CONNECT_FAILED
        );
-	   
+
 	return $MAP;
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/adodb-datadict.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-datadict.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-datadict.inc.php	(working copy)
@@ -2,14 +2,14 @@
 
 /**
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-	
+
   Set tabs to 4 for best viewing.
- 
+
  	DOCUMENTATION:
-	
+
 		See adodb/tests/test-datadict.php for docs and examples.
 */
 
@@ -42,13 +42,13 @@
 /**
 	Parse arguments, treat "text" (text) and 'text' as quotation marks.
 	To escape, use "" or '' or ))
-	
+
 	Will read in "abc def" sans quotes, as: abc def
 	Same with 'abc def'.
 	However if `abc def`, then will read in as `abc def`
-	
+
 	@param endstmtchar    Character that indicates end of statement
-	@param tokenchars     Include the following characters in tokens apart from A-Z and 0-9 
+	@param tokenchars     Include the following characters in tokens apart from A-Z and 0-9
 	@returns 2 dimensional array containing parsed tokens.
 */
 function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
@@ -62,7 +62,7 @@
 	$max = strlen($args);
 	$quoted = false;
 	$tokarr = array();
-	
+
 	while ($pos < $max) {
 		$ch = substr($args,$pos,1);
 		switch($ch) {
@@ -77,17 +77,17 @@
 				}
 				break;
 			}
-			
+
 			$tokarr[] = $ch;
 			break;
-		
+
 		case '`':
 			if ($intoken) $tokarr[] = $ch;
 		case '(':
-		case ')':	
+		case ')':
 		case '"':
 		case "'":
-			
+
 			if ($intoken) {
 				if (empty($endquote)) {
 					$tokens[$stmtno][] = implode('',$tokarr);
@@ -109,9 +109,9 @@
 					}
 				} else
 					$tokarr[] = $ch;
-					
+
 			}else {
-			
+
 				if ($ch == '(') $endquote = ')';
 				else $endquote = $ch;
 				$quoted = true;
@@ -120,27 +120,27 @@
 				if ($ch == '`') $tokarr[] = '`';
 			}
 			break;
-			
+
 		default:
-			
+
 			if (!$intoken) {
 				if ($ch == $endstmtchar) {
 					$stmtno += 1;
 					$tokens[$stmtno] = array();
 					break;
 				}
-			
+
 				$intoken = true;
 				$quoted = false;
 				$endquote = false;
 				$tokarr = array();
-	
+
 			}
-			
+
 			if ($quoted) $tokarr[] = $ch;
 			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
 			else {
-				if ($ch == $endstmtchar) {			
+				if ($ch == $endstmtchar) {
 					$tokens[$stmtno][] = implode('',$tokarr);
 					$stmtno += 1;
 					$tokens[$stmtno] = array();
@@ -156,7 +156,7 @@
 		$pos += 1;
 	}
 	if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
-	
+
 	return $tokens;
 }
 
@@ -165,7 +165,7 @@
 	var $connection;
 	var $debug = false;
 	var $dropTable = 'DROP TABLE %s';
-	var $renameTable = 'RENAME TABLE %s TO %s'; 
+	var $renameTable = 'RENAME TABLE %s TO %s';
 	var $dropIndex = 'DROP INDEX %s';
 	var $addCol = ' ADD';
 	var $alterCol = ' ALTER COLUMN';
@@ -180,43 +180,43 @@
 	var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql
 	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
 							/// in other words, we use a text area for editting.
-	
+
 	function GetCommentSQL($table,$col)
 	{
 		return false;
 	}
-	
+
 	function SetCommentSQL($table,$col,$cmt)
 	{
 		return false;
 	}
-	
+
 	function MetaTables()
 	{
 		if (!$this->connection->IsConnected()) return array();
 		return $this->connection->MetaTables();
 	}
-	
+
 	function MetaColumns($tab, $upper=true, $schema=false)
 	{
 		if (!$this->connection->IsConnected()) return array();
 		return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);
 	}
-	
+
 	function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
 	{
 		if (!$this->connection->IsConnected()) return array();
 		return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
 	}
-	
+
 	function MetaIndexes($table, $primary = false, $owner = false)
 	{
 		if (!$this->connection->IsConnected()) return array();
 		return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);
 	}
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
-	{		
+	{
 		static $typeMap = array(
 		'VARCHAR' => 'C',
 		'VARCHAR2' => 'C',
@@ -263,7 +263,7 @@
 		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
 		##
 		'BOOL' => 'L',
-		'BOOLEAN' => 'L', 
+		'BOOLEAN' => 'L',
 		'BIT' => 'L',
 		'L' => 'L',
 		##
@@ -296,21 +296,21 @@
 		'NUM' => 'N',
 		'NUMERIC' => 'N',
 		'MONEY' => 'N',
-		
+
 		## informix 9.2
-		'SQLINT' => 'I', 
-		'SQLSERIAL' => 'I', 
-		'SQLSMINT' => 'I', 
-		'SQLSMFLOAT' => 'N', 
-		'SQLFLOAT' => 'N', 
-		'SQLMONEY' => 'N', 
-		'SQLDECIMAL' => 'N', 
-		'SQLDATE' => 'D', 
-		'SQLVCHAR' => 'C', 
-		'SQLCHAR' => 'C', 
-		'SQLDTIME' => 'T', 
-		'SQLINTERVAL' => 'N', 
-		'SQLBYTES' => 'B', 
+		'SQLINT' => 'I',
+		'SQLSERIAL' => 'I',
+		'SQLSMINT' => 'I',
+		'SQLSMFLOAT' => 'N',
+		'SQLFLOAT' => 'N',
+		'SQLMONEY' => 'N',
+		'SQLDECIMAL' => 'N',
+		'SQLDATE' => 'D',
+		'SQLVCHAR' => 'C',
+		'SQLCHAR' => 'C',
+		'SQLDTIME' => 'T',
+		'SQLINTERVAL' => 'N',
+		'SQLBYTES' => 'B',
 		'SQLTEXT' => 'X',
 		 ## informix 10
 		"SQLINT8" => 'I8',
@@ -320,7 +320,7 @@
 		"SQLLVARCHAR" => 'X',
 		"SQLBOOL" => 'L'
 		);
-		
+
 		if (!$this->connection->IsConnected()) {
 			$t = strtoupper($t);
 			if (isset($typeMap[$t])) return $typeMap[$t];
@@ -328,36 +328,36 @@
 		}
 		return $this->connection->MetaType($t,$len,$fieldobj);
 	}
-	
+
 	function NameQuote($name = NULL,$allowBrackets=false)
 	{
 		if (!is_string($name)) {
 			return FALSE;
 		}
-		
+
 		$name = trim($name);
-		
+
 		if ( !is_object($this->connection) ) {
 			return $name;
 		}
-		
+
 		$quote = $this->connection->nameQuote;
-		
+
 		// if name is of the form `name`, quote it
 		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
 			return $quote . $matches[1] . $quote;
 		}
-		
+
 		// if name contains special characters, quote it
 		$regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex;
-		
+
 		if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {
 			return $quote . $name . $quote;
 		}
-		
+
 		return $name;
 	}
-	
+
 	function TableName($name)
 	{
 		if ( $this->schema ) {
@@ -365,7 +365,7 @@
 		}
 		return $this->NameQuote($name);
 	}
-	
+
 	// Executes the sql array returned by GetTableSQL and GetIndexSQL
 	function ExecuteSQLArray($sql, $continueOnError = true)
 	{
@@ -373,7 +373,7 @@
 		$conn = $this->connection;
 		$saved = $conn->debug;
 		foreach($sql as $line) {
-			
+
 			if ($this->debug) $conn->debug = true;
 			$ok = $conn->Execute($line);
 			$conn->debug = $saved;
@@ -385,43 +385,43 @@
 		}
 		return $rez;
 	}
-	
+
 	/**
 	 	Returns the actual type given a character code.
-		
+
 		C:  varchar
 		X:  CLOB (character large object) or largest varchar size if CLOB is not supported
 		C2: Multibyte varchar
 		X2: Multibyte CLOB
-		
+
 		B:  BLOB (binary large object)
-		
+
 		D:  Date
-		T:  Date-time 
+		T:  Date-time
 		L:  Integer field suitable for storing booleans (0 or 1)
 		I:  Integer
 		F:  Floating point number
 		N:  Numeric or decimal number
 	*/
-	
+
 	function ActualType($meta)
 	{
 		return $meta;
 	}
-	
+
 	function CreateDatabase($dbname,$options=false)
 	{
 		$options = $this->_Options($options);
 		$sql = array();
-		
+
 		$s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
 		if (isset($options[$this->upperName]))
 			$s .= ' '.$options[$this->upperName];
-		
+
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	/*
 	 Generates the SQL to create index. Returns an array of sql strings.
 	*/
@@ -430,25 +430,25 @@
 		if (!is_array($flds)) {
 			$flds = explode(',',$flds);
 		}
-		
+
 		foreach($flds as $key => $fld) {
 			# some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32)
 			$flds[$key] = $this->NameQuote($fld,$allowBrackets=true);
 		}
-		
+
 		return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions));
 	}
-	
+
 	function DropIndexSQL ($idxname, $tabname = NULL)
 	{
 		return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));
 	}
-	
+
 	function SetSchema($schema)
 	{
 		$this->schema = $schema;
 	}
-	
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -468,7 +468,7 @@
 		}
 		return $sql;
 	}
-	
+
 	/**
 	 * Change the definition of one column
 	 *
@@ -500,7 +500,7 @@
 		}
 		return $sql;
 	}
-	
+
 	/**
 	 * Rename one column
 	 *
@@ -523,7 +523,7 @@
 		}
 		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
 	}
-		
+
 	/**
 	 * Drop one column
 	 *
@@ -546,17 +546,17 @@
 		}
 		return $sql;
 	}
-	
+
 	function DropTableSQL($tabname)
 	{
 		return array (sprintf($this->dropTable, $this->TableName($tabname)));
 	}
-	
+
 	function RenameTableSQL($tabname,$newname)
 	{
 		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
-	}	
-	
+	}
+
 	/**
 	 Generate the SQL to create table. Returns an array of sql strings.
 	*/
@@ -565,11 +565,11 @@
 		list($lines,$pkey,$idxs) = $this->_GenFields($flds, true);
 		// genfields can return FALSE at times
 		if ($lines == null) $lines = array();
-		
+
 		$taboptions = $this->_Options($tableoptions);
 		$tabname = $this->TableName ($tabname);
 		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
-		
+
 		// ggiunta - 2006/10/12 - KLUDGE:
         // if we are on autoincrement, and table options includes REPLACE, the
         // autoincrement sequence has already been dropped on table creation sql, so
@@ -579,7 +579,7 @@
         	unset($taboptions['REPLACE']);
 		$tsql = $this->_Triggers($tabname,$taboptions);
 		foreach($tsql as $s) $sql[] = $s;
-		
+
 		if (is_array($idxs)) {
 			foreach($idxs as $idx => $idxdef) {
 				$sql_idxs = $this->CreateIndexSql($idx, $tabname,  $idxdef['cols'], $idxdef['opts']);
@@ -589,7 +589,7 @@
 
 		return $sql;
 	}
-	
+
 	function _GenFields($flds,$widespacing=false)
 	{
 		if (is_string($flds)) {
@@ -606,7 +606,7 @@
 						$f1['INDEX'] = '';
 						// fall through intentionally
 					case 'CONSTRAINT':
-					case 'DEFAULT': 
+					case 'DEFAULT':
 						$hasparam = $token;
 						break;
 					default:
@@ -631,7 +631,7 @@
 				$hasparam = false;
 
 				$flds[] = $f1;
-				
+
 			}
 		}
 		$this->autoIncrement = false;
@@ -640,7 +640,7 @@
 		$idxs = array();
 		foreach($flds as $fld) {
 			$fld = _array_change_key_case($fld);
-			
+
 			$fname = false;
 			$fdefault = false;
 			$fautoinc = false;
@@ -656,20 +656,20 @@
 			$funsigned = false;
 			$findex = '';
 			$funiqueindex = false;
-			
+
 			//-----------------
 			// Parse attributes
 			foreach($fld as $attr => $v) {
 				if ($attr == 2 && is_numeric($v)) $attr = 'SIZE';
 				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
-				
+
 				switch($attr) {
 				case '0':
 				case 'NAME': 	$fname = $v; break;
 				case '1':
 				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
-				
-				case 'SIZE': 	
+
+				case 'SIZE':
 								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
 								if ($dotat === false) $fsize = $v;
 								else {
@@ -695,33 +695,33 @@
 				case 'UNIQUE': $funiqueindex = true; break;
 				} //switch
 			} // foreach $fld
-			
+
 			//--------------------
 			// VALIDATE FIELD INFO
 			if (!strlen($fname)) {
 				if ($this->debug) ADOConnection::outp("Undefined NAME");
 				return false;
 			}
-			
+
 			$fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname));
 			$fname = $this->NameQuote($fname);
-			
+
 			if (!strlen($ftype)) {
 				if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'");
 				return false;
 			} else {
 				$ftype = strtoupper($ftype);
 			}
-			
+
 			$ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);
-			
+
 			if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls
-			
+
 			if ($fprimary) $pkey[] = $fname;
-			
+
 			// some databases do not allow blobs to have defaults
 			if ($ty == 'X') $fdefault = false;
-			
+
 			// build list of indexes
 			if ($findex != '') {
 				if (array_key_exists($findex, $idxs)) {
@@ -758,7 +758,7 @@
 					$fdefault = $this->connection->sysDate;
 				}
 			} else if ($fdefault !== false && !$fnoquote) {
-				if ($ty == 'C' or $ty == 'X' or 
+				if ($ty == 'C' or $ty == 'X' or
 					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault))) {
 
 					if (($ty == 'D' || $ty == 'T') && strtolower($fdefault) != 'null') {
@@ -773,27 +773,27 @@
 						}
 					}
 					else
-					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 
+					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ')
 						$fdefault = trim($fdefault);
 					else if (strtolower($fdefault) != 'null')
 						$fdefault = $this->connection->qstr($fdefault);
 				}
 			}
 			$suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
-			
+
 			// add index creation
 			if ($widespacing) $fname = str_pad($fname,24);
-			
+
 			 // check for field names appearing twice
             if (array_key_exists($fid, $lines)) {
             	 ADOConnection::outp("Field '$fname' defined twice");
             }
-			
+
 			$lines[$fid] = $fname.' '.$ftype.$suffix;
-			
+
 			if ($fautoinc) $this->autoIncrement = true;
 		} // foreach $flds
-		
+
 		return array($lines,$pkey,$idxs);
 	}
 
@@ -811,56 +811,56 @@
 		}
 		return $ftype;
 	}
-	
-	
+
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fnotnull) $suffix .= ' NOT NULL';
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-	
+
 		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s .= '(' . $flds . ')';
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
+
 	function _DropAutoIncrement($tabname)
 	{
 		return false;
 	}
-	
+
 	function _TableSQL($tabname,$lines,$pkey,$tableoptions)
 	{
 		$sql = array();
-		
+
 		if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) {
 			$sql[] = sprintf($this->dropTable,$tabname);
 			if ($this->autoIncrement) {
@@ -877,19 +877,19 @@
 			$s .= ",\n                 PRIMARY KEY (";
 			$s .= implode(", ",$pkey).")";
 		}
-		if (isset($tableoptions['CONSTRAINTS'])) 
+		if (isset($tableoptions['CONSTRAINTS']))
 			$s .= "\n".$tableoptions['CONSTRAINTS'];
-		
-		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 
+
+		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS']))
 			$s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
-		
+
 		$s .= "\n)";
 		if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName];
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
+
 	/**
 		GENERATE TRIGGERS IF NEEDED
 		used when table has auto-incrementing field that is emulated using triggers
@@ -898,7 +898,7 @@
 	{
 		return array();
 	}
-	
+
 	/**
 		Sanitize options, so that array elements with no keys are promoted to keys
 	*/
@@ -912,34 +912,34 @@
 		}
 		return $newopts;
 	}
-	
+
 	/**
 	"Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
-	
+
 	This function changes/adds new fields to your table. You don't
 	have to know if the col is new or not. It will check on its own.
 	*/
 	function ChangeTableSQL($tablename, $flds, $tableoptions = false, $dropOldFlds=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 		if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false);
-		
+
 		// check table exists
 		$save_handler = $this->connection->raiseErrorFn;
 		$this->connection->raiseErrorFn = '';
 		$cols = $this->MetaColumns($tablename);
 		$this->connection->raiseErrorFn = $save_handler;
-		
+
 		if (isset($savem)) $this->connection->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
-		if ( empty($cols)) { 
+
+		if ( empty($cols)) {
 			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
 		}
-		
+
 		if (is_array($flds)) {
 		// Cycle through the update fields, comparing
 		// existing fields to fields to update.
@@ -952,9 +952,9 @@
 					$obj = $cols[$k];
 					if (isset($obj->not_null) && $obj->not_null)
 						$v = str_replace('NOT NULL','',$v);
-					if (isset($obj->auto_increment) && $obj->auto_increment && empty($v['AUTOINCREMENT'])) 
+					if (isset($obj->auto_increment) && $obj->auto_increment && empty($v['AUTOINCREMENT']))
 					    $v = str_replace('AUTOINCREMENT','',$v);
-					
+
 					$c = $cols[$k];
 					$ml = $c->max_length;
 					$mt = $this->MetaType($c->type,$ml);
@@ -965,12 +965,12 @@
 					}
 				} else {
 					$holdflds[$k] = $v;
-				}		
+				}
 			}
 			$flds = $holdflds;
 		}
-	
 
+
 		// already exists, alter table instead
 		list($lines,$pkey,$idxs) = $this->_GenFields($flds);
 		// genfields can return FALSE at times
@@ -980,26 +980,26 @@
 
 		foreach ( $lines as $id => $v ) {
 			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
-			
+
 				$flds = Lens_ParseArgs($v,',');
-				
+
 				//  We are trying to change the size of the field, if not allowed, simply ignore the request.
 				// $flds[1] holds the type, $flds[2] holds the size -postnuke addition
 				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)
 				 && (isset($flds[0][2]) && is_numeric($flds[0][2]))) {
 					if ($this->debug) ADOConnection::outp(sprintf("<h3>%s cannot be changed to %s currently</h3>", $flds[0][0], $flds[0][1]));
 					#echo "<h3>$this->alterCol cannot be changed to $flds currently</h3>";
-					continue;	 
+					continue;
 	 			}
 				$sql[] = $alter . $this->alterCol . ' ' . $v;
 			} else {
 				$sql[] = $alter . $this->addCol . ' ' . $v;
 			}
 		}
-		
+
 		if ($dropOldFlds) {
 			foreach ( $cols as $id => $v )
-			    if ( !isset($lines[$id]) ) 
+			    if ( !isset($lines[$id]) )
 					$sql[] = $alter . $this->dropCol . ' ' . $v->name;
 		}
 		return $sql;
Index: typo3/sysext/adodb/adodb/adodb.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb.inc.php	(working copy)
@@ -1,9 +1,9 @@
 <?php
 /*
  * Set tabs to 4 for best viewing.
- * 
+ *
  * Latest version is available at http://adodb.sourceforge.net
- * 
+ *
  * This is the main include file for ADOdb.
  * Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
  *
@@ -13,14 +13,14 @@
 
 /**
 	\mainpage
-	
+
 	 @version V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
 
 	Released under both BSD license and Lesser GPL library license. You can choose which license
 	you prefer.
-	
-	PHP's database access functions are not standardised. This creates a need for a database 
-	class library to hide the differences between the different database API's (encapsulate 
+
+	PHP's database access functions are not standardised. This creates a need for a database
+	class library to hide the differences between the different database API's (encapsulate
 	the differences) so we can easily switch databases.
 
 	We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, DB2,
@@ -29,28 +29,28 @@
 	other databases via ODBC.
 
 	Latest Download at http://adodb.sourceforge.net/
-	  
+
  */
- 
+
  if (!defined('_ADODB_LAYER')) {
  	define('_ADODB_LAYER',1);
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CONSTANT DEFINITIONS
-	//==============================================================================================	
+	//==============================================================================================
 
 
-	/** 
+	/**
 	 * Set ADODB_DIR to the directory where this file resides...
 	 * This constant was formerly called $ADODB_RootPath
 	 */
 	if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__));
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// GLOBAL VARIABLES
-	//==============================================================================================	
+	//==============================================================================================
 
-	GLOBAL 
+	GLOBAL
 		$ADODB_vers, 		// database version
 		$ADODB_COUNTRECS,	// count number of records returned - slows down query
 		$ADODB_CACHE_DIR,	// directory to cache recordsets
@@ -60,14 +60,14 @@
 		$ADODB_COMPAT_FETCH, // If $ADODB_COUNTRECS and this is true, $rs->fields is available on EOF
 	 	$ADODB_FETCH_MODE,	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
 		$ADODB_GETONE_EOF,
-		$ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes (backticks) around field names in queries generated by getinsertsql and getupdatesql.	
-	
-	//==============================================================================================	
+		$ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes (backticks) around field names in queries generated by getinsertsql and getupdatesql.
+
+	//==============================================================================================
 	// GLOBAL SETUP
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	$ADODB_EXTENSION = defined('ADODB_EXTENSION');
-	
+
 	//********************************************************//
 	/*
 	Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
@@ -86,53 +86,53 @@
 
 
 	if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
-		
+
 		define('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;</p>');
-	
+
 	// allow [ ] @ ` " and . in table names
 		define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)');
-	
+
 	// prefetching used by oracle
 		if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
-	
-	
+
+
 	/*
 	Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
 	This currently works only with mssql, odbc, oci8po and ibase derived drivers.
-	
+
  		0 = assoc lowercase field names. $rs->fields['orderid']
 		1 = assoc uppercase field names. $rs->fields['ORDERID']
 		2 = use native-case field names. $rs->fields['OrderID']
 	*/
-	
+
 		define('ADODB_FETCH_DEFAULT',0);
 		define('ADODB_FETCH_NUM',1);
 		define('ADODB_FETCH_ASSOC',2);
 		define('ADODB_FETCH_BOTH',3);
-		
+
 		if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100);
-	
+
 		// PHP's version scheme makes converting to numbers difficult - workaround
 		$_adodb_ver = (float) PHP_VERSION;
 		if ($_adodb_ver >= 5.2) {
 			define('ADODB_PHPVER',0x5200);
 		} else if ($_adodb_ver >= 5.0) {
 			define('ADODB_PHPVER',0x5000);
-		} else 
+		} else
 			die("PHP5 or later required. You are running ".PHP_VERSION);
 	}
-	
-	
+
+
 	//if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
 
-	
+
 	/**
 	 	Accepts $src and $dest arrays, replacing string $data
 	*/
 	function ADODB_str_replace($src, $dest, $data)
 	{
 		if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data);
-		
+
 		$s = reset($src);
 		$d = reset($dest);
 		while ($s !== false) {
@@ -142,10 +142,10 @@
 		}
 		return $data;
 	}
-	
+
 	function ADODB_Setup()
 	{
-	GLOBAL 
+	GLOBAL
 		$ADODB_vers, 		// database version
 		$ADODB_COUNTRECS,	// count number of records returned - slows down query
 		$ADODB_CACHE_DIR,	// directory to cache recordsets
@@ -155,7 +155,7 @@
 		$ADODB_FORCE_TYPE,
 		$ADODB_GETONE_EOF,
 		$ADODB_QUOTE_FIELDNAMES;
-		
+
 		if (empty($ADODB_CACHE_CLASS)) $ADODB_CACHE_CLASS =  'ADODB_Cache_File' ;
 		$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
 		$ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
@@ -165,59 +165,59 @@
 			$ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? $_ENV['TMP'] : '/tmp';
 		} else {
 			// do not accept url based paths, eg. http:/ or ftp:/
-			if (strpos($ADODB_CACHE_DIR,'://') !== false) 
+			if (strpos($ADODB_CACHE_DIR,'://') !== false)
 				die("Illegal path http:// or ftp://");
 		}
-		
-			
+
+
 		// Initialize random number generator for randomizing cache flushes
 		// -- note Since PHP 4.2.0, the seed  becomes optional and defaults to a random value if omitted.
 		 srand(((double)microtime())*1000000);
-		
+
 		/**
 		 * ADODB version as a string.
 		 */
 		$ADODB_vers = 'V5.10 10 Nov 2009  (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
-	
+
 		/**
-		 * Determines whether recordset->RecordCount() is used. 
+		 * Determines whether recordset->RecordCount() is used.
 		 * Set to false for highest performance -- RecordCount() will always return -1 then
 		 * for databases that provide "virtual" recordcounts...
 		 */
-		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
+		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true;
 	}
-	
-	
-	//==============================================================================================	
+
+
+	//==============================================================================================
 	// CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	ADODB_Setup();
 
-	//==============================================================================================	
+	//==============================================================================================
 	// CLASS ADOFieldObject
-	//==============================================================================================	
+	//==============================================================================================
 	/**
 	 * Helper class for FetchFields -- holds info on a column
 	 */
-	class ADOFieldObject { 
+	class ADOFieldObject {
 		var $name = '';
 		var $max_length=0;
 		var $type="";
 /*
 		// additional fields by dannym... (danny_milo@yahoo.com)
-		var $not_null = false; 
+		var $not_null = false;
 		// actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^
 		// so we can as well make not_null standard (leaving it at "false" does not harm anyways)
 
-		var $has_default = false; // this one I have done only in mysql and postgres for now ... 
+		var $has_default = false; // this one I have done only in mysql and postgres for now ...
 			// others to come (dannym)
 		var $default_value; // default, if any, and supported. Check has_default first.
 */
 	}
-	
+
 	// for transaction handling
-	
+
 	function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
 	{
 		//print "Errorno ($fn errno=$errno m=$errmsg) ";
@@ -227,46 +227,46 @@
 			$fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
 		}
 	}
-	
+
 	//------------------
 	// class for caching
 	class ADODB_Cache_File {
-	
+
 		var $createdir = true; // requires creation of temp dirs
-		
+
 		function ADODB_Cache_File()
 		{
 		global $ADODB_INCLUDED_CSV;
 			if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
 		}
-		
+
 		// write serialised recordset to cache item/file
 		function writecache($filename, $contents,  $debug, $secs2cache)
 		{
 			return adodb_write_file($filename, $contents,$debug);
 		}
-		
+
 		// load serialised recordset and unserialise it
 		function &readcache($filename, &$err, $secs2cache, $rsClass)
 		{
 			$rs = csv2rs($filename,$err,$secs2cache,$rsClass);
 			return $rs;
 		}
-		
+
 		// flush all items in cache
 		function flushall($debug=false)
 		{
 		global $ADODB_CACHE_DIR;
 
 		$rez = false;
-		
+
 			if (strlen($ADODB_CACHE_DIR) > 1) {
 				$rez = $this->_dirFlush($ADODB_CACHE_DIR);
 	         	if ($debug) ADOConnection::outp( "flushall: $dir<br><pre>\n". $rez."</pre>");
 	   		}
 			return $rez;
 		}
-		
+
 		// flush one file in cache
 		function flushcache($f, $debug=false)
 		{
@@ -274,14 +274,14 @@
 		   		if ($debug) ADOConnection::outp( "flushcache: failed for $f");
 			}
 		}
-		
+
 		function getdirname($hash)
 		{
 		global $ADODB_CACHE_DIR;
 			if (!isset($this->notSafeMode)) $this->notSafeMode = !ini_get('safe_mode');
 			return ($this->notSafeMode) ? $ADODB_CACHE_DIR.'/'.substr($hash,0,2) : $ADODB_CACHE_DIR;
 		}
-		
+
 		// create temp directories
 		function createdir($hash, $debug)
 		{
@@ -291,24 +291,24 @@
 				if (!@mkdir($dir,0771)) if(!is_dir($dir) && $debug) ADOConnection::outp("Cannot create $dir");
 				umask($oldu);
 			}
-		
+
 			return $dir;
 		}
-		
+
 		/**
 		* Private function to erase all of the files and subdirectories in a directory.
 		*
 		* Just specify the directory, and tell it if you want to delete the directory or just clear it out.
 		* Note: $kill_top_level is used internally in the function to flush subdirectories.
 		*/
-		function _dirFlush($dir, $kill_top_level = false) 
+		function _dirFlush($dir, $kill_top_level = false)
 		{
 		   if(!$dh = @opendir($dir)) return;
-		   
+
 		   while (($obj = readdir($dh))) {
 		   		if($obj=='.' || $obj=='..') continue;
 				$f = $dir.'/'.$obj;
-		
+
 				if (strpos($obj,'.cache')) @unlink($f);
 				if (is_dir($f)) $this->_dirFlush($f, true);
 		   }
@@ -316,27 +316,27 @@
 		   return true;
 		}
 	}
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADOConnection
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	/**
 	 * Connection object. For connecting to databases, and executing queries.
-	 */ 
+	 */
 	class ADOConnection {
 	//
-	// PUBLIC VARS 
+	// PUBLIC VARS
 	//
 	var $dataProvider = 'native';
-	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql					
-	var $database = '';			/// Name of database to be used.	
-	var $host = ''; 			/// The hostname of the database server	
-	var $user = ''; 			/// The username which is used to connect to the database server. 
+	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql
+	var $database = '';			/// Name of database to be used.
+	var $host = ''; 			/// The hostname of the database server
+	var $user = ''; 			/// The username which is used to connect to the database server.
 	var $password = ''; 		/// Password for the username. For security, we no longer store it.
 	var $debug = false; 		/// if set to true will output sql statements
 	var $maxblobsize = 262144; 	/// maximum size of blobs or large text fields (262144 = 256K)-- some db's die otherwise like foxpro
-	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase	
+	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase
 	var $substr = 'substr';		/// substring operator
 	var $length = 'length';		/// string length ofperator
 	var $random = 'rand()';		/// random function
@@ -379,9 +379,9 @@
 	var $sysTimeStamp = false; /// name of function that returns the current timestamp
 	var $sysUTimeStamp = false; // name of function that returns the current timestamp accurate to the microsecond or nearest fraction
 	var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets
-	
+
 	var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' '
-	var $numCacheHits = 0; 
+	var $numCacheHits = 0;
 	var $numCacheMisses = 0;
 	var $pageExecuteCountRows = true;
 	var $uniqueSort = false; /// indicates that all fields in order by must be unique
@@ -390,76 +390,76 @@
 	var $ansiOuter = false; /// whether ansi outer join syntax supported
 	var $autoRollback = false; // autoRollback on PConnect().
 	var $poorAffectedRows = false; // affectedRows not working or unreliable
-	
+
 	var $fnExecute = false;
 	var $fnCacheExecute = false;
 	var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char
 	var $rsPrefix = "ADORecordSet_";
-	
+
 	var $autoCommit = true; 	/// do not modify this yourself - actually private
 	var $transOff = 0; 			/// temporarily disable transactions
 	var $transCnt = 0; 			/// count of nested transactions
-	
+
 	var $fetchMode=false;
-	
+
 	var $null2null = 'null'; // in autoexecute/getinsertsql/getupdatesql, this value will be converted to a null
 	 //
 	 // PRIVATE VARS
 	 //
 	var $_oldRaiseFn =  false;
 	var $_transOK = null;
-	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.	
+	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.
 	var $_errorMsg = false;		/// A variable which was used to keep the returned last error message.  The value will
-								/// then returned by the errorMsg() function	
-	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8					
+								/// then returned by the errorMsg() function
+	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8
 	var $_queryID = false;		/// This variable keeps the last created result link identifier
-	
+
 	var $_isPersistentConnection = false;	/// A boolean variable to state whether its a persistent connection or normal connection.	*/
 	var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
 	var $_evalAll = false;
 	var $_affected = false;
 	var $_logsql = false;
 	var $_transmode = ''; // transaction mode
-	
 
-	
+
+
 	/**
 	 * Constructor
 	 */
-	function ADOConnection()			
+	function ADOConnection()
 	{
 		die('Virtual Class -- cannot instantiate');
 	}
-	
+
 	static function Version()
 	{
 	global $ADODB_vers;
-	
+
 		return (float) substr($ADODB_vers,1);
 	}
-	
+
 	/**
 		Get server version info...
-		
-		@returns An array with 2 elements: $arr['string'] is the description string, 
+
+		@returns An array with 2 elements: $arr['string'] is the description string,
 			and $arr[version] is the version (also a string).
 	*/
 	function ServerInfo()
 	{
 		return array('description' => '', 'version' => '');
 	}
-	
+
 	function IsConnected()
 	{
     	return !empty($this->_connectionID);
 	}
-	
+
 	function _findvers($str)
 	{
 		if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1];
 		else return '';
 	}
-	
+
 	/**
 	* All error messages go through this bottleneck function.
 	* You can define your own handler by defining the function name in ADODB_OUTP.
@@ -467,7 +467,7 @@
 	static function outp($msg,$newline=true)
 	{
 	global $ADODB_FLUSH,$ADODB_OUTP;
-	
+
 		if (defined('ADODB_OUTP')) {
 			$fn = ADODB_OUTP;
 			$fn($msg,$newline);
@@ -477,25 +477,25 @@
 			$fn($msg,$newline);
 			return;
 		}
-		
+
 		if ($newline) $msg .= "<br>\n";
-		
+
 		if (isset($_SERVER['HTTP_USER_AGENT']) || !$newline) echo $msg;
 		else echo strip_tags($msg);
-	
-		
-		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan 
-		
+
+
+		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan
+
 	}
-	
+
 	function Time()
 	{
 		$rs = $this->_Execute("select $this->sysTimeStamp");
 		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
+
 		return false;
 	}
-	
+
 	/**
 	 * Connect to database
 	 *
@@ -506,16 +506,16 @@
 	 * @param [forceNew]		force new connection
 	 *
 	 * @return true or false
-	 */	  
-	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) 
+	 */
+	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false)
 	{
 		if ($argHostname != "") $this->host = $argHostname;
 		if ($argUsername != "") $this->user = $argUsername;
 		if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-		
-		$this->_isPersistentConnection = false;	
-			
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;
+
+		$this->_isPersistentConnection = false;
+
 		if ($forceNew) {
 			if ($rez=$this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true;
 		} else {
@@ -529,21 +529,21 @@
 			$err = "Missing extension for ".$this->dataProvider;
 			$ret = 0;
 		}
-		if ($fn = $this->raiseErrorFn) 
+		if ($fn = $this->raiseErrorFn)
 			$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-		
-		
+
+
 		$this->_connectionID = false;
 		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
 		return $ret;
-	}	
-	
+	}
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
 	}
-	
-	
+
+
 	/**
 	 * Always force a new connection to database - currently only works with oracle
 	 *
@@ -553,12 +553,12 @@
 	 * @param [argDatabaseName]	database
 	 *
 	 * @return true or false
-	 */	  
-	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") 
+	 */
+	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
 	{
 		return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true);
 	}
-	
+
 	/**
 	 * Establish persistent connect to database
 	 *
@@ -568,20 +568,20 @@
 	 * @param [argDatabaseName]	database
 	 *
 	 * @return return true or false
-	 */	
+	 */
 	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
 	{
-		
-		if (defined('ADODB_NEVER_PERSIST')) 
+
+		if (defined('ADODB_NEVER_PERSIST'))
 			return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
-		
+
 		if ($argHostname != "") $this->host = $argHostname;
 		if ($argUsername != "") $this->user = $argUsername;
 		if ($argPassword != "") $this->password = $argPassword;
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-			
-		$this->_isPersistentConnection = true;	
-		
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;
+
+		$this->_isPersistentConnection = true;
+
 		if ($rez = $this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true;
 		if (isset($rez)) {
 			$err = $this->ErrorMsg();
@@ -594,7 +594,7 @@
 		if ($fn = $this->raiseErrorFn) {
 			$fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
 		}
-		
+
 		$this->_connectionID = false;
 		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
 		return $ret;
@@ -605,32 +605,32 @@
 		if (defined('ADODB_ERROR_HANDLER') &&  ADODB_ERROR_HANDLER == 'adodb_throw') {
 			adodb_throw($this->databaseType,$src,-9999,$msg,$sql,false,$this);
 			return;
-		} 
+		}
 		ADOConnection::outp($msg);
 	}
-	
+
 	// create cache class. Code is backward compat with old memcache implementation
 	function _CreateCache()
 	{
 	global $ADODB_CACHE, $ADODB_CACHE_CLASS;
-	
+
 		if ($this->memCache) {
 		global $ADODB_INCLUDED_MEMCACHE;
-		
+
 			if (empty($ADODB_INCLUDED_MEMCACHE)) include(ADODB_DIR.'/adodb-memcache.lib.inc.php');
 				$ADODB_CACHE = new ADODB_Cache_MemCache($this);
 		} else
 				$ADODB_CACHE = new $ADODB_CACHE_CLASS($this);
-		
+
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysDate;
 		return $col; // child class implement
 	}
-	
+
 	/**
 	 * Should prepare the sql statement and return the stmt resource.
 	 * For databases that do not support this, we return the $sql. To ensure
@@ -645,7 +645,7 @@
 	 * @return return FALSE, or the prepared statement, or the original sql if
 	 * 			if the database does not support prepare.
 	 *
-	 */	
+	 */
 	function Prepare($sql)
 	{
 		return $sql;
@@ -664,7 +664,7 @@
 	 * @return return FALSE, or the prepared statement, or the original sql if
 	 * 			if the database does not support prepare.
 	 *
-	 */	
+	 */
 	function PrepareSP($sql,$param=true)
 	{
 		return $this->Prepare($sql,$param);
@@ -677,7 +677,7 @@
 	{
 		return $this->qstr($s,false);
 	}
-	
+
 	/**
 	 Requested by "Karsten Dambekalns" <k.dambekalns@fishfarm.de>
 	*/
@@ -691,18 +691,18 @@
 		#if (!empty($this->qNull)) if ($s == 'null') return $s;
 		$s = $this->qstr($s,false);
 	}
-	
+
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*/
 	function ErrorNative()
 	{
 		return $this->ErrorNo();
 	}
 
-	
+
    /**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*/
 	function nextId($seq_name)
 	{
@@ -720,19 +720,19 @@
 	{
 		return false;
 	}
-	
+
 	function CommitLock($table)
 	{
 		return $this->CommitTrans();
 	}
-	
+
 	function RollbackLock($table)
 	{
 		return $this->RollbackTrans();
 	}
-	
+
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*
 	* The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
 	* 	for easy porting :-)
@@ -741,20 +741,20 @@
 	* @returns		The previous fetch mode
 	*/
 	function SetFetchMode($mode)
-	{	
+	{
 		$old = $this->fetchMode;
 		$this->fetchMode = $mode;
-		
+
 		if ($old === false) {
 		global $ADODB_FETCH_MODE;
 			return $ADODB_FETCH_MODE;
 		}
 		return $old;
 	}
-	
 
+
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*/
 	function Query($sql, $inputarr=false)
 	{
@@ -763,18 +763,18 @@
 		return $rs;
 	}
 
-	
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
 	function LimitQuery($sql, $offset, $count, $params=false)
 	{
-		$rs = $this->SelectLimit($sql, $count, $offset, $params); 
+		$rs = $this->SelectLimit($sql, $count, $offset, $params);
 		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
 		return $rs;
 	}
 
-	
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
@@ -782,13 +782,13 @@
 	{
 		return $this->Close();
 	}
-	
+
 	/*
 		 Returns placeholder for parameter, eg.
 		 $DB->Param('a')
-		 
+
 		 will return ':a' for Oracle, and '?' for most other databases...
-		 
+
 		 For databases that require positioned params, eg $1, $2, $3 for postgresql,
 		 	pass in Param(false) before setting the first parameter.
 	*/
@@ -796,7 +796,7 @@
 	{
 		return '?';
 	}
-	
+
 	/*
 		InParameter and OutParameter are self-documenting versions of Parameter().
 	*/
@@ -804,23 +804,23 @@
 	{
 		return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
 	}
-	
+
 	/*
 	*/
 	function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
 	{
 		return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
-	
+
 	}
 
-	
-	/* 
+
+	/*
 	Usage in oracle
 		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
 		$db->Parameter($stmt,$id,'myid');
 		$db->Parameter($stmt,$group,'group',64);
 		$db->Execute();
-		
+
 		@param $stmt Statement returned by Prepare() or PrepareSP().
 		@param $var PHP variable to bind to
 		@param $name Name of stored procedure variable name to bind to.
@@ -833,8 +833,8 @@
 	{
 		return false;
 	}
-	
-	
+
+
 	function IgnoreErrors($saveErrs=false)
 	{
 		if (!$saveErrs) {
@@ -846,11 +846,11 @@
 			$this->_transOK = $saveErrs[1];
 		}
 	}
-	
+
 	/**
 		Improved method of initiating a transaction. Used together with CompleteTrans().
 		Advantages include:
-		
+
 		a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans.
 		   Only the outermost block is treated as a transaction.<br>
 		b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.<br>
@@ -863,23 +863,23 @@
 			$this->transOff += 1;
 			return true;
 		}
-		
+
 		$this->_oldRaiseFn = $this->raiseErrorFn;
 		$this->raiseErrorFn = $errfn;
 		$this->_transOK = true;
-		
+
 		if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
 		$ok = $this->BeginTrans();
 		$this->transOff = 1;
 		return $ok;
 	}
-	
-	
+
+
 	/**
 		Used together with StartTrans() to end a transaction. Monitors connection
 		for sql errors, and will commit or rollback as appropriate.
-		
-		@autoComplete if true, monitor sql errors and commit and rollback as appropriate, 
+
+		@autoComplete if true, monitor sql errors and commit and rollback as appropriate,
 		and if set to false force rollback even if no SQL error detected.
 		@returns true on commit, false on rollback.
 	*/
@@ -890,7 +890,7 @@
 			return true;
 		}
 		$this->raiseErrorFn = $this->_oldRaiseFn;
-		
+
 		$this->transOff = 0;
 		if ($this->_transOK && $autoComplete) {
 			if (!$this->CommitTrans()) {
@@ -903,16 +903,16 @@
 			$this->RollbackTrans();
 			if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred");
 		}
-		
+
 		return $this->_transOK;
 	}
-	
+
 	/*
 		At the end of a StartTrans/CompleteTrans block, perform a rollback.
 	*/
 	function FailTrans()
 	{
-		if ($this->debug) 
+		if ($this->debug)
 			if ($this->transOff == 0) {
 				ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans");
 			} else {
@@ -921,7 +921,7 @@
 			}
 		$this->_transOK = false;
 	}
-	
+
 	/**
 		Check if transaction has failed, only for Smart Transactions.
 	*/
@@ -930,15 +930,15 @@
 		if ($this->transOff > 0) return $this->_transOK == false;
 		return false;
 	}
-	
+
 	/**
-	 * Execute SQL 
+	 * Execute SQL
 	 *
 	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
 	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
 	 * @return 		RecordSet or false
 	 */
-	function Execute($sql,$inputarr=false) 
+	function Execute($sql,$inputarr=false)
 	{
 		if ($this->fnExecute) {
 			$fn = $this->fnExecute;
@@ -947,13 +947,13 @@
 		}
 		if ($inputarr) {
 			if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
+
 			$element0 = reset($inputarr);
 			# is_object check because oci8 descriptors can be passed in
 			$array_2d = is_array($element0) && !is_object(reset($element0));
 			//remove extra memory copy of input -mikefedyk
 			unset($element0);
-			
+
 			if (!is_array($sql) && !$this->_bindInputArray) {
 				$sqlarr = explode('?',$sql);
 				$nparams = sizeof($sqlarr)-1;
@@ -964,7 +964,7 @@
 					while(list(, $v) = each($arr)) {
 						$sql .= $sqlarr[$i];
 						// from Ron Baldwin <ron.baldwin#sourceprose.com>
-						// Only quote string types	
+						// Only quote string types
 						$typ = gettype($v);
 						if ($typ == 'string')
 							//New memory copy of input created here -mikefedyk
@@ -981,25 +981,25 @@
 						else
 							$sql .= $v;
 						$i += 1;
-						
+
 						if ($i == $nparams) break;
 					} // while
 					if (isset($sqlarr[$i])) {
 						$sql .= $sqlarr[$i];
 						if ($i+1 != sizeof($sqlarr)) $this->outp_throw( "Input Array does not match ?: ".htmlspecialchars($sql),'Execute');
-					} else if ($i != sizeof($sqlarr))	
+					} else if ($i != sizeof($sqlarr))
 						$this->outp_throw( "Input array does not match ?: ".htmlspecialchars($sql),'Execute');
-		
+
 					$ret = $this->_Execute($sql);
 					if (!$ret) return $ret;
-				}	
+				}
 			} else {
 				if ($array_2d) {
 					if (is_string($sql))
 						$stmt = $this->Prepare($sql);
 					else
 						$stmt = $sql;
-						
+
 					foreach($inputarr as $arr) {
 						$ret = $this->_Execute($stmt,$arr);
 						if (!$ret) return $ret;
@@ -1014,8 +1014,8 @@
 
 		return $ret;
 	}
-	
-	
+
+
 	function _Execute($sql,$inputarr=false)
 	{
 		if ($this->debug) {
@@ -1025,28 +1025,28 @@
 		} else {
 			$this->_queryID = @$this->_query($sql,$inputarr);
 		}
-		
+
 		/************************
 		// OK, query executed
 		*************************/
 
 		if ($this->_queryID === false) { // error handling if query fails
-			if ($this->debug == 99) adodb_backtrace(true,5);	
+			if ($this->debug == 99) adodb_backtrace(true,5);
 			$fn = $this->raiseErrorFn;
 			if ($fn) {
 				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
-			} 
+			}
 			$false = false;
 			return $false;
-		} 
-		
+		}
+
 		if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
 			$rsclass = $this->rsPrefix.'empty';
 			$rs = (class_exists($rsclass)) ? new $rsclass():  new ADORecordSet_empty();
-			
+
 			return $rs;
 		}
-		
+
 		// return real recordset from select statement
 		$rsclass = $this->rsPrefix.$this->databaseType;
 		$rs = new $rsclass($this->_queryID,$this->fetchMode);
@@ -1057,7 +1057,7 @@
 		if ($rs->_numOfRows <= 0) {
 		global $ADODB_COUNTRECS;
 			if ($ADODB_COUNTRECS) {
-				if (!$rs->EOF) { 
+				if (!$rs->EOF) {
 					$rs = $this->_rs2rs($rs,-1,-1,!is_array($sql));
 					$rs->_queryID = $this->_queryID;
 				} else
@@ -1092,16 +1092,16 @@
 		if (!$this->hasGenID) {
 			return 0; // formerly returns false pre 1.60
 		}
-		
+
 		$getnext = sprintf($this->_genIDSQL,$seqname);
-		
+
 		$holdtransOK = $this->_transOK;
-		
+
 		$save_handler = $this->raiseErrorFn;
 		$this->raiseErrorFn = '';
 		@($rs = $this->Execute($getnext));
 		$this->raiseErrorFn = $save_handler;
-		
+
 		if (!$rs) {
 			$this->_transOK = $holdtransOK; //if the status was ok before reset
 			$createseq = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
@@ -1109,17 +1109,17 @@
 		}
 		if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
 		else $this->genID = 0; // false
-	
+
 		if ($rs) $rs->Close();
 
 		return $this->genID;
-	}	
+	}
 
 	/**
 	 * @param $table string name of the table, not needed by all databases (eg. mysql), default ''
 	 * @param $column string name of the column, not needed by all databases (eg. mysql), default ''
 	 * @return  the last inserted ID. Not all databases support this.
-	 */ 
+	 */
 	function Insert_ID($table='',$column='')
 	{
 		if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
@@ -1137,8 +1137,8 @@
 	 *
 	 * @return  the last inserted ID. All databases support this. But aware possible
 	 * problems in multiuser environments. Heavy test this before deploying.
-	 */ 
-	function PO_Insert_ID($table="", $id="") 
+	 */
+	function PO_Insert_ID($table="", $id="")
 	{
 	   if ($this->hasInsertID){
 		   return $this->Insert_ID($table,$id);
@@ -1149,7 +1149,7 @@
 
 	/**
 	* @return # rows affected by UPDATE/DELETE
-	*/ 
+	*/
 	function Affected_Rows()
 	{
 		if ($this->hasAffectedRows) {
@@ -1159,12 +1159,12 @@
 			$val = $this->_affectedrows();
 			return ($val < 0) ? false : $val;
 		}
-				  
+
 		if ($this->debug) ADOConnection::outp( '<p>Affected_Rows error</p>',false);
 		return false;
 	}
-	
-	
+
+
 	/**
 	 * @return  the last error message
 	 */
@@ -1173,29 +1173,29 @@
 		if ($this->_errorMsg) return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
 		else return '';
 	}
-	
-	
+
+
 	/**
 	 * @return the last error number. Normally 0 means no error.
 	 */
-	function ErrorNo() 
+	function ErrorNo()
 	{
 		return ($this->_errorMsg) ? -1 : 0;
 	}
-	
+
 	function MetaError($err=false)
 	{
 		include_once(ADODB_DIR."/adodb-error.inc.php");
 		if ($err === false) $err = $this->ErrorNo();
 		return adodb_error($this->dataProvider,$this->databaseType,$err);
 	}
-	
+
 	function MetaErrorMsg($errno)
 	{
 		include_once(ADODB_DIR."/adodb-error.inc.php");
 		return adodb_errormsg($errno);
 	}
-	
+
 	/**
 	 * @returns an array with the primary key columns in it.
 	 */
@@ -1215,7 +1215,7 @@
 			return ADODB_VIEW_PRIMARYKEYS($this->databaseType, $this->database, $table, $owner);
 		return false;
 	}
-	
+
 	/**
 	 * @returns assoc array where keys are tables, and values are foreign keys
 	 */
@@ -1229,16 +1229,16 @@
 	 * @param dbName 	is the name of the database to select
 	 * @return 		true or false
 	 */
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{return false;}
-	
-	
+
+
 	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
+	* Will select, getting rows from $offset (1-based), for $nrows.
 	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
 	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
 	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
+	* eg.
 	*  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
 	*  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
 	*
@@ -1255,14 +1255,14 @@
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		if ($this->hasTop && $nrows > 0) {
-		// suggested by Reinhard Balling. Access requires top after distinct 
+		// suggested by Reinhard Balling. Access requires top after distinct
 		 // Informix requires first before distinct - F Riosa
 			$ismssql = (strpos($this->databaseType,'mssql') !== false);
 			if ($ismssql) $isaccess = false;
 			else $isaccess = (strpos($this->databaseType,'access') !== false);
-			
+
 			if ($offset <= 	0) {
-				
+
 					// access includes ties in result
 					if ($isaccess) {
 						$sql = preg_replace(
@@ -1292,18 +1292,18 @@
 				}
 			}
 		}
-		
+
 		// if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is set, we buffer  rows
 		// 0 to offset-1 which will be discarded anyway. So we disable $ADODB_COUNTRECS.
 		global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-			
 
+
 		if ($secs2cache != 0) $rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
 		else $rs = $this->Execute($sql,$inputarr);
-		
+
 		$ADODB_COUNTRECS = $savec;
 		if ($rs && !$rs->EOF) {
 			$rs = $this->_rs2rs($rs,$nrows,$offset);
@@ -1311,7 +1311,7 @@
 		//print_r($rs);
 		return $rs;
 	}
-	
+
 	/**
 	* Create serializable recordset. Breaks rs link to connection.
 	*
@@ -1322,10 +1322,10 @@
 		$rs2 = $this->_rs2rs($rs);
 		$ignore = false;
 		$rs2->connection = $ignore;
-		
+
 		return $rs2;
 	}
-	
+
 	/**
 	* Convert database recordset to an array recordset
 	* input recordset's cursor should be at beginning, and
@@ -1360,9 +1360,9 @@
 		$arr = $rs->GetArrayLimit($nrows,$offset);
 		//print_r($arr);
 		if ($close) $rs->Close();
-		
+
 		$arrayClass = $this->arrayClass;
-		
+
 		$rs2 = new $arrayClass();
 		$rs2->connection = $this;
 		$rs2->sql = $rs->sql;
@@ -1371,7 +1371,7 @@
 		$rs2->fetchMode = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
 		return $rs2;
 	}
-	
+
 	/*
 	* Return all rows. Compat with PEAR DB
 	*/
@@ -1380,7 +1380,7 @@
 		$arr = $this->GetArray($sql,$inputarr);
 		return $arr;
 	}
-	
+
 	function GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
 	{
 		$rs = $this->Execute($sql, $inputarr);
@@ -1391,7 +1391,7 @@
 		$arr = $rs->GetAssoc($force_array,$first2cols);
 		return $arr;
 	}
-	
+
 	function CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = false, $first2cols = false)
 	{
 		if (!is_numeric($secs2cache)) {
@@ -1406,7 +1406,7 @@
 		$arr = $rs->GetAssoc($force_array,$first2cols);
 		return $arr;
 	}
-	
+
 	/**
 	* Return first element of first row of sql statement. Recordset is disposed
 	* for you.
@@ -1419,32 +1419,32 @@
 	global $ADODB_COUNTRECS,$ADODB_GETONE_EOF;
 		$crecs = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-		
+
 		$ret = false;
 		$rs = $this->Execute($sql,$inputarr);
-		if ($rs) {	
+		if ($rs) {
 			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
 			else $ret = reset($rs->fields);
-			
+
 			$rs->Close();
 		}
 		$ADODB_COUNTRECS = $crecs;
 		return $ret;
 	}
-	
+
 	// $where should include 'WHERE fld=value'
 	function GetMedian($table, $field,$where = '')
 	{
 		$total = $this->GetOne("select count(*) from $table $where");
 		if (!$total) return false;
-	
+
 		$midrow = (integer) ($total/2);
 		$rs = $this->SelectLimit("select $field from $table $where order by 1",1,$midrow);
 		if ($rs && !$rs->EOF) return reset($rs->fields);
 		return false;
 	}
-	
-	
+
+
 	function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
 	{
 	global $ADODB_GETONE_EOF;
@@ -1454,14 +1454,14 @@
 			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
 			else $ret = reset($rs->fields);
 			$rs->Close();
-		} 
-		
+		}
+
 		return $ret;
 	}
-	
+
 	function GetCol($sql, $inputarr = false, $trim = false)
 	{
-	  	
+
 	  	$rs = $this->Execute($sql, $inputarr);
 	  	if ($rs) {
 			$rv = array();
@@ -1481,7 +1481,7 @@
 			$rv = false;
 	  	return $rv;
 	}
-	
+
 	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
 	{
 	  	$rs = $this->CacheExecute($secs, $sql, $inputarr);
@@ -1501,34 +1501,34 @@
 	   		$rs->Close();
 	  	} else
 			$rv = false;
-			
+
 	  	return $rv;
 	}
-	
+
 	function Transpose(&$rs,$addfieldnames=true)
 	{
 		$rs2 = $this->_rs2rs($rs);
 		$false = false;
 		if (!$rs2) return $false;
-		
+
 		$rs2->_transpose($addfieldnames);
 		return $rs2;
 	}
- 
+
 	/*
 		Calculate the offset of a date for a particular database and generate
 			appropriate SQL. Useful for calculating future/past dates and storing
 			in a database.
-			
+
 		If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
 	*/
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
 		return  '('.$date.'+'.$dayFraction.')';
 	}
-	
-	
+
+
 	/**
 	*
 	* @param sql			SQL statement
@@ -1537,12 +1537,12 @@
 	function GetArray($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
 		$rs = $this->Execute($sql,$inputarr);
 		$ADODB_COUNTRECS = $savec;
-		if (!$rs) 
+		if (!$rs)
 			if (defined('ADODB_PEAR')) {
 				$cls = ADODB_PEAR_Error();
 				return $cls;
@@ -1554,23 +1554,23 @@
 		$rs->Close();
 		return $arr;
 	}
-	
+
 	function CacheGetAll($secs2cache,$sql=false,$inputarr=false)
 	{
 		$arr = $this->CacheGetArray($secs2cache,$sql,$inputarr);
 		return $arr;
 	}
-	
+
 	function CacheGetArray($secs2cache,$sql=false,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
 		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
 		$ADODB_COUNTRECS = $savec;
-		
-		if (!$rs) 
+
+		if (!$rs)
 			if (defined('ADODB_PEAR')) {
 				$cls = ADODB_PEAR_Error();
 				return $cls;
@@ -1582,14 +1582,14 @@
 		$rs->Close();
 		return $arr;
 	}
-	
+
 	function GetRandRow($sql, $arr= false)
 	{
 		$rezarr = $this->GetAll($sql, $arr);
 		$sz = sizeof($rezarr);
 		return $rezarr[abs(rand()) % $sz];
 	}
-	
+
 	/**
 	* Return one row of sql statement. Recordset is disposed for you.
 	*
@@ -1601,9 +1601,9 @@
 	global $ADODB_COUNTRECS;
 		$crecs = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-		
+
 		$rs = $this->Execute($sql,$inputarr);
-		
+
 		$ADODB_COUNTRECS = $crecs;
 		if ($rs) {
 			if (!$rs->EOF) $arr = $rs->fields;
@@ -1611,27 +1611,27 @@
 			$rs->Close();
 			return $arr;
 		}
-		
+
 		$false = false;
 		return $false;
 	}
-	
+
 	function CacheGetRow($secs2cache,$sql=false,$inputarr=false)
 	{
 		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
 		if ($rs) {
 			if (!$rs->EOF) $arr = $rs->fields;
 			else $arr = array();
-			
+
 			$rs->Close();
 			return $arr;
 		}
 		$false = false;
 		return $false;
 	}
-	
+
 	/**
-	* Insert or replace a single record. Note: this is not the same as MySQL's replace. 
+	* Insert or replace a single record. Note: this is not the same as MySQL's replace.
 	* ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
 	* Also note that no table locking is done currently, so it is possible that the
 	* record be inserted twice by two programs...
@@ -1647,24 +1647,24 @@
 	*
 	* Currently blob replace not supported
 	*
-	* returns 0 = fail, 1 = update, 2 = insert 
+	* returns 0 = fail, 1 = update, 2 = insert
 	*/
-	
+
 	function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
 	{
 		global $ADODB_INCLUDED_LIB;
 		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		
+
 		return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc);
 	}
-	
-	
+
+
 	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
+	* Will select, getting rows from $offset (1-based), for $nrows.
 	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
 	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
 	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
+	* eg.
 	*  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
 	*  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
 	*
@@ -1678,7 +1678,7 @@
 	* @return		the recordset ($rs->databaseType == 'array')
  	*/
 	function CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
-	{	
+	{
 		if (!is_numeric($secs2cache)) {
 			if ($sql === false) $sql = -1;
 			if ($offset == -1) $offset = false;
@@ -1690,33 +1690,33 @@
 		}
 		return $rs;
 	}
-	
-	
+
+
 	/**
-	* Flush cached recordsets that match a particular $sql statement. 
+	* Flush cached recordsets that match a particular $sql statement.
 	* If $sql == false, then we purge all files in the cache.
  	*/
-	
+
 	/**
-   * Flush cached recordsets that match a particular $sql statement. 
+   * Flush cached recordsets that match a particular $sql statement.
    * If $sql == false, then we purge all files in the cache.
     */
 	function CacheFlush($sql=false,$inputarr=false)
 	{
 	global $ADODB_CACHE_DIR, $ADODB_CACHE;
-		
+
 		if (empty($ADODB_CACHE)) return false;
-		
+
 		if (!$sql) {
 			 $ADODB_CACHE->flushall($this->debug);
 	         return;
 	    }
-		
+
 		$f = $this->_gencachename($sql.serialize($inputarr),false);
 		return $ADODB_CACHE->flushcache($f, $this->debug);
 	}
-   
-	
+
+
 	/**
 	* Private function to generate filename for caching.
 	* Filename is generated based on:
@@ -1727,15 +1727,15 @@
 	*  - userid
 	*  - setFetchMode (adodb 4.23)
 	*
-	* When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR). 
-	* Assuming that we can have 50,000 files per directory with good performance, 
+	* When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR).
+	* Assuming that we can have 50,000 files per directory with good performance,
 	* then we can scale to 12.8 million unique cached recordsets. Wow!
  	*/
 	function _gencachename($sql,$createdir)
 	{
 	global $ADODB_CACHE, $ADODB_CACHE_DIR;
-		
-		if ($this->fetchMode === false) { 
+
+		if ($this->fetchMode === false) {
 		global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		} else {
@@ -1745,15 +1745,15 @@
 		if (!$ADODB_CACHE->createdir) return $m;
 		if (!$createdir) $dir = $ADODB_CACHE->getdirname($m);
 		else $dir = $ADODB_CACHE->createdir($m, $this->debug);
-		
+
 		return $dir.'/adodb_'.$m.'.cache';
 	}
-	
-	
+
+
 	/**
 	 * Execute SQL, caching recordsets.
 	 *
-	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. 
+	 * @param [secs2cache]	seconds to cache data, set to 0 to force query.
 	 *					  This is an optional parameter.
 	 * @param sql		SQL statement to execute
 	 * @param [inputarr]	holds the input data  to bind to
@@ -1762,25 +1762,25 @@
 	function CacheExecute($secs2cache,$sql=false,$inputarr=false)
 	{
 	global $ADODB_CACHE;
-	
+
 		if (empty($ADODB_CACHE)) $this->_CreateCache();
-		
+
 		if (!is_numeric($secs2cache)) {
 			$inputarr = $sql;
 			$sql = $secs2cache;
 			$secs2cache = $this->cacheSecs;
 		}
-		
+
 		if (is_array($sql)) {
 			$sqlparam = $sql;
 			$sql = $sql[0];
 		} else
 			$sqlparam = $sql;
-			
-		
+
+
 		$md5file = $this->_gencachename($sql.serialize($inputarr),true);
 		$err = '';
-		
+
 		if ($secs2cache > 0){
 			$rs = $ADODB_CACHE->readcache($md5file,$err,$secs2cache,$this->arrayClass);
 			$this->numCacheHits += 1;
@@ -1789,7 +1789,7 @@
 			$rs = false;
 			$this->numCacheMisses += 1;
 		}
-		
+
 		if (!$rs) {
 		// no cached rs found
 			if ($this->debug) {
@@ -1798,7 +1798,7 @@
 				}
 				if ($this->debug !== -1) ADOConnection::outp( " $md5file cache failure: $err (see sql below)");
 			}
-			
+
 			$rs = $this->Execute($sqlparam,$inputarr);
 
 			if ($rs) {
@@ -1807,13 +1807,13 @@
 				$rs = $this->_rs2rs($rs); // read entire recordset into memory immediately
 				$rs->timeCreated = time(); // used by caching
 				$txt = _rs2serialize($rs,false,$sql); // serialize
-	
+
 				$ok = $ADODB_CACHE->writecache($md5file,$txt,$this->debug, $secs2cache);
 				if (!$ok) {
 					if ($ok === false) {
 						$em = 'Cache write error';
 						$en = -32000;
-						
+
 						if ($fn = $this->raiseErrorFn) {
 							$fn($this->databaseType,'CacheExecute', $en, $em, $md5file,$sql,$this);
 						}
@@ -1822,52 +1822,52 @@
 						$en = -32001;
 						// do not call error handling for just a warning
 					}
-					
+
 					if ($this->debug) ADOConnection::outp( " ".$em);
 				}
 				if ($rs->EOF && !$eof) {
 					$rs->MoveFirst();
-					//$rs = csv2rs($md5file,$err);		
+					//$rs = csv2rs($md5file,$err);
 					$rs->connection = $this; // Pablo suggestion
-				}  
-				
+				}
+
 			} else if (!$this->memCache)
 				$ADODB_CACHE->flushcache($md5file);
 		} else {
 			$this->_errorMsg = '';
 			$this->_errorCode = 0;
-			
+
 			if ($this->fnCacheExecute) {
 				$fn = $this->fnCacheExecute;
 				$fn($this, $secs2cache, $sql, $inputarr);
 			}
 		// ok, set cached object found
 			$rs->connection = $this; // Pablo suggestion
-			if ($this->debug){ 			
+			if ($this->debug){
 				if ($this->debug == 99) adodb_backtrace();
 				$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
 				$ttl = $rs->timeCreated + $secs2cache - time();
 				$s = is_array($sql) ? $sql[0] : $sql;
 				if ($inBrowser) $s = '<i>'.htmlspecialchars($s).'</i>';
-				
+
 				ADOConnection::outp( " $md5file reloaded, ttl=$ttl [ $s ]");
 			}
 		}
 		return $rs;
 	}
-	
-	
-	/* 
-		Similar to PEAR DB's autoExecute(), except that 
+
+
+	/*
+		Similar to PEAR DB's autoExecute(), except that
 		$mode can be 'INSERT' or 'UPDATE' or DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
 		If $mode == 'UPDATE', then $where is compulsory as a safety measure.
-		
+
 		$forceUpdate means that even if the data has not changed, perform update.
 	 */
-	function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false) 
+	function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false)
 	{
 		$false = false;
-		$sql = 'SELECT * FROM '.$table;  
+		$sql = 'SELECT * FROM '.$table;
 		if ($where!==FALSE) $sql .= ' WHERE '.$where;
 		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
 			$this->outp_throw('AutoExecute: Illegal mode=UPDATE with empty WHERE clause','AutoExecute');
@@ -1878,7 +1878,7 @@
 		if (!$rs) return $false; // table does not exist
 		$rs->tableName = $table;
 		$rs->sql = $sql;
-		
+
 		switch((string) $mode) {
 		case 'UPDATE':
 		case '2':
@@ -1897,15 +1897,15 @@
 		if ($ret) $ret = true;
 		return $ret;
 	}
-	
-	
+
+
 	/**
 	 * Generates an Update Query based on an existing recordset.
 	 * $arrFields is an associative array of fields with the value
 	 * that should be assigned.
 	 *
 	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table and sql should only 
+	 *	   that is run against a single table and sql should only
 	 *		 be a simple select stmt with no groupby/orderby/limit
 	 *
 	 * "Jonathan Younger" <jyounger@unilab.com>
@@ -1936,27 +1936,27 @@
 	 *	   that is run against a single table.
   	 */
 	function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null)
-	{	
+	{
 		global $ADODB_INCLUDED_LIB;
 		if (!isset($force)) {
 			global $ADODB_FORCE_TYPE;
 			$force = $ADODB_FORCE_TYPE;
-			
+
 		}
 		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
 		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
 	}
-	
 
+
 	/**
 	* Update a blob column, given a where clause. There are more sophisticated
 	* blob handling functions that we could have implemented, but all require
 	* a very complex API. Instead we have chosen something that is extremely
-	* simple to understand and use. 
+	* simple to understand and use.
 	*
 	* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
 	*
-	* Usage to update a $blobvalue which has a primary key blob_id=1 into a 
+	* Usage to update a $blobvalue which has a primary key blob_id=1 into a
 	* field blobtable.blobcolumn:
 	*
 	*	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
@@ -1966,7 +1966,7 @@
 	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 	*	$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
-	
+
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
@@ -1975,7 +1975,7 @@
 	/**
 	* Usage:
 	*	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
-	*	
+	*
 	*	$blobtype supports 'BLOB' and 'CLOB'
 	*
 	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
@@ -1989,45 +1989,45 @@
 		fclose($fd);
 		return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
 	}
-	
+
 	function BlobDecode($blob)
 	{
 		return $blob;
 	}
-	
+
 	function BlobEncode($blob)
 	{
 		return $blob;
 	}
-	
+
 	function SetCharSet($charset)
 	{
 		return false;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
 	}
-	
+
 	function LogSQL($enable=true)
 	{
 		include_once(ADODB_DIR.'/adodb-perf.inc.php');
-		
+
 		if ($enable) $this->fnExecute = 'adodb_log_sql';
 		else $this->fnExecute = false;
-		
-		$old = $this->_logsql;	
+
+		$old = $this->_logsql;
 		$this->_logsql = $enable;
 		if ($enable && !$old) $this->_affected = false;
 		return $old;
 	}
-	
+
 	function GetCharSet()
 	{
 		return false;
 	}
-	
+
 	/**
 	* Usage:
 	*	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
@@ -2039,21 +2039,21 @@
 	{
 		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
 	}
-	
+
 	// not the fastest implementation - quick and dirty - jlim
 	// for best performance, use the actual $rs->MetaType().
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
-		
+
 		if (empty($this->_metars)) {
 			$rsclass = $this->rsPrefix.$this->databaseType;
-			$this->_metars = new $rsclass(false,$this->fetchMode); 
+			$this->_metars = new $rsclass(false,$this->fetchMode);
 			$this->_metars->connection = $this;
 		}
 		return $this->_metars->MetaType($t,$len,$fieldobj);
 	}
-	
-	
+
+
 	/**
 	*  Change the SQL connection locale to a specified locale.
 	*  This is used to get the date formats written depending on the client locale.
@@ -2067,13 +2067,13 @@
 				$this->fmtDate="'Y-m-d'";
 				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
 				break;
-				
+
 			case 'US':
 				$this->fmtDate = "'m-d-Y'";
 				$this->fmtTimeStamp = "'m-d-Y H:i:s'";
 				break;
-				
-			case 'PT_BR': 	
+
+			case 'PT_BR':
 			case 'NL':
 			case 'FR':
 			case 'RO':
@@ -2081,12 +2081,12 @@
 				$this->fmtDate="'d-m-Y'";
 				$this->fmtTimeStamp = "'d-m-Y H:i:s'";
 				break;
-				
+
 			case 'GE':
 				$this->fmtDate="'d.m.Y'";
 				$this->fmtTimeStamp = "'d.m.Y H:i:s'";
 				break;
-				
+
 			default:
 				$this->fmtDate="'Y-m-d'";
 				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
@@ -2095,13 +2095,13 @@
 	}
 
 	/**
-	 * GetActiveRecordsClass Performs an 'ALL' query 
-	 * 
+	 * GetActiveRecordsClass Performs an 'ALL' query
+	 *
 	 * @param mixed $class This string represents the class of the current active record
 	 * @param mixed $table Table used by the active record object
 	 * @param mixed $whereOrderBy Where, order, by clauses
-	 * @param mixed $bindarr 
-	 * @param mixed $primkeyArr 
+	 * @param mixed $bindarr
+	 * @param mixed $primkeyArr
 	 * @param array $extra Query extras: limit, offset...
 	 * @param mixed $relations Associative array: table's foreign name, "hasMany", "belongsTo"
 	 * @access public
@@ -2118,13 +2118,13 @@
 		if (!isset($_ADODB_ACTIVE_DBS))include_once(ADODB_DIR.'/adodb-active-record.inc.php');
 		return adodb_GetActiveRecordsClass($this, $class, $table, $whereOrderBy, $bindarr, $primkeyArr, $extra, $relations);
 	}
-	
+
 	function GetActiveRecords($table,$where=false,$bindarr=false,$primkeyArr=false)
 	{
 		$arr = $this->GetActiveRecordsClass('ADODB_Active_Record', $table, $where, $bindarr, $primkeyArr);
 		return $arr;
 	}
-	
+
 	/**
 	 * Close Connection
 	 */
@@ -2134,20 +2134,20 @@
 		$this->_connectionID = false;
 		return $rez;
 	}
-	
+
 	/**
 	 * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
 	 *
 	 * @return true if succeeded or false if database does not support transactions
 	 */
-	function BeginTrans() 
+	function BeginTrans()
 	{
 		if ($this->debug) ADOConnection::outp("BeginTrans: Transactions not supported for this driver");
 		return false;
 	}
-	
+
 	/* set transaction mode */
-	function SetTransactionMode( $transaction_mode ) 
+	function SetTransactionMode( $transaction_mode )
 	{
 		$transaction_mode = $this->MetaTransaction($transaction_mode, $this->dataProvider);
 		$this->_transmode  = $transaction_mode;
@@ -2162,11 +2162,11 @@
 	{
 		$mode = strtoupper($mode);
 		$mode = str_replace('ISOLATION LEVEL ','',$mode);
-		
+
 		switch($mode) {
 
 		case 'READ UNCOMMITTED':
-			switch($db) { 
+			switch($db) {
 			case 'oci8':
 			case 'oracle':
 				return 'ISOLATION LEVEL READ COMMITTED';
@@ -2174,11 +2174,11 @@
 				return 'ISOLATION LEVEL READ UNCOMMITTED';
 			}
 			break;
-					
+
 		case 'READ COMMITTED':
 				return 'ISOLATION LEVEL READ COMMITTED';
 			break;
-			
+
 		case 'REPEATABLE READ':
 			switch($db) {
 			case 'oci8':
@@ -2188,16 +2188,16 @@
 				return 'ISOLATION LEVEL REPEATABLE READ';
 			}
 			break;
-			
+
 		case 'SERIALIZABLE':
 				return 'ISOLATION LEVEL SERIALIZABLE';
 			break;
-			
+
 		default:
 			return $mode;
 		}
 	}
-	
+
 	/**
 	 * If database does not support transactions, always return true as data always commited
 	 *
@@ -2205,48 +2205,48 @@
 	 *
 	 * @return true/false.
 	 */
-	function CommitTrans($ok=true) 
+	function CommitTrans($ok=true)
 	{ return true;}
-	
-	
+
+
 	/**
 	 * If database does not support transactions, rollbacks always fail, so return false
 	 *
 	 * @return true/false.
 	 */
-	function RollbackTrans() 
+	function RollbackTrans()
 	{ return false;}
 
 
 	/**
-	 * return the databases that the driver can connect to. 
+	 * return the databases that the driver can connect to.
 	 * Some databases will return an empty array.
 	 *
 	 * @return an array of database names.
 	 */
-		function MetaDatabases() 
+		function MetaDatabases()
 		{
 		global $ADODB_FETCH_MODE;
-		
+
 			if ($this->metaDatabasesSQL) {
-				$save = $ADODB_FETCH_MODE; 
-				$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-				
+				$save = $ADODB_FETCH_MODE;
+				$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
 				if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-				
+
 				$arr = $this->GetCol($this->metaDatabasesSQL);
 				if (isset($savem)) $this->SetFetchMode($savem);
-				$ADODB_FETCH_MODE = $save; 
-			
+				$ADODB_FETCH_MODE = $save;
+
 				return $arr;
 			}
-			
+
 			return false;
 		}
-	
-		
+
+
 	/**
-	 * @param ttype can either be 'VIEW' or 'TABLE' or false. 
+	 * @param ttype can either be 'VIEW' or 'TABLE' or false.
 	 * 		If false, both views and tables are returned.
 	 *		"VIEW" returns only views
 	 *		"TABLE" returns only tables
@@ -2254,34 +2254,34 @@
 	 * @param mask  is the input mask - only supported by oci8 and postgresql
 	 *
 	 * @return  array of tables for current database.
-	 */ 
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	 */
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
-		
+
+
 		$false = false;
 		if ($mask) {
 			return $false;
 		}
 		if ($this->metaTablesSQL) {
-			$save = $ADODB_FETCH_MODE; 
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-			
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
 			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			
+
 			$rs = $this->Execute($this->metaTablesSQL);
 			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save; 
-			
+			$ADODB_FETCH_MODE = $save;
+
 			if ($rs === false) return $false;
 			$arr = $rs->GetArray();
 			$arr2 = array();
-			
-			if ($hast = ($ttype && isset($arr[0][1]))) { 
+
+			if ($hast = ($ttype && isset($arr[0][1]))) {
 				$showt = strncmp($ttype,'T',1);
 			}
-			
+
 			for ($i=0; $i < sizeof($arr); $i++) {
 				if ($hast) {
 					if ($showt == 0) {
@@ -2297,8 +2297,8 @@
 		}
 		return $false;
 	}
-	
-	
+
+
 	function _findschema(&$table,&$schema)
 	{
 		if (!$schema && ($at = strpos($table,'.')) !== false) {
@@ -2306,9 +2306,9 @@
 			$table = substr($table,$at+1);
 		}
 	}
-	
+
 	/**
-	 * List columns in a database as an array of ADOFieldObjects. 
+	 * List columns in a database as an array of ADOFieldObjects.
 	 * See top of file for definition of object.
 	 *
 	 * @param $table	table name to query
@@ -2317,17 +2317,17 @@
 	 *
 	 * @return  array of ADOFieldObjects for current table.
 	 */
-	function MetaColumns($table,$normalize=true) 
+	function MetaColumns($table,$normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-		
+
 		$false = false;
-		
+
 		if (!empty($this->metaColumnsSQL)) {
-		
+
 			$schema = false;
 			$this->_findschema($table,$schema);
-		
+
 			$save = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
@@ -2347,24 +2347,24 @@
 					if ($fld->scale>0) $fld->max_length += 1;
 				} else
 					$fld->max_length = $rs->fields[2];
-					
-				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 				else $retarr[strtoupper($fld->name)] = $fld;
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 		}
 		return $false;
 	}
-	
+
     /**
       * List indexes on a table as an array.
       * @param table  table name to query
       * @param primary true to only show primary keys. Not actually used for most databases
 	  *
       * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
-	  
+
 		 Array (
 		    [name_of_index] => Array
 		      (
@@ -2374,7 +2374,7 @@
 	          	[0] => firstname
 		      	[1] => lastname
 	          )
-		)		
+		)
       */
      function MetaIndexes($table, $primary = false, $owner = false)
      {
@@ -2383,12 +2383,12 @@
      }
 
 	/**
-	 * List columns names in a table as an array. 
+	 * List columns names in a table as an array.
 	 * @param table	table name to query
 	 *
 	 * @return  array of column names for current table.
-	 */ 
-	function MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) 
+	 */
+	function MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */)
 	{
 		$objarr = $this->MetaColumns($table);
 		if (!is_array($objarr)) {
@@ -2399,34 +2399,34 @@
 		if ($numIndexes) {
 			$i = 0;
 			if ($useattnum) {
-				foreach($objarr as $v) 
+				foreach($objarr as $v)
 					$arr[$v->attnum] = $v->name;
-				
+
 			} else
 				foreach($objarr as $v) $arr[$i++] = $v->name;
 		} else
 			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
-		
+
 		return $arr;
 	}
-			
+
 	/**
 	 * Different SQL databases used different methods to combine strings together.
-	 * This function provides a wrapper. 
-	 * 
+	 * This function provides a wrapper.
+	 *
 	 * param s	variable number of string parameters
 	 *
 	 * Usage: $db->Concat($str1,$str2);
-	 * 
+	 *
 	 * @return concatenated string
-	 */ 	 
+	 */
 	function Concat()
-	{	
+	{
 		$arr = func_get_args();
 		return implode($this->concat_operator, $arr);
 	}
-	
-	
+
+
 	/**
 	 * Converts a date "d" to a string that the database can understand.
 	 *
@@ -2438,10 +2438,10 @@
 	{
 		if (empty($d) && $d !== 0) return 'null';
 		if ($isfld) return $d;
-		
+
 		if (is_object($d)) return $d->format($this->fmtDate);
-		
-		
+
+
 		if (is_string($d) && !is_numeric($d)) {
 			if ($d === 'null' || strncmp($d,"'",1) === 0) return $d;
 			if ($this->isoDates) return "'$d'";
@@ -2450,24 +2450,24 @@
 
 		return adodb_date($this->fmtDate,$d);
 	}
-	
+
 	function BindDate($d)
 	{
 		$d = $this->DBDate($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
+
 	function BindTimeStamp($d)
 	{
 		$d = $this->DBTimeStamp($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
-	
+
+
 	/**
 	 * Converts a timestamp "ts" to a string that the database can understand.
 	 *
@@ -2480,18 +2480,18 @@
 		if (empty($ts) && $ts !== 0) return 'null';
 		if ($isfld) return $ts;
 		if (is_object($ts)) return $ts->format($this->fmtTimeStamp);
-		
+
 		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
+		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14))
 			return adodb_date($this->fmtTimeStamp,$ts);
-		
+
 		if ($ts === 'null') return $ts;
 		if ($this->isoDates && strlen($ts) !== 14) return "'$ts'";
-		
+
 		$ts = ADOConnection::UnixTimeStamp($ts);
 		return adodb_date($this->fmtTimeStamp,$ts);
 	}
-	
+
 	/**
 	 * Also in ADORecordSet.
 	 * @param $v is a date string in YYYY-MM-DD format
@@ -2505,17 +2505,17 @@
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
 			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
-	
+
 		if (is_numeric($v) && strlen($v) !== 8) return $v;
-		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
+		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|",
 			($v), $rr)) return false;
 
 		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
 		// h-m-s-MM-DD-YY
 		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
 	}
-	
 
+
 	/**
 	 * Also in ADORecordSet.
 	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
@@ -2529,18 +2529,18 @@
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
 			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
-		
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+
+		if (!preg_match(
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
 			($v), $rr)) return false;
-			
+
 		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
-	
+
 		// h-m-s-MM-DD-YY
 		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
 		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
 	}
-	
+
 	/**
 	 * Also in ADORecordSet.
 	 *
@@ -2551,7 +2551,7 @@
 	 *
 	 * @return a date formated as user desires
 	 */
-	 
+
 	function UserDate($v,$fmt='Y-m-d',$gmt=false)
 	{
 		$tt = $this->UnixDate($v);
@@ -2561,11 +2561,11 @@
 		else if ($tt == 0) return $this->emptyDate;
 		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
 		}
-		
+
 		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-	
+
 	}
-	
+
 		/**
 	 *
 	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
@@ -2584,19 +2584,19 @@
 		if ($tt == 0) return $this->emptyTimeStamp;
 		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
 	}
-	
+
 	function escape($s,$magic_quotes=false)
 	{
 		return $this->addq($s,$magic_quotes);
 	}
-	
+
 	/**
-	* Quotes a string, without prefixing nor appending quotes. 
+	* Quotes a string, without prefixing nor appending quotes.
 	*/
 	function addq($s,$magic_quotes=false)
 	{
 		if (!$magic_quotes) {
-		
+
 			if ($this->replaceQuote[0] == '\\'){
 				// only since php 4.0.5
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
@@ -2604,10 +2604,10 @@
 			}
 			return  str_replace("'",$this->replaceQuote,$s);
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
-		
+
 		if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase'))  // ' already quoted, no need to change anything
 			return $s;
 		else {// change \' to '' for sybase/mssql
@@ -2615,12 +2615,12 @@
 			return str_replace("\\'",$this->replaceQuote,$s);
 		}
 	}
-	
+
 	/**
 	 * Correctly quotes a string so that all strings are escaped. We prefix and append
 	 * to the string single-quotes.
 	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
+	 *
 	 * @param s			the string to quote
 	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
 	 *				This undoes the stupidity of magic quotes for GPC.
@@ -2628,9 +2628,9 @@
 	 * @return  quoted string to be sent back to database
 	 */
 	function qstr($s,$magic_quotes=false)
-	{	
+	{
 		if (!$magic_quotes) {
-		
+
 			if ($this->replaceQuote[0] == '\\'){
 				// only since php 4.0.5
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
@@ -2638,10 +2638,10 @@
 			}
 			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
-		
+
 		if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase'))  // ' already quoted, no need to change anything
 			return "'$s'";
 		else {// change \' to '' for sybase/mssql
@@ -2649,11 +2649,11 @@
 			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
 		}
 	}
-	
-	
+
+
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
 	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
 	*
 	* See readme.htm#ex8 for an example of usage.
@@ -2668,7 +2668,7 @@
 	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
 	*
 	*/
-	function PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
+	function PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0)
 	{
 		global $ADODB_INCLUDED_LIB;
 		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
@@ -2676,11 +2676,11 @@
 		else $rs = _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
 		return $rs;
 	}
-	
-		
+
+
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
 	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
 	*
 	* @param secs2cache	seconds to cache data, set to 0 to force query
@@ -2690,11 +2690,11 @@
 	* @param [inputarr]	array of bind variables
 	* @return		the recordset ($rs->databaseType == 'array')
 	*/
-	function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) 
+	function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false)
 	{
 		/*switch($this->dataProvider) {
 		case 'postgres':
-		case 'mysql': 
+		case 'mysql':
 			break;
 		default: $secs2cache = 0; break;
 		}*/
@@ -2703,67 +2703,67 @@
 	}
 
 } // end class ADOConnection
-	
-	
-	
-	//==============================================================================================	
+
+
+
+	//==============================================================================================
 	// CLASS ADOFetchObj
-	//==============================================================================================	
-		
+	//==============================================================================================
+
 	/**
 	* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
 	*/
 	class ADOFetchObj {
 	};
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet_empty
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	class ADODB_Iterator_empty implements Iterator {
-	
+
 	    private $rs;
-	
-	    function __construct($rs) 
+
+	    function __construct($rs)
 		{
 	        $this->rs = $rs;
 	    }
-	    function rewind() 
+	    function rewind()
 		{
 	    }
-	
-		function valid() 
+
+		function valid()
 		{
 	        return !$this->rs->EOF;
 	    }
-		
-	    function key() 
+
+	    function key()
 		{
 	        return false;
 	    }
-		
-	    function current() 
+
+	    function current()
 		{
 	        return false;
 	    }
-		
-	    function next() 
+
+	    function next()
 		{
 	    }
-		
+
 		function __call($func, $params)
 		{
 			return call_user_func_array(array($this->rs, $func), $params);
 		}
-		
+
 		function hasMore()
 		{
 			return false;
 		}
-	
+
 	}
 
-	
+
 	/**
 	* Lightweight recordset when there are no records to be returned
 	*/
@@ -2784,60 +2784,60 @@
 		function Init() {}
 		function getIterator() {return new ADODB_Iterator_empty($this);}
 	}
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// DATE AND TIME FUNCTIONS
-	//==============================================================================================	
+	//==============================================================================================
 	if (!defined('ADODB_DATE_VERSION')) include(ADODB_DIR.'/adodb-time.inc.php');
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet
-	//==============================================================================================	
+	//==============================================================================================
 
 	class ADODB_Iterator implements Iterator {
-	
+
 	    private $rs;
-	
-	    function __construct($rs) 
+
+	    function __construct($rs)
 		{
 	        $this->rs = $rs;
 	    }
-	    function rewind() 
+	    function rewind()
 		{
 	        $this->rs->MoveFirst();
 	    }
-	
-		function valid() 
+
+		function valid()
 		{
 	        return !$this->rs->EOF;
 	    }
-		
-	    function key() 
+
+	    function key()
 		{
 	        return $this->rs->_currentRow;
 	    }
-		
-	    function current() 
+
+	    function current()
 		{
 	        return $this->rs->fields;
 	    }
-		
-	    function next() 
+
+	    function next()
 		{
 	        $this->rs->MoveNext();
 	    }
-		
+
 		function __call($func, $params)
 		{
 			return call_user_func_array(array($this->rs, $func), $params);
 		}
-	
-		
+
+
 		function hasMore()
 		{
 			return !$this->rs->EOF;
 		}
-	
+
 	}
 
 
@@ -2850,7 +2850,7 @@
 	 */
 	class ADORecordSet implements IteratorAggregate {
 	/*
-	 * public variables	
+	 * public variables
 	 */
 	var $dataProvider = "native";
 	var $fields = false; 	/// holds the current row data
@@ -2858,8 +2858,8 @@
 							/// in other words, we use a text area for editing.
 	var $canSeek = false; 	/// indicates that seek is supported
 	var $sql; 				/// sql text
-	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object. 
-	
+	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object.
+
 	var $emptyTimeStamp = '&nbsp;'; /// what to display when $time==0
 	var $emptyDate = '&nbsp;'; /// what to display when $time==0
 	var $debug = false;
@@ -2869,7 +2869,7 @@
 	var $fetchMode;			/// default fetch mode
 	var $connection = false; /// the parent connection
 	/*
-	 *	private variables	
+	 *	private variables
 	 */
 	var $_numOfRows = -1;	/** number of rows, or -1 */
 	var $_numOfFields = -1;	/** number of fields in recordset */
@@ -2879,38 +2879,38 @@
 	var $_inited = false; 	/** Init() should only be called once */
 	var $_obj; 				/** Used by FetchObj */
 	var $_names;			/** Used by FetchObj */
-	
+
 	var $_currentPage = -1;	/** Added by Iván Oliva to implement recordset pagination */
 	var $_atFirstPage = false;	/** Added by Iván Oliva to implement recordset pagination */
 	var $_atLastPage = false;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_lastPageNo = -1; 
+	var $_lastPageNo = -1;
 	var $_maxRecordCount = 0;
 	var $datetime = false;
-	
+
 	/**
 	 * Constructor
 	 *
 	 * @param queryID  	this is the queryID returned by ADOConnection->_query()
 	 *
 	 */
-	function ADORecordSet($queryID) 
+	function ADORecordSet($queryID)
 	{
 		$this->_queryID = $queryID;
 	}
-	
-	function getIterator() 
+
+	function getIterator()
 	{
         return new ADODB_Iterator($this);
     }
-	
+
 	/* this is experimental - i don't really know what to return... */
 	function __toString()
 	{
 		include_once(ADODB_DIR.'/toexport.inc.php');
 		return _adodb_export($this,',',',',false,true);
 	}
-	
-	
+
+
 	function Init()
 	{
 		if ($this->_inited) return;
@@ -2921,7 +2921,7 @@
 			$this->_numOfFields = 0;
 		}
 		if ($this->_numOfRows != 0 && $this->_numOfFields && $this->_currentRow == -1) {
-			
+
 			$this->_currentRow = 0;
 			if ($this->EOF = ($this->_fetch() === false)) {
 				$this->_numOfRows = 0; // _numOfRows could be -1
@@ -2930,11 +2930,11 @@
 			$this->EOF = true;
 		}
 	}
-	
-	
+
+
 	/**
 	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * If the recordset has 2 cols, we treat the 1st col as the containing
 	 * the text to display to the user, and 2nd col as the return value. Default
 	 * strings are compared with the FIRST column.
 	 *
@@ -2945,7 +2945,7 @@
 	 * @param [size]		#rows to show for listbox. not used by popup
 	 * @param [selectAttr]		additional attributes to defined for SELECT tag.
 	 *				useful for holding javascript onChange='...' handlers.
-	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with 
+	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with
 	 *				column 0 (1st col) if this is true. This is not documented.
 	 *
 	 * @return HTML
@@ -2960,22 +2960,22 @@
 		return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
 			$size, $selectAttr,$compareFields0);
 	}
-	
 
-	
+
+
 	/**
 	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * If the recordset has 2 cols, we treat the 1st col as the containing
 	 * the text to display to the user, and 2nd col as the return value. Default
 	 * strings are compared with the SECOND column.
 	 *
 	 */
-	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')	
+	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')
 	{
 		return $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
 			$size, $selectAttr,false);
 	}
-	
+
 	/*
 		Grouped Menu
 	*/
@@ -2995,7 +2995,7 @@
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function GetArray($nRows = -1) 
+	function GetArray($nRows = -1)
 	{
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) {
 		$results = adodb_getall($this,$nRows);
@@ -3010,13 +3010,13 @@
 		}
 		return $results;
 	}
-	
+
 	function GetAll($nRows = -1)
 	{
 		$arr = $this->GetArray($nRows);
 		return $arr;
 	}
-	
+
 	/*
 	* Some databases allow multiple recordsets to be returned. This function
 	* will return true if there is a next recordset, or false if no more.
@@ -3025,9 +3025,9 @@
 	{
 		return false;
 	}
-	
+
 	/**
-	 * return recordset as a 2-dimensional array. 
+	 * return recordset as a 2-dimensional array.
 	 * Helper function for ADOConnection->SelectLimit()
 	 *
 	 * @param offset	is the row to start calculations from (1-based)
@@ -3035,26 +3035,26 @@
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function GetArrayLimit($nrows,$offset=-1) 
-	{	
+	function GetArrayLimit($nrows,$offset=-1)
+	{
 		if ($offset <= 0) {
 			$arr = $this->GetArray($nrows);
 			return $arr;
-		} 
-		
+		}
+
 		$this->Move($offset);
-		
+
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
-	
-	
+
+
 	/**
 	 * Synonym for GetArray() for compatibility with ADO.
 	 *
@@ -3062,15 +3062,15 @@
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function GetRows($nRows = -1) 
+	function GetRows($nRows = -1)
 	{
 		$arr = $this->GetArray($nRows);
 		return $arr;
 	}
-	
+
 	/**
-	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns. 
-	 * The first column is treated as the key and is not included in the array. 
+	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns.
+	 * The first column is treated as the key and is not included in the array.
 	 * If there is only 2 columns, it will return a 1 dimensional array of key-value pairs unless
 	 * $force_array == true.
 	 *
@@ -3078,16 +3078,16 @@
 	 * 	array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing,
 	 * 	read the source.
 	 *
-	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and 
+	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and
 	 * instead of returning array[col0] => array(remaining cols), return array[col0] => col1
 	 *
-	 * @return an associative array indexed by the first column of the array, 
+	 * @return an associative array indexed by the first column of the array,
 	 * 	or false if the  data has less than 2 cols.
 	 */
-	function GetAssoc($force_array = false, $first2cols = false) 
+	function GetAssoc($force_array = false, $first2cols = false)
 	{
 	global $ADODB_EXTENSION;
-	
+
 		$cols = $this->_numOfFields;
 		if ($cols < 2) {
 			$false = false;
@@ -3095,7 +3095,7 @@
 		}
 		$numIndex = isset($this->fields[0]);
 		$results = array();
-		
+
 		if (!$first2cols && ($cols > 2 || $force_array)) {
 			if ($ADODB_EXTENSION) {
 				if ($numIndex) {
@@ -3112,7 +3112,7 @@
 						foreach($keys as $key) {
 							$sliced_array[$key] = $this->fields[$key];
 						}
-						
+
 						$results[trim(reset($this->fields))] = $sliced_array;
 						adodb_movenext($this);
 					}
@@ -3132,7 +3132,7 @@
 						foreach($keys as $key) {
 							$sliced_array[$key] = $this->fields[$key];
 						}
-						
+
 						$results[trim(reset($this->fields))] = $sliced_array;
 						$this->MoveNext();
 					}
@@ -3151,7 +3151,7 @@
 					while (!$this->EOF) {
 					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
 						$v1 = trim(reset($this->fields));
-						$v2 = ''.next($this->fields); 
+						$v2 = ''.next($this->fields);
 						$results[$v1] = $v2;
 						adodb_movenext($this);
 					}
@@ -3167,19 +3167,19 @@
 					while (!$this->EOF) {
 					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
 						$v1 = trim(reset($this->fields));
-						$v2 = ''.next($this->fields); 
+						$v2 = ''.next($this->fields);
 						$results[$v1] = $v2;
 						$this->MoveNext();
 					}
 				}
 			}
 		}
-		
+
 		$ref = $results; # workaround accelerator incompat with PHP 4.4 :(
-		return $ref; 
+		return $ref;
 	}
-	
-	
+
+
 	/**
 	 *
 	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
@@ -3196,8 +3196,8 @@
 		if ($tt === 0) return $this->emptyTimeStamp;
 		return adodb_date($fmt,$tt);
 	}
-	
-	
+
+
 	/**
 	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
 	 * @param fmt 	is the format to apply to it, using date()
@@ -3214,8 +3214,8 @@
 		}
 		return adodb_date($fmt,$tt);
 	}
-	
-	
+
+
 	/**
 	 * @param $v is a date string in YYYY-MM-DD format
 	 *
@@ -3225,8 +3225,8 @@
 	{
 		return ADOConnection::UnixDate($v);
 	}
-	
 
+
 	/**
 	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
 	 *
@@ -3236,8 +3236,8 @@
 	{
 		return ADOConnection::UnixTimeStamp($v);
 	}
-	
-	
+
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
@@ -3245,8 +3245,8 @@
 	{
 		return $this->Close();
 	}
-	
-	
+
+
 	/**
 	* PEAR DB compat, number of rows
 	*/
@@ -3254,8 +3254,8 @@
 	{
 		return $this->_numOfRows;
 	}
-	
-	
+
+
 	/**
 	* PEAR DB compat, number of cols
 	*/
@@ -3263,9 +3263,9 @@
 	{
 		return $this->_numOfFields;
 	}
-	
+
 	/**
-	* Fetch a row, returning false if no more rows. 
+	* Fetch a row, returning false if no more rows.
 	* This is PEAR DB compat mode.
 	*
 	* @return false or array containing the current record
@@ -3281,10 +3281,10 @@
 		if (!$this->_fetch()) $this->EOF = true;
 		return $arr;
 	}
-	
-	
+
+
 	/**
-	* Fetch a row, returning PEAR_Error if no more rows. 
+	* Fetch a row, returning PEAR_Error if no more rows.
 	* This is PEAR DB compat mode.
 	*
 	* @return DB_OK or error object
@@ -3296,26 +3296,26 @@
 		$this->MoveNext();
 		return 1; // DB_OK
 	}
-	
-	
+
+
 	/**
 	 * Move to the first row in the recordset. Many databases do NOT support this.
 	 *
 	 * @return true or false
 	 */
-	function MoveFirst() 
+	function MoveFirst()
 	{
 		if ($this->_currentRow == 0) return true;
-		return $this->Move(0);			
-	}			
+		return $this->Move(0);
+	}
 
-	
+
 	/**
-	 * Move to the last row in the recordset. 
+	 * Move to the last row in the recordset.
 	 *
 	 * @return true or false
 	 */
-	function MoveLast() 
+	function MoveLast()
 	{
 		if ($this->_numOfRows >= 0) return $this->Move($this->_numOfRows-1);
 		if ($this->EOF) return false;
@@ -3327,14 +3327,14 @@
 		$this->EOF = false;
 		return true;
 	}
-	
-	
+
+
 	/**
 	 * Move to next record in the recordset.
 	 *
 	 * @return true if there still rows available, or false if there are no more rows (EOF).
 	 */
-	function MoveNext() 
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
@@ -3350,8 +3350,8 @@
 		*/
 		return false;
 	}
-	
-	
+
+
 	/**
 	 * Random access to a specific row in the recordset. Some databases do not support
 	 * access to previous rows in the databases (no scrolling backwards).
@@ -3360,15 +3360,15 @@
 	 *
 	 * @return true if there still rows available, or false if there are no more rows (EOF).
 	 */
-	function Move($rowNumber = 0) 
+	function Move($rowNumber = 0)
 	{
 		$this->EOF = false;
 		if ($rowNumber == $this->_currentRow) return true;
 		if ($rowNumber >= $this->_numOfRows)
 	   		if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-2;
-  				
-		if ($this->canSeek) { 
-	
+
+		if ($this->canSeek) {
+
 			if ($this->_seek($rowNumber)) {
 				$this->_currentRow = $rowNumber;
 				if ($this->_fetch()) {
@@ -3386,26 +3386,26 @@
 					adodb_movenext($this);
 				}
 			} else {
-			
+
 				while (! $this->EOF && $this->_currentRow < $rowNumber) {
 					$this->_currentRow++;
-					
+
 					if (!$this->_fetch()) $this->EOF = true;
 				}
 			}
 			return !($this->EOF);
 		}
-		
-		$this->fields = false;	
+
+		$this->fields = false;
 		$this->EOF = true;
 		return false;
 	}
-	
-		
+
+
 	/**
 	 * Get the value of a field in the current row by column name.
 	 * Will not work if ADODB_FETCH_MODE is set to ADODB_FETCH_NUM.
-	 * 
+	 *
 	 * @param colname  is the field to access
 	 *
 	 * @return the value of $colname column
@@ -3414,7 +3414,7 @@
 	{
 		return $this->fields[$colname];
 	}
-	
+
 	function GetAssocKeys($upper=true)
 	{
 		$this->bind = array();
@@ -3424,7 +3424,7 @@
 			else $this->bind[($upper) ? strtoupper($o->name) : strtolower($o->name)] = $i;
 		}
 	}
-	
+
   /**
    * Use associative array to get fields array for databases that do not support
    * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
@@ -3438,44 +3438,44 @@
 	{
 		$record = array();
 	 //	if (!$this->fields) return $record;
-		
+
 	   	if (!$this->bind) {
 			$this->GetAssocKeys($upper);
 		}
-		
+
 		foreach($this->bind as $k => $v) {
 			$record[$k] = $this->fields[$v];
 		}
 
 		return $record;
 	}
-	
-	
+
+
 	/**
 	 * Clean up recordset
 	 *
 	 * @return true or false
 	 */
-	function Close() 
+	function Close()
 	{
 		// free connection object - this seems to globally free the object
 		// and not merely the reference, so don't do this...
-		// $this->connection = false; 
+		// $this->connection = false;
 		if (!$this->_closed) {
 			$this->_closed = true;
-			return $this->_close();		
+			return $this->_close();
 		} else
 			return true;
 	}
-	
+
 	/**
-	 * synonyms RecordCount and RowCount	
+	 * synonyms RecordCount and RowCount
 	 *
 	 * @return the number of rows or -1 if this is not supported
 	 */
 	function RecordCount() {return $this->_numOfRows;}
-	
-	
+
+
 	/*
 	* If we are using PageExecute(), this will return the maximum possible rows
 	* that can be returned when paging a recordset.
@@ -3484,15 +3484,15 @@
 	{
 		return ($this->_maxRecordCount) ? $this->_maxRecordCount : $this->RecordCount();
 	}
-	
+
 	/**
-	 * synonyms RecordCount and RowCount	
+	 * synonyms RecordCount and RowCount
 	 *
 	 * @return the number of rows or -1 if this is not supported
 	 */
-	function RowCount() {return $this->_numOfRows;} 
-	
+	function RowCount() {return $this->_numOfRows;}
 
+
 	 /**
 	 * Portable RecordCount. Pablo Roca <pabloroca@mvps.org>
 	 *
@@ -3500,39 +3500,39 @@
 	 *
 	 * But aware possible problems in multiuser environments. For better speed the table
 	 * must be indexed by the condition. Heavy test this before deploying.
-	 */ 
+	 */
 	function PO_RecordCount($table="", $condition="") {
-		
+
 		$lnumrows = $this->_numOfRows;
 		// the database doesn't support native recordcount, so we do a workaround
 		if ($lnumrows == -1 && $this->connection) {
 			IF ($table) {
-				if ($condition) $condition = " WHERE " . $condition; 
+				if ($condition) $condition = " WHERE " . $condition;
 				$resultrows = $this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
 				if ($resultrows) $lnumrows = reset($resultrows->fields);
 			}
 		}
 		return $lnumrows;
 	}
-	
-	
+
+
 	/**
 	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
 	 */
 	function CurrentRow() {return $this->_currentRow;}
-	
+
 	/**
 	 * synonym for CurrentRow -- for ADO compat
 	 *
 	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
 	 */
 	function AbsolutePosition() {return $this->_currentRow;}
-	
+
 	/**
 	 * @return the number of columns in the recordset. Some databases will set this to 0
 	 * if no records are returned, others will return the number of columns in the query.
 	 */
-	function FieldCount() {return $this->_numOfFields;}   
+	function FieldCount() {return $this->_numOfFields;}
 
 
 	/**
@@ -3542,14 +3542,14 @@
 	 *
 	 * @return the ADOFieldObject for that column, or false.
 	 */
-	function FetchField($fieldoffset = -1) 
+	function FetchField($fieldoffset = -1)
 	{
 		// must be defined by child class
-		
+
 		$false = false;
 		return $false;
-	}	
-	
+	}
+
 	/**
 	 * Get the ADOFieldObjects of all columns in an array.
 	 *
@@ -3557,11 +3557,11 @@
 	function FieldTypesArray()
 	{
 		$arr = array();
-		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) 
+		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++)
 			$arr[] = $this->FetchField($i);
 		return $arr;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default case is lowercase field names.
@@ -3573,11 +3573,11 @@
 		$o = $this->FetchObject(false);
 		return $o;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default case is uppercase.
-	* 
+	*
 	* @param $isupper to set the object property names to uppercase
 	*
 	* @return the object with the properties set to the fields of the current row
@@ -3595,21 +3595,21 @@
 		$i = 0;
 		if (PHP_VERSION >= 5) $o = clone($this->_obj);
 		else $o = $this->_obj;
-	
+
 		for ($i=0; $i <$this->_numOfFields; $i++) {
 			$name = $this->_names[$i];
 			if ($isupper) $n = strtoupper($name);
 			else $n = $name;
-			
+
 			$o->$n = $this->Fields($name);
 		}
 		return $o;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default is lower-case field names.
-	* 
+	*
 	* @return the object with the properties set to the fields of the current row,
 	* 	or false if EOF
 	*
@@ -3620,12 +3620,12 @@
 		$o = $this->FetchNextObject(false);
 		return $o;
 	}
-	
-	
+
+
 	/**
-	* Return the fields array of the current row as an object for convenience. 
+	* Return the fields array of the current row as an object for convenience.
 	* The default is upper case field names.
-	* 
+	*
 	* @param $isupper to set the object property names to uppercase
 	*
 	* @return the object with the properties set to the fields of the current row,
@@ -3637,14 +3637,14 @@
 	{
 		$o = false;
 		if ($this->_numOfRows != 0 && !$this->EOF) {
-			$o = $this->FetchObject($isupper);	
+			$o = $this->FetchObject($isupper);
 			$this->_currentRow++;
 			if ($this->_fetch()) return $o;
 		}
 		$this->EOF = true;
 		return $o;
 	}
-	
+
 	/**
 	 * Get the metatype of the column. This is used for formatting. This is because
 	 * many databases use different names for the same type, so we transform the original
@@ -3655,8 +3655,8 @@
 	 * 	fields bigger than a certain size as a 'B' (blob).
 	 * @param fieldobj is the field object returned by the database driver. Can hold
 	 *	additional info (eg. primary_key for mysql).
-	 * 
-	 * @return the general type of the data: 
+	 *
+	 * @return the general type of the data:
 	 *	C for character < 250 chars
 	 *	X for teXt (>= 250 chars)
 	 *	B for Binary
@@ -3666,8 +3666,8 @@
 	 * 	L for logical/Boolean
 	 *	I for integer
 	 *	R for autoincrement counter/integer
-	 * 
 	 *
+	 *
 	*/
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
@@ -3723,7 +3723,7 @@
 		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
 		##
 		'BOOL' => 'L',
-		'BOOLEAN' => 'L', 
+		'BOOLEAN' => 'L',
 		'BIT' => 'L',
 		'L' => 'L',
 		##
@@ -3756,21 +3756,21 @@
 		'NUM' => 'N',
 		'NUMERIC' => 'N',
 		'MONEY' => 'N',
-		
+
 		## informix 9.2
-		'SQLINT' => 'I', 
-		'SQLSERIAL' => 'I', 
-		'SQLSMINT' => 'I', 
-		'SQLSMFLOAT' => 'N', 
-		'SQLFLOAT' => 'N', 
-		'SQLMONEY' => 'N', 
-		'SQLDECIMAL' => 'N', 
-		'SQLDATE' => 'D', 
-		'SQLVCHAR' => 'C', 
-		'SQLCHAR' => 'C', 
-		'SQLDTIME' => 'T', 
-		'SQLINTERVAL' => 'N', 
-		'SQLBYTES' => 'B', 
+		'SQLINT' => 'I',
+		'SQLSERIAL' => 'I',
+		'SQLSMINT' => 'I',
+		'SQLSMFLOAT' => 'N',
+		'SQLFLOAT' => 'N',
+		'SQLMONEY' => 'N',
+		'SQLDECIMAL' => 'N',
+		'SQLDATE' => 'D',
+		'SQLVCHAR' => 'C',
+		'SQLCHAR' => 'C',
+		'SQLDTIME' => 'T',
+		'SQLINTERVAL' => 'N',
+		'SQLBYTES' => 'B',
 		'SQLTEXT' => 'X',
 		 ## informix 10
 		"SQLINT8" => 'I8',
@@ -3780,46 +3780,46 @@
 		"SQLLVARCHAR" => 'X',
 		"SQLBOOL" => 'L'
 		);
-		
+
 		$tmap = false;
 		$t = strtoupper($t);
 		$tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N';
 		switch ($tmap) {
 		case 'C':
-		
-			// is the char field is too long, return as text field... 
+
+			// is the char field is too long, return as text field...
 			if ($this->blobSize >= 0) {
 				if ($len > $this->blobSize) return 'X';
 			} else if ($len > 250) {
 				return 'X';
 			}
 			return 'C';
-			
+
 		case 'I':
 			if (!empty($fieldobj->primary_key)) return 'R';
 			return 'I';
-		
+
 		case false:
 			return 'N';
-			
+
 		case 'B':
-			 if (isset($fieldobj->binary)) 
+			 if (isset($fieldobj->binary))
 				 return ($fieldobj->binary) ? 'B' : 'X';
 			return 'B';
-		
+
 		case 'D':
 			if (!empty($this->connection) && !empty($this->connection->datetime)) return 'T';
 			return 'D';
-			
-		default: 
+
+		default:
 			if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B';
 			return $tmap;
 		}
 	}
-	
-	
+
+
 	function _close() {}
-	
+
 	/**
 	 * set/returns the current recordset page when paginating
 	 */
@@ -3828,7 +3828,7 @@
 		if ($page != -1) $this->_currentPage = $page;
 		return $this->_currentPage;
 	}
-	
+
 	/**
 	 * set/returns the status of the atFirstPage flag when paginating
 	 */
@@ -3837,13 +3837,13 @@
 		if ($status != false) $this->_atFirstPage = $status;
 		return $this->_atFirstPage;
 	}
-	
+
 	function LastPageNo($page = false)
 	{
 		if ($page != false) $this->_lastPageNo = $page;
 		return $this->_lastPageNo;
 	}
-	
+
 	/**
 	 * set/returns the status of the atLastPage flag when paginating
 	 */
@@ -3852,20 +3852,20 @@
 		if ($status != false) $this->_atLastPage = $status;
 		return $this->_atLastPage;
 	}
-	
+
 } // end class ADORecordSet
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet_array
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	/**
 	 * This class encapsulates the concept of a recordset created in memory
 	 * as an array. This is useful for the creation of cached recordsets.
-	 * 
+	 *
 	 * Note that the constructor is different from the standard ADORecordSet
 	 */
-	
+
 	class ADORecordSet_array extends ADORecordSet
 	{
 		var $databaseType = 'array';
@@ -3887,32 +3887,32 @@
 		function ADORecordSet_array($fakeid=1)
 		{
 		global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
-		
+
 			// fetch() on EOF does not delete $this->fields
 			$this->compat = !empty($ADODB_COMPAT_FETCH);
-			$this->ADORecordSet($fakeid); // fake queryID		
+			$this->ADORecordSet($fakeid); // fake queryID
 			$this->fetchMode = $ADODB_FETCH_MODE;
 		}
-		
+
 		function _transpose($addfieldnames=true)
 		{
 		global $ADODB_INCLUDED_LIB;
-			
+
 			if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
 			$hdr = true;
-			
+
 			$fobjs = $addfieldnames ? $this->_fieldobjects : false;
 			adodb_transpose($this->_array, $newarr, $hdr, $fobjs);
 			//adodb_pr($newarr);
-			
+
 			$this->_skiprow1 = false;
 			$this->_array = $newarr;
 			$this->_colnames = $hdr;
-			
+
 			adodb_probetypes($newarr,$this->_types);
-		
+
 			$this->_fieldobjects = array();
-			
+
 			foreach($hdr as $k => $name) {
 				$f = new ADOFieldObject();
 				$f->name = $name;
@@ -3921,18 +3921,18 @@
 				$this->_fieldobjects[] = $f;
 			}
 			$this->fields = reset($this->_array);
-			
+
 			$this->_initrs();
-			
+
 		}
-		
+
 		/**
 		 * Setup the array.
 		 *
 		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
+		 *			The first row should hold the column names
 		 *			unless paramter $colnames is used.
-		 * @param typearr	holds an array of types. These are the same types 
+		 * @param typearr	holds an array of types. These are the same types
 		 *			used in MetaTypes (C,B,L,I,N).
 		 * @param [colnames]	array of column names. If set, then the first row of
 		 *			$array should not hold the column names.
@@ -3940,7 +3940,7 @@
 		function InitArray($array,$typearr,$colnames=false)
 		{
 			$this->_array = $array;
-			$this->_types = $typearr;	
+			$this->_types = $typearr;
 			if ($colnames) {
 				$this->_skiprow1 = false;
 				$this->_colnames = $colnames;
@@ -3954,7 +3954,7 @@
 		 * Setup the Array and datatype file objects
 		 *
 		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
+		 *			The first row should hold the column names
 		 *			unless paramter $colnames is used.
 		 * @param fieldarr	holds an array of ADOFieldObject's.
 		 */
@@ -3964,10 +3964,10 @@
 			$this->_skiprow1= false;
 			if ($fieldarr) {
 				$this->_fieldobjects = $fieldarr;
-			} 
+			}
 			$this->Init();
 		}
-		
+
 		function GetArray($nRows=-1)
 		{
 			if ($nRows == -1 && $this->_currentRow <= 0 && !$this->_skiprow1) {
@@ -3977,21 +3977,21 @@
 				return $arr;
 			}
 		}
-		
+
 		function _initrs()
 		{
 			$this->_numOfRows =  sizeof($this->_array);
 			if ($this->_skiprow1) $this->_numOfRows -= 1;
-		
+
 			$this->_numOfFields =(isset($this->_fieldobjects)) ?
 				 sizeof($this->_fieldobjects):sizeof($this->_types);
 		}
-		
+
 		/* Use associative array to get fields array */
 		function Fields($colname)
 		{
 			$mode = isset($this->adodbFetchMode) ? $this->adodbFetchMode : $this->fetchMode;
-			
+
 			if ($mode & ADODB_FETCH_ASSOC) {
 				if (!isset($this->fields[$colname]) && !is_null($this->fields[$colname])) $colname = strtolower($colname);
 				return $this->fields[$colname];
@@ -4005,8 +4005,8 @@
 			}
 			return $this->fields[$this->bind[strtoupper($colname)]];
 		}
-		
-		function FetchField($fieldOffset = -1) 
+
+		function FetchField($fieldOffset = -1)
 		{
 			if (isset($this->_fieldobjects)) {
 				return $this->_fieldobjects[$fieldOffset];
@@ -4015,10 +4015,10 @@
 			$o->name = $this->_colnames[$fieldOffset];
 			$o->type =  $this->_types[$fieldOffset];
 			$o->max_length = -1; // length not known
-			
+
 			return $o;
 		}
-			
+
 		function _seek($row)
 		{
 			if (sizeof($this->_array) && 0 <= $row && $row < $this->_numOfRows) {
@@ -4029,31 +4029,31 @@
 			}
 			return false;
 		}
-		
-		function MoveNext() 
+
+		function MoveNext()
 		{
-			if (!$this->EOF) {		
+			if (!$this->EOF) {
 				$this->_currentRow++;
-				
+
 				$pos = $this->_currentRow;
-				
+
 				if ($this->_numOfRows <= $pos) {
 					if (!$this->compat) $this->fields = false;
 				} else {
 					if ($this->_skiprow1) $pos += 1;
 					$this->fields = $this->_array[$pos];
 					return true;
-				}		
+				}
 				$this->EOF = true;
 			}
-			
+
 			return false;
-		}	
-	
+		}
+
 		function _fetch()
 		{
 			$pos = $this->_currentRow;
-			
+
 			if ($this->_numOfRows <= $pos) {
 				if (!$this->compat) $this->fields = false;
 				return false;
@@ -4062,41 +4062,41 @@
 			$this->fields = $this->_array[$pos];
 			return true;
 		}
-		
-		function _close() 
+
+		function _close()
 		{
-			return true;	
+			return true;
 		}
-	
+
 	} // ADORecordSet_array
 
-	//==============================================================================================	
+	//==============================================================================================
 	// HELPER FUNCTIONS
-	//==============================================================================================			
-	
+	//==============================================================================================
+
 	/**
 	 * Synonym for ADOLoadCode. Private function. Do not use.
 	 *
 	 * @deprecated
 	 */
-	function ADOLoadDB($dbType) 
-	{ 
+	function ADOLoadDB($dbType)
+	{
 		return ADOLoadCode($dbType);
 	}
-		
+
 	/**
 	 * Load the code for a specific database driver. Private function. Do not use.
 	 */
-	function ADOLoadCode($dbType) 
+	function ADOLoadCode($dbType)
 	{
 	global $ADODB_LASTDB;
-	
+
 		if (!$dbType) return false;
 		$db = strtolower($dbType);
 		switch ($db) {
-			case 'ado': 
+			case 'ado':
 				if (PHP_VERSION >= 5) $db = 'ado5';
-				$class = 'ado'; 
+				$class = 'ado';
 				break;
 			case 'ifx':
 			case 'maxsql': $class = $db = 'mysqlt'; break;
@@ -4106,12 +4106,12 @@
 			default:
 				$class = $db; break;
 		}
-		
+
 		$file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
 		@include_once($file);
 		$ADODB_LASTDB = $class;
 		if (class_exists("ADODB_" . $class)) return $class;
-		
+
 		//ADOConnection::outp(adodb_pr(get_declared_classes(),true));
 		if (!file_exists($file)) ADOConnection::outp("Missing file: $file");
 		else ADOConnection::outp("Syntax error in file: $file");
@@ -4126,7 +4126,7 @@
 		$tmp = ADONewConnection($db);
 		return $tmp;
 	}
-	
+
 	/**
 	 * Instantiate a new Connection class for a specific database driver.
 	 *
@@ -4138,7 +4138,7 @@
 	function ADONewConnection($db='')
 	{
 	GLOBAL $ADODB_NEWCONNECTION, $ADODB_LASTDB;
-		
+
 		if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
 		$errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
 		$false = false;
@@ -4157,11 +4157,11 @@
 			if ($at2 !== FALSE) {
 				$dsna['host'] = '';
 			}
-			
+
 			if (strncmp($origdsn,'pdo',3) == 0) {
 				$sch = explode('_',$dsna['scheme']);
 				if (sizeof($sch)>1) {
-				
+
 					$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
 					if ($sch[1] == 'sqlite')
 						$dsna['host'] = rawurlencode($sch[1].':'.rawurldecode($dsna['host']));
@@ -4170,14 +4170,14 @@
 					$dsna['scheme'] = 'pdo';
 				}
 			}
-			
+
 			$db = @$dsna['scheme'];
 			if (!$db) return $false;
 			$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
 			$dsna['user'] = isset($dsna['user']) ? rawurldecode($dsna['user']) : '';
 			$dsna['pass'] = isset($dsna['pass']) ? rawurldecode($dsna['pass']) : '';
 			$dsna['path'] = isset($dsna['path']) ? rawurldecode(substr($dsna['path'],1)) : ''; # strip off initial /
-			
+
 			if (isset($dsna['query'])) {
 				$opt1 = explode('&',$dsna['query']);
 				foreach($opt1 as $k => $v) {
@@ -4198,15 +4198,15 @@
 		if (!empty($ADODB_NEWCONNECTION)) {
 			$obj = $ADODB_NEWCONNECTION($db);
 
-		} 
-		
+		}
+
 		if(empty($obj)) {
-		
+
 			if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
 			if (empty($db)) $db = $ADODB_LASTDB;
-			
+
 			if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
-			
+
 			if (!$db) {
 				if (isset($origdsn)) $db = $origdsn;
 				if ($errorfn) {
@@ -4217,19 +4217,19 @@
 							 $db,false,$ignore);
 				} else
 					 ADOConnection::outp( "<p>ADONewConnection: Unable to load database driver '$db'</p>",false);
-					
+
 				return $false;
 			}
-			
+
 			$cls = 'ADODB_'.$db;
 			if (!class_exists($cls)) {
 				adodb_backtrace();
 				return $false;
 			}
-			
+
 			$obj = new $cls();
 		}
-		
+
 		# constructor should not fail
 		if ($obj) {
 			if ($errorfn)  $obj->raiseErrorFn = $errorfn;
@@ -4259,15 +4259,15 @@
 					#oci8
 					case 'nls_date_format': $obj->NLS_DATE_FORMAT = $v; break;
 					case 'cachesecs': $obj->cacheSecs = $v; break;
-					case 'memcache': 
+					case 'memcache':
 						$varr = explode(':',$v);
 						$vlen = sizeof($varr);
-						if ($vlen == 0) break;	
+						if ($vlen == 0) break;
 						$obj->memCache = true;
 						$obj->memCacheHost = explode(',',$varr[0]);
-						if ($vlen == 1) break;	
+						if ($vlen == 1) break;
 						$obj->memCachePort = $varr[1];
-						if ($vlen == 2) break;	
+						if ($vlen == 2) break;
 						$obj->memCacheCompress = $varr[2] ?  true : false;
 						break;
 					}
@@ -4278,36 +4278,36 @@
 					$ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
 				else
 					$ok = $obj->NConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-					
+
 				if (!$ok) return $false;
 			}
 		}
 		return $obj;
 	}
-	
-	
-	
+
+
+
 	// $perf == true means called by NewPerfMonitor(), otherwise for data dictionary
 	function _adodb_getdriver($provider,$drivername,$perf=false)
 	{
 		switch ($provider) {
-		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6); 
-		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5); 
+		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6);
+		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5);
 		case 'ado'  :   if (strncmp('ado_',$drivername,4)==0) return substr($drivername,4);
 		case 'native':  break;
 		default:
 			return $provider;
 		}
-		
+
 		switch($drivername) {
 		case 'mysqlt':
-		case 'mysqli': 
-				$drivername='mysql'; 
+		case 'mysqli':
+				$drivername='mysql';
 				break;
 		case 'postgres7':
 		case 'postgres8':
-				$drivername = 'postgres'; 
-				break;	
+				$drivername = 'postgres';
+				break;
 		case 'firebird15': $drivername = 'firebird'; break;
 		case 'oracle': $drivername = 'oci8'; break;
 		case 'access': if ($perf) $drivername = ''; break;
@@ -4319,7 +4319,7 @@
 		}
 		return $drivername;
 	}
-	
+
 	function NewPerfMonitor(&$conn)
 	{
 		$false = false;
@@ -4330,10 +4330,10 @@
 		$class = "Perf_$drivername";
 		if (!class_exists($class)) return $false;
 		$perf = new $class($conn);
-		
+
 		return $perf;
 	}
-	
+
 	function NewDataDictionary(&$conn,$drivername=false)
 	{
 		$false = false;
@@ -4356,34 +4356,34 @@
 		$dict->quote = $conn->nameQuote;
 		if (!empty($conn->_connectionID))
 			$dict->serverInfo = $conn->ServerInfo();
-		
+
 		return $dict;
 	}
 
 
-	
+
 	/*
 		Perform a print_r, with pre tags for better formatting.
 	*/
 	function adodb_pr($var,$as_string=false)
 	{
 		if ($as_string) ob_start();
-		
-		if (isset($_SERVER['HTTP_USER_AGENT'])) { 
+
+		if (isset($_SERVER['HTTP_USER_AGENT'])) {
 			echo " <pre>\n";print_r($var);echo "</pre>\n";
 		} else
 			print_r($var);
-			
+
 		if ($as_string) {
 			$s = ob_get_contents();
 			ob_end_clean();
 			return $s;
 		}
 	}
-	
+
 	/*
 		Perform a stack-crawl and pretty print it.
-		
+
 		@param printOrArr  Pass in a boolean to indicate print, or an $exception->trace array (assumes that print is true then).
 		@param levels Number of levels to display
 	*/
Index: typo3/sysext/adodb/adodb/adodb-active-recordx.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-active-recordx.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-active-recordx.inc.php	(working copy)
@@ -3,18 +3,18 @@
 
 @version V5.06 29 Sept 2008   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
   Latest version is available at http://adodb.sourceforge.net
- 
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-  
+
   Active Record implementation. Superset of Zend Framework's.
-  
-  This is "Active Record eXtended" to support JOIN, WORK and LAZY mode by Chris Ravenscroft  chris#voilaweb.com 
-  
+
+  This is "Active Record eXtended" to support JOIN, WORK and LAZY mode by Chris Ravenscroft  chris#voilaweb.com
+
   Version 0.9
-  
-  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
+
+  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord
   	for info on Ruby on Rails Active Record implementation
 */
 
@@ -63,29 +63,29 @@
 function ADODB_SetDatabaseAdapter(&$db)
 {
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		foreach($_ADODB_ACTIVE_DBS as $k => $d) {
 			if (PHP_VERSION >= 5) {
 				if ($d->db === $db) return $k;
 			} else {
-				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) 
+				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database)
 					return $k;
 			}
 		}
-		
+
 		$obj = new ADODB_Active_DB();
 		$obj->db = $db;
 		$obj->tables = array();
-		
+
 		$_ADODB_ACTIVE_DBS[] = $obj;
-		
+
 		return sizeof($_ADODB_ACTIVE_DBS)-1;
 }
 
 
 class ADODB_Active_Record {
 	static $_changeNames = true; // dynamically pluralize table names
-	static $_foreignSuffix = '_id'; // 
+	static $_foreignSuffix = '_id'; //
 	var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat]
 	var $_table; // tablename, if set in class definition then use it as table name
 	var $_sTable; // singularized table name
@@ -106,18 +106,18 @@
 	}
 
 	// should be static
-	static function SetDatabaseAdapter(&$db) 
+	static function SetDatabaseAdapter(&$db)
 	{
 		return ADODB_SetDatabaseAdapter($db);
 	}
-	
-	
+
+
 	public function __set($name, $value)
 	{
 		$name = str_replace(' ', '_', $name);
 		$this->$name = $value;
 	}
-	
+
 	// php5 constructor
 	// Note: if $table is defined, then we will use it as our table name
 	// Otherwise we will use our classname...
@@ -131,12 +131,12 @@
 	function __construct($table = false, $pkeyarr=false, $db=false, $options=array())
 	{
 	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
-	
+
 		if ($db == false && is_object($pkeyarr)) {
 			$db = $pkeyarr;
 			$pkeyarr = false;
 		}
-		
+
 		if($table)
 		{
 			// table argument exists. It is expected to be
@@ -159,10 +159,10 @@
 			$this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db);
 		} else
 			$this->_dbat = sizeof($_ADODB_ACTIVE_DBS)-1;
-		
-		
+
+
 		if ($this->_dbat < 0) $this->Error("No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",'ADODB_Active_Record::__constructor');
-		
+
 		$this->_tableat = $this->_table; # reserved for setting the assoc value to a non-table name, eg. the sql string in future
 
 		// CFR: Just added this option because UpdateActiveTable() can refresh its information
@@ -178,13 +178,13 @@
 			$table->_belongsTo = array();
 		}
 	}
-	
+
 	function __wakeup()
 	{
   		$class = get_class($this);
   		new $class;
 	}
-	
+
 	// CFR: Constants found in Rails
 	static $IrregularP = array(
 		'PERSON'    => 'people',
@@ -231,26 +231,26 @@
 		$lastc2 = substr($ut,$len-2);
 		switch ($lastc) {
 		case 'S':
-			return $table.'es';	
+			return $table.'es';
 		case 'Y':
 			return substr($table,0,$len-1).'ies';
-		case 'X':	
+		case 'X':
 			return $table.'es';
-		case 'H': 
+		case 'H':
 			if ($lastc2 == 'CH' || $lastc2 == 'SH')
 				return $table.'es';
 		default:
 			return $table.'s';
 		}
 	}
-	
+
 	// CFR Lamest singular inflector ever - @todo Make it real!
 	// Note: There is an assumption here...and it is that the argument's length >= 4
 	function _singularize($table)
 	{
-	
+
 		if (!ADODB_Active_Record::$_changeNames) return $table;
-	
+
 		$ut = strtoupper($table);
 		if(isset(self::$WeIsI[$ut]))
 		{
@@ -320,7 +320,7 @@
 		$ar->foreignName = $foreignRef;
 		$ar->UpdateActiveTable();
 		$ar->foreignKey = ($foreignKey) ? $foreignKey : $ar->foreignName . self::$_foreignSuffix;
-		
+
 		$table =& $this->TableInfo();
 		if(!isset($table->_belongsTo[$foreignRef]))
 		{
@@ -332,8 +332,8 @@
 
 	/**
 	 * __get Access properties - used for lazy loading
-	 * 
-	 * @param mixed $name 
+	 *
+	 * @param mixed $name
 	 * @access protected
 	 * @return void
 	 */
@@ -348,12 +348,12 @@
 		if($offset >= 0) $extras['offset'] = $offset;
 		if($limit >= 0) $extras['limit'] = $limit;
 		$table =& $this->TableInfo();
-		
-		if (strlen($whereOrderBy)) 
+
+		if (strlen($whereOrderBy))
 			if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy))
 				if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy))
 					$whereOrderBy = 'AND '.$whereOrderBy;
-					
+
 		if(!empty($table->_belongsTo[$name]))
 		{
 			$obj = $table->_belongsTo[$name];
@@ -366,7 +366,7 @@
 					$belongsToId = $k;
 				else
 					$belongsToId = 'id';
-				
+
 				$arrayOfOne =
 					$obj->Find(
 						$belongsToId.'='.$this->$columnName.' '.$whereOrderBy, false, false, $extras);
@@ -380,7 +380,7 @@
 			if(($k = reset($table->keys)))
 				$hasManyId   = $k;
 			else
-				$hasManyId   = 'id';			
+				$hasManyId   = 'id';
 
 			$this->$name =
 				$obj->Find(
@@ -389,7 +389,7 @@
 		}
 	}
 	//////////////////////////////////
-	
+
 	// update metadata
 	function UpdateActiveTable($pkeys=false,$forceUpdate=false)
 	{
@@ -405,14 +405,14 @@
 
 			$tobj = $tables[$tableat];
 			foreach($tobj->flds as $name => $fld) {
-			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) 
+			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value))
 				$this->$name = $fld->default_value;
 			else
 				$this->$name = null;
 			}
 			return;
 		}
-		
+
 		$db = $activedb->db;
 		$fname = $ADODB_CACHE_DIR . '/adodb_' . $db->databaseType . '_active_'. $table . '.cache';
 		if (!$forceUpdate && $ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR && file_exists($fname)) {
@@ -420,11 +420,11 @@
 			@flock($fp, LOCK_SH);
 			$acttab = unserialize(fread($fp,100000));
 			fclose($fp);
-			if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { 
+			if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) {
 				// abs(rand()) randomizes deletion, reducing contention to delete/refresh file
 				// ideally, you should cache at least 32 secs
 				$activedb->tables[$table] = $acttab;
-				
+
 				//if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname");
 			  	return;
 			} else if ($db->debug) {
@@ -433,18 +433,18 @@
 		}
 		$activetab = new ADODB_Active_Table();
 		$activetab->name = $table;
-		
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
-		
+
 		$cols = $db->MetaColumns($table);
-		
+
 		if (isset($savem)) $db->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$cols) {
-			$this->Error("Invalid table name: $table",'UpdateActiveTable'); 
+			$this->Error("Invalid table name: $table",'UpdateActiveTable');
 			return false;
 		}
 		$fld = reset($cols);
@@ -454,17 +454,17 @@
 				foreach($cols as $name => $fld) {
 					if (!empty($fld->primary_key)) $pkeys[] = $name;
 				}
-			} else	
+			} else
 				$pkeys = $this->GetPrimaryKeys($db, $table);
 		}
 		if (empty($pkeys)) {
 			$this->Error("No primary key found for table $table",'UpdateActiveTable');
 			return false;
 		}
-		
+
 		$attr = array();
 		$keys = array();
-		
+
 		switch($ADODB_ASSOC_CASE) {
 		case 0:
 			foreach($cols as $name => $fldobj) {
@@ -479,18 +479,18 @@
 				$keys[strtolower($name)] = strtolower($name);
 			}
 			break;
-			
-		case 1: 
+
+		case 1:
 			foreach($cols as $name => $fldobj) {
 				$name = strtoupper($name);
-               
+
                 if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
                     $this->$name = $fldobj->default_value;
                 else
 					$this->$name = null;
 				$attr[$name] = $fldobj;
 			}
-			
+
 			foreach($pkeys as $k => $name) {
 				$keys[strtoupper($name)] = strtoupper($name);
 			}
@@ -498,7 +498,7 @@
 		default:
 			foreach($cols as $name => $fldobj) {
 				$name = ($fldobj->name);
-                
+
                 if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
                     $this->$name = $fldobj->default_value;
                 else
@@ -510,7 +510,7 @@
 			}
 			break;
 		}
-		
+
 		$activetab->keys = $keys;
 		$activetab->flds = $attr;
 		$activetab->updateColsCount();
@@ -523,58 +523,58 @@
 		}
 		if (isset($activedb->tables[$table])) {
 			$oldtab = $activedb->tables[$table];
-		
+
 			if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo;
 			if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany;
 		}
 		$activedb->tables[$table] = $activetab;
 	}
-	
+
 	function GetPrimaryKeys(&$db, $table)
 	{
 		return $db->MetaPrimaryKeys($table);
 	}
-	
-	// error handler for both PHP4+5. 
+
+	// error handler for both PHP4+5.
 	function Error($err,$fn)
 	{
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		$fn = get_class($this).'::'.$fn;
 		$this->_lasterr = $fn.': '.$err;
-		
+
 		if ($this->_dbat < 0) $db = false;
 		else {
 			$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
 			$db = $activedb->db;
 		}
-		
-		if (function_exists('adodb_throw')) {	
+
+		if (function_exists('adodb_throw')) {
 			if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false);
 			else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db);
 		} else
 			if (!$db || $db->debug) ADOConnection::outp($this->_lasterr);
-		
+
 	}
-	
+
 	// return last error message
 	function ErrorMsg()
 	{
 		if (!function_exists('adodb_throw')) {
 			if ($this->_dbat < 0) $db = false;
 			else $db = $this->DB();
-		
+
 			// last error could be database error too
 			if ($db && $db->ErrorMsg()) return $db->ErrorMsg();
 		}
 		return $this->_lasterr;
 	}
-	
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		if ($this->_dbat < 0) return -9999; // no database connection...
 		$db = $this->DB();
-		
+
 		return (int) $db->ErrorNo();
 	}
 
@@ -583,7 +583,7 @@
 	function DB()
 	{
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		if ($this->_dbat < 0) {
 			$false = false;
 			$this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB");
@@ -593,18 +593,18 @@
 		$db = $activedb->db;
 		return $db;
 	}
-	
+
 	// retrieve ADODB_Active_Table
 	function &TableInfo()
 	{
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
 		$table = $activedb->tables[$this->_tableat];
 		return $table;
 	}
-	
-	
+
+
 	// I have an ON INSERT trigger on a table that sets other columns in the table.
 	// So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook
 	function Reload()
@@ -615,21 +615,21 @@
 		return($this->Load($where));
 	}
 
-	
+
 	// set a numeric array (using natural table field ordering) as object properties
 	function Set(&$row)
 	{
 	global $ACTIVE_RECORD_SAFETY;
-	
+
 		$db = $this->DB();
-		
+
 		if (!$row) {
-			$this->_saved = false;		
+			$this->_saved = false;
 			return false;
 		}
-		
+
 		$this->_saved = true;
-		
+
 		$table = $this->TableInfo();
 		$sizeofFlds = sizeof($table->flds);
 		$sizeofRow  = sizeof($row);
@@ -687,7 +687,7 @@
         # </AP>
 		return true;
 	}
-	
+
 	// get last inserted id for INSERT
 	function LastInsertID(&$db,$fieldname)
 	{
@@ -695,14 +695,14 @@
 			$val = $db->Insert_ID($this->_table,$fieldname);
 		else
 			$val = false;
-			
+
 		if (is_null($val) || $val === false) {
 			// this might not work reliably in multi-user environment
 			return $db->GetOne("select max(".$fieldname.") from ".$this->_table);
 		}
 		return $val;
 	}
-	
+
 	// quote data in where clause
 	function doquote(&$db, $val,$t)
 	{
@@ -710,13 +710,13 @@
 		case 'D':
 		case 'T':
 			if (empty($val)) return 'null';
-			
+
 		case 'C':
 		case 'X':
 			if (is_null($val)) return 'null';
-			
-			if (strlen($val)>1 && 
-				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { 
+
+			if (strlen($val)>1 &&
+				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) {
 				return $db->qstr($val);
 				break;
 			}
@@ -725,13 +725,13 @@
 			break;
 		}
 	}
-	
+
 	// generate where clause for an UPDATE/SELECT
 	function GenWhere(&$db, &$table)
 	{
 		$keys = $table->keys;
 		$parr = array();
-		
+
 		foreach($keys as $k) {
 			$f = $table->flds[$k];
 			if ($f) {
@@ -740,15 +740,15 @@
 		}
 		return implode(' and ', $parr);
 	}
-	
-	
+
+
 	//------------------------------------------------------------ Public functions below
-	
+
 	function Load($where=null,$bindarr=false)
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$this->_where = $where;
-		
+
 		$save = $db->SetFetchMode(ADODB_FETCH_NUM);
 		$qry = "select * from ".$this->_table;
 		$table =& $this->TableInfo();
@@ -757,7 +757,7 @@
 			$hasManyId   = $k;
 		else
 			$hasManyId   = 'id';
-		
+
 		foreach($table->_belongsTo as $foreignTable)
 		{
 			if(($k = reset($foreignTable->TableInfo()->keys)))
@@ -780,7 +780,7 @@
 		}
 		if($where)
 			$qry .= ' WHERE '.$where;
-		
+
 		// Simple case: no relations. Load row and return.
 		if((count($table->_hasMany) + count($table->_belongsTo)) < 1)
 		{
@@ -790,7 +790,7 @@
 			$db->SetFetchMode($save);
 			return $this->Set($row);
 		}
-		
+
 		// More complex case when relations have to be collated
 		$rows = $db->GetAll($qry,$bindarr);
 		if(!$rows)
@@ -800,7 +800,7 @@
 			return false;
 		$class = get_class($this);
 		$isFirstRow = true;
-		
+
 		if(($k = reset($this->TableInfo()->keys)))
 			$myId   = $k;
 		else
@@ -819,7 +819,7 @@
 		}
 		if(!$found)
 			$this->outp_throw("Unable to locate key $myId for $class in Load()",'Load');
-		
+
 		foreach($rows as $row)
 		{
 			$rowId = intval($row[$index]);
@@ -873,21 +873,21 @@
 							}
 						}
 					}
-				}				
+				}
 			}
 		}
 		return true;
 	}
-	
+
 	// false on error
 	function Save()
 	{
 		if ($this->_saved) $ok = $this->Update();
 		else $ok = $this->Insert();
-		
+
 		return $ok;
 	}
-	
+
 	// CFR: Sometimes we may wish to consider that an object is not to be replaced but inserted.
 	// Sample use case: an 'undo' command object (after a delete())
 	function Dirty()
@@ -901,7 +901,7 @@
 		$db = $this->DB(); if (!$db) return false;
 		$cnt = 0;
 		$table = $this->TableInfo();
-		
+
 		$valarr = array();
 		$names = array();
 		$valstr = array();
@@ -915,7 +915,7 @@
 				$cnt += 1;
 			}
 		}
-		
+
 		if (empty($names)){
 			foreach($table->flds as $name=>$fld) {
 				$valarr[] = null;
@@ -926,7 +926,7 @@
 		}
 		$sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')';
 		$ok = $db->Execute($sql,$valarr);
-		
+
 		if ($ok) {
 			$this->_saved = true;
 			$autoinc = false;
@@ -941,23 +941,23 @@
 				$this->$k = $this->LastInsertID($db,$k);
 			}
 		}
-		
+
 		$this->_original = $valarr;
 		return !empty($ok);
 	}
-	
+
 	function Delete()
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$where = $this->GenWhere($db,$table);
 		$sql = 'DELETE FROM '.$this->_table.' WHERE '.$where;
 		$ok = $db->Execute($sql);
-		
+
 		return $ok ? true : false;
 	}
-	
+
 	// returns an array of active record objects
 	function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array())
 	{
@@ -967,7 +967,7 @@
 			array('foreignName'=>$this->foreignName, 'belongsTo'=>$table->_belongsTo, 'hasMany'=>$table->_hasMany));
 		return $arr;
 	}
-	
+
 	// CFR: In introduced this method to ensure that inner workings are not disturbed by
 	// subclasses...for instance when GetActiveRecordsClass invokes Find()
 	// Why am I not invoking parent::Find?
@@ -985,12 +985,12 @@
 	function Replace()
 	{
 	global $ADODB_ASSOC_CASE;
-		
+
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$pkey = $table->keys;
-		
+
 		foreach($table->flds as $name=>$fld) {
 			$val = $this->$name;
 			/*
@@ -1010,17 +1010,17 @@
 			$arr[$name] = $this->doquote($db,$val,$t);
 			$valarr[] = $val;
 		}
-		
+
 		if (!is_array($pkey)) $pkey = array($pkey);
-		
-		
-		if ($ADODB_ASSOC_CASE == 0) 
+
+
+		if ($ADODB_ASSOC_CASE == 0)
 			foreach($pkey as $k => $v)
 				$pkey[$k] = strtolower($v);
-		elseif ($ADODB_ASSOC_CASE == 1) 
+		elseif ($ADODB_ASSOC_CASE == 1)
 			foreach($pkey as $k => $v)
 				$pkey[$k] = strtoupper($v);
-				
+
 		$ok = $db->Replace($this->_table,$arr,$pkey);
 		if ($ok) {
 			$this->_saved = true; // 1= update 2=insert
@@ -1037,9 +1037,9 @@
 					$this->$k = $this->LastInsertID($db,$k);
 				}
 			}
-			
+
 			$this->_original = $valarr;
-		} 
+		}
 		return $ok;
 	}
 
@@ -1048,14 +1048,14 @@
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$where = $this->GenWhere($db, $table);
-		
+
 		if (!$where) {
 			$this->error("Where missing for table $table", "Update");
 			return false;
 		}
-		$valarr = array(); 
+		$valarr = array();
 		$neworig = array();
 		$pairs = array();
 		$i = -1;
@@ -1064,11 +1064,11 @@
 			$i += 1;
 			$val = $this->$name;
 			$neworig[] = $val;
-			
+
 			if (isset($table->keys[$name])) {
 				continue;
 			}
-			
+
 			if (is_null($val)) {
 				if (isset($fld->not_null) && $fld->not_null) {
 					if (isset($fld->default_value) && strlen($fld->default_value)) continue;
@@ -1078,16 +1078,16 @@
 					}
 				}
 			}
-			
+
 			if (isset($this->_original[$i]) && $val == $this->_original[$i]) {
 				continue;
-			}			
+			}
 			$valarr[] = $val;
 			$pairs[] = $name.'='.$db->Param($cnt);
 			$cnt += 1;
 		}
-		
-		
+
+
 		if (!$cnt) return -1;
 		$sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where;
 		$ok = $db->Execute($sql,$valarr);
@@ -1097,23 +1097,23 @@
 		}
 		return 0;
 	}
-	
+
 	function GetAttributeNames()
 	{
 		$table = $this->TableInfo();
 		if (!$table) return false;
 		return array_keys($table->flds);
 	}
-	
+
 };
 
 function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bindarr, $primkeyArr,
 			$extra, $relations)
 {
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		if (empty($extra['loading'])) $extra['loading'] = ADODB_LAZY_AR;
-		
+
 		$save = $db->SetFetchMode(ADODB_FETCH_NUM);
 		$table = &$tableObj->_table;
 		$tableInfo =& $tableObj->TableInfo();
@@ -1135,7 +1135,7 @@
 		}
 		if(!$found)
 			$db->outp_throw("Unable to locate key $myId for $class in GetActiveRecordsClass()",'GetActiveRecordsClass');
-		
+
 		$qry = "select * from ".$table;
 		if(ADODB_JOIN_AR == $extra['loading'])
 		{
@@ -1192,19 +1192,19 @@
 			}
 		} else
 			$rows = $db->GetAll($qry,$bindarr);
-			
+
 		$db->SetFetchMode($save);
-		
+
 		$false = false;
-		
-		if ($rows === false) {	
+
+		if ($rows === false) {
 			return $false;
 		}
-		
-		
+
+
 		if (!isset($_ADODB_ACTIVE_DBS)) {
 			include(ADODB_DIR.'/adodb-active-record.inc.php');
-		}	
+		}
 		if (!class_exists($class)) {
 			$db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass');
 			return $false;
@@ -1218,7 +1218,7 @@
 		$arrRef = array();
 		$bTos = array(); // Will store belongTo's indices if any
 		foreach($rows as $row) {
-		
+
 			$obj = new $class($table,$primkeyArr,$db);
 			if ($obj->ErrorNo()){
 				$db->_errorMsg = $obj->ErrorMsg();
@@ -1268,7 +1268,7 @@
 			{
 				if(ADODB_JOIN_AR == $extra['loading'])
 				{
-					$isNewObj = !isset($uniqArr['_'.$row[0]]); 
+					$isNewObj = !isset($uniqArr['_'.$row[0]]);
 					if($isNewObj)
 						$uniqArr['_'.$row[0]] = $obj;
 
@@ -1322,7 +1322,7 @@
 						}
 					}
 					if(!$isNewObj)
-						unset($obj); // We do not need this object itself anymore and do not want it re-added to the main array					
+						unset($obj); // We do not need this object itself anymore and do not want it re-added to the main array
 				}
 				else if(ADODB_LAZY_AR == $extra['loading'])
 				{
@@ -1382,7 +1382,7 @@
 						array_push($arrRef[$obj->$dbClassRef]->$foreignName, $obj);
 					}
 				}
-				
+
 			}
 			if(!empty($relations['belongsTo']))
 			{
@@ -1398,7 +1398,7 @@
 					else
 					{
 						$belongsToId = 'id';
-					}						
+					}
 					$origObjsArr = $bTos[$foreignTableRef];
 					$bTosString = implode(',', array_keys($bTos[$foreignTableRef]));
 					$foreignName = $foreignTable->foreignName;
Index: typo3/sysext/adodb/adodb/adodb-active-record.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-active-record.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-active-record.inc.php	(working copy)
@@ -3,16 +3,16 @@
 
 @version V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
   Latest version is available at http://adodb.sourceforge.net
- 
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-  
+
   Active Record implementation. Superset of Zend Framework's.
-  
+
   Version 0.92
-  
-  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
+
+  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord
   	for info on Ruby on Rails Active Record implementation
 */
 
@@ -44,30 +44,30 @@
 
 // $db = database connection
 // $index = name of index - can be associative, for an example see
-//    http://phplens.com/lens/lensforum/msgs.php?id=17790 
+//    http://phplens.com/lens/lensforum/msgs.php?id=17790
 // returns index into $_ADODB_ACTIVE_DBS
 function ADODB_SetDatabaseAdapter(&$db, $index=false)
 {
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		foreach($_ADODB_ACTIVE_DBS as $k => $d) {
 			if (PHP_VERSION >= 5) {
 				if ($d->db === $db) return $k;
 			} else {
-				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) 
+				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database)
 					return $k;
 			}
 		}
-		
+
 		$obj = new ADODB_Active_DB();
 		$obj->db = $db;
 		$obj->tables = array();
-		
+
 		if ($index == false) $index = sizeof($_ADODB_ACTIVE_DBS);
 
-		
+
 		$_ADODB_ACTIVE_DBS[$index] = $obj;
-		
+
 		return sizeof($_ADODB_ACTIVE_DBS)-1;
 }
 
@@ -75,8 +75,8 @@
 class ADODB_Active_Record {
 	static $_changeNames = true; // dynamically pluralize table names
 	static $_quoteNames = false;
-	
-	static $_foreignSuffix = '_id'; // 
+
+	static $_foreignSuffix = '_id'; //
 	var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat]
 	var $_table; // tablename, if set in class definition then use it as table name
 	var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat]
@@ -95,29 +95,29 @@
 	}
 
 	// should be static
-	static function SetDatabaseAdapter(&$db, $index=false) 
+	static function SetDatabaseAdapter(&$db, $index=false)
 	{
 		return ADODB_SetDatabaseAdapter($db, $index);
 	}
-	
-	
+
+
 	public function __set($name, $value)
 	{
 		$name = str_replace(' ', '_', $name);
 		$this->$name = $value;
 	}
-	
+
 	// php5 constructor
 	function __construct($table = false, $pkeyarr=false, $db=false)
 	{
 	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
-	
+
 		if ($db == false && is_object($pkeyarr)) {
 			$db = $pkeyarr;
 			$pkeyarr = false;
 		}
-		
-		if (!$table) { 
+
+		if (!$table) {
 			if (!empty($this->_table)) $table = $this->_table;
 			else $table = $this->_pluralize(get_class($this));
 		}
@@ -135,13 +135,13 @@
 
 		$this->UpdateActiveTable($pkeyarr);
 	}
-	
+
 	function __wakeup()
 	{
   		$class = get_class($this);
   		new $class;
 	}
-	
+
 	function _pluralize($table)
 	{
 		if (!ADODB_Active_Record::$_changeNames) return $table;
@@ -152,26 +152,26 @@
 		$lastc2 = substr($ut,$len-2);
 		switch ($lastc) {
 		case 'S':
-			return $table.'es';	
+			return $table.'es';
 		case 'Y':
 			return substr($table,0,$len-1).'ies';
-		case 'X':	
+		case 'X':
 			return $table.'es';
-		case 'H': 
+		case 'H':
 			if ($lastc2 == 'CH' || $lastc2 == 'SH')
 				return $table.'es';
 		default:
 			return $table.'s';
 		}
 	}
-	
+
 	// CFR Lamest singular inflector ever - @todo Make it real!
 	// Note: There is an assumption here...and it is that the argument's length >= 4
 	function _singularize($tables)
 	{
-	
+
 		if (!ADODB_Active_Record::$_changeNames) return $table;
-	
+
 		$ut = strtoupper($tables);
 		$len = strlen($tables);
 		if($ut[$len-1] != 'S')
@@ -203,14 +203,14 @@
 		$table->_hasMany[$foreignRef] = $ar;
 	#	$this->$foreignRef = $this->_hasMany[$foreignRef]; // WATCHME Removed assignment by ref. to please __get()
 	}
-	
+
 	// use when you don't want ADOdb to auto-pluralize tablename
 	static function TableHasMany($table, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record')
 	{
 		$ar = new ADODB_Active_Record($table);
 		$ar->hasMany($foreignRef, $foreignKey, $foreignClass);
 	}
-	
+
 	// use when you don't want ADOdb to auto-pluralize tablename
 	static function TableKeyHasMany($table, $tablePKey, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record')
 	{
@@ -218,8 +218,8 @@
 		$ar = new ADODB_Active_Record($table,$tablePKey);
 		$ar->hasMany($foreignRef, $foreignKey, $foreignClass);
 	}
-	
-	
+
+
 	// use when you want ADOdb to auto-pluralize tablename for you. Note that the class must already be defined.
 	// e.g. class Person will generate relationship for table Persons
 	static function ClassHasMany($parentclass, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record')
@@ -227,8 +227,8 @@
 		$ar = new $parentclass();
 		$ar->hasMany($foreignRef, $foreignKey, $foreignClass);
 	}
-	
 
+
 	function belongsTo($foreignRef,$foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
 	{
 		global $inflector;
@@ -238,24 +238,24 @@
 		$ar->parentKey = $parentKey;
 		$ar->UpdateActiveTable();
 		$ar->foreignKey = ($foreignKey) ? $foreignKey : $foreignRef.ADODB_Active_Record::$_foreignSuffix;
-		
+
 		$table =& $this->TableInfo();
 		$table->_belongsTo[$foreignRef] = $ar;
 	#	$this->$foreignRef = $this->_belongsTo[$foreignRef];
 	}
-	
+
 	static function ClassBelongsTo($class, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
 	{
 		$ar = new $class();
 		$ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass);
 	}
-	
+
 	static function TableBelongsTo($table, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
 	{
 		$ar = new ADOdb_Active_Record($table);
 		$ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass);
 	}
-	
+
 	static function TableKeyBelongsTo($table, $tablePKey, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
 	{
 		if (!is_array($tablePKey)) $tablePKey = array($tablePKey);
@@ -266,8 +266,8 @@
 
 	/**
 	 * __get Access properties - used for lazy loading
-	 * 
-	 * @param mixed $name 
+	 *
+	 * @param mixed $name
 	 * @access protected
 	 * @return mixed
 	 */
@@ -275,9 +275,9 @@
 	{
 		return $this->LoadRelations($name, '', -1, -1);
 	}
-	
+
 	/**
-	 * @param string $name 
+	 * @param string $name
 	 * @param string $whereOrderBy : eg. ' AND field1 = value ORDER BY field2'
 	 * @param offset
 	 * @param limit
@@ -289,12 +289,12 @@
 		$table = $this->TableInfo();
 		if ($limit >= 0) $extras['limit'] = $limit;
 		if ($offset >= 0) $extras['offset'] = $offset;
-		
-		if (strlen($whereOrderBy)) 
+
+		if (strlen($whereOrderBy))
 			if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy))
 				if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy))
 					$whereOrderBy = 'AND '.$whereOrderBy;
-				
+
 		if(!empty($table->_belongsTo[$name]))
 		{
 			$obj = $table->_belongsTo[$name];
@@ -305,7 +305,7 @@
 			{
 				if ($obj->parentKey) $key = $obj->parentKey;
 				else $key = reset($table->keys);
-				
+
 				$arrayOfOne = $obj->Find($key.'='.$this->$columnName.' '.$whereOrderBy,false,false,$extras);
 				if ($arrayOfOne) {
 					$this->$name = $arrayOfOne[0];
@@ -314,7 +314,7 @@
 			}
 		}
 		if(!empty($table->_hasMany[$name]))
-		{	
+		{
 			$obj = $table->_hasMany[$name];
 			$key = reset($table->keys);
 			$id = @$this->$key;
@@ -327,11 +327,11 @@
 			$this->$name = $objs;
 			return $objs;
 		}
-		
+
 		return array();
 	}
 	//////////////////////////////////
-	
+
 	// update metadata
 	function UpdateActiveTable($pkeys=false,$forceUpdate=false)
 	{
@@ -347,7 +347,7 @@
 
 			$tobj = $tables[$tableat];
 			foreach($tobj->flds as $name => $fld) {
-			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) 
+			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value))
 				$this->$name = $fld->default_value;
 			else
 				$this->$name = null;
@@ -361,11 +361,11 @@
 			@flock($fp, LOCK_SH);
 			$acttab = unserialize(fread($fp,100000));
 			fclose($fp);
-			if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { 
+			if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) {
 				// abs(rand()) randomizes deletion, reducing contention to delete/refresh file
 				// ideally, you should cache at least 32 secs
 				$activedb->tables[$table] = $acttab;
-				
+
 				//if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname");
 			  	return;
 			} else if ($db->debug) {
@@ -374,18 +374,18 @@
 		}
 		$activetab = new ADODB_Active_Table();
 		$activetab->name = $table;
-		
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
-		
+
 		$cols = $db->MetaColumns($table);
-		
+
 		if (isset($savem)) $db->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$cols) {
-			$this->Error("Invalid table name: $table",'UpdateActiveTable'); 
+			$this->Error("Invalid table name: $table",'UpdateActiveTable');
 			return false;
 		}
 		$fld = reset($cols);
@@ -395,17 +395,17 @@
 				foreach($cols as $name => $fld) {
 					if (!empty($fld->primary_key)) $pkeys[] = $name;
 				}
-			} else	
+			} else
 				$pkeys = $this->GetPrimaryKeys($db, $table);
 		}
 		if (empty($pkeys)) {
 			$this->Error("No primary key found for table $table",'UpdateActiveTable');
 			return false;
 		}
-		
+
 		$attr = array();
 		$keys = array();
-		
+
 		switch($ADODB_ASSOC_CASE) {
 		case 0:
 			foreach($cols as $name => $fldobj) {
@@ -420,18 +420,18 @@
 				$keys[strtolower($name)] = strtolower($name);
 			}
 			break;
-			
-		case 1: 
+
+		case 1:
 			foreach($cols as $name => $fldobj) {
 				$name = strtoupper($name);
-               
+
                 if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
                     $this->$name = $fldobj->default_value;
                 else
 					$this->$name = null;
 				$attr[$name] = $fldobj;
 			}
-			
+
 			foreach($pkeys as $k => $name) {
 				$keys[strtoupper($name)] = strtoupper($name);
 			}
@@ -439,7 +439,7 @@
 		default:
 			foreach($cols as $name => $fldobj) {
 				$name = ($fldobj->name);
-                
+
                 if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
                     $this->$name = $fldobj->default_value;
                 else
@@ -451,7 +451,7 @@
 			}
 			break;
 		}
-		
+
 		$activetab->keys = $keys;
 		$activetab->flds = $attr;
 
@@ -463,58 +463,58 @@
 		}
 		if (isset($activedb->tables[$table])) {
 			$oldtab = $activedb->tables[$table];
-		
+
 			if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo;
 			if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany;
 		}
 		$activedb->tables[$table] = $activetab;
 	}
-	
+
 	function GetPrimaryKeys(&$db, $table)
 	{
 		return $db->MetaPrimaryKeys($table);
 	}
-	
-	// error handler for both PHP4+5. 
+
+	// error handler for both PHP4+5.
 	function Error($err,$fn)
 	{
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		$fn = get_class($this).'::'.$fn;
 		$this->_lasterr = $fn.': '.$err;
-		
+
 		if ($this->_dbat < 0) $db = false;
 		else {
 			$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
 			$db = $activedb->db;
 		}
-		
-		if (function_exists('adodb_throw')) {	
+
+		if (function_exists('adodb_throw')) {
 			if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false);
 			else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db);
 		} else
 			if (!$db || $db->debug) ADOConnection::outp($this->_lasterr);
-		
+
 	}
-	
+
 	// return last error message
 	function ErrorMsg()
 	{
 		if (!function_exists('adodb_throw')) {
 			if ($this->_dbat < 0) $db = false;
 			else $db = $this->DB();
-		
+
 			// last error could be database error too
 			if ($db && $db->ErrorMsg()) return $db->ErrorMsg();
 		}
 		return $this->_lasterr;
 	}
-	
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		if ($this->_dbat < 0) return -9999; // no database connection...
 		$db = $this->DB();
-		
+
 		return (int) $db->ErrorNo();
 	}
 
@@ -523,7 +523,7 @@
 	function DB()
 	{
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		if ($this->_dbat < 0) {
 			$false = false;
 			$this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB");
@@ -533,7 +533,7 @@
 		$db = $activedb->db;
 		return $db;
 	}
-	
+
 	// retrieve ADODB_Active_Table
 	function &TableInfo()
 	{
@@ -542,8 +542,8 @@
 		$table = $activedb->tables[$this->_tableat];
 		return $table;
 	}
-	
-	
+
+
 	// I have an ON INSERT trigger on a table that sets other columns in the table.
 	// So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook
 	function Reload()
@@ -554,21 +554,21 @@
 		return($this->Load($where));
 	}
 
-	
+
 	// set a numeric array (using natural table field ordering) as object properties
 	function Set(&$row)
 	{
 	global $ACTIVE_RECORD_SAFETY;
-	
+
 		$db = $this->DB();
-		
+
 		if (!$row) {
-			$this->_saved = false;		
+			$this->_saved = false;
 			return false;
 		}
-		
+
 		$this->_saved = true;
-		
+
 		$table = $this->TableInfo();
 		if ($ACTIVE_RECORD_SAFETY && sizeof($table->flds) != sizeof($row)) {
             # <AP>
@@ -587,7 +587,7 @@
 		}
         else
 			$keys = array_keys($row);
-			
+
         # <AP>
         reset($keys);
         $this->_original = array();
@@ -601,7 +601,7 @@
         # </AP>
 		return true;
 	}
-	
+
 	// get last inserted id for INSERT
 	function LastInsertID(&$db,$fieldname)
 	{
@@ -609,14 +609,14 @@
 			$val = $db->Insert_ID($this->_table,$fieldname);
 		else
 			$val = false;
-			
+
 		if (is_null($val) || $val === false) {
 			// this might not work reliably in multi-user environment
 			return $db->GetOne("select max(".$fieldname.") from ".$this->_table);
 		}
 		return $val;
 	}
-	
+
 	// quote data in where clause
 	function doquote(&$db, $val,$t)
 	{
@@ -624,15 +624,15 @@
 		case 'D':
 		case 'T':
 			if (empty($val)) return 'null';
-		
+
 		case 'B':
 		case 'N':
 		case 'C':
 		case 'X':
 			if (is_null($val)) return 'null';
-			
-			if (strlen($val)>1 && 
-				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { 
+
+			if (strlen($val)>1 &&
+				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) {
 				return $db->qstr($val);
 				break;
 			}
@@ -641,13 +641,13 @@
 			break;
 		}
 	}
-	
+
 	// generate where clause for an UPDATE/SELECT
 	function GenWhere(&$db, &$table)
 	{
 		$keys = $table->keys;
 		$parr = array();
-		
+
 		foreach($keys as $k) {
 			$f = $table->flds[$k];
 			if ($f) {
@@ -656,48 +656,48 @@
 		}
 		return implode(' and ', $parr);
 	}
-	
-	
+
+
 	function _QName($n,$db=false)
 	{
 		if (!ADODB_Active_Record::$_quoteNames) return $n;
 		if (!$db) $db = $this->DB(); if (!$db) return false;
 		return $db->nameQuote.$n.$db->nameQuote;
 	}
-	
+
 	//------------------------------------------------------------ Public functions below
-	
+
 	function Load($where=null,$bindarr=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$db = $this->DB(); if (!$db) return false;
 		$this->_where = $where;
-		
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
-		
+
 		$qry = "select * from ".$this->_table;
 
 		if($where) {
 			$qry .= ' WHERE '.$where;
 		}
 		$row = $db->GetRow($qry,$bindarr);
-		
+
 		if (isset($savem)) $db->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		return $this->Set($row);
 	}
-	
+
 	# useful for multiple record inserts
 	# see http://phplens.com/lens/lensforum/msgs.php?id=17795
 	function Reset()
 	{
         $this->_where=null;
-        $this->_saved = false; 
-        $this->_lasterr = false; 
+        $this->_saved = false;
+        $this->_lasterr = false;
         $this->_original = false;
         $vars=get_object_vars($this);
         foreach($vars as $k=>$v){
@@ -708,24 +708,24 @@
         $this->foreignName=strtolower(get_class($this));
         return true;
     }
-	
+
 	// false on error
 	function Save()
 	{
 		if ($this->_saved) $ok = $this->Update();
 		else $ok = $this->Insert();
-		
+
 		return $ok;
 	}
-	
-	
+
+
 	// false on error
 	function Insert()
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$cnt = 0;
 		$table = $this->TableInfo();
-		
+
 		$valarr = array();
 		$names = array();
 		$valstr = array();
@@ -739,7 +739,7 @@
 				$cnt += 1;
 			}
 		}
-		
+
 		if (empty($names)){
 			foreach($table->flds as $name=>$fld) {
 				$valarr[] = null;
@@ -750,7 +750,7 @@
 		}
 		$sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')';
 		$ok = $db->Execute($sql,$valarr);
-		
+
 		if ($ok) {
 			$this->_saved = true;
 			$autoinc = false;
@@ -765,23 +765,23 @@
 				$this->$k = $this->LastInsertID($db,$k);
 			}
 		}
-		
+
 		$this->_original = $valarr;
 		return !empty($ok);
 	}
-	
+
 	function Delete()
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$where = $this->GenWhere($db,$table);
 		$sql = 'DELETE FROM '.$this->_table.' WHERE '.$where;
 		$ok = $db->Execute($sql);
-		
+
 		return $ok ? true : false;
 	}
-	
+
 	// returns an array of active record objects
 	function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array())
 	{
@@ -789,17 +789,17 @@
 		$arr = $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr,$extra);
 		return $arr;
 	}
-	
+
 	// returns 0 on error, 1 on update, 2 on insert
 	function Replace()
 	{
 	global $ADODB_ASSOC_CASE;
-		
+
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$pkey = $table->keys;
-		
+
 		foreach($table->flds as $name=>$fld) {
 			$val = $this->$name;
 			/*
@@ -815,24 +815,24 @@
 			if (is_null($val) && !empty($fld->auto_increment)) {
             	continue;
             }
-			
+
 			if (is_array($val)) continue;
-			
+
 			$t = $db->MetaType($fld->type);
 			$arr[$name] = $this->doquote($db,$val,$t);
 			$valarr[] = $val;
 		}
-		
+
 		if (!is_array($pkey)) $pkey = array($pkey);
-		
-		
-		if ($ADODB_ASSOC_CASE == 0) 
+
+
+		if ($ADODB_ASSOC_CASE == 0)
 			foreach($pkey as $k => $v)
 				$pkey[$k] = strtolower($v);
-		elseif ($ADODB_ASSOC_CASE == 1) 
+		elseif ($ADODB_ASSOC_CASE == 1)
 			foreach($pkey as $k => $v)
 				$pkey[$k] = strtoupper($v);
-				
+
 		$ok = $db->Replace($this->_table,$arr,$pkey);
 		if ($ok) {
 			$this->_saved = true; // 1= update 2=insert
@@ -849,9 +849,9 @@
 					$this->$k = $this->LastInsertID($db,$k);
 				}
 			}
-			
+
 			$this->_original = $valarr;
-		} 
+		}
 		return $ok;
 	}
 
@@ -860,14 +860,14 @@
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$where = $this->GenWhere($db, $table);
-		
+
 		if (!$where) {
 			$this->error("Where missing for table $table", "Update");
 			return false;
 		}
-		$valarr = array(); 
+		$valarr = array();
 		$neworig = array();
 		$pairs = array();
 		$i = -1;
@@ -876,10 +876,10 @@
 			$i += 1;
 			$val = $this->$name;
 			$neworig[] = $val;
-			
-			if (isset($table->keys[$name]) || is_array($val)) 
+
+			if (isset($table->keys[$name]) || is_array($val))
 				continue;
-			
+
 			if (is_null($val)) {
 				if (isset($fld->not_null) && $fld->not_null) {
 					if (isset($fld->default_value) && strlen($fld->default_value)) continue;
@@ -889,16 +889,16 @@
 					}
 				}
 			}
-			
+
 			if (isset($this->_original[$i]) && $val == $this->_original[$i]) {
 				continue;
-			}			
+			}
 			$valarr[] = $val;
 			$pairs[] = $this->_QName($name,$db).'='.$db->Param($cnt);
 			$cnt += 1;
 		}
-		
-		
+
+
 		if (!$cnt) return -1;
 		$sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where;
 		$ok = $db->Execute($sql,$valarr);
@@ -908,14 +908,14 @@
 		}
 		return 0;
 	}
-	
+
 	function GetAttributeNames()
 	{
 		$table = $this->TableInfo();
 		if (!$table) return false;
 		return array_keys($table->flds);
 	}
-	
+
 };
 
 function adodb_GetActiveRecordsClass(&$db, $class, $table,$whereOrderBy,$bindarr, $primkeyArr,
@@ -923,10 +923,10 @@
 {
 global $_ADODB_ACTIVE_DBS;
 
-	
+
 	$save = $db->SetFetchMode(ADODB_FETCH_NUM);
 	$qry = "select * from ".$table;
-	
+
 	if (!empty($whereOrderBy))
 		$qry .= ' WHERE '.$whereOrderBy;
 	if(isset($extra['limit']))
@@ -947,14 +947,14 @@
 		$rows = $db->GetAll($qry,$bindarr);
 
 	$db->SetFetchMode($save);
-	
+
 	$false = false;
-	
-	if ($rows === false) {	
+
+	if ($rows === false) {
 		return $false;
 	}
-	
 
+
 	if (!class_exists($class)) {
 		$db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass');
 		return $false;
@@ -967,7 +967,7 @@
 	$arrRef = array();
 	$bTos = array(); // Will store belongTo's indices if any
 	foreach($rows as $row) {
-	
+
 		$obj = new $class($table,$primkeyArr,$db);
 		if ($obj->ErrorNo()){
 			$db->_errorMsg = $obj->ErrorMsg();
@@ -975,7 +975,7 @@
 		}
 		$obj->Set($row);
 		$arr[] = $obj;
-	} // foreach($rows as $row) 
+	} // foreach($rows as $row)
 
 	return $arr;
 }
Index: typo3/sysext/adodb/adodb/adodb-exceptions.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-exceptions.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-exceptions.inc.php	(working copy)
@@ -14,7 +14,7 @@
  */
 
 
-if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
+if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
 define('ADODB_ERROR_HANDLER','adodb_throw');
 
 class ADODB_Exception extends Exception {
@@ -24,7 +24,7 @@
 var $params = '';
 var $host = '';
 var $database = '';
-	
+
 	function __construct($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
 	{
 		switch($fn) {
@@ -33,7 +33,7 @@
 			$this->params = $p2;
 			$s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n";
 			break;
-	
+
 		case 'PCONNECT':
 		case 'CONNECT':
 			$user = $thisConnection->user;
@@ -43,7 +43,7 @@
 			$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
 			break;
 		}
-	
+
 		$this->dbms = $dbms;
 		if ($thisConnection) {
 			$this->host = $thisConnection->host;
@@ -51,7 +51,7 @@
 		}
 		$this->fn = $fn;
 		$this->msg = $errmsg;
-				
+
 		if (!is_numeric($errno)) $errno = -1;
 		parent::__construct($s,$errno);
 	}
@@ -71,7 +71,7 @@
 function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
 {
 global $ADODB_EXCEPTION;
-	
+
 	if (error_reporting() == 0) return; // obey @ protocol
 	if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION;
 	else $errfn = 'ADODB_EXCEPTION';
Index: typo3/sysext/adodb/adodb/drivers/adodb-csv.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-csv.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-csv.inc.php	(working copy)
@@ -1,19 +1,19 @@
 <?php
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 4.
-  
+
   Currently unsupported: MetaDatabases, MetaTables and MetaColumns, and also inputarr in Execute.
   Native types have been converted to MetaTypes.
   Transactions not supported yet.
-  
+
   Limitation of url length. For IIS, see MaxClientRequestBuffer registry value.
-  
+
 	  http://support.microsoft.com/default.aspx?scid=kb;en-us;260694
-*/ 
+*/
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -22,12 +22,12 @@
  define("_ADODB_CSV_LAYER", 1 );
 
 include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
- 
+
 class ADODB_csv extends ADOConnection {
 	var $databaseType = 'csv';
 	var $databaseProvider = 'csv';
 	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
+	var $hasAffectedRows = true;
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
 	var $_affectedrows=0;
 	var $_insertid=0;
@@ -35,35 +35,35 @@
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $hasTransactions = false;
 	var $_errorNo = false;
-	
-	function ADODB_csv() 
-	{		
+
+	function ADODB_csv()
+	{
 	}
-	
+
 	function _insertid()
 	{
 			return $this->_insertid;
 	}
-	
+
 	function _affectedrows()
 	{
 			return $this->_affectedrows;
 	}
-  
+
   	function MetaDatabases()
 	{
 		return false;
 	}
 
-	
+
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
 		$this->_url = $argHostname;
-		return true;	
+		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
@@ -71,24 +71,24 @@
 		$this->_url = $argHostname;
 		return true;
 	}
-	
- 	function MetaColumns($table, $normalize=true) 
+
+ 	function MetaColumns($table, $normalize=true)
 	{
 		return false;
 	}
-		
-		
+
+
 	// parameters use PostgreSQL convention, not MySQL
 	function SelectLimit($sql,$nrows=-1,$offset=-1)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$url = $this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=".
 			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE).
 			"&offset=$offset";
 		$err = false;
 		$rs = csv2rs($url,$err,false);
-		
+
 		if ($this->debug) print "$url<br><i>$err</i><br>";
 
 		$at = strpos($err,'::::');
@@ -99,25 +99,25 @@
 			$this->_errorMsg = substr($err,$at+4,1024);
 			$this->_errorNo = -9999;
 		}
-		if ($this->_errorNo) 
+		if ($this->_errorNo)
 			if ($fn = $this->raiseErrorFn) {
 				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,'');
 			}
-			
-		if (is_object($rs)) {	
-		
-			$rs->databaseType='csv';		
+
+		if (is_object($rs)) {
+
+			$rs->databaseType='csv';
 			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
 			$rs->connection = $this;
 		}
 		return $rs;
 	}
-	
+
 	// returns queryID or false
 	function _Execute($sql,$inputarr=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		if (!$this->_bindInputArray && $inputarr) {
 			$sqlarr = explode('?',$sql);
 			$sql = '';
@@ -132,37 +132,37 @@
 				else
 					$sql .= $v;
 				$i += 1;
-	
+
 			}
 			$sql .= $sqlarr[$i];
-			if ($i+1 != sizeof($sqlarr))	
+			if ($i+1 != sizeof($sqlarr))
 				print "Input Array does not match ?: ".htmlspecialchars($sql);
 			$inputarr = false;
 		}
-		
+
 		$url =  $this->_url.'?sql='.urlencode($sql)."&fetch=".
 			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE);
 		$err = false;
-		
-		
+
+
 		$rs = csv2rs($url,$err,false);
 		if ($this->debug) print urldecode($url)."<br><i>$err</i><br>";
 		$at = strpos($err,'::::');
-		if ($at === false) {		
+		if ($at === false) {
 			$this->_errorMsg = $err;
 			$this->_errorNo = (integer)$err;
 		} else {
 			$this->_errorMsg = substr($err,$at+4,1024);
 			$this->_errorNo = -9999;
 		}
-		
-		if ($this->_errorNo) 
+
+		if ($this->_errorNo)
 			if ($fn = $this->raiseErrorFn) {
 				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr);
 			}
 		if (is_object($rs)) {
 			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
-			
+
 			$this->_affectedrows = $rs->affectedrows;
 			$this->_insertid = $rs->insertid;
 			$rs->databaseType='csv';
@@ -171,18 +171,18 @@
 		return $rs;
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	{
 			return $this->_errorMsg;
 	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
+
+	/*	Returns: the last error number from previous database operation	*/
+	function ErrorNo()
 	{
 		return $this->_errorNo;
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -195,7 +195,7 @@
 	{
 		$this->ADORecordset($id,$mode);
 	}
-	
+
 	function _close()
 	{
 		return true;
@@ -203,5 +203,5 @@
 }
 
 } // define
-	
+
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/drivers/adodb-mssqlpo.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-mssqlpo.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-mssqlpo.inc.php	(working copy)
@@ -21,13 +21,13 @@
 	The big difference between mssqlpo and it's parent mssql is that mssqlpo supports
 	the more standard || string concatenation operator.
 */
-	
+
 include_once(ADODB_DIR.'/drivers/adodb-mssql.inc.php');
 
 class ADODB_mssqlpo extends ADODB_mssql {
 	var $databaseType = "mssqlpo";
-	var $concat_operator = '||'; 
-	
+	var $concat_operator = '||';
+
 	function ADODB_mssqlpo()
 	{
 		ADODB_mssql::ADODB_mssql();
@@ -44,7 +44,7 @@
 		if (!$stmt)  return $sql;
 		return array($sql,$stmt);
 	}
-	
+
 	function _query($sql,$inputarr=false)
 	{
 		if (is_string($sql)) $sql = str_replace('||','+',$sql);
Index: typo3/sysext/adodb/adodb/drivers/adodb-ado_mssql.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-ado_mssql.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-ado_mssql.inc.php	(working copy)
@@ -1,17 +1,17 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
-  Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client. 
+
+  Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client.
   Works only on MS Windows.
-  
-  Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used. 
+
+  Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used.
   Please check http://bugs.php.net/ for more info.
 */
 
@@ -24,7 +24,7 @@
 }
 
 
-class  ADODB_ado_mssql extends ADODB_ado {        
+class  ADODB_ado_mssql extends ADODB_ado {
 	var $databaseType = 'ado_mssql';
 	var $hasTop = 'top';
 	var $hasInsertID = true;
@@ -36,25 +36,25 @@
 	var $substr = "substring";
 	var $length = 'len';
 	var $_dropSeqSQL = "drop table %s";
-	
+
 	//var $_inTransaction = 1; // always open recordsets, so no transaction problems.
-	
+
 	function ADODB_ado_mssql()
 	{
 	        $this->ADODB_ado();
 	}
-	
+
 	function _insertid()
 	{
 	        return $this->GetOne('select SCOPE_IDENTITY()');
 	}
-	
+
 	function _affectedrows()
 	{
 	        return $this->GetOne('select @@rowcount');
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -64,25 +64,25 @@
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET TRANSACTION ".$transaction_mode);
 	}
-	
+
 	function qstr($s,$magic_quotes=false)
 	{
 		$s = ADOConnection::qstr($s, $magic_quotes);
 		return str_replace("\0", "\\\\000", $s);
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
         $table = strtoupper($table);
         $arr= array();
         $dbc = $this->_connectionID;
-        
+
         $osoptions = array();
         $osoptions[0] = null;
         $osoptions[1] = null;
         $osoptions[2] = $table;
         $osoptions[3] = null;
-        
+
         $adors=@$dbc->OpenSchema(4, $osoptions);//tables
 
         if ($adors){
@@ -93,7 +93,7 @@
                         $fld->type = 'CHAR'; // cannot discover type in ADO!
                         $fld->max_length = -1;
                         $arr[strtoupper($fld->name)]=$fld;
-        
+
                         $adors->MoveNext();
                 }
                 $adors->Close();
@@ -101,10 +101,10 @@
         $false = false;
 		return empty($arr) ? $false : $arr;
 	}
-	
+
 	function CreateSequence($seq='adodbseq',$start=1)
 	{
-		
+
 		$this->Execute('BEGIN TRANSACTION adodbseq');
 		$start -= 1;
 		$this->Execute("create table $seq (id float(53))");
@@ -113,7 +113,7 @@
 				$this->Execute('ROLLBACK TRANSACTION adodbseq');
 				return false;
 		}
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		$this->Execute('COMMIT TRANSACTION adodbseq');
 		return true;
 	}
 
@@ -129,23 +129,23 @@
 				$this->Execute('ROLLBACK TRANSACTION adodbseq');
 				return false;
 			}
-			$this->Execute('COMMIT TRANSACTION adodbseq'); 
+			$this->Execute('COMMIT TRANSACTION adodbseq');
 			return $start;
 		}
 		$num = $this->GetOne("select id from $seq");
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		$this->Execute('COMMIT TRANSACTION adodbseq');
 		return $num;
-		
+
 		// in old implementation, pre 1.90, we returned GUID...
 		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
 	}
-	
-	} // end class 
-	
-	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {        
-	
+
+	} // end class
+
+	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {
+
 	var $databaseType = 'ado_mssql';
-	
+
 	function ADORecordSet_ado_mssql($id,$mode=false)
 	{
 	        return $this->ADORecordSet_ado($id,$mode);
Index: typo3/sysext/adodb/adodb/drivers/adodb-postgres7.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-postgres7.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-postgres7.inc.php	(working copy)
@@ -1,11 +1,11 @@
 <?php
 /*
  V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 4.
-  
+
   Postgres7 support.
   28 Feb 2001: Currently indicate that we support LIMIT
   01 Dec 2001: dannym added support for default values
@@ -17,12 +17,12 @@
 include_once(ADODB_DIR."/drivers/adodb-postgres64.inc.php");
 
 class ADODB_postgres7 extends ADODB_postgres64 {
-	var $databaseType = 'postgres7';	
+	var $databaseType = 'postgres7';
 	var $hasLimit = true;	// set to true for pgsql 6.5+ only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
 	var $ansiOuter = true;
 	var $charSet = true; //set to true for Postgres 7 and above - PG client supports encodings
-	
-	function ADODB_postgres7() 
+
+	function ADODB_postgres7()
 	{
 		$this->ADODB_postgres64();
 		if (ADODB_ASSOC_CASE !== 2) {
@@ -31,10 +31,10 @@
 		$this->_bindInputArray = PHP_VERSION >= 5.1;
 	}
 
-	
-	// the following should be compat with postgresql 7.2, 
+
+	// the following should be compat with postgresql 7.2,
 	// which makes obsolete the LIMIT limit,offset syntax
-	 function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	 function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	 {
 		 $offsetStr = ($offset >= 0) ? " OFFSET ".((integer)$offset) : '';
 		 $limitStr  = ($nrows >= 0)  ? " LIMIT ".((integer)$nrows) : '';
@@ -42,7 +42,7 @@
 		  	$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
 		 else
 		  	$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-		
+
 		return $rs;
 	 }
  	/*
@@ -58,7 +58,7 @@
 
 	/*
 		I discovered that the MetaForeignKeys method no longer worked for Postgres 8.3.
-		I went ahead and modified it to work for both 8.2 and 8.3. 
+		I went ahead and modified it to work for both 8.2 and 8.3.
 		Please feel free to include this change in your next release of adodb.
 		 William Kolodny [William.Kolodny#gt-t.net]
 	*/
@@ -68,15 +68,15 @@
 	  SELECT fum.ftblname AS lookup_table, split_part(fum.rf, ')'::text, 1) AS lookup_field,
 	     fum.ltable AS dep_table, split_part(fum.lf, ')'::text, 1) AS dep_field
 	  FROM (
-	  SELECT fee.ltable, fee.ftblname, fee.consrc, split_part(fee.consrc,'('::text, 2) AS lf, 
+	  SELECT fee.ltable, fee.ftblname, fee.consrc, split_part(fee.consrc,'('::text, 2) AS lf,
 	    split_part(fee.consrc, '('::text, 3) AS rf
 	  FROM (
 	      SELECT foo.relname AS ltable, foo.ftblname,
 	          pg_get_constraintdef(foo.oid) AS consrc
 	      FROM (
 	          SELECT c.oid, c.conname AS name, t.relname, ft.relname AS ftblname
-	          FROM pg_constraint c 
-	          JOIN pg_class t ON (t.oid = c.conrelid) 
+	          FROM pg_constraint c
+	          JOIN pg_class t ON (t.oid = c.conrelid)
 	          JOIN pg_class ft ON (ft.oid = c.confrelid)
 	          JOIN pg_namespace nft ON (nft.oid = ft.relnamespace)
 	          LEFT JOIN pg_description ds ON (ds.objoid = c.oid)
@@ -89,9 +89,9 @@
 	  ORDER BY fum.ftblname, fum.ltable, split_part(fum.lf, ')'::text, 1)
 	  ";
 	  $rs = $this->Execute($sql);
-	
+
 	  if (!$rs || $rs->EOF) return false;
-	
+
 	  $a = array();
 	  while (!$rs->EOF) {
 	    if ($upper) {
@@ -101,11 +101,11 @@
 	    }
 		$rs->MoveNext();
 	  }
-	
+
 	  return $a;
-	
+
 	}
-	
+
 	// from  Edward Jaramilla, improved version - works on pg 7.4
 	function _old_MetaForeignKeys($table, $owner=false, $upper=false)
 	{
@@ -120,20 +120,20 @@
 		c.relname = \''.strtolower($table).'\'
 		ORDER BY
 			t.tgrelid';
-		
+
 		$rs = $this->Execute($sql);
-		
+
 		if (!$rs || $rs->EOF) return false;
-		
+
 		$arr = $rs->GetArray();
 		$a = array();
 		foreach($arr as $v) {
 			$data = explode(chr(0), $v['args']);
 			$size = count($data)-1; //-1 because the last node is empty
 			for($i = 4; $i < $size; $i++) {
-				if ($upper) 
+				if ($upper)
 					$a[strtoupper($data[2])][] = strtoupper($data[$i].'='.$data[++$i]);
-				else 
+				else
 					$a[$data[2]][] = $data[$i].'='.$data[++$i];
 			}
 		}
@@ -158,7 +158,7 @@
 				else $sql .= $v.' $'.$i;
 				$i++;
 			}
-			
+
 			$rez = pg_query_params($this->_connectionID,$sql, $inputarr);
 		} else {
 			$rez = pg_query($this->_connectionID,$sql);
@@ -170,10 +170,10 @@
 			}
 			$this->_resultid = $rez;
 			return true;
-		}		
+		}
 		return $rez;
 	}
-	
+
  	 // this is a set of functions for managing client encoding - very important if the encodings
 	// of your database and your output target (i.e. HTML) don't match
 	//for instance, you may have UNICODE database and server it on-site as WIN1251 etc.
@@ -191,7 +191,7 @@
 			return $this->charSet;
 		}
 	}
-	
+
 	// SetCharSet - switch the client encoding
 	function SetCharSet($charset_name)
 	{
@@ -205,7 +205,7 @@
 	}
 
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
@@ -213,21 +213,21 @@
 class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
 
 	var $databaseType = "postgres7";
-	
-	
-	function ADORecordSet_postgres7($queryID,$mode=false) 
+
+
+	function ADORecordSet_postgres7($queryID,$mode=false)
 	{
 		$this->ADORecordSet_postgres64($queryID,$mode);
 	}
-	
+
 	 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
 			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
 				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-			
+
 				if (is_array($this->fields)) {
 					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
 					return true;
@@ -237,43 +237,43 @@
 			$this->EOF = true;
 		}
 		return false;
-	}		
+	}
 
 }
 
 class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
 
 	var $databaseType = "postgres7";
-	
-	
-	function ADORecordSet_assoc_postgres7($queryID,$mode=false) 
+
+
+	function ADORecordSet_assoc_postgres7($queryID,$mode=false)
 	{
 		$this->ADORecordSet_postgres64($queryID,$mode);
 	}
-	
+
 	function _fetch()
 	{
 		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
         	return false;
 
 		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-		
+
 		if ($this->fields) {
 			if (isset($this->_blobArr)) $this->_fixblobs();
 			$this->_updatefields();
 		}
-			
+
 		return (is_array($this->fields));
 	}
-	
+
 		// Create associative array
 	function _updatefields()
 	{
 		if (ADODB_ASSOC_CASE == 2) return; // native
-	
+
 		$arr = array();
 		$lowercase = (ADODB_ASSOC_CASE == 0);
-		
+
 		foreach($this->fields as $k => $v) {
 			if (is_integer($k)) $arr[$k] = $v;
 			else {
@@ -285,25 +285,25 @@
 		}
 		$this->fields = $arr;
 	}
-	
-	function MoveNext() 
+
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
 			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
 				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-			
+
 				if (is_array($this->fields)) {
 					if ($this->fields) {
 						if (isset($this->_blobArr)) $this->_fixblobs();
-					
+
 						$this->_updatefields();
 					}
 					return true;
 				}
 			}
-			
-			
+
+
 			$this->fields = false;
 			$this->EOF = true;
 		}
Index: typo3/sysext/adodb/adodb/drivers/adodb-informix72.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-informix72.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-informix72.inc.php	(working copy)
@@ -31,7 +31,7 @@
 	var $metaTablesSQL="select tabname,tabtype from systables where tabtype in ('T','V') and owner!='informix'"; //Don't get informix tables and pseudo-tables
 
 
-	var $metaColumnsSQL = 
+	var $metaColumnsSQL =
 		"select c.colname, c.coltype, c.collength, d.default,c.colno
 		from syscolumns c, systables t,outer sysdefaults d
 		where c.tabid=t.tabid and d.tabid=t.tabid and d.colno=c.colno
@@ -53,26 +53,26 @@
 	var $sysDate = 'TODAY';
 	var $sysTimeStamp = 'CURRENT';
 	var $cursorType = IFX_SCROLL; // IFX_SCROLL or IFX_HOLD or 0
-   
+
 	function ADODB_informix72()
 	{
 		// alternatively, use older method:
 		//putenv("DBDATE=Y4MD-");
-		
+
 		// force ISO date format
 		putenv('GL_DATE=%Y-%m-%d');
-		
+
 		if (function_exists('ifx_byteasvarchar')) {
-			ifx_byteasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
-        	ifx_textasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
+			ifx_byteasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content.
+        	ifx_textasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content.
         	ifx_blobinfile_mode(0); // Mode "0" means save Byte-Blobs in memory, and mode "1" means save Byte-Blobs in a file.
 		}
 	}
-	
+
 	function ServerInfo()
 	{
 	    if (isset($this->version)) return $this->version;
-	
+
 	    $arr['description'] = $this->GetOne("select DBINFO('version','full') from systables where tabid = 1");
 	    $arr['version'] = $this->GetOne("select DBINFO('version','major') || DBINFO('version','minor') from systables where tabid = 1");
 	    $this->version = $arr;
@@ -104,8 +104,8 @@
 		return true;
 	}
 
-	function CommitTrans($ok=true) 
-	{ 
+	function CommitTrans($ok=true)
+	{
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
@@ -132,7 +132,7 @@
 	/*	Returns: the last error message from previous database operation
 		Note: This function is NOT available for Microsoft SQL Server.	*/
 
-	function ErrorMsg() 
+	function ErrorMsg()
 	{
 		if (!empty($this->_logsql)) return $this->_errorMsg;
 		$this->_errorMsg = ifx_errormsg();
@@ -142,15 +142,15 @@
 	function ErrorNo()
 	{
 		preg_match("/.*SQLCODE=([^\]]*)/",ifx_error(),$parse);
-		if (is_array($parse) && isset($parse[1])) return (int)$parse[1]; 
+		if (is_array($parse) && isset($parse[1])) return (int)$parse[1];
 		return 0;
 	}
 
-   
+
     function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$false = false;
 		if (!empty($this->metaColumnsSQL)) {
 			$save = $ADODB_FETCH_MODE;
@@ -187,18 +187,18 @@
 					$fld->has_default = 0;
 				}
 
-                $retarr[strtolower($fld->name)] = $fld;	
+                $retarr[strtolower($fld->name)] = $fld;
 				$rs->MoveNext();
 			}
 
 			$rs->Close();
 			$rspkey->Close(); //!eos
-			return $retarr;	
+			return $retarr;
 		}
 
 		return $false;
 	}
-	
+
    function xMetaColumns($table)
    {
 		return ADOConnection::MetaColumns($table,false);
@@ -247,15 +247,15 @@
    {
    		return function_exists('ifx_byteasvarchar') ? $blobid : @ifx_get_blob($blobid);
    }
-   
+
 	// returns true or false
    function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('ifx_connect')) return null;
-		
+
 		$dbs = $argDatabasename . "@" . $argHostname;
-		if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); 
-		putenv("INFORMIXSERVER=".trim($argHostname)); 
+		if ($argHostname) putenv("INFORMIXSERVER=$argHostname");
+		putenv("INFORMIXSERVER=".trim($argHostname));
 		$this->_connectionID = ifx_connect($dbs,$argUsername,$argPassword);
 		if ($this->_connectionID === false) return false;
 		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
@@ -266,9 +266,9 @@
    function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('ifx_connect')) return null;
-		
+
 		$dbs = $argDatabasename . "@" . $argHostname;
-		putenv("INFORMIXSERVER=".trim($argHostname)); 
+		putenv("INFORMIXSERVER=".trim($argHostname));
 		$this->_connectionID = ifx_pconnect($dbs,$argUsername,$argPassword);
 		if ($this->_connectionID === false) return false;
 		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
@@ -287,7 +287,7 @@
 	function _query($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-	
+
 	  // String parameters have to be converted using ifx_create_char
 	  if ($inputarr) {
 		 foreach($inputarr as $v) {
@@ -348,7 +348,7 @@
 
 	function ADORecordset_informix72($id,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
Index: typo3/sysext/adodb/adodb/drivers/adodb-vfp.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-vfp.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-vfp.inc.php	(working copy)
@@ -1,13 +1,13 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
 */
 
@@ -20,7 +20,7 @@
 if (!defined('ADODB_VFP')){
 define('ADODB_VFP',1);
 class ADODB_vfp extends ADODB_odbc {
-	var $databaseType = "vfp";	
+	var $databaseType = "vfp";
 	var $fmtDate = "{^Y-m-d}";
 	var $fmtTimeStamp = "{^Y-m-d, h:i:sA}";
 	var $replaceQuote = "'+chr(39)+'" ;
@@ -33,19 +33,19 @@
 	var $ansiOuter = true;
 	var $hasTransactions = false;
 	var $curmode = false ; // See sqlext.h, SQL_CUR_DEFAULT == SQL_CUR_USE_DRIVER == 2L
-	
+
 	function ADODB_vfp()
 	{
 		$this->ADODB_odbc();
 	}
-	
+
 	function Time()
 	{
 		return time();
 	}
-	
+
 	function BeginTrans() { return false;}
-	
+
 	// quote string to be sent back to database
 	function qstr($s,$nofixquotes=false)
 	{
@@ -53,7 +53,7 @@
 		return "'".$s."'";
 	}
 
-	
+
 	// TOP requires ORDER BY for VFP
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
@@ -61,17 +61,17 @@
 		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 		return $ret;
 	}
-	
 
 
+
 };
- 
 
-class  ADORecordSet_vfp extends ADORecordSet_odbc {	
-	
-	var $databaseType = "vfp";		
 
-	
+class  ADORecordSet_vfp extends ADORecordSet_odbc {
+
+	var $databaseType = "vfp";
+
+
 	function ADORecordSet_vfp($id,$mode=false)
 	{
 		return $this->ADORecordSet_odbc($id,$mode);
@@ -89,15 +89,15 @@
 			if ($len <= $this->blobSize) return 'C';
 		case 'M':
 			return 'X';
-			 
+
 		case 'D': return 'D';
-		
+
 		case 'T': return 'T';
-		
+
 		case 'L': return 'L';
-		
+
 		case 'I': return 'I';
-		
+
 		default: return 'N';
 		}
 	}
Index: typo3/sysext/adodb/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-ibase.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-ibase.inc.php	(working copy)
@@ -1,23 +1,23 @@
 <?php
 /*
-V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.  
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
 
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Interbase data driver. Requires interbase client. Works on Windows and Unix.
 
   3 Jan 2002 -- suggestions by Hans-Peter Oeri <kampfcaspar75@oeri.ch>
   	changed transaction handling and added experimental blob stuff
-  
+
   Docs to interbase at the website
    http://www.synectics.co.za/php3/tutorial/IB_PHP3_API.html
-   
+
   To use gen_id(), see
    http://www.volny.cz/iprenosil/interbase/ip_ib_code.htm#_code_creategen
-   
+
    $rs = $conn->Execute('select gen_id(adodb,1) from rdb$database');
    $id = $rs->fields[0];
    $conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)");
@@ -53,26 +53,26 @@
 	var $poorAffectedRows = true;
 	var $blobEncodeType = 'C';
 	var $role = false;
-	
-	function ADODB_ibase() 
+
+	function ADODB_ibase()
 	{
 		 if (defined('IBASE_DEFAULT')) $this->ibasetrans = IBASE_DEFAULT;
   	}
-	
-	
+
+
 	   // returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$persist=false)
-	{  
+	{
 		if (!function_exists('ibase_pconnect')) return null;
 		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
 		$fn = ($persist) ? 'ibase_pconnect':'ibase_connect';
 		if ($this->role)
 			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
 					$this->charSet,$this->buffers,$this->dialect,$this->role);
-		else	
+		else
 			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
 					$this->charSet,$this->buffers,$this->dialect);
-		
+
 		if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html
 			$this->replaceQuote = "''";
 		}
@@ -80,14 +80,14 @@
 			$this->_handleerror();
 			return false;
 		}
-		
+
 		// PHP5 change.
 		if (function_exists('ibase_timefmt')) {
 			ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
 			if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
 			else ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
 			ibase_timefmt($this->ibase_timefmt,IBASE_TIME );
-			
+
 		} else {
 			ini_set("ibase.timestampformat", $this->ibase_timestampfmt);
 			ini_set("ibase.dateformat", $this->ibase_datefmt);
@@ -99,30 +99,30 @@
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,true);
-	}	
-	
-	
+	}
+
+
 	function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
-	{	
+	{
 		if ($internalKey) return array('RDB$DB_KEY');
-		
+
 		$table = strtoupper($table);
-		
+
 		$sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME
-	FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME  
+	FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME
 	WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\'
 	ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
 
 		$a = $this->GetCol($sql,false,true);
 		if ($a && sizeof($a)>0) return $a;
-		return false;	  
+		return false;
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['dialect'] = $this->dialect;
 		switch($arr['dialect']) {
-		case '': 
+		case '':
 		case '1': $s = 'Interbase 5.5 or earlier'; break;
 		case '2': $s = 'Interbase 5.6'; break;
 		default:
@@ -134,16 +134,16 @@
 	}
 
 	function BeginTrans()
-	{	 
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 	 	$this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
 		return $this->_transactionID;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
@@ -156,13 +156,13 @@
 		$this->_transactionID = false;
 		return $ret;
 	}
-	
+
 	// there are some compat problems with ADODB_COUNTRECS=false and $this->_logsql currently.
 	// it appears that ibase extension cannot support multiple concurrent queryid's
-	function _Execute($sql,$inputarr=false) 
+	function _Execute($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		if ($this->_logsql) {
 			$savecrecs = $ADODB_COUNTRECS;
 			$ADODB_COUNTRECS = true; // force countrecs
@@ -173,20 +173,20 @@
 		}
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
 		$ret = false;
 		$this->autoCommit = true;
-		if ($this->_transactionID) 
+		if ($this->_transactionID)
 				  $ret = ibase_rollback($this->_transactionID);
-		$this->_transactionID = false;   
-		
+		$this->_transactionID = false;
+
 		return $ret;
 	}
-	
+
 	function MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
         // save old fetch mode
@@ -214,7 +214,7 @@
 	        $ADODB_FETCH_MODE = $save;
             return $false;
         }
-        
+
         $indexes = array();
 		while ($row = $rs->FetchRow()) {
 			$index = $row[0];
@@ -236,11 +236,11 @@
             $this->SetFetchMode($savem);
         }
         $ADODB_FETCH_MODE = $save;
-        
+
         return $indexes;
 	}
 
-	
+
 	// See http://community.borland.com/article/0,1410,25844,00.html
 	function RowLock($tables,$where,$col=false)
 	{
@@ -248,21 +248,21 @@
 		$this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim?
 		return 1;
 	}
-	
-	
+
+
 	function CreateSequence($seqname,$startID=1)
 	{
 		$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
 		if (!$ok) return false;
 		return $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
 	}
-	
+
 	function DropSequence($seqname)
 	{
 		$seqname = strtoupper($seqname);
 		$this->Execute("delete from RDB\$GENERATORS where RDB\$GENERATOR_NAME='$seqname'");
 	}
-	
+
 	function GenID($seqname='adodbseq',$startID=1)
 	{
 		$getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
@@ -274,13 +274,13 @@
 		}
 		if ($rs && !$rs->EOF) $this->genID = (integer) reset($rs->fields);
 		else $this->genID = 0; // false
-		
+
 		if ($rs) $rs->Close();
-		
+
 		return $this->genID;
 	}
 
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 		   return false;
 	}
@@ -290,13 +290,13 @@
 		$this->_errorMsg = ibase_errmsg();
 	}
 
-	function ErrorNo() 
+	function ErrorNo()
 	{
 		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1];
 		else return 0;
 	}
 
-	function ErrorMsg() 
+	function ErrorMsg()
 	{
 			return $this->_errorMsg;
 	}
@@ -311,7 +311,7 @@
 	   // returns query ID if successful, otherwise false
 	   // there have been reports of problems with nested queries - the code is probably not re-entrant?
 	function _query($sql,$iarr=false)
-	{ 
+	{
 
 		if (!$this->autoCommit && $this->_transactionID) {
 			$conn = $this->_transactionID;
@@ -341,11 +341,11 @@
 					case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
 					}
 				}
-			} else $ret = $fn($sql); 
+			} else $ret = $fn($sql);
 		} else {
 			$fn = 'ibase_query';
-		
-			if (is_array($iarr)) {	
+
+			if (is_array($iarr)) {
 				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
 					if (sizeof($iarr) == 0) $iarr[0] = ''; // PHP5 compat hack
 					$fnarr = array_merge( array($conn,$sql) , $iarr);
@@ -363,7 +363,7 @@
 					case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
 					}
 				}
-			} else $ret = $fn($conn,$sql); 
+			} else $ret = $fn($conn,$sql);
 		}
 		if ($docommit && $ret === true) ibase_commit($this->_connectionID);
 
@@ -373,11 +373,11 @@
 
 	 // returns true or false
 	 function _close()
-	 {	   
+	 {
 		if (!$this->autoCommit) @ibase_rollback($this->_connectionID);
 		return @ibase_close($this->_connectionID);
 	 }
-	
+
 	//OPN STUFF start
 	function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3)
 	{
@@ -385,14 +385,14 @@
 		$fld->max_length = $flen;
 		$fld->scale = null;
 		switch($ftype){
-			case 7: 
+			case 7:
 			case 8:
 				if ($dialect3) {
 				    switch($fsubtype){
-				    	case 0: 
+				    	case 0:
 				    		$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
 				    		break;
-				    	case 1: 
+				    	case 1:
 				    		$fld->type = 'numeric';
 							$fld->max_length = $fprecision;
 							$fld->scale = $fscale;
@@ -413,15 +413,15 @@
 					}
 				}
 				break;
-			case 16: 
+			case 16:
 				if ($dialect3) {
 				    switch($fsubtype){
-				    	case 0: 
+				    	case 0:
 				    		$fld->type = 'decimal';
 							$fld->max_length = 18;
 							$fld->scale = 0;
 				    		break;
-				    	case 1: 
+				    	case 1:
 				    		$fld->type = 'numeric';
 							$fld->max_length = $fprecision;
 							$fld->scale = $fscale;
@@ -476,21 +476,21 @@
 	}
 	//OPN STUFF end
 		// returns array of ADOFieldObjects for current table
-	function MetaColumns($table, $normalize=true) 
+	function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-		
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-	
+
 		$ADODB_FETCH_MODE = $save;
 		$false = false;
 		if ($rs === false) {
 			return $false;
 		}
-		
+
 		$retarr = array();
 		//OPN STUFF start
 		$dialect3 = ($this->dialect==3 ? true : false);
@@ -502,16 +502,16 @@
 			$this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $dialect3);
 			if (isset($rs->fields[1]) && $rs->fields[1]) {
 				$fld->not_null = true;
-			}				
+			}
 			if (isset($rs->fields[2])) {
-				
+
 				$fld->has_default = true;
 				$d = substr($rs->fields[2],strlen('default '));
 				switch ($fld->type)
 				{
 				case 'smallint':
 				case 'integer': $fld->default_value = (int) $d; break;
-				case 'char': 
+				case 'char':
 				case 'blob':
 				case 'text':
 				case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
@@ -527,48 +527,48 @@
 				$fld->sub_type = null;
 			}
 			//OPN STUFF end
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[strtoupper($fld->name)] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if ( empty($retarr)) return $false;
-		else return $retarr;	
+		else return $retarr;
 	}
-	
-	function BlobEncode( $blob ) 
+
+	function BlobEncode( $blob )
 	{
 		$blobid = ibase_blob_create( $this->_connectionID);
 		ibase_blob_add( $blobid, $blob );
 		return ibase_blob_close( $blobid );
 	}
-	
-	// since we auto-decode all blob's since 2.42, 
+
+	// since we auto-decode all blob's since 2.42,
 	// BlobDecode should not do any transforms
 	function BlobDecode($blob)
 	{
-		return $blob; 
+		return $blob;
 	}
-	
-	
-	
-	
+
+
+
+
 	// old blobdecode function
 	// still used to auto-decode all blob's
-	function _BlobDecode_old( $blob ) 
+	function _BlobDecode_old( $blob )
 	{
 		$blobid = ibase_blob_open($this->_connectionID, $blob );
 		$realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet <kevinboillet@yahoo.fr>
-		while($string = ibase_blob_get($blobid, 8192)){ 
-			$realblob .= $string; 
+		while($string = ibase_blob_get($blobid, 8192)){
+			$realblob .= $string;
 		}
 		ibase_blob_close( $blobid );
 
 		return( $realblob );
-	} 
-	
-	function _BlobDecode( $blob ) 
+	}
+
+	function _BlobDecode( $blob )
     {
         if  (ADODB_PHPVER >= 0x5000) {
             $blob_data = ibase_blob_info($this->_connectionID, $blob );
@@ -584,7 +584,7 @@
             $realblob = ibase_blob_get($blobid, $this->maxblobsize);
 
             while($string = ibase_blob_get($blobid, 8192)){
-                $realblob .= $string; 
+                $realblob .= $string;
             }
         } else {
             $realblob = ibase_blob_get($blobid, $blob_data[0]);
@@ -593,69 +593,69 @@
         ibase_blob_close( $blobid );
         return( $realblob );
 	}
-	
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
-		$fd = fopen($path,'rb'); 
-		if ($fd === false) return false; 
-		$blob_id = ibase_blob_create($this->_connectionID); 
-		
-		/* fill with data */ 
-		
-		while ($val = fread($fd,32768)){ 
-			ibase_blob_add($blob_id, $val); 
-		} 
-		
-		/* close and get $blob_id_str for inserting into table */ 
-		$blob_id_str = ibase_blob_close($blob_id); 
-		
-		fclose($fd); 
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
-	} 
-	
+
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
+	{
+		$fd = fopen($path,'rb');
+		if ($fd === false) return false;
+		$blob_id = ibase_blob_create($this->_connectionID);
+
+		/* fill with data */
+
+		while ($val = fread($fd,32768)){
+			ibase_blob_add($blob_id, $val);
+		}
+
+		/* close and get $blob_id_str for inserting into table */
+		$blob_id_str = ibase_blob_close($blob_id);
+
+		fclose($fd);
+		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
+	}
+
 	/*
 		Insert a null into the blob field of the table first.
 		Then use UpdateBlob to store the blob.
-		
+
 		Usage:
-		 
+
 		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') 
-	{ 
-	$blob_id = ibase_blob_create($this->_connectionID); 
-	
-	// ibase_blob_add($blob_id, $val); 
-	
-	// replacement that solves the problem by which only the first modulus 64K / 
-	// of $val are stored at the blob field //////////////////////////////////// 
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+	$blob_id = ibase_blob_create($this->_connectionID);
+
+	// ibase_blob_add($blob_id, $val);
+
+	// replacement that solves the problem by which only the first modulus 64K /
+	// of $val are stored at the blob field ////////////////////////////////////
 	// Thx Abel Berenstein  aberenstein#afip.gov.ar
-	$len = strlen($val); 
-	$chunk_size = 32768; 
-	$tail_size = $len % $chunk_size; 
-	$n_chunks = ($len - $tail_size) / $chunk_size; 
-	
-	for ($n = 0; $n < $n_chunks; $n++) { 
-		$start = $n * $chunk_size; 
-		$data = substr($val, $start, $chunk_size); 
-		ibase_blob_add($blob_id, $data); 
-	} 
-	
+	$len = strlen($val);
+	$chunk_size = 32768;
+	$tail_size = $len % $chunk_size;
+	$n_chunks = ($len - $tail_size) / $chunk_size;
+
+	for ($n = 0; $n < $n_chunks; $n++) {
+		$start = $n * $chunk_size;
+		$data = substr($val, $start, $chunk_size);
+		ibase_blob_add($blob_id, $data);
+	}
+
 	if ($tail_size) {
-		$start = $n_chunks * $chunk_size; 
-		$data = substr($val, $start, $tail_size); 
-		ibase_blob_add($blob_id, $data); 
+		$start = $n_chunks * $chunk_size;
+		$data = substr($val, $start, $tail_size);
+		ibase_blob_add($blob_id, $data);
 	}
-	// end replacement ///////////////////////////////////////////////////////// 
-	
-	$blob_id_str = ibase_blob_close($blob_id); 
-	
-	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
-	
-	} 
-	
-	
+	// end replacement /////////////////////////////////////////////////////////
+
+	$blob_id_str = ibase_blob_close($blob_id);
+
+	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
+
+	}
+
+
 	function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		$blob_id = ibase_blob_create($this->_connectionID);
@@ -663,15 +663,15 @@
 		$blob_id_str = ibase_blob_close($blob_id);
 		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	// Only since Interbase 6.0 - uses EXTRACT
 	// problem - does not zero-fill the day and month yet
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysDate;
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= '||';
@@ -696,15 +696,15 @@
 			case 'H':
 			case 'h':
 			  $s .= "(extract(hour from $col))";
-			  break;                        
+			  break;
 			case 'I':
 			case 'i':
 			  $s .= "(extract(minute from $col))";
-			  break;                
+			  break;
 			case 'S':
 			case 's':
 			  $s .= "CAST((extract(second from $col)) AS INTEGER)";
-			  break;        
+			  break;
 
 			default:
 				if ($ch == '\\') {
@@ -729,11 +729,11 @@
 	var $databaseType = "ibase";
 	var $bind=false;
 	var $_cacheType;
-	
+
 	function ADORecordset_ibase($id,$mode=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 			$this->fetchMode = ($mode === false) ? $ADODB_FETCH_MODE : $mode;
 			$this->ADORecordSet($id);
 	}
@@ -752,20 +752,20 @@
 			 	$fld->name = ($ibf['alias']);
 				 if (empty($fld->name)) $fld->name = ($ibf['name']);
 				 break;
-			 case 0: 
+			 case 0:
 				 $fld->name = strtoupper($ibf['alias']);
 				 if (empty($fld->name)) $fld->name = strtoupper($ibf['name']);
 				 break;
-			 case 1: 
+			 case 1:
 			 	$fld->name = strtolower($ibf['alias']);
 				 if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
 				 break;
 			 }
-			 
+
 			 $fld->type = $ibf['type'];
 			 $fld->max_length = $ibf['length'];
-			 
-			 /*       This needs to be populated from the metadata */ 
+
+			 /*       This needs to be populated from the metadata */
 			 $fld->not_null = false;
 			 $fld->has_default = false;
 			 $fld->default_value = 'null';
@@ -778,48 +778,48 @@
 		$this->_numOfFields = @ibase_num_fields($this->_queryID);
 
 		// cache types for blob decode check
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-			$f1 = $this->FetchField($i); 
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
+			$f1 = $this->FetchField($i);
 			$this->_cacheType[] = $f1->type;
-		}				
+		}
 	}
 
 	function _seek($row)
 	{
 		return false;
 	}
-	
-	function _fetch() 
+
+	function _fetch()
 	{
-		$f = @ibase_fetch_row($this->_queryID); 
+		$f = @ibase_fetch_row($this->_queryID);
 		if ($f === false) {
 			$this->fields = false;
 			return false;
 		}
 		// OPN stuff start - optimized
 		// fix missing nulls and decode blobs automatically
-	
+
 		global $ADODB_ANSI_PADDING_OFF;
 		//$ADODB_ANSI_PADDING_OFF=1;
 		$rtrim = !empty($ADODB_ANSI_PADDING_OFF);
-		
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
+
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
 			if ($this->_cacheType[$i]=="BLOB") {
-				if (isset($f[$i])) { 
-					$f[$i] = $this->connection->_BlobDecode($f[$i]); 
-				} else { 
-					$f[$i] = null; 
-				} 
-			} else { 
-				if (!isset($f[$i])) { 
-					$f[$i] = null; 
+				if (isset($f[$i])) {
+					$f[$i] = $this->connection->_BlobDecode($f[$i]);
+				} else {
+					$f[$i] = null;
+				}
+			} else {
+				if (!isset($f[$i])) {
+					$f[$i] = null;
 				} else if ($rtrim && is_string($f[$i])) {
 					$f[$i] = rtrim($f[$i]);
 				}
-			} 
-		} 
-		// OPN stuff end 
-		
+			}
+		}
+		// OPN stuff end
+
 		$this->fields = $f;
 		if ($this->fetchMode == ADODB_FETCH_ASSOC) {
 			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
@@ -840,13 +840,13 @@
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		return $this->fields[$this->bind[strtoupper($colname)]];
-		
+
 	}
-	
 
-	function _close() 
+
+	function _close()
 	{
 			return @ibase_free_result($this->_queryID);
 	}
@@ -861,7 +861,7 @@
 		switch (strtoupper($t)) {
 		case 'CHAR':
 			return 'C';
-			
+
 		case 'TEXT':
 		case 'VARCHAR':
 		case 'VARYING':
@@ -869,14 +869,14 @@
 			return 'X';
 		case 'BLOB':
 			return 'B';
-			   
+
 		case 'TIMESTAMP':
 		case 'DATE': return 'D';
 		case 'TIME': return 'T';
 				//case 'T': return 'T';
 
 				//case 'L': return 'L';
-		case 'INT': 
+		case 'INT':
 		case 'SHORT':
 		case 'INTEGER': return 'I';
 		default: return 'N';
Index: typo3/sysext/adodb/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-borland_ibase.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-borland_ibase.inc.php	(working copy)
@@ -1,13 +1,13 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Support Borland Interbase 6.5 and later
 
 */
@@ -18,28 +18,28 @@
 include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
 
 class ADODB_borland_ibase extends ADODB_ibase {
-	var $databaseType = "borland_ibase";	
-	
-	
+	var $databaseType = "borland_ibase";
+
+
 	function ADODB_borland_ibase()
 	{
 		$this->ADODB_ibase();
 	}
-	
+
 	function BeginTrans()
-	{	 
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 	 	$this->_transactionID = ibase_trans($this->ibasetrans, $this->_connectionID);
 		return $this->_transactionID;
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['dialect'] = $this->dialect;
 		switch($arr['dialect']) {
-		case '': 
+		case '':
 		case '1': $s = 'Interbase 6.5, Dialect 1'; break;
 		case '2': $s = 'Interbase 6.5, Dialect 2'; break;
 		default:
@@ -49,41 +49,41 @@
 		$arr['description'] = $s;
 		return $arr;
 	}
-	
+
 	// Note that Interbase 6.5 uses ROWS instead - don't you love forking wars!
-	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
+	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows
 	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
 	// Firebird uses
 	//		SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		if ($nrows > 0) {
-			if ($offset <= 0) $str = " ROWS $nrows "; 
+			if ($offset <= 0) $str = " ROWS $nrows ";
 			else {
 				$a = $offset+1;
 				$b = $offset+$nrows;
 				$str = " ROWS $a TO $b";
 			}
 		} else {
-			// ok, skip 
+			// ok, skip
 			$a = $offset + 1;
 			$str = " ROWS $a TO 999999999"; // 999 million
 		}
 		$sql .= $str;
-		
-		return ($secs2cache) ? 
+
+		return ($secs2cache) ?
 				$this->CacheExecute($secs2cache,$sql,$inputarr)
 			:
 				$this->Execute($sql,$inputarr);
 	}
-	
+
 };
- 
 
-class  ADORecordSet_borland_ibase extends ADORecordSet_ibase {	
-	
-	var $databaseType = "borland_ibase";		
-	
+
+class  ADORecordSet_borland_ibase extends ADORecordSet_ibase {
+
+	var $databaseType = "borland_ibase";
+
 	function ADORecordSet_borland_ibase($id,$mode=false)
 	{
 		$this->ADORecordSet_ibase($id,$mode);
Index: typo3/sysext/adodb/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-fbsql.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-fbsql.inc.php	(working copy)
@@ -1,12 +1,12 @@
 <?php
 /*
  @version V5.06 16 Oct 2008  (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
- Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
- Contribution by Frank M. Kromann <frank@frontbase.com>. 
+ Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
+ Contribution by Frank M. Kromann <frank@frontbase.com>.
   Set tabs to 8.
-*/ 
+*/
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -17,26 +17,26 @@
 class ADODB_fbsql extends ADOConnection {
 	var $databaseType = 'fbsql';
 	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
-	var $metaTablesSQL = "SHOW TABLES";	
+	var $hasAffectedRows = true;
+	var $metaTablesSQL = "SHOW TABLES";
 	var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
 	var $hasLimit = false;
-	
-	function ADODB_fbsql() 
-	{			
+
+	function ADODB_fbsql()
+	{
 	}
-	
+
 	function _insertid()
 	{
 			return fbsql_insert_id($this->_connectionID);
 	}
-	
+
 	function _affectedrows()
 	{
 			return fbsql_affected_rows($this->_connectionID);
 	}
-  
+
   	function MetaDatabases()
 	{
 		$qid = fbsql_list_dbs($this->_connectionID);
@@ -61,39 +61,39 @@
 		if (sizeof($arr) > 0) return "CONCAT($s)";
 		else return '';
 	}
-	
+
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		$this->_connectionID = fbsql_connect($argHostname,$argUsername,$argPassword);
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		$this->_connectionID = fbsql_pconnect($argHostname,$argUsername,$argPassword);
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
- 	function MetaColumns($table, $normalize=true) 
+
+ 	function MetaColumns($table, $normalize=true)
 	{
 		if ($this->metaColumnsSQL) {
-			
+
 			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-			
+
 			if ($rs === false) return false;
-			
+
 			$retarr = array();
 			while (!$rs->EOF){
 				$fld = new ADOFieldObject();
 				$fld->name = $rs->fields[0];
 				$fld->type = $rs->fields[1];
-					
+
 				// split type into type(length):
 				if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array)) {
 					$fld->type = $query_array[1];
@@ -105,88 +105,88 @@
 				$fld->primary_key = ($rs->fields[3] == 'PRI');
 				$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
 				$fld->binary = (strpos($fld->type,'blob') !== false);
-				
-				$retarr[strtoupper($fld->name)] = $fld;	
+
+				$retarr[strtoupper($fld->name)] = $fld;
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 		}
 		return false;
 	}
-		
+
 	// returns true or false
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 		$this->database = $dbName;
 		if ($this->_connectionID) {
-			return @fbsql_select_db($dbName,$this->_connectionID);		
+			return @fbsql_select_db($dbName,$this->_connectionID);
 		}
-		else return false;	
+		else return false;
 	}
-	
-	
+
+
 	// returns queryID or false
 	function _query($sql,$inputarr=false)
 	{
 		return fbsql_query("$sql;",$this->_connectionID);
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	{
 		$this->_errorMsg = @fbsql_error($this->_connectionID);
 			return $this->_errorMsg;
 	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
+
+	/*	Returns: the last error number from previous database operation	*/
+	function ErrorNo()
 	{
 		return @fbsql_errno($this->_connectionID);
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
 		return @fbsql_close($this->_connectionID);
 	}
-		
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_fbsql extends ADORecordSet{	
-	
+class ADORecordSet_fbsql extends ADORecordSet{
+
 	var $databaseType = "fbsql";
 	var $canSeek = true;
-	
-	function ADORecordSet_fbsql($queryID,$mode=false) 
+
+	function ADORecordSet_fbsql($queryID,$mode=false)
 	{
-		if (!$mode) { 
+		if (!$mode) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		switch ($mode) {
 		case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break;
 		case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break;
-		case ADODB_FETCH_BOTH: 
+		case ADODB_FETCH_BOTH:
 		default:
 		$this->fetchMode = FBSQL_BOTH; break;
 		}
 		return $this->ADORecordSet($queryID);
 	}
-	
+
 	function _initrs()
 	{
 	GLOBAL $ADODB_COUNTRECS;
 		$this->_numOfRows = ($ADODB_COUNTRECS) ? @fbsql_num_rows($this->_queryID):-1;
 		$this->_numOfFields = @fbsql_num_fields($this->_queryID);
 	}
-	
 
 
+
 	function FetchField($fieldOffset = -1) {
 		if ($fieldOffset != -1) {
 			$o =  @fbsql_fetch_field($this->_queryID, $fieldOffset);
@@ -198,25 +198,25 @@
 			$o = @fbsql_fetch_field($this->_queryID);// fbsql returns the max length less spaces -- so it is unrealiable
 			//$o->max_length = -1;
 		}
-		
+
 		return $o;
 	}
-		
+
 	function _seek($row)
 	{
 		return @fbsql_data_seek($this->_queryID,$row);
 	}
-	
+
 	function _fetch($ignore_fields=false)
 	{
 		$this->fields = @fbsql_fetch_array($this->_queryID,$this->fetchMode);
 		return ($this->fields == true);
 	}
-	
+
 	function _close() {
-		return @fbsql_free_result($this->_queryID);		
+		return @fbsql_free_result($this->_queryID);
 	}
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -227,36 +227,36 @@
 		$len = -1; // fbsql max_length is not accurate
 		switch (strtoupper($t)) {
 		case 'CHARACTER':
-		case 'CHARACTER VARYING': 
-		case 'BLOB': 
-		case 'CLOB': 
-		case 'BIT': 
-		case 'BIT VARYING': 
+		case 'CHARACTER VARYING':
+		case 'BLOB':
+		case 'CLOB':
+		case 'BIT':
+		case 'BIT VARYING':
 			if ($len <= $this->blobSize) return 'C';
-			
+
 		// so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
 			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
+
 		case 'DATE': return 'D';
-		
+
 		case 'TIME':
 		case 'TIME WITH TIME ZONE':
-		case 'TIMESTAMP': 
+		case 'TIMESTAMP':
 		case 'TIMESTAMP WITH TIME ZONE': return 'T';
-		
+
 		case 'PRIMARY_KEY':
 			return 'R';
 		case 'INTEGER':
-		case 'SMALLINT': 
+		case 'SMALLINT':
 		case 'BOOLEAN':
-			
+
 			if (!empty($fieldobj->primary_key)) return 'R';
 			else return 'I';
-		
+
 		default: return 'N';
 		}
 	}
Index: typo3/sysext/adodb/adodb/drivers/adodb-odbc_mssql.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-odbc_mssql.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-odbc_mssql.inc.php	(working copy)
@@ -1,14 +1,14 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
-  MSSQL support via ODBC. Requires ODBC. Works on Windows and Unix. 
+
+  MSSQL support via ODBC. Requires ODBC. Works on Windows and Unix.
   For Unix configuration, see http://phpbuilder.com/columns/alberto20000919.php3
 */
 
@@ -19,8 +19,8 @@
 	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
 
- 
-class  ADODB_odbc_mssql extends ADODB_odbc {	
+
+class  ADODB_odbc_mssql extends ADODB_odbc {
 	var $databaseType = 'odbc_mssql';
 	var $fmtDate = "'Y-m-d'";
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
@@ -37,13 +37,13 @@
 	var $ansiOuter = true; // for mssql7 or later
 	var $identitySQL = 'select SCOPE_IDENTITY()'; // 'select SCOPE_IDENTITY'; # for mssql 2000
 	var $hasInsertID = true;
-	var $connectStmt = 'SET CONCAT_NULL_YIELDS_NULL OFF'; # When SET CONCAT_NULL_YIELDS_NULL is ON, 
+	var $connectStmt = 'SET CONCAT_NULL_YIELDS_NULL OFF'; # When SET CONCAT_NULL_YIELDS_NULL is ON,
 														  # concatenating a null value with a string yields a NULL result
-	
+
 	function ADODB_odbc_mssql()
 	{
 		$this->ADODB_odbc();
-		//$this->curmode = SQL_CUR_USE_ODBC;	
+		//$this->curmode = SQL_CUR_USE_ODBC;
 	}
 
 	// crashes php...
@@ -60,31 +60,31 @@
 		return $arr;
 	}
 
-	function IfNull( $field, $ifNull ) 
+	function IfNull( $field, $ifNull )
 	{
 		return " ISNULL($field, $ifNull) "; // if MS SQL Server
 	}
-	
+
 	function _insertid()
 	{
 	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
+	// Returns the last IDENTITY value inserted into an IDENTITY column in
+	// the same scope. A scope is a module -- a stored procedure, trigger,
+	// function, or batch. Thus, two statements are in the same scope if
 	// they are in the same stored procedure, function, or batch.
 			return $this->GetOne($this->identitySQL);
 	}
-	
-	
+
+
 	function MetaForeignKeys($table, $owner=false, $upper=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
+
+		$sql =
 "select object_name(constid) as constraint_name,
 	col_name(fkeyid, fkey) as column_name,
 	object_name(rkeyid) as referenced_table_name,
@@ -92,20 +92,20 @@
 from sysforeignkeys
 where upper(object_name(fkeyid)) = $table
 order by constraint_name, referenced_table_name, keyno";
-		
+
 		$constraints = $this->GetArray($sql);
-		
+
 		$ADODB_FETCH_MODE = $save;
-		
+
 		$arr = false;
 		foreach($constraints as $constr) {
 			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3];
 		}
 		if (!$arr) return false;
-		
+
 		$arr2 = false;
-		
+
 		foreach($arr as $k => $v) {
 			foreach($v as $a => $b) {
 				if ($upper) $a = strtoupper($a);
@@ -114,8 +114,8 @@
 		}
 		return $arr2;
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		if ($mask) {$this->debug=1;
 			$save = $this->metaTablesSQL;
@@ -123,29 +123,29 @@
 			$this->metaTablesSQL .= " AND name like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
 		$arr = ADOConnection::MetaColumns($table);
 		return $arr;
 	}
-	
-	
+
+
 	function MetaIndexes($table,$primary=false, $owner=false)
 	{
 		$table = $this->qstr($table);
 
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno,
 			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
 			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid
 			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
 			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
 			ORDER BY O.name, I.Name, K.keyno";
@@ -156,7 +156,7 @@
         if ($this->fetchMode !== FALSE) {
         	$savem = $this->SetFetchMode(FALSE);
         }
-        
+
         $rs = $this->Execute($sql);
         if (isset($savem)) {
         	$this->SetFetchMode($savem);
@@ -170,20 +170,20 @@
 		$indexes = array();
 		while ($row = $rs->FetchRow()) {
 			if (!$primary && $row[5]) continue;
-			
+
             $indexes[$row[0]]['unique'] = $row[6];
             $indexes[$row[0]]['columns'][] = $row[1];
     	}
         return $indexes;
 	}
-	
+
 	function _query($sql,$inputarr=false)
 	{
 		if (is_string($sql)) $sql = str_replace('||','+',$sql);
 		return ADODB_odbc::_query($sql,$inputarr);
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -193,33 +193,33 @@
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET TRANSACTION ".$transaction_mode);
 	}
-	
+
 	// "Stein-Aksel Basma" <basma@accelero.no>
 	// tested with MSSQL 2000
 	function MetaPrimaryKeys($table)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$schema = '';
 		$this->_findschema($table,$schema);
 		//if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
-	
+		if ($schema) $schema = "and k.table_catalog like '$schema%'";
+
 		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
-		information_schema.table_constraints tc 
+		information_schema.table_constraints tc
 		where tc.constraint_name = k.constraint_name and tc.constraint_type =
 		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
-		
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 		$a = $this->GetCol($sql);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if ($a && sizeof($a)>0) return $a;
 		$false = false;
-		return $false;	  
+		return $false;
 	}
-	
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		if ($nrows > 0 && $offset <= 0) {
@@ -228,16 +228,16 @@
 			$rs = $this->Execute($sql,$inputarr);
 		} else
 			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			
+
 		return $rs;
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= '+';
@@ -264,11 +264,11 @@
 			case 'h':
 				$s .= "substring(convert(char(14),$col,0),13,2)";
 				break;
-			
+
 			case 'H':
 				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
 				break;
-				
+
 			case 'i':
 				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
 				break;
@@ -279,7 +279,7 @@
 			case 'A':
 				$s .= "substring(convert(char(19),$col,0),18,2)";
 				break;
-				
+
 			default:
 				if ($ch == '\\') {
 					$i++;
@@ -292,15 +292,15 @@
 		return $s;
 	}
 
-} 
- 
-class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {	
-	
+}
+
+class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {
+
 	var $databaseType = 'odbc_mssql';
-	
+
 	function ADORecordSet_odbc_mssql($id,$mode=false)
 	{
 		return $this->ADORecordSet_odbc($id,$mode);
-	}	
+	}
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/drivers/adodb-db2oci.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-db2oci.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-db2oci.inc.php	(working copy)
@@ -1,13 +1,13 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
 */
 
@@ -37,22 +37,22 @@
 
 	$_COLONARR = array();
 	$_COLONSZ = sizeof($arr);
-	
+
 	$sql2 = preg_replace("/(:[0-9]+)/e","_colontrack('\\1')",$sql);
-	
+
 	if (empty($_COLONARR)) return array($sql,$arr);
-	
+
 	foreach($_COLONARR as $k => $v) {
-		$arr2[] = $arr[$v]; 
+		$arr2[] = $arr[$v];
 	}
-	
+
 	return array($sql2,$arr2);
 }
 */
 
 /*
 	Smart remapping of :0, :1 bind vars to ? ?
-	
+
 	Handles colons in comments -- and / * * / and in quoted strings.
 */
 
@@ -62,41 +62,41 @@
 	$arrsize = sizeof($arr);
 	$state = 'NORM';
 	$at = 1;
-	$ch = $sql[0]; 
+	$ch = $sql[0];
 	$ch2 = @$sql[1];
 	$sql2 = '';
 	$arr2 = array();
 	$nprev = 0;
-	
-	
+
+
 	while (strlen($ch)) {
-	
+
 		switch($ch) {
 		case '/':
 			if ($state == 'NORM' && $ch2 == '*') {
 				$state = 'COMMENT';
-				
+
 				$at += 1;
 				$ch = $ch2;
 				$ch2 = $at < $lensql ? $sql[$at] : '';
 			}
 			break;
-			
+
 		case '*':
 			if ($state == 'COMMENT' && $ch2 == '/') {
 				$state = 'NORM';
-				
+
 				$at += 1;
 				$ch = $ch2;
 				$ch2 = $at < $lensql ? $sql[$at] : '';
 			}
 			break;
-		
+
 		case "\n":
 		case "\r":
 			if ($state == 'COMMENT2') $state = 'NORM';
 			break;
-		
+
 		case "'":
 			do {
 				$at += 1;
@@ -104,10 +104,10 @@
 				$ch2 = $at < $lensql ? $sql[$at] : '';
 			} while ($ch !== "'");
 			break;
-			
+
 		case ':':
 			if ($state == 'COMMENT' || $state == 'COMMENT2') break;
-			
+
 			//echo "$at=$ch $ch2, ";
 			if ('0' <= $ch2 && $ch2 <= '9') {
 				$n = '';
@@ -127,7 +127,7 @@
 				}
 			}
 			break;
-			
+
 		case '-':
 			if ($state == 'NORM') {
 				if ($ch2 == '-') $state = 'COMMENT2';
@@ -137,54 +137,54 @@
 			}
 			break;
 		}
-		
+
 		$at += 1;
 		$ch = $ch2;
 		$ch2 = $at < $lensql ? $sql[$at] : '';
 	}
-	
+
 	if ($nprev == 0) {
 		$sql2 = $sql;
 	} else {
 		$sql2 .= substr($sql,$nprev);
 	}
-	
+
 	return array($sql2,$arr2);
 }
 
 class ADODB_db2oci extends ADODB_db2 {
-	var $databaseType = "db2oci";	
+	var $databaseType = "db2oci";
 	var $sysTimeStamp = 'sysdate';
 	var $sysDate = 'trunc(sysdate)';
 	var $_bindInputArray = true;
-	
+
 	function ADODB_db2oci()
 	{
 		parent::ADODB_db2();
 	}
-	
+
 	function Param($name,$type=false)
 	{
 		return ':'.$name;
 	}
-	
-	
+
+
 	function MetaTables($ttype=false,$schema=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = db2_tables($this->_connectionID);
-		
+
 		$rs = new ADORecordSet_db2($qid);
-		
+
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) {
 			$false = false;
 			return $false;
 		}
-		
+
 		$arr = $rs->GetArray();
 		$rs->Close();
 		$arr2 = array();
@@ -199,7 +199,7 @@
 			$name = $schemaval.$arr[$i][2];
 			$owner = $arr[$i][1];
 			if (substr($name,0,8) == 'EXPLAIN_') continue;
-			if ($ttype) { 
+			if ($ttype) {
 				if ($isview) {
 					if (strncmp($type,'V',1) === 0) $arr2[] = $name;
 				} else if (strncmp($type,'T',1) === 0 && strncmp($owner,'SYS',3) !== 0) $arr2[] = $name;
@@ -207,19 +207,19 @@
 		}
 		return $arr2;
 	}
-	
+
 	function _Execute($sql, $inputarr=false	)
 	{
 		if ($inputarr) list($sql,$inputarr) = _colonparser($sql, $inputarr);
 		return parent::_Execute($sql, $inputarr);
 	}
 };
- 
 
-class  ADORecordSet_db2oci extends ADORecordSet_db2 {	
-	
-	var $databaseType = "db2oci";		
-	
+
+class  ADORecordSet_db2oci extends ADORecordSet_db2 {
+
+	var $databaseType = "db2oci";
+
 	function ADORecordSet_db2oci($id,$mode=false)
 	{
 		return $this->ADORecordSet_db2($id,$mode);
Index: typo3/sysext/adodb/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-firebird.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-firebird.inc.php	(working copy)
@@ -1,11 +1,11 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
 
 */
@@ -16,21 +16,21 @@
 include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
 
 class ADODB_firebird extends ADODB_ibase {
-	var $databaseType = "firebird";	
+	var $databaseType = "firebird";
 	var $dialect = 3;
-	
+
 	var $sysTimeStamp = "CURRENT_TIMESTAMP"; //"cast('NOW' as timestamp)";
-	
+
 	function ADODB_firebird()
-	{	
+	{
 		$this->ADODB_ibase();
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['dialect'] = $this->dialect;
 		switch($arr['dialect']) {
-		case '': 
+		case '':
 		case '1': $s = 'Firebird Dialect 1'; break;
 		case '2': $s = 'Firebird Dialect 2'; break;
 		default:
@@ -40,35 +40,35 @@
 		$arr['description'] = $s;
 		return $arr;
 	}
-	
+
 	// Note that Interbase 6.5 uses this ROWS instead - don't you love forking wars!
-	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
+	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows
 	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0)
 	{
 		$nrows = (integer) $nrows;
 		$offset = (integer) $offset;
 		$str = 'SELECT ';
-		if ($nrows >= 0) $str .= "FIRST $nrows "; 
+		if ($nrows >= 0) $str .= "FIRST $nrows ";
 		$str .=($offset>=0) ? "SKIP $offset " : '';
-		
-		$sql = preg_replace('/^[ \t]*select/i',$str,$sql); 
+
+		$sql = preg_replace('/^[ \t]*select/i',$str,$sql);
 		if ($secs)
 			$rs = $this->CacheExecute($secs,$sql,$inputarr);
 		else
 			$rs = $this->Execute($sql,$inputarr);
-			
+
 		return $rs;
 	}
-	
-	
+
+
 };
- 
 
-class  ADORecordSet_firebird extends ADORecordSet_ibase {	
-	
-	var $databaseType = "firebird";		
-	
+
+class  ADORecordSet_firebird extends ADORecordSet_ibase {
+
+	var $databaseType = "firebird";
+
 	function ADORecordSet_firebird($id,$mode=false)
 	{
 		$this->ADORecordSet_ibase($id,$mode);
Index: typo3/sysext/adodb/adodb/drivers/adodb-mysqlt.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-mysqlt.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-mysqlt.inc.php	(working copy)
@@ -2,14 +2,14 @@
 
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 8.
-  
+
   MySQL code that supports transactions. For MySQL 3.23 or later.
   Code from James Poon <jpoon88@yahoo.com>
-  
+
   Requires mysql client. Works on Windows and Unix.
 */
 
@@ -23,20 +23,20 @@
 	var $databaseType = 'mysqlt';
 	var $ansiOuter = true; // for Version 3.23.17 or later
 	var $hasTransactions = true;
-	var $autoRollback = true; // apparently mysql does not autorollback properly 
-	
-	function ADODB_mysqlt() 
-	{			
+	var $autoRollback = true; // apparently mysql does not autorollback properly
+
+	function ADODB_mysqlt()
+	{
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
 	}
-	
+
 	/* set transaction mode
-	
+
 	SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
 { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
 
 	*/
-	function SetTransactionMode( $transaction_mode ) 
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -46,27 +46,27 @@
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
-	
+
 	function BeginTrans()
-	{	  
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->Execute('SET AUTOCOMMIT=0');
 		$this->Execute('BEGIN');
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
+
+	function CommitTrans($ok=true)
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		if ($this->transCnt) $this->transCnt -= 1;
 		$ok = $this->Execute('COMMIT');
 		$this->Execute('SET AUTOCOMMIT=1');
 		return $ok ? true : false;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
@@ -75,41 +75,41 @@
 		$this->Execute('SET AUTOCOMMIT=1');
 		return $ok ? true : false;
 	}
-	
-	function RowLock($tables,$where='',$col='1 as adodb_ignore') 
+
+	function RowLock($tables,$where='',$col='1 as adodb_ignore')
 	{
 		if ($this->transCnt==0) $this->BeginTrans();
 		if ($where) $where = ' where '.$where;
 		$rs = $this->Execute("select $col from $tables $where for update");
-		return !empty($rs); 
+		return !empty($rs);
 	}
-	
+
 }
 
-class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
+class ADORecordSet_mysqlt extends ADORecordSet_mysql{
 	var $databaseType = "mysqlt";
-	
-	function ADORecordSet_mysqlt($queryID,$mode=false) 
+
+	function ADORecordSet_mysqlt($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
-		
+
 		switch ($mode)
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
 		default: $this->fetchMode = MYSQL_BOTH; break;
 		}
-	
+
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
@@ -124,11 +124,11 @@
 	}
 }
 
-class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {	
+class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
 
-	function ADORecordSet_ext_mysqlt($queryID,$mode=false) 
+	function ADORecordSet_ext_mysqlt($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -136,16 +136,16 @@
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
-		default: 
+		default:
 			$this->fetchMode = MYSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		return adodb_movenext($this);
Index: typo3/sysext/adodb/adodb/drivers/adodb-pdo_oci.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-pdo_oci.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-pdo_oci.inc.php	(working copy)
@@ -3,13 +3,13 @@
 
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 8.
- 
-*/ 
 
+*/
+
 class ADODB_pdo_oci extends ADODB_pdo_base {
 
 	var $concat_operator='||';
@@ -18,11 +18,11 @@
 	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
 	var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
 	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW')";
-	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; 
-		
+	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno";
+
  	var $_initdate = true;
 	var $_hasdual = true;
-	
+
 	function _init($parentDriver)
 	{
 		$parentDriver->_bindInputArray = true;
@@ -31,8 +31,8 @@
 			$parentDriver->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
 		}
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		if ($mask) {
 			$save = $this->metaTablesSQL;
@@ -40,24 +40,24 @@
 			$this->metaTablesSQL .= " AND table_name like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
+
 	function MetaColumns($table,$normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$false = false;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!$rs) {
@@ -73,19 +73,19 @@
 			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
 				$fld->type ='INT';
 	     		$fld->max_length = $rs->fields[4];
-	    	}	
+	    	}
 		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
 			$fld->binary = (strpos($fld->type,'BLOB') !== false);
 			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[strtoupper($fld->name)] = $fld;
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr))
 			return  $false;
-		else 
+		else
 			return $retarr;
 	}
 }
Index: typo3/sysext/adodb/adodb/drivers/adodb-pdo.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-pdo.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-pdo.inc.php	(working copy)
@@ -1,16 +1,16 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Requires ODBC. Works on Windows and Unix.
 
-	Problems: 
+	Problems:
 		Where is float/decimal type in pdo_param_type
 		LOB handling for CLOB/BLOB differs significantly
 */
@@ -24,30 +24,30 @@
 
 /* int as in long (the php native int type).
  * If you mark a column as an int, PDO expects get_col to return
- * a pointer to a long 
+ * a pointer to a long
 PDO::PARAM_INT, 1
 
-/* get_col ptr should point to start of the string buffer 
+/* get_col ptr should point to start of the string buffer
 PDO::PARAM_STR, 2
 
 /* get_col: when len is 0 ptr should point to a php_stream *,
  * otherwise it should behave like a string. Indicate a NULL field
- * value by setting the ptr to NULL 
+ * value by setting the ptr to NULL
 PDO::PARAM_LOB, 3
 
 /* get_col: will expect the ptr to point to a new PDOStatement object handle,
- * but this isn't wired up yet 
-PDO::PARAM_STMT, 4 /* hierarchical result set 
+ * but this isn't wired up yet
+PDO::PARAM_STMT, 4 /* hierarchical result set
 
-/* get_col ptr should point to a zend_bool 
+/* get_col ptr should point to a zend_bool
 PDO::PARAM_BOOL, 5
 
 
-/* magic flag to denote a parameter as being input/output 
+/* magic flag to denote a parameter as being input/output
 PDO::PARAM_INPUT_OUTPUT = 0x80000000
 };
 */
-	
+
 function adodb_pdo_type($t)
 {
 	switch($t) {
@@ -56,7 +56,7 @@
 	default: return 'NUMERIC';
 	}
 }
-	 
+
 /*--------------------------------------------------------------------------------------
 --------------------------------------------------------------------------------------*/
 
@@ -68,28 +68,28 @@
 
 
 class ADODB_pdo extends ADOConnection {
-	var $databaseType = "pdo";	
+	var $databaseType = "pdo";
 	var $dataProvider = "pdo";
 	var $fmtDate = "'Y-m-d'";
 	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $hasAffectedRows = true;
-	var $_bindInputArray = true;	
+	var $_bindInputArray = true;
 	var $_genSeqSQL = "create table %s (id integer)";
 	var $_autocommit = true;
 	var $_haserrorfunctions = true;
 	var $_lastAffectedRows = 0;
-	
+
 	var $_errormsg = false;
 	var $_errorno = false;
-	
+
 	var $dsnType = '';
 	var $stmt = false;
-	
+
 	function ADODB_pdo()
 	{
 	}
-	
+
 	function _UpdatePDO()
 	{
 		$d = $this->_driver;
@@ -101,7 +101,7 @@
 		$this->random = $d->random;
 		$this->concat_operator = $d->concat_operator;
 		$this->nameQuote = $d->nameQuote;
-				
+
 		$this->hasGenID = $d->hasGenID;
 		$this->_genIDSQL = $d->_genIDSQL;
 		$this->_genSeqSQL = $d->_genSeqSQL;
@@ -109,18 +109,18 @@
 
 		$d->_init($this);
 	}
-	
+
 	function Time()
 	{
 		if (!empty($this->_driver->_hasdual)) $sql = "select $this->sysTimeStamp from dual";
 		else $sql = "select $this->sysTimeStamp";
-		
+
 		$rs = $this->_Execute($sql);
 		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
+
 		return false;
 	}
-	
+
 	// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persist=false)
 	{
@@ -139,7 +139,7 @@
 			$this->_errormsg = 'Connection attempt failed: '.$e->getMessage();
 			return false;
 		}
-		
+
 		if ($this->_connectionID) {
 			switch(ADODB_ASSOC_CASE){
 			case 0: $m = PDO::CASE_LOWER; break;
@@ -147,10 +147,10 @@
 			default:
 			case 2: $m = PDO::CASE_NATURAL; break;
 			}
-			
+
 			//$this->_connectionID->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_SILENT );
 			$this->_connectionID->setAttribute(PDO::ATTR_CASE,$m);
-			
+
 			$class = 'ADODB_pdo_'.$this->dsnType;
 			//$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
 			switch($this->dsnType) {
@@ -166,7 +166,7 @@
 				$this->_driver = new $class();
 			else
 				$this->_driver = new ADODB_pdo_base();
-			
+
 			$this->_driver->_connectionID = $this->_connectionID;
 			$this->_UpdatePDO();
 			return true;
@@ -174,27 +174,27 @@
 		$this->_driver = new ADODB_pdo_base();
 		return false;
 	}
-	
-	function Concat() 
+
+	function Concat()
 	{
 		$args = func_get_args();
-		if(method_exists($this->_driver, 'Concat')) 
-			return call_user_func_array(array($this->_driver, 'Concat'), $args); 
-		
-		return call_user_func_array(array($this,'parent::Concat'), $args); 
+		if(method_exists($this->_driver, 'Concat'))
+			return call_user_func_array(array($this->_driver, 'Concat'), $args);
+
+		return call_user_func_array(array($this,'parent::Concat'), $args);
 	}
-	
+
 	// returns true or false
 	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 		return $this->_connect($argDSN, $argUsername, $argPassword, $argDatabasename, true);
 	}
-	
+
 	/*------------------------------------------------------------------------------*/
-	
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{	
+
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	{
 		$save = $this->_driver->fetchMode;
 		$this->_driver->fetchMode = $this->fetchMode;
 	 	$this->_driver->debug = $this->debug;
@@ -202,51 +202,51 @@
 		$this->_driver->fetchMode = $save;
 		return $ret;
 	}
-	
-	
+
+
 	function ServerInfo()
 	{
 		return $this->_driver->ServerInfo();
 	}
-	
+
 	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		return $this->_driver->MetaTables($ttype,$showSchema,$mask);
 	}
-	
+
 	function MetaColumns($table,$normalize=true)
 	{
 		return $this->_driver->MetaColumns($table,$normalize);
 	}
-	
+
 	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
 	{
 		$obj = $stmt[1];
 		if ($type) $obj->bindParam($name,$var,$type,$maxLen);
 		else $obj->bindParam($name, $var);
 	}
-	
+
 	function OffsetDate($dayFraction,$date=false)
-    {   
+    {
         return $this->_driver->OffsetDate($dayFraction,$date);
     }
-	
+
 	function ErrorMsg()
 	{
 		if ($this->_errormsg !== false) return $this->_errormsg;
 		if (!empty($this->_stmt)) $arr = $this->_stmt->errorInfo();
 		else if (!empty($this->_connectionID)) $arr = $this->_connectionID->errorInfo();
 		else return 'No Connection Established';
-		
-		
+
+
 		if ($arr) {
 		 	if (sizeof($arr)<2) return '';
 			if ((integer)$arr[1]) return $arr[2];
 			else return '';
 		} else return '-1';
 	}
-	
 
+
 	function ErrorNo()
 	{
 		if ($this->_errorno !== false) return $this->_errorno;
@@ -257,71 +257,71 @@
 			else $err = -1;
 		} else
 			return 0;
-			
+
 		if ($err == '00000') return 0; // allows empty check
 		return $err;
 	}
 
-	function SetTransactionMode($transaction_mode) 
+	function SetTransactionMode($transaction_mode)
 	{
-		if(method_exists($this->_driver, 'SetTransactionMode')) 
-			return $this->_driver->SetTransactionMode($transaction_mode); 
-		
-		return parent::SetTransactionMode($seqname); 
+		if(method_exists($this->_driver, 'SetTransactionMode'))
+			return $this->_driver->SetTransactionMode($transaction_mode);
+
+		return parent::SetTransactionMode($seqname);
 	}
 
 	function BeginTrans()
-	{	
-		if(method_exists($this->_driver, 'BeginTrans')) 
-			return $this->_driver->BeginTrans(); 
-		
+	{
+		if(method_exists($this->_driver, 'BeginTrans'))
+			return $this->_driver->BeginTrans();
+
 		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->_autocommit = false;
 		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,false);
 		return $this->_connectionID->beginTransaction();
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if(method_exists($this->_driver, 'CommitTrans')) 
-			return $this->_driver->CommitTrans($ok); 
-		
+
+	function CommitTrans($ok=true)
+	{
+		if(method_exists($this->_driver, 'CommitTrans'))
+			return $this->_driver->CommitTrans($ok);
+
 		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
-		
+
 		$ret = $this->_connectionID->commit();
 		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
-		if(method_exists($this->_driver, 'RollbackTrans')) 
-			return $this->_driver->RollbackTrans(); 
-		
+		if(method_exists($this->_driver, 'RollbackTrans'))
+			return $this->_driver->RollbackTrans();
+
 		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
-		
+
 		$ret = $this->_connectionID->rollback();
 		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
 		return $ret;
 	}
-	
+
 	function Prepare($sql)
 	{
 		$this->_stmt = $this->_connectionID->prepare($sql);
 		if ($this->_stmt) return array($sql,$this->_stmt);
-		
+
 		return false;
 	}
-	
+
 	function PrepareStmt($sql)
 	{
 		$stmt = $this->_connectionID->prepare($sql);
@@ -329,34 +329,34 @@
 		$obj = new ADOPDOStatement($stmt,$this);
 		return $obj;
 	}
-	
+
 	function CreateSequence($seqname='adodbseq',$startID=1)
 	{
-		if(method_exists($this->_driver, 'CreateSequence')) 
-			return $this->_driver->CreateSequence($seqname, $startID); 
-		
-		return parent::CreateSequence($seqname, $startID); 
+		if(method_exists($this->_driver, 'CreateSequence'))
+			return $this->_driver->CreateSequence($seqname, $startID);
+
+		return parent::CreateSequence($seqname, $startID);
 	}
-	
+
 	function DropSequence($seqname='adodbseq')
 	{
-		if(method_exists($this->_driver, 'DropSequence')) 
-			return $this->_driver->DropSequence($seqname); 
-		
-		return parent::DropSequence($seqname); 
+		if(method_exists($this->_driver, 'DropSequence'))
+			return $this->_driver->DropSequence($seqname);
+
+		return parent::DropSequence($seqname);
 	}
 
 	function GenID($seqname='adodbseq',$startID=1)
 	{
-		if(method_exists($this->_driver, 'GenID')) 
-			return $this->_driver->GenID($seqname, $startID); 
-		
-		return parent::GenID($seqname, $startID); 
+		if(method_exists($this->_driver, 'GenID'))
+			return $this->_driver->GenID($seqname, $startID);
+
+		return parent::GenID($seqname, $startID);
 	}
 
-	
+
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
 		if (is_array($sql)) {
 			$stmt = $sql[1];
@@ -369,19 +369,19 @@
 			$this->_driver->debug = $this->debug;
 			if ($inputarr) $ok = $stmt->execute($inputarr);
 			else $ok = $stmt->execute();
-		} 
-		
-		
+		}
+
+
 		$this->_errormsg = false;
 		$this->_errorno = false;
-			
+
 		if ($ok) {
 			$this->_stmt = $stmt;
 			return $stmt;
 		}
-		
+
 		if ($stmt) {
-			
+
 			$arr = $stmt->errorinfo();
 			if ((integer)$arr[1]) {
 				$this->_errormsg = $arr[2];
@@ -406,7 +406,7 @@
 	{
 		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
 	}
-	
+
 	function _insertid()
 	{
 		return ($this->_connectionID) ? $this->_connectionID->lastInsertId() : 0;
@@ -417,30 +417,30 @@
 
 	var $sysDate = "'?'";
 	var $sysTimeStamp = "'?'";
-	
 
+
 	function _init($parentDriver)
 	{
 		$parentDriver->_bindInputArray = true;
 		#$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
 	}
-	
+
 	function ServerInfo()
 	{
 		return ADOConnection::ServerInfo();
 	}
-	
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 		return $ret;
 	}
-	
+
 	function MetaTables()
 	{
 		return false;
 	}
-	
+
 	function MetaColumns()
 	{
 		return false;
@@ -449,17 +449,17 @@
 
 class ADOPDOStatement {
 
-	var $databaseType = "pdo";		
+	var $databaseType = "pdo";
 	var $dataProvider = "pdo";
 	var $_stmt;
 	var $_connectionID;
-	
+
 	function ADOPDOStatement($stmt,$connection)
 	{
 		$this->_stmt = $stmt;
 		$this->_connectionID = $connection;
 	}
-	
+
 	function Execute($inputArr=false)
 	{
 		$savestmt = $this->_connectionID->_stmt;
@@ -467,19 +467,19 @@
 		$this->_connectionID->_stmt = $savestmt;
 		return $rs;
 	}
-	
+
 	function InParameter(&$var,$name,$maxLen=4000,$type=false)
 	{
 
 		if ($type) $this->_stmt->bindParam($name,$var,$type,$maxLen);
 		else $this->_stmt->bindParam($name, $var);
 	}
-	
+
 	function Affected_Rows()
 	{
 		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
 	}
-	
+
 	function ErrorMsg()
 	{
 		if ($this->_stmt) $arr = $this->_stmt->errorInfo();
@@ -490,12 +490,12 @@
 			else return '';
 		} else return '-1';
 	}
-	
+
 	function NumCols()
 	{
 		return ($this->_stmt) ? $this->_stmt->columnCount() : 0;
 	}
-	
+
 	function ErrorNo()
 	{
 		if ($this->_stmt) return $this->_stmt->errorCode();
@@ -507,15 +507,15 @@
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_pdo extends ADORecordSet {	
-	
+class ADORecordSet_pdo extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "pdo";		
+	var $databaseType = "pdo";
 	var $dataProvider = "pdo";
-	
+
 	function ADORecordSet_pdo($id,$mode=false)
 	{
-		if ($mode === false) {  
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -523,17 +523,17 @@
 		switch($mode) {
 		case ADODB_FETCH_NUM: $mode = PDO::FETCH_NUM; break;
 		case ADODB_FETCH_ASSOC:  $mode = PDO::FETCH_ASSOC; break;
-		
-		case ADODB_FETCH_BOTH: 
+
+		case ADODB_FETCH_BOTH:
 		default: $mode = PDO::FETCH_BOTH; break;
 		}
 		$this->fetchMode = $mode;
-		
+
 		$this->_queryID = $id;
 		$this->ADORecordSet($id);
 	}
 
-	
+
 	function Init()
 	{
 		if ($this->_inited) return;
@@ -552,21 +552,21 @@
 			$this->EOF = true;
 		}
 	}
-	
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		$this->_numOfRows = ($ADODB_COUNTRECS) ? @$this->_queryID->rowCount() : -1;
 		if (!$this->_numOfRows) $this->_numOfRows = -1;
 		$this->_numOfFields = $this->_queryID->columnCount();
 	}
 
 	// returns the field object
-	function FetchField($fieldOffset = -1) 
+	function FetchField($fieldOffset = -1)
 	{
 		$off=$fieldOffset+1; // offsets begin at 1
-		
+
 		$o= new ADOFieldObject();
 		$arr = @$this->_queryID->getColumnMeta($fieldOffset);
 		if (!$arr) {
@@ -583,34 +583,34 @@
 		else $o->type = adodb_pdo_type($arr['pdo_type']);
 		$o->max_length = $arr['len'];
 		$o->precision = $arr['precision'];
-		
+
 		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;
 	}
-	
+
 	function _seek($row)
 	{
 		return false;
 	}
-	
+
 	function _fetch()
 	{
 		if (!$this->_queryID) return false;
-		
+
 		$this->fields = $this->_queryID->fetch($this->fetchMode);
 		return !empty($this->fields);
 	}
-	
-	function _close() 
+
+	function _close()
 	{
 		$this->_queryID = false;
 	}
-	
+
 	function Fields($colname)
 	{
 		if ($this->adodbFetchMode != ADODB_FETCH_NUM) return @$this->fields[$colname];
-		
+
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
Index: typo3/sysext/adodb/adodb/drivers/adodb-mysql.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-mysql.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-mysql.inc.php	(working copy)
@@ -1,16 +1,16 @@
 <?php
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 8.
-  
+
   MySQL code that does not support transactions. Use mysqlt if you need transactions.
   Requires mysql client. Works on Windows and Unix.
-  
+
  28 Feb 2001: MetaColumns bug fix - suggested by  Freek Dijkstra (phpeverywhere@macfreek.com)
-*/ 
+*/
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -22,8 +22,8 @@
 	var $databaseType = 'mysql';
 	var $dataProvider = 'mysql';
 	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
-	var $metaTablesSQL = "SHOW TABLES";	
+	var $hasAffectedRows = true;
+	var $metaTablesSQL = "SHOW TABLES";
 	var $metaColumnsSQL = "SHOW COLUMNS FROM `%s`";
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
 	var $hasLimit = true;
@@ -39,102 +39,102 @@
 	var $substr = "substring";
 	var $nameQuote = '`';		/// string to use to quote identifiers and names
 	var $compat323 = false; 		// true if compat with mysql 3.23
-	
-	function ADODB_mysql() 
-	{			
+
+	function ADODB_mysql()
+	{
 		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['description'] = ADOConnection::GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " IFNULL($field, $ifNull) "; // if MySQL
 	}
-	
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
+
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
 			$this->metaTablesSQL .= " from $showSchema";
 		}
-		
+
 		if ($mask) {
 			$mask = $this->qstr($mask);
 			$this->metaTablesSQL .= " like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		$this->metaTablesSQL = $save;
 		return $ret;
 	}
-	
-	
+
+
 	function MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
         // save old fetch mode
         global $ADODB_FETCH_MODE;
-        
+
 		$false = false;
         $save = $ADODB_FETCH_MODE;
         $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
         if ($this->fetchMode !== FALSE) {
                $savem = $this->SetFetchMode(FALSE);
         }
-        
+
         // get index details
         $rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
-        
+
         // restore fetchmode
         if (isset($savem)) {
                 $this->SetFetchMode($savem);
         }
         $ADODB_FETCH_MODE = $save;
-        
+
         if (!is_object($rs)) {
                 return $false;
         }
-        
+
         $indexes = array ();
-        
+
         // parse index data into array
         while ($row = $rs->FetchRow()) {
                 if ($primary == FALSE AND $row[2] == 'PRIMARY') {
                         continue;
                 }
-                
+
                 if (!isset($indexes[$row[2]])) {
                         $indexes[$row[2]] = array(
                                 'unique' => ($row[1] == 0),
                                 'columns' => array()
                         );
                 }
-                
+
                 $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
         }
-        
+
         // sort columns by order in the index
         foreach ( array_keys ($indexes) as $index )
         {
                 ksort ($indexes[$index]['columns']);
         }
-        
+
         return $indexes;
 	}
 
-	
+
 	// if magic quotes disabled, use mysql_real_escape_string()
 	function qstr($s,$magic_quotes=false)
 	{
 		if (is_null($s)) return 'NULL';
 		if (!$magic_quotes) {
-		
+
 			if (ADODB_PHPVER >= 0x4300) {
 				if (is_resource($this->_connectionID))
 					return "'".mysql_real_escape_string($s,$this->_connectionID)."'";
@@ -142,20 +142,20 @@
 			if ($this->replaceQuote[0] == '\\'){
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
 			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
 		return "'$s'";
 	}
-	
+
 	function _insertid()
 	{
 		return ADOConnection::GetOne('SELECT LAST_INSERT_ID()');
 		//return mysql_insert_id($this->_connectionID);
 	}
-	
+
 	function GetOne($sql,$inputarr=false)
 	{
 		if ($this->compat323 == false && strncasecmp($sql,'sele',4) == 0) {
@@ -170,17 +170,17 @@
 		}
 		return false;
 	}
-	
+
 	function BeginTrans()
 	{
 		if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver");
 	}
-	
+
 	function _affectedrows()
 	{
 			return mysql_affected_rows($this->_connectionID);
 	}
-  
+
  	 // See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
 	// Reference on Last_Insert_ID on the recommended way to simulate sequences
  	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
@@ -188,23 +188,23 @@
 	var $_genSeqCountSQL = "select count(*) from %s";
 	var $_genSeq2SQL = "insert into %s values (%s)";
 	var $_dropSeqSQL = "drop table %s";
-	
+
 	function CreateSequence($seqname='adodbseq',$startID=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
 		$u = strtoupper($seqname);
-		
+
 		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
 		if (!$ok) return false;
 		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 	}
-	
 
+
 	function GenID($seqname='adodbseq',$startID=1)
 	{
 		// post-nuke sets hasGenID to false
 		if (!$this->hasGenID) return false;
-		
+
 		$savelog = $this->_logsql;
 		$this->_logsql = false;
 		$getnext = sprintf($this->_genIDSQL,$seqname);
@@ -218,17 +218,17 @@
 			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 			$rs = $this->Execute($getnext);
 		}
-		
+
 		if ($rs) {
 			$this->genID = mysql_insert_id($this->_connectionID);
 			$rs->Close();
 		} else
 			$this->genID = 0;
-		
+
 		$this->_logsql = $savelog;
 		return $this->genID;
 	}
-	
+
   	function MetaDatabases()
 	{
 		$qid = mysql_list_dbs($this->_connectionID);
@@ -242,11 +242,11 @@
 		}
 		return $arr;
 	}
-	
-		
+
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'DATE_FORMAT('.$col.",'";
 		$concat = false;
@@ -254,7 +254,7 @@
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
 			switch($ch) {
-				
+
 			default:
 				if ($ch == '\\') {
 					$i++;
@@ -265,7 +265,7 @@
 			case '/':
 				$s .= $ch;
 				break;
-				
+
 			case 'Y':
 			case 'y':
 				$s .= '%Y';
@@ -273,7 +273,7 @@
 			case 'M':
 				$s .= '%b';
 				break;
-				
+
 			case 'm':
 				$s .= '%m';
 				break;
@@ -281,45 +281,45 @@
 			case 'd':
 				$s .= '%d';
 				break;
-			
+
 			case 'Q':
 			case 'q':
 				$s .= "'),Quarter($col)";
-				
+
 				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
 				else $s .= ",('";
 				$concat = true;
 				break;
-			
-			case 'H': 
+
+			case 'H':
 				$s .= '%H';
 				break;
-				
+
 			case 'h':
 				$s .= '%I';
 				break;
-				
+
 			case 'i':
 				$s .= '%i';
 				break;
-				
+
 			case 's':
 				$s .= '%s';
 				break;
-				
+
 			case 'a':
 			case 'A':
 				$s .= '%p';
 				break;
-				
+
 			case 'w':
 				$s .= '%w';
 				break;
-				
+
 			 case 'W':
 				$s .= '%U';
 				break;
-				
+
 			case 'l':
 				$s .= '%W';
 				break;
@@ -329,36 +329,36 @@
 		if ($concat) $s = "CONCAT($s)";
 		return $s;
 	}
-	
 
+
 	// returns concatenated string
 	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
 	function Concat()
 	{
 		$s = "";
 		$arr = func_get_args();
-		
+
 		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
+		$s = implode(',',$arr);
 		if (strlen($s) > 0) return "CONCAT($s)";
 		else return '';
 	}
-	
+
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
-		
+
 		$fraction = $dayFraction * 24 * 3600;
 		return '('. $date . ' + INTERVAL ' .	 $fraction.' SECOND)';
-		
+
 //		return "from_unixtime(unix_timestamp($date)+$fraction)";
 	}
-	
+
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!empty($this->port)) $argHostname .= ":".$this->port;
-		
+
 		if (ADODB_PHPVER >= 0x4300)
 			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
 												$this->forceNewConnect,$this->clientFlags);
@@ -367,17 +367,17 @@
 												$this->forceNewConnect);
 		else
 			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
-	
+
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!empty($this->port)) $argHostname .= ":".$this->port;
-		
+
 		if (ADODB_PHPVER >= 0x4300)
 			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword,$this->clientFlags);
 		else
@@ -385,16 +385,16 @@
 		if ($this->_connectionID === false) return false;
 		if ($this->autoRollback) $this->RollbackTrans();
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		$this->forceNewConnect = true;
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
 	}
-	
- 	function MetaColumns($table, $normalize=true) 
+
+ 	function MetaColumns($table, $normalize=true)
 	{
 		$this->_findschema($table,$schema);
 		if ($schema) {
@@ -404,27 +404,27 @@
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
+
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
+
 		if ($schema) {
 			$this->SelectDB($dbName);
 		}
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!is_object($rs)) {
 			$false = false;
 			return $false;
 		}
-			
+
 		$retarr = array();
 		while (!$rs->EOF){
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$type = $rs->fields[1];
-			
+
 			// split type into type(length):
 			$fld->scale = null;
 			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
@@ -460,7 +460,7 @@
 					$fld->has_default = false;
 				}
 			}
-			
+
 			if ($save == ADODB_FETCH_NUM) {
 				$retarr[] = $fld;
 			} else {
@@ -468,63 +468,63 @@
 			}
 				$rs->MoveNext();
 			}
-		
+
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 	}
-		
+
 	// returns true or false
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 		$this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		if ($this->_connectionID) {
-			return @mysql_select_db($dbName,$this->_connectionID);		
+			return @mysql_select_db($dbName,$this->_connectionID);
 		}
-		else return false;	
+		else return false;
 	}
-	
+
 	// parameters use PostgreSQL convention, not MySQL
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
 	{
 		$offsetStr =($offset>=0) ? ((integer)$offset)."," : '';
 		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
-		if ($nrows < 0) $nrows = '18446744073709551615'; 
-		
+		if ($nrows < 0) $nrows = '18446744073709551615';
+
 		if ($secs)
 			$rs = $this->CacheExecute($secs,$sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
 		else
 			$rs = $this->Execute($sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
 		return $rs;
 	}
-	
+
 	// returns queryID or false
 	function _query($sql,$inputarr=false)
 	{
 	//global $ADODB_COUNTRECS;
-		//if($ADODB_COUNTRECS) 
+		//if($ADODB_COUNTRECS)
 		return mysql_query($sql,$this->_connectionID);
 		//else return @mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	{
-	
+
 		if ($this->_logsql) return $this->_errorMsg;
 		if (empty($this->_connectionID)) $this->_errorMsg = @mysql_error();
 		else $this->_errorMsg = @mysql_error($this->_connectionID);
 		return $this->_errorMsg;
 	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
+
+	/*	Returns: the last error number from previous database operation	*/
+	function ErrorNo()
 	{
 		if ($this->_logsql) return $this->_errorCode;
 		if (empty($this->_connectionID))  return @mysql_errno();
 		else return @mysql_errno($this->_connectionID);
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -532,23 +532,23 @@
 		$this->_connectionID = false;
 	}
 
-	
+
 	/*
 	* Maximum size of C field
 	*/
 	function CharMax()
 	{
-		return 255; 
+		return 255;
 	}
-	
+
 	/*
 	* Maximum size of X field
 	*/
 	function TextMax()
 	{
-		return 4294967295; 
+		return 4294967295;
 	}
-	
+
 	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
      {
@@ -566,7 +566,7 @@
          $matches = array();
 
          if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
-	     $foreign_keys = array();	 	 
+	     $foreign_keys = array();
          $num_keys = count($matches[0]);
          for ( $i = 0;  $i < $num_keys;  $i ++ ) {
              $my_field  = explode('`, `', $matches[1][$i]);
@@ -590,26 +590,26 @@
                  }
              }
          }
-         
+
          return  $foreign_keys;
      }
-	 
-	
+
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
 
-class ADORecordSet_mysql extends ADORecordSet{	
-	
+class ADORecordSet_mysql extends ADORecordSet{
+
 	var $databaseType = "mysql";
 	var $canSeek = true;
-	
-	function ADORecordSet_mysql($queryID,$mode=false) 
+
+	function ADORecordSet_mysql($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -623,9 +623,9 @@
 			$this->fetchMode = MYSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function _initrs()
 	{
 	//GLOBAL $ADODB_COUNTRECS;
@@ -633,9 +633,9 @@
 		$this->_numOfRows = @mysql_num_rows($this->_queryID);
 		$this->_numOfFields = @mysql_num_fields($this->_queryID);
 	}
-	
-	function FetchField($fieldOffset = -1) 
-	{	
+
+	function FetchField($fieldOffset = -1)
+	{
 		if ($fieldOffset != -1) {
 			$o = @mysql_fetch_field($this->_queryID, $fieldOffset);
 			$f = @mysql_field_flags($this->_queryID,$fieldOffset);
@@ -648,7 +648,7 @@
 			if ($o) $o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jnich#att.com)
 		//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
 		}
-			
+
 		return $o;
 	}
 
@@ -658,13 +658,13 @@
 		else $row = ADORecordSet::GetRowAssoc($upper);
 		return $row;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
-	{	
+	{
 		// added @ by "Michael William Miller" <mille562@pilot.msu.edu>
 		if ($this->fetchMode != MYSQL_NUM) return @$this->fields[$colname];
-		
+
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -674,13 +674,13 @@
 		}
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
 	function _seek($row)
 	{
 		if ($this->_numOfRows == 0) return false;
 		return @mysql_data_seek($this->_queryID,$row);
 	}
-	
+
 	function MoveNext()
 	{
 		//return adodb_movenext($this);
@@ -695,18 +695,18 @@
 		}
 		return false;
 	}
-	
+
 	function _fetch()
 	{
 		$this->fields =  @mysql_fetch_array($this->_queryID,$this->fetchMode);
 		return is_array($this->fields);
 	}
-	
+
 	function _close() {
-		@mysql_free_result($this->_queryID);	
-		$this->_queryID = false;	
+		@mysql_free_result($this->_queryID);
+		$this->_queryID = false;
 	}
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -714,59 +714,59 @@
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'STRING': 
+		case 'STRING':
 		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
-		case 'SET': 
+		case 'VARCHAR':
+		case 'TINYBLOB':
+		case 'TINYTEXT':
+		case 'ENUM':
+		case 'SET':
 			if ($len <= $this->blobSize) return 'C';
-			
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 			return 'X';
-			
+
 		// php_mysql extension always returns 'blob' even if 'text'
 		// so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
 		case 'BINARY':
 			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
+
 		case 'YEAR':
 		case 'DATE': return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER':
 		case 'BIGINT':
 		case 'TINYINT':
 		case 'MEDIUMINT':
-		case 'SMALLINT': 
-			
+		case 'SMALLINT':
+
 			if (!empty($fieldobj->primary_key)) return 'R';
 			else return 'I';
-		
+
 		default: return 'N';
 		}
 	}
 
 }
 
-class ADORecordSet_ext_mysql extends ADORecordSet_mysql {	
-	function ADORecordSet_ext_mysql($queryID,$mode=false) 
+class ADORecordSet_ext_mysql extends ADORecordSet_mysql {
+	function ADORecordSet_ext_mysql($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -782,7 +782,7 @@
 		$this->adodbFetchMode = $mode;
 		$this->ADORecordSet($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		return @adodb_movenext($this);
Index: typo3/sysext/adodb/adodb/drivers/adodb-pdo_mssql.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-pdo_mssql.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-pdo_mssql.inc.php	(working copy)
@@ -3,40 +3,40 @@
 
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 8.
- 
-*/ 
 
+*/
+
 class ADODB_pdo_mssql extends ADODB_pdo {
-	
+
 	var $hasTop = 'top';
 	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
 	var $sysTimeStamp = 'GetDate()';
-	
-	
+
+
 	function _init($parentDriver)
 	{
-	
+
 		$parentDriver->hasTransactions = false; ## <<< BUG IN PDO mssql driver
 		$parentDriver->_bindInputArray = false;
 		$parentDriver->hasInsertID = true;
 	}
-	
+
 	function ServerInfo()
 	{
 		return ADOConnection::ServerInfo();
 	}
-	
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 		return $ret;
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -46,12 +46,12 @@
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET TRANSACTION ".$transaction_mode);
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		return false;
 	}
-	
+
 	function MetaColumns($table,$normalize=true)
 	{
 		return false;
Index: typo3/sysext/adodb/adodb/drivers/adodb-ldap.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-ldap.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-ldap.inc.php	(working copy)
@@ -1,18 +1,18 @@
 <?php
 /*
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-   Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+   Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 8.
-  
+
   Revision 1: (02/25/2005) Updated codebase to include the _inject_bind_options function. This allows
   users to access the options in the ldap_set_option function appropriately. Most importantly
   LDAP Version 3 is now supported. See the examples for more information. Also fixed some minor
   bugs that surfaced when PHP error levels were set high.
-  
+
   Joshua Eldridge (joshuae74#hotmail.com)
-*/ 
+*/
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -26,11 +26,11 @@
 class ADODB_ldap extends ADOConnection {
     var $databaseType = 'ldap';
 	var $dataProvider = 'ldap';
-	
+
 	# Connection information
     var $username = false;
     var $password = false;
-    
+
     # Used during searches
     var $filter;
     var $dn;
@@ -42,28 +42,28 @@
 
 	# error on binding, eg. "Binding: invalid credentials"
 	var $_bind_errmsg = "Binding: %s";
-	
-	function ADODB_ldap() 
-	{		
+
+	function ADODB_ldap()
+	{
 	}
-  		
+
 	// returns true or false
-	
+
 	function _connect( $host, $username, $password, $ldapbase)
 	{
 	global $LDAP_CONNECT_OPTIONS;
-		
+
 		if ( !function_exists( 'ldap_connect' ) ) return null;
-		
+
 		if (strpos('ldap://',$host) === 0 || strpos('ldaps://',$host) === 0) {
 			$this->_connectionID = @ldap_connect($host);
 		} else {
 			$conn_info = array( $host,$this->port);
-		
+
 			if ( strstr( $host, ':' ) ) {
 			    $conn_info = explode( ':', $host );
-			} 
-		
+			}
+
 			$this->_connectionID = @ldap_connect( $conn_info[0], $conn_info[1] );
 		}
 		if (!$this->_connectionID) {
@@ -75,14 +75,14 @@
 		if( count( $LDAP_CONNECT_OPTIONS ) > 0 ) {
 			$this->_inject_bind_options( $LDAP_CONNECT_OPTIONS );
 		}
-		
+
 		if ($username) {
 		    $bind = @ldap_bind( $this->_connectionID, $username, $password );
 		} else {
 			$username = 'anonymous';
-		    $bind = @ldap_bind( $this->_connectionID );		
+		    $bind = @ldap_bind( $this->_connectionID );
 		}
-		
+
 		if (!$bind) {
 			$e = sprintf($this->_bind_errmsg,ldap_error($this->_connectionID));
 			$this->_errorMsg = $e;
@@ -93,7 +93,7 @@
 		$this->database = $ldapbase;
 		return $this->_connectionID;
 	}
-    
+
 /*
 	Valid Domain Values for LDAP Options:
 
@@ -152,32 +152,32 @@
 				or die( "Unable to set server option: " . $option["OPTION_NAME"] );
 		}
 	}
-	
+
 	/* returns _queryID or false */
 	function _query($sql,$inputarr=false)
 	{
 		$rs = @ldap_search( $this->_connectionID, $this->database, $sql );
 		$this->_errorMsg = ($rs) ? '' : 'Search error on '.$sql.': '.ldap_error($this->_connectionID);
-		return $rs; 
+		return $rs;
 	}
 
 	function ErrorMsg()
 	{
 		return $this->_errorMsg;
 	}
-	
+
 	function ErrorNo()
 	{
 		return @ldap_errno($this->_connectionID);
 	}
-	
+
     /* closes the LDAP connection */
 	function _close()
 	{
 		@ldap_close( $this->_connectionID );
 		$this->_connectionID = false;
 	}
-    
+
 	function SelectDB($db) {
 		$this->database = $db;
 		return true;
@@ -188,14 +188,14 @@
         if( !empty( $this->version ) ) return $this->version;
         $version = array();
         /*
-        Determines how aliases are handled during search. 
+        Determines how aliases are handled during search.
         LDAP_DEREF_NEVER (0x00)
         LDAP_DEREF_SEARCHING (0x01)
         LDAP_DEREF_FINDING (0x02)
         LDAP_DEREF_ALWAYS (0x03)
-        The LDAP_DEREF_SEARCHING value means aliases are dereferenced during the search but 
-        not when locating the base object of the search. The LDAP_DEREF_FINDING value means 
-        aliases are dereferenced when locating the base object but not during the search.  
+        The LDAP_DEREF_SEARCHING value means aliases are dereferenced during the search but
+        not when locating the base object of the search. The LDAP_DEREF_FINDING value means
+        aliases are dereferenced when locating the base object but not during the search.
         Default: LDAP_DEREF_NEVER
         */
         ldap_get_option( $this->_connectionID, LDAP_OPT_DEREF, $version['LDAP_OPT_DEREF'] ) ;
@@ -209,9 +209,9 @@
           case 3:
             $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_ALWAYS';
         }
-        
-        /* 
-        A limit on the number of entries to return from a search. 
+
+        /*
+        A limit on the number of entries to return from a search.
         LDAP_NO_LIMIT (0) means no limit.
         Default: LDAP_NO_LIMIT
         */
@@ -219,9 +219,9 @@
         if ( $version['LDAP_OPT_SIZELIMIT'] == 0 ) {
            $version['LDAP_OPT_SIZELIMIT'] = 'LDAP_NO_LIMIT';
         }
-        
+
         /*
-        A limit on the number of seconds to spend on a search. 
+        A limit on the number of seconds to spend on a search.
         LDAP_NO_LIMIT (0) means no limit.
         Default: LDAP_NO_LIMIT
         */
@@ -229,9 +229,9 @@
         if ( $version['LDAP_OPT_TIMELIMIT'] == 0 ) {
            $version['LDAP_OPT_TIMELIMIT'] = 'LDAP_NO_LIMIT';
         }
-        
+
         /*
-        Determines whether the LDAP library automatically follows referrals returned by LDAP servers or not. 
+        Determines whether the LDAP library automatically follows referrals returned by LDAP servers or not.
         LDAP_OPT_ON
         LDAP_OPT_OFF
         Default: ON
@@ -241,10 +241,10 @@
            $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_OFF';
         } else {
            $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_ON';
-        
+
         }
         /*
-        Determines whether LDAP I/O operations are automatically restarted if they abort prematurely. 
+        Determines whether LDAP I/O operations are automatically restarted if they abort prematurely.
         LDAP_OPT_ON
         LDAP_OPT_OFF
         Default: OFF
@@ -254,7 +254,7 @@
            $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_OFF';
         } else {
            $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_ON';
-        
+
         }
         /*
         This option indicates the version of the LDAP protocol used when communicating with the primary LDAP server.
@@ -267,56 +267,56 @@
            $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION2';
         } else {
            $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION3';
-        
+
         }
         /* The host name (or list of hosts) for the primary LDAP server. */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] ); 
-        
+        ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] );
+        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] );
+        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] );
+        ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] );
+
         return $this->version = $version;
-    
+
     }
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_ldap extends ADORecordSet{	
-	
+class ADORecordSet_ldap extends ADORecordSet{
+
 	var $databaseType = "ldap";
 	var $canSeek = false;
 	var $_entryID; /* keeps track of the entry resource identifier */
-	
-	function ADORecordSet_ldap($queryID,$mode=false) 
+
+	function ADORecordSet_ldap($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_NUM: 
-		  $this->fetchMode = LDAP_NUM; 
+		case ADODB_FETCH_NUM:
+		  $this->fetchMode = LDAP_NUM;
 		break;
-		case ADODB_FETCH_ASSOC: 
-		  $this->fetchMode = LDAP_ASSOC; 
+		case ADODB_FETCH_ASSOC:
+		  $this->fetchMode = LDAP_ASSOC;
 		break;
 		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH: 
+		case ADODB_FETCH_BOTH:
 		default:
-		  $this->fetchMode = LDAP_BOTH; 
+		  $this->fetchMode = LDAP_BOTH;
 		break;
 		}
-	
-		$this->ADORecordSet($queryID);	
+
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function _initrs()
 	{
-	   /* 
+	   /*
 	   This could be teaked to respect the $COUNTRECS directive from ADODB
 	   It's currently being used in the _fetch() function and the
 	   GetAssoc() function
@@ -328,7 +328,7 @@
     /*
     Return whole recordset as a multi-dimensional associative array
 	*/
-	function GetAssoc($force_array = false, $first2cols = false) 
+	function GetAssoc($force_array = false, $first2cols = false)
 	{
 		$records = $this->_numOfRows;
         $results = array();
@@ -340,14 +340,14 @@
                         } else {
                             array_shift( $v );
                             $results[$i][$k] = $v;
-                        } 
+                        }
                     }
                 }
             }
-        
-		return $results; 
+
+		return $results;
 	}
-    
+
     function GetRowAssoc()
 	{
         $results = array();
@@ -358,13 +358,13 @@
                 } else {
                     array_shift( $v );
                     $results[$k] = $v;
-                } 
+                }
             }
         }
- 
-		return $results; 
+
+		return $results;
 	}
-		
+
     function GetRowNums()
     {
         $results = array();
@@ -376,48 +376,48 @@
                 } else {
                     array_shift( $v );
                     $results[$i] = $v;
-                } 
+                }
             $i++;
             }
         }
         return $results;
     }
-	
+
 	function _fetch()
-	{		
+	{
 		if ( $this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0 )
         	return false;
-        	
+
         if ( $this->_currentRow == 0 ) {
 		  $this->_entryID = ldap_first_entry( $this->connection->_connectionID, $this->_queryID );
         } else {
           $this->_entryID = ldap_next_entry( $this->connection->_connectionID, $this->_entryID );
         }
-	    
+
 	    $this->fields = ldap_get_attributes( $this->connection->_connectionID, $this->_entryID );
-	    $this->_numOfFields = $this->fields['count'];	
+	    $this->_numOfFields = $this->fields['count'];
 	    switch ( $this->fetchMode ) {
-            
+
             case LDAP_ASSOC:
             $this->fields = $this->GetRowAssoc();
             break;
-            
+
             case LDAP_NUM:
 			$this->fields = array_merge($this->GetRowNums(),$this->GetRowAssoc());
             break;
-            
+
             case LDAP_BOTH:
             default:
 			$this->fields = $this->GetRowNums();
             break;
         }
-        return ( is_array( $this->fields ) );        
+        return ( is_array( $this->fields ) );
 	}
-	
+
 	function _close() {
-		@ldap_free_result( $this->_queryID );	
+		@ldap_free_result( $this->_queryID );
 		$this->_queryID = false;
 	}
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/drivers/adodb-sqlanywhere.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-sqlanywhere.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-sqlanywhere.inc.php	(working copy)
@@ -1,10 +1,10 @@
 <?php
-/* 
+/*
 version V5.06 16 Oct 2008  (c) 2000-2009  John Lim (jlim#natsoft.com).  All rights
 reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
 
   Latest version is available at http://adodb.sourceforge.net
@@ -30,7 +30,7 @@
 		.
 	   'VALUES (\'test\', ' . $blobVarName . ')');
 
-	 instead of loading blob from a file, you can also load from 
+	 instead of loading blob from a file, you can also load from
 	  an unformatted (raw) blob variable:
 	  $dbcon->load_blobvar_from_var($blobVarName, $varName);
 
@@ -53,9 +53,9 @@
  define('ADODB_SYBASE_SQLANYWHERE',1);
 
  class ADODB_sqlanywhere extends ADODB_odbc {
-  	var $databaseType = "sqlanywhere";	
+  	var $databaseType = "sqlanywhere";
 	var $hasInsertID = true;
-	
+
 	function ADODB_sqlanywhere()
 	{
 		$this->ADODB_odbc();
@@ -152,9 +152,9 @@
   }
  }; //class
 
- class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {	
+ class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {
 
-  var $databaseType = "sqlanywhere";		
+  var $databaseType = "sqlanywhere";
 
  function ADORecordSet_sqlanywhere($id,$mode=false)
  {
Index: typo3/sysext/adodb/adodb/drivers/adodb-informix.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-informix.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-informix.inc.php	(working copy)
@@ -22,7 +22,7 @@
 	var $databaseType = "informix";
 	var $hasTop = 'FIRST';
 	var $ansiOuter = true;
-	
+
 	function IfNull( $field, $ifNull )
 	{
 		return " NVL($field, $ifNull) "; // if Informix 9.X or 10.X
@@ -31,7 +31,7 @@
 
 class ADORecordset_informix extends ADORecordset_informix72 {
 	var $databaseType = "informix";
-	
+
 	function ADORecordset_informix($id,$mode=false)
 	{
 		$this->ADORecordset_informix72($id,$mode);
Index: typo3/sysext/adodb/adodb/drivers/adodb-ado.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-ado.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-ado.inc.php	(working copy)
@@ -1,31 +1,31 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
 	Microsoft ADO data driver. Requires ADO. Works only on MS Windows.
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
-	
+
 define("_ADODB_ADO_LAYER", 1 );
 /*--------------------------------------------------------------------------------------
 --------------------------------------------------------------------------------------*/
 
-	
+
 class ADODB_ado extends ADOConnection {
-	var $databaseType = "ado";	
+	var $databaseType = "ado";
 	var $_bindInputArray = false;
 	var $fmtDate = "'Y-m-d'";
 	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
 	var $replaceQuote = "''"; // string to use to replace quotes
-	var $dataProvider = "ado";	
+	var $dataProvider = "ado";
 	var $hasAffectedRows = true;
 	var $adoParameterType = 201; // 201 = long varchar, 203=long wide varchar, 205 = long varbinary
 	var $_affectedRows = false;
@@ -34,11 +34,11 @@
 	var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
 	var $_lock_type = -1;
 	var $_execute_option = -1;
-	var $poorAffectedRows = true; 
+	var $poorAffectedRows = true;
 	var $charPage;
-		
-	function ADODB_ado() 
-	{ 	
+
+	function ADODB_ado()
+	{
 		$this->_affectedRows = new VARIANT;
 	}
 
@@ -47,14 +47,14 @@
 		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
 		return array('description' => $desc, 'version' => '');
 	}
-	
+
 	function _affectedrows()
 	{
 		if (PHP_VERSION >= 5) return $this->_affectedRows;
-		
+
 		return $this->_affectedRows->value;
 	}
-	
+
 	// you can also pass a connection string like this:
 	//
 	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
@@ -62,49 +62,49 @@
 	{
 		$u = 'UID';
 		$p = 'PWD';
-	
+
 		if (!empty($this->charPage))
 			$dbc = new COM('ADODB.Connection',null,$this->charPage);
 		else
 			$dbc = new COM('ADODB.Connection');
-			
+
 		if (! $dbc) return false;
 
 		/* special support if provider is mssql or access */
 		if ($argProvider=='mssql') {
 			$u = 'User Id';  //User parameter name for OLEDB
-			$p = 'Password'; 
+			$p = 'Password';
 			$argProvider = "SQLOLEDB"; // SQL Server Provider
-			
+
 			// not yet
 			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
-			
+
 			//use trusted conection for SQL if username not specified
 			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
 		} else if ($argProvider=='access')
 			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
-		
-		if ($argProvider) $dbc->Provider = $argProvider;	
-		
+
+		if ($argProvider) $dbc->Provider = $argProvider;
+
 		if ($argUsername) $argHostname .= ";$u=$argUsername";
 		if ($argPassword)$argHostname .= ";$p=$argPassword";
-		
+
 		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."<BR>\n version=$dbc->version");
 		// @ added below for php 4.0.1 and earlier
 		@$dbc->Open((string) $argHostname);
-		
+
 		$this->_connectionID = $dbc;
-		
+
 		$dbc->CursorLocation = $this->_cursor_location;
 		return  $dbc->State > 0;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
 	{
 		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
-	}	
-	
+	}
+
 /*
 	adSchemaCatalogs	= 1,
 	adSchemaCharacterSets	= 2,
@@ -146,12 +146,12 @@
 	adSchemaMembers	= 38
 
 */
-	
+
 	function MetaTables()
 	{
 		$arr= array();
 		$dbc = $this->_connectionID;
-		
+
 		$adors=@$dbc->OpenSchema(20);//tables
 		if ($adors){
 			$f = $adors->Fields(2);//table/view name
@@ -165,25 +165,25 @@
 			}
 			$adors->Close();
 		}
-		
+
 		return $arr;
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
 		$table = strtoupper($table);
 		$arr = array();
 		$dbc = $this->_connectionID;
-		
+
 		$adors=@$dbc->OpenSchema(4);//tables
-	
+
 		if ($adors){
 			$t = $adors->Fields(2);//table/view name
 			while (!$adors->EOF){
-				
-				
+
+
 				if (strtoupper($t->Value) == $table) {
-				
+
 					$fld = new ADOFieldObject();
 					$c = $adors->Fields(3);
 					$fld->name = $c->Value;
@@ -191,7 +191,7 @@
 					$fld->max_length = -1;
 					$arr[strtoupper($fld->name)]=$fld;
 				}
-		
+
 				$adors->MoveNext();
 			}
 			$adors->Close();
@@ -199,20 +199,20 @@
 		$false = false;
 		return empty($arr) ? $false : $arr;
 	}
-	
 
 
-	
+
+
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
-		
+
 		$dbc = $this->_connectionID;
 		$false = false;
-		
-	//	return rs	
+
+	//	return rs
 		if ($inputarr) {
-			
+
 			if (!empty($this->charPage))
 				$oCmd = new COM('ADODB.Command',null,$this->charPage);
 			else
@@ -238,7 +238,7 @@
 					$len=1;
 				else
 					$this->adoParameterType = 130;
-				
+
 				// name, type, direction 1 = input, len,
         		$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val);
 
@@ -250,12 +250,12 @@
 			if ($dbc->Errors->Count > 0) return $false;
 			return $rs;
 		}
-		
+
 		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
 
 		if ($dbc->Errors->Count > 0) return $false;
 		if (! $rs) return $false;
-		
+
 		if ($rs->State == 0) {
 			$true = true;
 			return $true; // 0 = adStateClosed means no records returned
@@ -263,11 +263,11 @@
 		return $rs;
 	}
 
-	
-	function BeginTrans() 
-	{ 
+
+	function BeginTrans()
+	{
 		if ($this->transOff) return true;
-		
+
 		if (isset($this->_thisTransactions))
 			if (!$this->_thisTransactions) return false;
 		else {
@@ -279,12 +279,12 @@
 		$this->transCnt += 1;
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transOff) return true;
-		
+
 		@$this->_connectionID->CommitTrans();
 		if ($this->transCnt) @$this->transCnt -= 1;
 		return true;
@@ -295,10 +295,10 @@
 		if ($this->transCnt) @$this->transCnt -= 1;
 		return true;
 	}
-	
-	/*	Returns: the last error message from previous database operation	*/	
 
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+
+	function ErrorMsg()
 	{
 		if (!$this->_connectionID) return "No connection established";
 		$errc = $this->_connectionID->Errors;
@@ -307,8 +307,8 @@
 		$err = $errc->Item($errc->Count-1);
 		return $err->Description;
 	}
-	
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		$errc = $this->_connectionID->Errors;
 		if ($errc->Count == 0) return 0;
@@ -323,27 +323,27 @@
 		$this->_connectionID = false;
 		return true;
 	}
-	
-	
+
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_ado extends ADORecordSet {	
-	
+class ADORecordSet_ado extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "ado";	
-	var $dataProvider = "ado";	
+	var $databaseType = "ado";
+	var $dataProvider = "ado";
 	var $_tarr = false; // caches the types
 	var $_flds; // and field objects
 	var $canSeek = true;
   	var $hideErrors = true;
-		  
+
 	function ADORecordSet_ado($id,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -355,7 +355,7 @@
 	// returns the field object
 	function FetchField($fieldOffset = -1) {
 		$off=$fieldOffset+1; // offsets begin at 1
-		
+
 		$o= new ADOFieldObject();
 		$rs = $this->_queryID;
 		$f = $rs->Fields($fieldOffset);
@@ -363,12 +363,12 @@
 		$t = $f->Type;
 		$o->type = $this->MetaType($t);
 		$o->max_length = $f->DefinedSize;
-		$o->ado_type = $t;	
+		$o->ado_type = $t;
 
 		//print "off=$off name=$o->name type=$o->type len=$o->max_length<br>";
 		return $o;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
@@ -380,25 +380,25 @@
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
 
-		
+
 	function _initrs()
 	{
 		$rs = $this->_queryID;
 		$this->_numOfRows = $rs->RecordCount;
-		
+
 		$f = $rs->Fields;
 		$this->_numOfFields = $f->Count;
 	}
-	
-	
+
+
 	 // should only be used to move forward as we normally use forward-only cursors
 	function _seek($row)
 	{
-	   $rs = $this->_queryID; 
+	   $rs = $this->_queryID;
 		// absoluteposition doesn't work -- my maths is wrong ?
 		//	$rs->AbsolutePosition->$row-2;
 		//	return true;
@@ -406,10 +406,10 @@
 		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
 		return true;
 	}
-	
+
 /*
 	OLEDB types
-	
+
 	 enum DBTYPEENUM
 	{	DBTYPE_EMPTY	= 0,
 	DBTYPE_NULL	= 1,
@@ -445,9 +445,9 @@
 	DBTYPE_DBDATE	= 133,
 	DBTYPE_DBTIME	= 134,
 	DBTYPE_DBTIMESTAMP	= 135
-	
+
 	ADO Types
-	
+
    	adEmpty	= 0,
 	adTinyInt	= 16,
 	adSmallInt	= 2,
@@ -467,7 +467,7 @@
 	adUserDefined	= 132,
 	adVariant	= 12,
 	adIDispatch	= 9,
-	adIUnknown	= 13,	
+	adIUnknown	= 13,
 	adGUID	= 72,
 	adDate	= 7,
 	adDBDate	= 133,
@@ -496,9 +496,9 @@
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		if (!is_numeric($t)) return $t;
-		
+
 		switch ($t) {
 		case 0:
 		case 12: // variant
@@ -511,7 +511,7 @@
 		case 204: // varBin
 		case 72: // guid
 			if ($len <= $this->blobSize) return 'C';
-		
+
 		case 201:
 		case 203:
 			return 'X';
@@ -521,12 +521,12 @@
 			 return 'B';
 		case 7:
 		case 133: return 'D';
-		
+
 		case 134:
 		case 135: return 'T';
-		
+
 		case 11: return 'L';
-		
+
 		case 16://	adTinyInt	= 16,
 		case 2://adSmallInt	= 2,
 		case 3://adInteger	= 3,
@@ -539,17 +539,17 @@
 		default: return 'N';
 		}
 	}
-	
+
 	// time stamp not supported yet
 	function _fetch()
-	{	
+	{
 		$rs = $this->_queryID;
 		if (!$rs or $rs->EOF) {
 			$this->fields = false;
 			return false;
 		}
 		$this->fields = array();
-	
+
 		if (!$this->_tarr) {
 			$tarr = array();
 			$flds = array();
@@ -559,12 +559,12 @@
 				$tarr[] = $f->Type;
 			}
 			// bind types and flds only once
-			$this->_tarr = $tarr; 
+			$this->_tarr = $tarr;
 			$this->_flds = $flds;
 		}
 		$t = reset($this->_tarr);
 		$f = reset($this->_flds);
-		
+
 		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
 		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
 			//echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
@@ -575,12 +575,12 @@
 					if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
 						// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
 						$val=(float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
-					else 
+					else
 						$val = $f->value;
 					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
 				}
-				break;			
-			case 133:// A date value (yyyymmdd) 
+				break;
+			case 133:// A date value (yyyymmdd)
 				if ($val = $f->value) {
 					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
 				} else
@@ -591,7 +591,7 @@
 				else {
 					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
 					else $val = $f->value;
-					
+
 					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
 					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
 				}
@@ -610,11 +610,11 @@
 					else $val = 0;
 				}
 				if(is_null($f->value)) $val = null;
-				
+
 				$this->fields[] = $val;
 				break;
 			default:
-				$this->fields[] = $f->value; 
+				$this->fields[] = $f->value;
 				break;
 			}
 			//print " $f->value $t, ";
@@ -623,27 +623,27 @@
 		} // for
 		if ($this->hideErrors) error_reporting($olde);
 		@$rs->MoveNext(); // @ needed for some versions of PHP!
-		
+
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
 		}
 		return true;
 	}
-	
+
 		function NextRecordSet()
 		{
 			$rs = $this->_queryID;
 			$this->_queryID = $rs->NextRecordSet();
 			//$this->_queryID = $this->_QueryId->NextRecordSet();
 			if ($this->_queryID == null) return false;
-			
+
 			$this->_currentRow = -1;
 			$this->_currentPage = -1;
 			$this->bind = false;
 			$this->fields = false;
 			$this->_flds = false;
 			$this->_tarr = false;
-			
+
 			$this->_inited = false;
 			$this->Init();
 			return true;
@@ -652,7 +652,7 @@
 	function _close() {
 		$this->_flds = false;
 		@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
-		$this->_queryID = false;	
+		$this->_queryID = false;
 	}
 
 }
Index: typo3/sysext/adodb/adodb/drivers/adodb-proxy.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-proxy.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-proxy.inc.php	(working copy)
@@ -1,13 +1,13 @@
 <?php
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 4.
-  
+
   Synonym for csv driver.
-*/ 
+*/
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -15,19 +15,19 @@
 if (! defined("_ADODB_PROXY_LAYER")) {
 	 define("_ADODB_PROXY_LAYER", 1 );
 	 include(ADODB_DIR."/drivers/adodb-csv.inc.php");
-	 
+
 	class ADODB_proxy extends ADODB_csv {
 		var $databaseType = 'proxy';
 		var $databaseProvider = 'csv';
 	}
 	class ADORecordset_proxy extends ADORecordset_csv {
-	var $databaseType = "proxy";		
-	
-		function ADORecordset_proxy($id,$mode=false) 
+	var $databaseType = "proxy";
+
+		function ADORecordset_proxy($id,$mode=false)
 		{
 			$this->ADORecordset($id,$mode);
 		}
 	};
 } // define
-	
+
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/drivers/adodb-mysqli.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-mysqli.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-mysqli.inc.php	(working copy)
@@ -1,26 +1,26 @@
 <?php
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 8.
-  
+
   MySQL code that does not support transactions. Use mysqlt if you need transactions.
   Requires mysql client. Works on Windows and Unix.
- 
+
 21 October 2003: MySQLi extension implementation by Arjen de Rijke (a.de.rijke@xs4all.nl)
 Based on adodb 3.40
-*/ 
+*/
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 if (! defined("_ADODB_MYSQLI_LAYER")) {
  define("_ADODB_MYSQLI_LAYER", 1 );
- 
+
  // PHP5 compat...
- if (! defined("MYSQLI_BINARY_FLAG"))  define("MYSQLI_BINARY_FLAG", 128); 
+ if (! defined("MYSQLI_BINARY_FLAG"))  define("MYSQLI_BINARY_FLAG", 128);
  if (!defined('MYSQLI_READ_DEFAULT_GROUP')) define('MYSQLI_READ_DEFAULT_GROUP',1);
 
  // disable adodb extension - currently incompatible.
@@ -30,8 +30,8 @@
 	var $databaseType = 'mysqli';
 	var $dataProvider = 'native';
 	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
-	var $metaTablesSQL = "SHOW TABLES";	
+	var $hasAffectedRows = true;
+	var $metaTablesSQL = "SHOW TABLES";
 	var $metaColumnsSQL = "SHOW COLUMNS FROM `%s`";
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
 	var $hasLimit = true;
@@ -52,15 +52,15 @@
 	var $optionFlags = array(array(MYSQLI_READ_DEFAULT_GROUP,0));
   	var $arrayClass = 'ADORecordSet_array_mysqli';
   	var $multiQuery = false;
-	
-	function ADODB_mysqli() 
-	{			
+
+	function ADODB_mysqli()
+	{
 	 // if(!extension_loaded("mysqli"))
 	      ;//trigger_error("You must have the mysqli extension installed.", E_USER_ERROR);
-	    
+
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -74,19 +74,19 @@
 	// returns true or false
 	// To add: parameter int $port,
 	//         parameter string $socket
-	function _connect($argHostname = NULL, 
-			  $argUsername = NULL, 
-			  $argPassword = NULL, 
+	function _connect($argHostname = NULL,
+			  $argUsername = NULL,
+			  $argPassword = NULL,
 			  $argDatabasename = NULL, $persist=false)
 	  {
 	  	 if(!extension_loaded("mysqli")) {
 			return null;
 		 }
 	    $this->_connectionID = @mysqli_init();
-	    
+
 	    if (is_null($this->_connectionID)) {
 	      // mysqli_init only fails if insufficient memory
-	      if ($this->debug) 
+	      if ($this->debug)
 				ADOConnection::outp("mysqli_init() failed : "  . $this->ErrorMsg());
 	      return false;
 	    }
@@ -95,7 +95,7 @@
 		read connection options from the standard mysql configuration file
 		/etc/my.cnf - "Bastien Duclaux" <bduclaux#yahoo.com>
 		*/
-		foreach($this->optionFlags as $arr) {	
+		foreach($this->optionFlags as $arr) {
 			mysqli_options($this->_connectionID,$arr[0],$arr[1]);
 		}
 
@@ -108,18 +108,18 @@
 					$this->port,
 					$this->socket,
 					$this->clientFlags);
- 	     
+
 		if ($ok) {
 	 		if ($argDatabasename)  return $this->SelectDB($argDatabasename);
  			return true;
  	   } else {
-			if ($this->debug) 
+			if ($this->debug)
 		  		ADOConnection::outp("Could't connect : "  . $this->ErrorMsg());
 			$this->_connectionID = null;
 			return false;
 	   }
 	}
-	
+
 	// returns true or false
 	// How to force a persistent connection
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
@@ -127,64 +127,64 @@
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true);
 
 	}
-	
+
 	// When is this used? Close old connection first?
-	// In _connect(), check $this->forceNewConnect? 
+	// In _connect(), check $this->forceNewConnect?
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	  {
 	    $this->forceNewConnect = true;
 	    return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
 	  }
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " IFNULL($field, $ifNull) "; // if MySQL
 	}
-	
+
 	// do not use $ADODB_COUNTRECS
 	function GetOne($sql,$inputarr=false)
 	{
 		$ret = false;
 		$rs = $this->Execute($sql,$inputarr);
-		if ($rs) {	
+		if ($rs) {
 			if (!$rs->EOF) $ret = reset($rs->fields);
 			$rs->Close();
 		}
 		return $ret;
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['description'] = $this->GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	
+
+
 	function BeginTrans()
-	{	  
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
-		
+
 		//$this->Execute('SET AUTOCOMMIT=0');
 		mysqli_autocommit($this->_connectionID, false);
 		$this->Execute('BEGIN');
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
+
+	function CommitTrans($ok=true)
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->Execute('COMMIT');
-		
+
 		//$this->Execute('SET AUTOCOMMIT=1');
 		mysqli_autocommit($this->_connectionID, true);
 		return true;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
@@ -194,22 +194,22 @@
 		mysqli_autocommit($this->_connectionID, true);
 		return true;
 	}
-	
-	function RowLock($tables,$where='',$col='1 as adodb_ignore') 
+
+	function RowLock($tables,$where='',$col='1 as adodb_ignore')
 	{
 		if ($this->transCnt==0) $this->BeginTrans();
 		if ($where) $where = ' where '.$where;
 		$rs = $this->Execute("select $col from $tables $where for update");
-		return !empty($rs); 
+		return !empty($rs);
 	}
-	
+
 	// if magic quotes disabled, use mysql_real_escape_string()
 	// From readme.htm:
 	// Quotes a string to be sent to the database. The $magic_quotes_enabled
-	// parameter may look funny, but the idea is if you are quoting a 
-	// string extracted from a POST/GET variable, then 
-	// pass get_magic_quotes_gpc() as the second parameter. This will 
-	// ensure that the variable is not quoted twice, once by qstr and once 
+	// parameter may look funny, but the idea is if you are quoting a
+	// string extracted from a POST/GET variable, then
+	// pass get_magic_quotes_gpc() as the second parameter. This will
+	// ensure that the variable is not quoted twice, once by qstr and once
 	// by the magic_quotes_gpc.
 	//
 	//Eg. $s = $db->qstr(_GET['name'],get_magic_quotes_gpc());
@@ -218,17 +218,17 @@
 		if (is_null($s)) return 'NULL';
 		if (!$magic_quotes) {
 	    	if (PHP_VERSION >= 5)
-	      		return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";   
-	    
+	      		return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";
+
 		if ($this->replaceQuote[0] == '\\')
 			$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-	    return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+	    return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 	  }
 	  // undo magic quotes for "
 	  $s = str_replace('\\"','"',$s);
 	  return "'$s'";
 	}
-	
+
 	function _insertid()
 	{
 	  $result = @mysqli_insert_id($this->_connectionID);
@@ -237,7 +237,7 @@
 	  }
 	  return $result;
 	}
-	
+
 	// Only works for INSERT, UPDATE and DELETE query's
 	function _affectedrows()
 	{
@@ -247,7 +247,7 @@
 	  }
 	  return $result;
 	}
-  
+
  	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
 	// Reference on Last_Insert_ID on the recommended way to simulate sequences
  	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
@@ -255,22 +255,22 @@
 	var $_genSeqCountSQL = "select count(*) from %s";
 	var $_genSeq2SQL = "insert into %s values (%s)";
 	var $_dropSeqSQL = "drop table %s";
-	
+
 	function CreateSequence($seqname='adodbseq',$startID=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
 		$u = strtoupper($seqname);
-		
+
 		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
 		if (!$ok) return false;
 		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 	}
-	
+
 	function GenID($seqname='adodbseq',$startID=1)
 	{
 		// post-nuke sets hasGenID to false
 		if (!$this->hasGenID) return false;
-		
+
 		$getnext = sprintf($this->_genIDSQL,$seqname);
 		$holdtransOK = $this->_transOK; // save the current status
 		$rs = @$this->Execute($getnext);
@@ -282,16 +282,16 @@
 			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 			$rs = $this->Execute($getnext);
 		}
-		
+
 		if ($rs) {
 			$this->genID = mysqli_insert_id($this->_connectionID);
 			$rs->Close();
 		} else
 			$this->genID = 0;
-			
+
 		return $this->genID;
 	}
-	
+
   	function MetaDatabases()
 	{
 		$query = "SHOW DATABASES";
@@ -308,63 +308,63 @@
         return $ret;
 	}
 
-	  
+
 	function MetaIndexes ($table, $primary = FALSE)
 	{
 		// save old fetch mode
 		global $ADODB_FETCH_MODE;
-		
+
 		$false = false;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== FALSE) {
 		       $savem = $this->SetFetchMode(FALSE);
 		}
-		
+
 		// get index details
 		$rs = $this->Execute(sprintf('SHOW INDEXES FROM %s',$table));
-		
+
 		// restore fetchmode
 		if (isset($savem)) {
 		        $this->SetFetchMode($savem);
 		}
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!is_object($rs)) {
 		        return $false;
 		}
-		
+
 		$indexes = array ();
-		
+
 		// parse index data into array
 		while ($row = $rs->FetchRow()) {
 		        if ($primary == FALSE AND $row[2] == 'PRIMARY') {
 		                continue;
 		        }
-		        
+
 		        if (!isset($indexes[$row[2]])) {
 		                $indexes[$row[2]] = array(
 		                        'unique' => ($row[1] == 0),
 		                        'columns' => array()
 		                );
 		        }
-		        
+
 		        $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
 		}
-		
+
 		// sort columns by order in the index
 		foreach ( array_keys ($indexes) as $index )
 		{
 		        ksort ($indexes[$index]['columns']);
 		}
-		
+
 		return $indexes;
 	}
 
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'DATE_FORMAT('.$col.",'";
 		$concat = false;
@@ -379,7 +379,7 @@
 			case 'Q':
 			case 'q':
 				$s .= "'),Quarter($col)";
-				
+
 				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
 				else $s .= ",('";
 				$concat = true;
@@ -387,7 +387,7 @@
 			case 'M':
 				$s .= '%b';
 				break;
-				
+
 			case 'm':
 				$s .= '%m';
 				break;
@@ -395,38 +395,38 @@
 			case 'd':
 				$s .= '%d';
 				break;
-			
-			case 'H': 
+
+			case 'H':
 				$s .= '%H';
 				break;
-				
+
 			case 'h':
 				$s .= '%I';
 				break;
-				
+
 			case 'i':
 				$s .= '%i';
 				break;
-				
+
 			case 's':
 				$s .= '%s';
 				break;
-				
+
 			case 'a':
 			case 'A':
 				$s .= '%p';
 				break;
-			
+
 			case 'w':
 				$s .= '%w';
 				break;
-				
+
 			case 'l':
 				$s .= '%W';
 				break;
-				
+
 			default:
-				
+
 				if ($ch == '\\') {
 					$i++;
 					$ch = substr($fmt,$i,1);
@@ -439,55 +439,55 @@
 		if ($concat) $s = "CONCAT($s)";
 		return $s;
 	}
-	
+
 	// returns concatenated string
 	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
 	function Concat()
 	{
 		$s = "";
 		$arr = func_get_args();
-		
+
 		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
+		$s = implode(',',$arr);
 		if (strlen($s) > 0) return "CONCAT($s)";
 		else return '';
 	}
-	
+
 	// dayFraction is a day in floating point
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
-		
+
 		$fraction = $dayFraction * 24 * 3600;
 		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
+
 //		return "from_unixtime(unix_timestamp($date)+$fraction)";
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
 			$this->metaTablesSQL .= " from $showSchema";
 		}
-		
+
 		if ($mask) {
 			$mask = $this->qstr($mask);
 			$this->metaTablesSQL .= " like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		$this->metaTablesSQL = $save;
 		return $ret;
 	}
-	
+
 	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
 	{
 	 global $ADODB_FETCH_MODE;
-		
+
 		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
-		
+
 	    if ( !empty($owner) ) {
 	       $table = "$owner.$table";
 	    }
@@ -495,21 +495,21 @@
 		if ($associative) {
 			$create_sql = isset($a_create_table["Create Table"]) ? $a_create_table["Create Table"] : $a_create_table["Create View"];
 	    } else $create_sql  = $a_create_table[1];
-	
+
 	    $matches = array();
-	
+
 	    if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
-	 	$foreign_keys = array();	 	 
+	 	$foreign_keys = array();
 	    $num_keys = count($matches[0]);
 	    for ( $i = 0;  $i < $num_keys;  $i ++ ) {
 	        $my_field  = explode('`, `', $matches[1][$i]);
 	        $ref_table = $matches[2][$i];
 	        $ref_field = explode('`, `', $matches[3][$i]);
-	
+
 	        if ( $upper ) {
 	            $ref_table = strtoupper($ref_table);
 	        }
-	
+
 	        // see https://sourceforge.net/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
 			if (!isset($foreign_keys[$ref_table])) {
 				$foreign_keys[$ref_table] = array();
@@ -523,16 +523,16 @@
 	            }
 	        }
 	    }
-	    
+
 	    return  $foreign_keys;
 	}
-	
- 	function MetaColumns($table, $normalize=true) 
+
+ 	function MetaColumns($table, $normalize=true)
 	{
 		$false = false;
 		if (!$this->metaColumnsSQL)
 			return $false;
-		
+
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
@@ -543,13 +543,13 @@
 		$ADODB_FETCH_MODE = $save;
 		if (!is_object($rs))
 			return $false;
-		
+
 		$retarr = array();
 		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$type = $rs->fields[1];
-			
+
 			// split type into type(length):
 			$fld->scale = null;
 			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
@@ -585,7 +585,7 @@
 					$fld->has_default = false;
 				}
 			}
-			
+
 			if ($save == ADODB_FETCH_NUM) {
 				$retarr[] = $fld;
 			} else {
@@ -593,47 +593,47 @@
 			}
 			$rs->MoveNext();
 		}
-		
+
 		$rs->Close();
 		return $retarr;
 	}
-		
+
 	// returns true or false
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 //	    $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
 	    $this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		
+
 	    if ($this->_connectionID) {
         	$result = @mysqli_select_db($this->_connectionID, $dbName);
 			if (!$result) {
 		    	ADOConnection::outp("Select of database " . $dbName . " failed. " . $this->ErrorMsg());
 			}
-			return $result;		
+			return $result;
 		}
-	    return false;	
+	    return false;
 	}
-	
+
 	// parameters use PostgreSQL convention, not MySQL
 	function SelectLimit($sql,
 			      $nrows = -1,
 			      $offset = -1,
-			      $inputarr = false, 
+			      $inputarr = false,
 			      $secs = 0)
 	{
 		$offsetStr = ($offset >= 0) ? "$offset," : '';
 		if ($nrows < 0) $nrows = '18446744073709551615';
-		
+
 		if ($secs)
 			$rs = $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr );
 		else
 			$rs = $this->Execute($sql . " LIMIT $offsetStr$nrows" , $inputarr );
-			
+
 		return $rs;
 	}
-	
-	
+
+
 	function Prepare($sql)
 	{
 		return $sql;
@@ -644,8 +644,8 @@
 		}
 		return array($sql,$stmt);
 	}
-	
-	
+
+
 	// returns queryID or false
 	function _query($sql, $inputarr)
 	{
@@ -656,35 +656,35 @@
 		// return value of the stored proc (ie the number of rows affected).
 		// Commented out for reasons of performance. You should retrieve every recordset yourself.
 		//	if (!mysqli_next_result($this->connection->_connectionID))	return false;
-	
+
 		if (is_array($sql)) {
-		
+
 			// Prepare() not supported because mysqli_stmt_execute does not return a recordset, but
 			// returns as bound variables.
-		
+
 			$stmt = $sql[1];
 			$a = '';
 			foreach($inputarr as $k => $v) {
 				if (is_string($v)) $a .= 's';
-				else if (is_integer($v)) $a .= 'i'; 
+				else if (is_integer($v)) $a .= 'i';
 				else $a .= 'd';
 			}
-			
+
 			$fnarr = array_merge( array($stmt,$a) , $inputarr);
 			$ret = call_user_func_array('mysqli_stmt_bind_param',$fnarr);
 			$ret = mysqli_stmt_execute($stmt);
 			return $ret;
 		}
-		
+
 		/*
 		if (!$mysql_res =  mysqli_query($this->_connectionID, $sql, ($ADODB_COUNTRECS) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT)) {
 		    if ($this->debug) ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
 		    return false;
 		}
-		
+
 		return $mysql_res;
 		*/
-		
+
 		if ($this->multiQuery) {
 			$rs = mysqli_multi_query($this->_connectionID, $sql.';');
 			if ($rs) {
@@ -693,36 +693,36 @@
 			}
 		} else {
 			$rs = mysqli_query($this->_connectionID, $sql, $ADODB_COUNTRECS ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT);
-		
+
 			if ($rs) return $rs;
 		}
 
 		if($this->debug)
 			ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
-		
+
 		return false;
-		
+
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	  {
-	    if (empty($this->_connectionID)) 
+	    if (empty($this->_connectionID))
 	      $this->_errorMsg = @mysqli_connect_error();
-	    else 
+	    else
 	      $this->_errorMsg = @mysqli_error($this->_connectionID);
 	    return $this->_errorMsg;
 	  }
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
+
+	/*	Returns: the last error number from previous database operation	*/
+	function ErrorNo()
 	  {
-	    if (empty($this->_connectionID))  
+	    if (empty($this->_connectionID))
 	      return @mysqli_connect_errno();
-	    else 
+	    else
 	      return @mysqli_errno($this->_connectionID);
 	  }
-	
+
 	// returns true or false
 	function _close()
 	  {
@@ -735,15 +735,15 @@
 	*/
 	function CharMax()
 	{
-		return 255; 
+		return 255;
 	}
-	
+
 	/*
 	* Maximum size of X field
 	*/
 	function TextMax()
 	{
-	  return 4294967295; 
+	  return 4294967295;
 	}
 
 
@@ -753,14 +753,14 @@
 	// for instance, you may have UTF8 database and server it on-site as latin1 etc.
 	// GetCharSet - get the name of the character set the client is using now
 	// Under Windows, the functions should work with MySQL 4.1.11 and above, the set of charsets supported
-	// depends on compile flags of mysql distribution 
+	// depends on compile flags of mysql distribution
 
   function GetCharSet()
   {
     //we will use ADO's builtin property charSet
     if (!method_exists($this->_connectionID,'character_set_name'))
     	return false;
-    	
+
     $this->charSet = @$this->_connectionID->character_set_name();
     if (!$this->charSet) {
       return false;
@@ -787,50 +787,50 @@
 
 
 }
- 
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_mysqli extends ADORecordSet{	
-	
+class ADORecordSet_mysqli extends ADORecordSet{
+
 	var $databaseType = "mysqli";
 	var $canSeek = true;
-	
-	function ADORecordSet_mysqli($queryID, $mode = false) 
+
+	function ADORecordSet_mysqli($queryID, $mode = false)
 	{
-	  if ($mode === false) 
-	   { 
+	  if ($mode === false)
+	   {
 	      global $ADODB_FETCH_MODE;
 	      $mode = $ADODB_FETCH_MODE;
 	   }
-	   
+
 	  switch ($mode)
 	    {
-	    case ADODB_FETCH_NUM: 
-	      $this->fetchMode = MYSQLI_NUM; 
+	    case ADODB_FETCH_NUM:
+	      $this->fetchMode = MYSQLI_NUM;
 	      break;
 	    case ADODB_FETCH_ASSOC:
-	      $this->fetchMode = MYSQLI_ASSOC; 
+	      $this->fetchMode = MYSQLI_ASSOC;
 	      break;
 	    case ADODB_FETCH_DEFAULT:
 	    case ADODB_FETCH_BOTH:
 	    default:
-	      $this->fetchMode = MYSQLI_BOTH; 
+	      $this->fetchMode = MYSQLI_BOTH;
 	      break;
 	    }
 	  $this->adodbFetchMode = $mode;
-	  $this->ADORecordSet($queryID);	
+	  $this->ADORecordSet($queryID);
 	}
-	
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		$this->_numOfRows = $ADODB_COUNTRECS ? @mysqli_num_rows($this->_queryID) : -1;
 		$this->_numOfFields = @mysqli_num_fields($this->_queryID);
 	}
-	
+
 /*
 1      = MYSQLI_NOT_NULL_FLAG
 2      = MYSQLI_PRI_KEY_FLAG
@@ -851,8 +851,8 @@
 131072 = MYSQLI_BINCMP_FLAG
 */
 
-	function FetchField($fieldOffset = -1) 
-	{	
+	function FetchField($fieldOffset = -1)
+	{
 		$fieldnr = $fieldOffset;
 		if ($fieldOffset != -1) {
 		  $fieldOffset = @mysqli_field_seek($this->_queryID, $fieldnr);
@@ -872,18 +872,18 @@
 
 	function GetRowAssoc($upper = true)
 	{
-		if ($this->fetchMode == MYSQLI_ASSOC && !$upper) 
+		if ($this->fetchMode == MYSQLI_ASSOC && !$upper)
 		  return $this->fields;
 		$row = ADORecordSet::GetRowAssoc($upper);
 		return $row;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
-	{	
-	  if ($this->fetchMode != MYSQLI_NUM) 
+	{
+	  if ($this->fetchMode != MYSQLI_NUM)
 	    return @$this->fields[$colname];
-		
+
 	  if (!$this->bind) {
 	    $this->bind = array();
 	    for ($i = 0; $i < $this->_numOfFields; $i++) {
@@ -893,10 +893,10 @@
 	  }
 	  return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
 	function _seek($row)
 	{
-	  if ($this->_numOfRows == 0) 
+	  if ($this->_numOfRows == 0)
 	    return false;
 
 	  if ($row < 0)
@@ -906,12 +906,12 @@
 	  $this->EOF = false;
 	  return true;
 	}
-		
-		
+
+
 	function NextRecordSet()
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		mysqli_free_result($this->_queryID);
 		$this->_queryID = -1;
 		// Move to the next recordset, or return false if there is none. In a stored proc
@@ -937,24 +937,24 @@
 	// 10% speedup to move MoveNext to child class
 	// This is the only implementation that works now (23-10-2003).
 	// Other functions return no or the wrong results.
-	function MoveNext() 
+	function MoveNext()
 	{
 		if ($this->EOF) return false;
 		$this->_currentRow++;
 		$this->fields = @mysqli_fetch_array($this->_queryID,$this->fetchMode);
-		
+
 		if (is_array($this->fields)) return true;
 		$this->EOF = true;
 		return false;
-	}	
-	
+	}
+
 	function _fetch()
 	{
-		$this->fields = mysqli_fetch_array($this->_queryID,$this->fetchMode);  
+		$this->fields = mysqli_fetch_array($this->_queryID,$this->fetchMode);
 	  	return is_array($this->fields);
 	}
-	
-	function _close() 
+
+	function _close()
 	{
 	    //if results are attached to this pointer from Stored Proceedure calls, the next standard query will die 2014
         //only a problem with persistant connections
@@ -969,10 +969,10 @@
         @mysqli_next_result($this->connection->_connectionID);
 
 
-		mysqli_free_result($this->_queryID); 
-	  	$this->_queryID = false;	
+		mysqli_free_result($this->_queryID);
+	  	$this->_queryID = false;
 	}
-	
+
 /*
 
 0 = MYSQLI_TYPE_DECIMAL
@@ -1009,18 +1009,18 @@
 		    $t = $fieldobj->type;
 		    $len = $fieldobj->max_length;
 		}
-		
-		
+
+
 		 $len = -1; // mysql max_length is not accurate
 		 switch (strtoupper($t)) {
-		 case 'STRING': 
+		 case 'STRING':
 		 case 'CHAR':
-		 case 'VARCHAR': 
-		 case 'TINYBLOB': 
-		 case 'TINYTEXT': 
-		 case 'ENUM': 
-		 case 'SET': 
-		
+		 case 'VARCHAR':
+		 case 'TINYBLOB':
+		 case 'TINYTEXT':
+		 case 'ENUM':
+		 case 'SET':
+
 		case MYSQLI_TYPE_TINY_BLOB :
 		#case MYSQLI_TYPE_CHAR :
 		case MYSQLI_TYPE_STRING :
@@ -1028,61 +1028,61 @@
 		case MYSQLI_TYPE_SET :
 		case 253 :
 		   if ($len <= $this->blobSize) return 'C';
-		   
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 		   return 'X';
-		
-		
+
+
 		   // php_mysql extension always returns 'blob' even if 'text'
 		   // so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
-		
+
 		case MYSQLI_TYPE_BLOB :
 		case MYSQLI_TYPE_LONG_BLOB :
 		case MYSQLI_TYPE_MEDIUM_BLOB :
-		
+
 		   return !empty($fieldobj->binary) ? 'B' : 'X';
 		case 'YEAR':
-		case 'DATE': 
+		case 'DATE':
 		case MYSQLI_TYPE_DATE :
 		case MYSQLI_TYPE_YEAR :
-		
+
 		   return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP':
-		
+
 		case MYSQLI_TYPE_DATETIME :
 		case MYSQLI_TYPE_NEWDATE :
 		case MYSQLI_TYPE_TIME :
 		case MYSQLI_TYPE_TIMESTAMP :
-		
+
 			return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER':
 		case 'BIGINT':
 		case 'TINYINT':
 		case 'MEDIUMINT':
-		case 'SMALLINT': 
-		
+		case 'SMALLINT':
+
 		case MYSQLI_TYPE_INT24 :
 		case MYSQLI_TYPE_LONG :
 		case MYSQLI_TYPE_LONGLONG :
 		case MYSQLI_TYPE_SHORT :
 		case MYSQLI_TYPE_TINY :
-		
+
 		   if (!empty($fieldobj->primary_key)) return 'R';
-		   
+
 		   return 'I';
-		
-		
+
+
 		   // Added floating-point types
 		   // Maybe not necessery.
 		 case 'FLOAT':
@@ -1092,23 +1092,23 @@
 		 case 'DEC':
 		 case 'FIXED':
 		 default:
-		 	//if (!is_numeric($t)) echo "<p>--- Error in type matching $t -----</p>"; 
+		 	//if (!is_numeric($t)) echo "<p>--- Error in type matching $t -----</p>";
 		 	return 'N';
 		}
 	} // function
-	
 
+
 } // rs class
- 
+
 }
 
 class ADORecordSet_array_mysqli extends ADORecordSet_array {
-  
-  function ADORecordSet_array_mysqli($id=-1,$mode=false) 
+
+  function ADORecordSet_array_mysqli($id=-1,$mode=false)
   {
     $this->ADORecordSet_array($id,$mode);
   }
-  
+
 	function MetaType($t, $len = -1, $fieldobj = false)
 	{
 		if (is_object($t)) {
@@ -1116,18 +1116,18 @@
 		    $t = $fieldobj->type;
 		    $len = $fieldobj->max_length;
 		}
-		
-		
+
+
 		 $len = -1; // mysql max_length is not accurate
 		 switch (strtoupper($t)) {
-		 case 'STRING': 
+		 case 'STRING':
 		 case 'CHAR':
-		 case 'VARCHAR': 
-		 case 'TINYBLOB': 
-		 case 'TINYTEXT': 
-		 case 'ENUM': 
-		 case 'SET': 
-		
+		 case 'VARCHAR':
+		 case 'TINYBLOB':
+		 case 'TINYTEXT':
+		 case 'ENUM':
+		 case 'SET':
+
 		case MYSQLI_TYPE_TINY_BLOB :
 		#case MYSQLI_TYPE_CHAR :
 		case MYSQLI_TYPE_STRING :
@@ -1135,61 +1135,61 @@
 		case MYSQLI_TYPE_SET :
 		case 253 :
 		   if ($len <= $this->blobSize) return 'C';
-		   
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 		   return 'X';
-		
-		
+
+
 		   // php_mysql extension always returns 'blob' even if 'text'
 		   // so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
-		
+
 		case MYSQLI_TYPE_BLOB :
 		case MYSQLI_TYPE_LONG_BLOB :
 		case MYSQLI_TYPE_MEDIUM_BLOB :
-		
+
 		   return !empty($fieldobj->binary) ? 'B' : 'X';
 		case 'YEAR':
-		case 'DATE': 
+		case 'DATE':
 		case MYSQLI_TYPE_DATE :
 		case MYSQLI_TYPE_YEAR :
-		
+
 		   return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP':
-		
+
 		case MYSQLI_TYPE_DATETIME :
 		case MYSQLI_TYPE_NEWDATE :
 		case MYSQLI_TYPE_TIME :
 		case MYSQLI_TYPE_TIMESTAMP :
-		
+
 			return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER':
 		case 'BIGINT':
 		case 'TINYINT':
 		case 'MEDIUMINT':
-		case 'SMALLINT': 
-		
+		case 'SMALLINT':
+
 		case MYSQLI_TYPE_INT24 :
 		case MYSQLI_TYPE_LONG :
 		case MYSQLI_TYPE_LONGLONG :
 		case MYSQLI_TYPE_SHORT :
 		case MYSQLI_TYPE_TINY :
-		
+
 		   if (!empty($fieldobj->primary_key)) return 'R';
-		   
+
 		   return 'I';
-		
-		
+
+
 		   // Added floating-point types
 		   // Maybe not necessery.
 		 case 'FLOAT':
@@ -1199,11 +1199,11 @@
 		 case 'DEC':
 		 case 'FIXED':
 		 default:
-		 	//if (!is_numeric($t)) echo "<p>--- Error in type matching $t -----</p>"; 
+		 	//if (!is_numeric($t)) echo "<p>--- Error in type matching $t -----</p>";
 		 	return 'N';
 		}
 	} // function
-  
+
 }
 
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/drivers/adodb-postgres8.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-postgres8.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-postgres8.inc.php	(working copy)
@@ -1,12 +1,12 @@
 <?php
 /*
  V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 4.
-  
-  NOTE: The "postgres8" driver is remapped to "postgres7". 
+
+  NOTE: The "postgres8" driver is remapped to "postgres7".
 */
 
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/drivers/adodb-sqlite.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-sqlite.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-sqlite.inc.php	(working copy)
@@ -1,14 +1,14 @@
 <?php
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
 
   Latest version is available at http://adodb.sourceforge.net
-  
+
   SQLite info: http://www.hwaci.com/sw/sqlite/
-    
+
   Install Instructions:
   ====================
   1. Place this in adodb/drivers
@@ -23,27 +23,27 @@
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $concat_operator='||';
 	var $_errorNo = 0;
-	var $hasLimit = true;	
+	var $hasLimit = true;
 	var $hasInsertID = true; 		/// supports autoincrement ID?
 	var $hasAffectedRows = true; 	/// supports affected rows for update/delete?
 	var $metaTablesSQL = "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name";
 	var $sysDate = "adodb_date('Y-m-d')";
 	var $sysTimeStamp = "adodb_date('Y-m-d H:i:s')";
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	
-	function ADODB_sqlite() 
+
+	function ADODB_sqlite()
 	{
 	}
-	
+
 /*
-  function __get($name) 
+  function __get($name)
   {
   	switch($name) {
 	case 'sysDate': return "'".date($this->fmtDate)."'";
 	case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
 	}
   }*/
-	
+
 	function ServerInfo()
 	{
 		$arr['version'] = sqlite_libversion();
@@ -51,34 +51,34 @@
 		$arr['encoding'] = sqlite_libencoding();
 		return $arr;
 	}
-	
+
 	function BeginTrans()
-	{	  
-		 if ($this->transOff) return true; 
+	{
+		 if ($this->transOff) return true;
 		 $ret = $this->Execute("BEGIN TRANSACTION");
 		 $this->transCnt += 1;
 		 return true;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
 		$ret = $this->Execute("COMMIT");
 		if ($this->transCnt>0)$this->transCnt -= 1;
 		return !empty($ret);
 	}
-	
+
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$ret = $this->Execute("ROLLBACK");
 		if ($this->transCnt>0)$this->transCnt -= 1;
 		return !empty($ret);
 	}
-	
+
 	// mark newnham
-	function MetaColumns($table, $normalize=true) 
+	function MetaColumns($table, $normalize=true)
 	{
 	  global $ADODB_FETCH_MODE;
 	  $false = false;
@@ -88,7 +88,7 @@
 	  $rs = $this->Execute("PRAGMA table_info('$table')");
 	  if (isset($savem)) $this->SetFetchMode($savem);
 	  if (!$rs) {
-	    $ADODB_FETCH_MODE = $save; 
+	    $ADODB_FETCH_MODE = $save;
 	    return $false;
 	  }
 	  $arr = array();
@@ -105,17 +105,17 @@
 	    $fld->not_null = $r['notnull'];
 	    $fld->default_value = $r['dflt_value'];
 	    $fld->scale = 0;
-	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;	
+	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;
 	    else $arr[strtoupper($fld->name)] = $fld;
 	  }
 	  $rs->Close();
 	  $ADODB_FETCH_MODE = $save;
 	  return $arr;
 	}
-	
+
 	function _init($parentDriver)
 	{
-	
+
 		$parentDriver->hasTransactions = false;
 		$parentDriver->hasInsertID = true;
 	}
@@ -124,55 +124,55 @@
 	{
 		return sqlite_last_insert_rowid($this->_connectionID);
 	}
-	
+
 	function _affectedrows()
 	{
         return sqlite_changes($this->_connectionID);
     }
-	
-	function ErrorMsg() 
+
+	function ErrorMsg()
  	{
 		if ($this->_logsql) return $this->_errorMsg;
 		return ($this->_errorNo) ? sqlite_error_string($this->_errorNo) : '';
 	}
- 
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		return $this->_errorNo;
 	}
-	
+
 	function SQLDate($fmt, $col=false)
 	{
 		$fmt = $this->qstr($fmt);
 		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
 	}
-	
-	
+
+
 	function _createFunctions()
 	{
 		@sqlite_create_function($this->_connectionID, 'adodb_date', 'adodb_date', 1);
 		@sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
 	}
-	
 
+
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('sqlite_open')) return null;
 		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
+
 		$this->_connectionID = sqlite_open($argHostname);
 		if ($this->_connectionID === false) return false;
 		$this->_createFunctions();
 		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('sqlite_open')) return null;
 		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
+
 		$this->_connectionID = sqlite_popen($argHostname);
 		if ($this->_connectionID === false) return false;
 		$this->_createFunctions();
@@ -186,11 +186,11 @@
 		if (!$rez) {
 			$this->_errorNo = sqlite_last_error($this->_connectionID);
 		}
-		
+
 		return $rez;
 	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
 		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
@@ -198,20 +198,20 @@
 	   		$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
 	  	else
 	   		$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-			
+
 		return $rs;
 	}
-	
+
 	/*
 		This algorithm is not very efficient, but works even if table locking
 		is not available.
-		
+
 		Will return false if unable to generate an ID after $MAXLOOPS attempts.
 	*/
 	var $_genSeqSQL = "create table %s (id integer)";
-	
+
 	function GenID($seq='adodbseq',$start=1)
-	{	
+	{
 		// if you have to modify the parameter below, your database is overloaded,
 		// or you need to implement generation of id's yourself!
 		$MAXLOOPS = 100;
@@ -219,14 +219,14 @@
 		while (--$MAXLOOPS>=0) {
 			@($num = $this->GetOne("select id from $seq"));
 			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));
 				$start -= 1;
 				$num = '0';
 				$ok = $this->Execute("insert into $seq values($start)");
 				if (!$ok) return false;
-			} 
+			}
 			$this->Execute("update $seq set id=id+1 where id=$num");
-			
+
 			if ($this->affected_rows() > 0) {
 				$num += 1;
 				$this->genID = $num;
@@ -247,14 +247,14 @@
 		$start -= 1;
 		return $this->Execute("insert into $seqname values($start)");
 	}
-	
+
 	var $_dropSeqSQL = 'drop table %s';
 	function DropSequence($seqname)
 	{
 		if (empty($this->_dropSeqSQL)) return false;
 		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -274,7 +274,7 @@
 		$SQL=sprintf("SELECT name,sql FROM sqlite_master WHERE type='index' AND tbl_name='%s'", strtolower($table));
         $rs = $this->Execute($SQL);
         if (!is_object($rs)) {
-			if (isset($savem)) 
+			if (isset($savem))
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
             return $false;
@@ -300,7 +300,7 @@
 			array_pop($cols);
 			$indexes[$row[0]]['columns'] = $cols;
 		}
-		if (isset($savem)) { 
+		if (isset($savem)) {
             $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
@@ -320,8 +320,8 @@
 
 	function ADORecordset_sqlite($queryID,$mode=false)
 	{
-		
-		if ($mode === false) { 
+
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -331,9 +331,9 @@
 		default: $this->fetchMode = SQLITE_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		
+
 		$this->_queryID = $queryID;
-	
+
 		$this->_inited = true;
 		$this->fields = array();
 		if ($queryID) {
@@ -345,7 +345,7 @@
 			$this->_numOfFields = 0;
 			$this->EOF = true;
 		}
-		
+
 		return $this->_queryID;
 	}
 
@@ -358,7 +358,7 @@
 		$fld->max_length = -1;
 		return $fld;
 	}
-	
+
    function _initrs()
    {
 		$this->_numOfRows = @sqlite_num_rows($this->_queryID);
@@ -375,22 +375,22 @@
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
    function _seek($row)
    {
    		return sqlite_seek($this->_queryID, $row);
    }
 
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields=false)
 	{
 		$this->fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
 		return !empty($this->fields);
 	}
-	
-	function _close() 
+
+	function _close()
 	{
 	}
 
Index: typo3/sysext/adodb/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-mssql.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-mssql.inc.php	(working copy)
@@ -1,17 +1,17 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
-  Native mssql driver. Requires mssql client. Works on Windows. 
-  To configure for Unix, see 
+
+  Native mssql driver. Requires mssql client. Works on Windows.
+  To configure for Unix, see
    	http://phpbuilder.com/columns/alberto20000919.php3
-	
+
 */
 
 
@@ -20,15 +20,15 @@
 
 //----------------------------------------------------------------
 // MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
-// and this causes tons of problems because localized versions of 
-// MSSQL will return the dates in dmy or  mdy order; and also the 
-// month strings depends on what language has been configured. The 
+// and this causes tons of problems because localized versions of
+// MSSQL will return the dates in dmy or  mdy order; and also the
+// month strings depends on what language has been configured. The
 // following two variables allow you to control the localization
 // settings - Ugh.
 //
 // MORE LOCALIZATION INFO
 // ----------------------
-// To configure datetime, look for and modify sqlcommn.loc, 
+// To configure datetime, look for and modify sqlcommn.loc,
 //  	typically found in c:\mssql\install
 // Also read :
 //	 http://support.microsoft.com/default.aspx?scid=kb;EN-US;q220918
@@ -40,12 +40,12 @@
 // has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
 if (ADODB_PHPVER >= 0x4300) {
 // docs say 4.2.0, but testing shows only since 4.3.0 does it work!
-	ini_set('mssql.datetimeconvert',0); 
+	ini_set('mssql.datetimeconvert',0);
 } else {
 global $ADODB_mssql_mths;		// array, months must be upper-case
 
 
-	$ADODB_mssql_date_order = 'mdy'; 
+	$ADODB_mssql_date_order = 'mdy';
 	$ADODB_mssql_mths = array(
 		'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
 		'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
@@ -72,7 +72,7 @@
 }
 
 class ADODB_mssql extends ADOConnection {
-	var $databaseType = "mssql";	
+	var $databaseType = "mssql";
 	var $dataProvider = "mssql";
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $fmtDate = "'Y-m-d'";
@@ -86,7 +86,7 @@
 	var $metaColumnsSQL = # xtype==61 is datetime
 "select c.name,t.name,c.length,
 	(case when c.xusertype=61 then 0 else c.xprec end),
-	(case when c.xusertype=61 then 0 else c.xscale end) 
+	(case when c.xusertype=61 then 0 else c.xscale end)
 	from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
 	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
 	var $hasGenID = true;
@@ -104,54 +104,54 @@
 	var $uniqueOrderBy = true;
 	var $_bindInputArray = true;
 	var $forceNewConnect = false;
-	
-	function ADODB_mssql() 
-	{		
+
+	function ADODB_mssql()
+	{
 		$this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
 	}
 
 	function ServerInfo()
 	{
 	global $ADODB_FETCH_MODE;
-	
-	
+
+
 		if ($this->fetchMode === false) {
 			$savem = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		} else 
+		} else
 			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
-				
+
 		if (0) {
 			$stmt = $this->PrepareSP('sp_server_info');
 			$val = 2;
 			$this->Parameter($stmt,$val,'attribute_id');
 			$row = $this->GetRow($stmt);
 		}
-		
+
 		$row = $this->GetRow("execute sp_server_info 2");
-		
-		
+
+
 		if ($this->fetchMode === false) {
 			$ADODB_FETCH_MODE = $savem;
 		} else
 			$this->SetFetchMode($savem);
-		
+
 		$arr['description'] = $row[2];
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " ISNULL($field, $ifNull) "; // if MS SQL Server
 	}
-	
+
 	function _insertid()
 	{
 	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
+	// Returns the last IDENTITY value inserted into an IDENTITY column in
+	// the same scope. A scope is a module -- a stored procedure, trigger,
+	// function, or batch. Thus, two statements are in the same scope if
 	// they are in the same stored procedure, function, or batch.
         if ($this->lastInsID !== false) {
             return $this->lastInsID; // InsID from sp_executesql call
@@ -166,7 +166,7 @@
 	* Correctly quotes a string so that all strings are escaped. We prefix and append
 	* to the string single-quotes.
 	* An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	* 
+	*
 	* @param s         the string to quote
 	* @param [magic_quotes]    if $s is GET/POST var, set to get_magic_quotes_gpc().
 	*              This undoes the stupidity of magic quotes for GPC.
@@ -201,10 +201,10 @@
 	}
 
 	var $_dropSeqSQL = "drop table %s";
-	
+
 	function CreateSequence($seq='adodbseq',$start=1)
 	{
-		
+
 		$this->Execute('BEGIN TRANSACTION adodbseq');
 		$start -= 1;
 		$this->Execute("create table $seq (id float(53))");
@@ -213,7 +213,7 @@
 				$this->Execute('ROLLBACK TRANSACTION adodbseq');
 				return false;
 		}
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		$this->Execute('COMMIT TRANSACTION adodbseq');
 		return true;
 	}
 
@@ -229,41 +229,41 @@
 				$this->Execute('ROLLBACK TRANSACTION adodbseq');
 				return false;
 			}
-			$this->Execute('COMMIT TRANSACTION adodbseq'); 
+			$this->Execute('COMMIT TRANSACTION adodbseq');
 			return $start;
 		}
 		$num = $this->GetOne("select id from $seq");
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		$this->Execute('COMMIT TRANSACTION adodbseq');
 		return $num;
-		
+
 		// in old implementation, pre 1.90, we returned GUID...
 		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
 	}
-	
 
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		if ($nrows > 0 && $offset <= 0) {
 			$sql = preg_replace(
 				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
-				
+
 			if ($secs2cache)
 				$rs = $this->CacheExecute($secs2cache, $sql, $inputarr);
 			else
 				$rs = $this->Execute($sql,$inputarr);
 		} else
 			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-	
+
 		return $rs;
 	}
-	
-	
+
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= '+';
@@ -290,11 +290,11 @@
 			case 'h':
 				$s .= "substring(convert(char(14),$col,0),13,2)";
 				break;
-			
+
 			case 'H':
 				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
 				break;
-				
+
 			case 'i':
 				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
 				break;
@@ -305,7 +305,7 @@
 			case 'A':
 				$s .= "substring(convert(char(19),$col,0),18,2)";
 				break;
-				
+
 			default:
 				if ($ch == '\\') {
 					$i++;
@@ -318,18 +318,18 @@
 		return $s;
 	}
 
-	
+
 	function BeginTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$this->transCnt += 1;
 	   	$ok = $this->Execute('BEGIN TRAN');
 	   	return $ok;
 	}
-		
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transCnt) $this->transCnt -= 1;
 		$ok = $this->Execute('COMMIT TRAN');
@@ -337,13 +337,13 @@
 	}
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
 		$ok = $this->Execute('ROLLBACK TRAN');
 		return $ok;
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -353,35 +353,35 @@
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET TRANSACTION ".$transaction_mode);
 	}
-	
+
 	/*
 		Usage:
-		
+
 		$this->BeginTrans();
 		$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
-		
+
 		# some operation on both tables table1 and table2
-		
+
 		$this->CommitTrans();
-		
+
 		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
 	*/
-	function RowLock($tables,$where,$col='top 1 null as ignore') 
+	function RowLock($tables,$where,$col='top 1 null as ignore')
 	{
 		if (!$this->transCnt) $this->BeginTrans();
 		return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where");
 	}
-	
-	
+
+
 	function MetaIndexes($table,$primary=false, $owner=false)
 	{
 		$table = $this->qstr($table);
 
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno,
 			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
 			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid
 			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
 			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
 			ORDER BY O.name, I.Name, K.keyno";
@@ -392,7 +392,7 @@
         if ($this->fetchMode !== FALSE) {
         	$savem = $this->SetFetchMode(FALSE);
         }
-        
+
         $rs = $this->Execute($sql);
         if (isset($savem)) {
         	$this->SetFetchMode($savem);
@@ -406,22 +406,22 @@
 		$indexes = array();
 		while ($row = $rs->FetchRow()) {
 			if ($primary && !$row[5]) continue;
-			
+
             $indexes[$row[0]]['unique'] = $row[6];
             $indexes[$row[0]]['columns'][] = $row[1];
     	}
         return $indexes;
 	}
-	
+
 	function MetaForeignKeys($table, $owner=false, $upper=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
+
+		$sql =
 "select object_name(constid) as constraint_name,
 	col_name(fkeyid, fkey) as column_name,
 	object_name(rkeyid) as referenced_table_name,
@@ -429,20 +429,20 @@
 from sysforeignkeys
 where upper(object_name(fkeyid)) = $table
 order by constraint_name, referenced_table_name, keyno";
-		
+
 		$constraints = $this->GetArray($sql);
-		
+
 		$ADODB_FETCH_MODE = $save;
-		
+
 		$arr = false;
 		foreach($constraints as $constr) {
 			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3];
 		}
 		if (!$arr) return false;
-		
+
 		$arr2 = false;
-		
+
 		foreach($arr as $k => $v) {
 			foreach($v as $a => $b) {
 				if ($upper) $a = strtoupper($a);
@@ -453,55 +453,55 @@
 	}
 
 	//From: Fernando Moreira <FMoreira@imediata.pt>
-	function MetaDatabases() 
-	{ 
-		if(@mssql_select_db("master")) { 
-				 $qry=$this->metaDatabasesSQL; 
-				 if($rs=@mssql_query($qry,$this->_connectionID)){ 
-						 $tmpAr=$ar=array(); 
-						 while($tmpAr=@mssql_fetch_row($rs)) 
-								 $ar[]=$tmpAr[0]; 
-						@mssql_select_db($this->database); 
-						 if(sizeof($ar)) 
-								 return($ar); 
-						 else 
-								 return(false); 
-				 } else { 
-						 @mssql_select_db($this->database); 
-						 return(false); 
-				 } 
-		 } 
-		 return(false); 
-	} 
+	function MetaDatabases()
+	{
+		if(@mssql_select_db("master")) {
+				 $qry=$this->metaDatabasesSQL;
+				 if($rs=@mssql_query($qry,$this->_connectionID)){
+						 $tmpAr=$ar=array();
+						 while($tmpAr=@mssql_fetch_row($rs))
+								 $ar[]=$tmpAr[0];
+						@mssql_select_db($this->database);
+						 if(sizeof($ar))
+								 return($ar);
+						 else
+								 return(false);
+				 } else {
+						 @mssql_select_db($this->database);
+						 return(false);
+				 }
+		 }
+		 return(false);
+	}
 
 	// "Stein-Aksel Basma" <basma@accelero.no>
 	// tested with MSSQL 2000
 	function MetaPrimaryKeys($table)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$schema = '';
 		$this->_findschema($table,$schema);
 		if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
+		if ($schema) $schema = "and k.table_catalog like '$schema%'";
 
 		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
-		information_schema.table_constraints tc 
+		information_schema.table_constraints tc
 		where tc.constraint_name = k.constraint_name and tc.constraint_type =
 		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
-		
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$a = $this->GetCol($sql);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if ($a && sizeof($a)>0) return $a;
 		$false = false;
-		return $false;	  
+		return $false;
 	}
 
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		if ($mask) {
 			$save = $this->metaTablesSQL;
@@ -509,32 +509,32 @@
 			$this->metaTablesSQL .= " AND name like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
- 
-	function SelectDB($dbName) 
+
+	function SelectDB($dbName)
 	{
 		$this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		if ($this->_connectionID) {
-			return @mssql_select_db($dbName);		
+			return @mssql_select_db($dbName);
 		}
-		else return false;	
+		else return false;
 	}
-	
-	function ErrorMsg() 
+
+	function ErrorMsg()
 	{
 		if (empty($this->_errorMsg)){
 			$this->_errorMsg = mssql_get_last_message();
 		}
 		return $this->_errorMsg;
 	}
-	
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
 		if (empty($this->_errorMsg)) {
@@ -547,7 +547,7 @@
 		if (is_array($arr)) return $arr[0];
 	   else return -1;
 	}
-	
+
 	// returns true or false, newconnect supported since php 5.1.0.
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$newconnect=false)
 	{
@@ -555,26 +555,26 @@
 		$this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword,$newconnect);
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
-	
+
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('mssql_pconnect')) return null;
 		$this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword);
 		if ($this->_connectionID === false) return false;
-		
+
 		// persistent connections can forget to rollback on crash, so we do it here.
 		if ($this->autoRollback) {
 			$cnt = $this->GetOne('select @@TRANCOUNT');
-			while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); 
+			while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN');
 		}
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
     {
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true);
@@ -587,10 +587,10 @@
 		$sql2 = $sqlarr[0];
 		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
 			$sql2 .=  '@P'.($i-1) . $sqlarr[$i];
-		} 
+		}
 		return array($sql,$this->qstr($sql2),$max,$sql2);
 	}
-	
+
 	function PrepareSP($sql)
 	{
 		if (!$this->_has_mssql_init) {
@@ -601,7 +601,7 @@
 		if (!$stmt)  return $sql;
 		return array($sql,$stmt);
 	}
-	
+
 	// returns concatenated string
     // MSSQL requires integers to be cast as strings
     // automatically cast every datatype to VARCHAR(255)
@@ -622,26 +622,26 @@
             array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
             $s = implode('+',$arr);
             if (sizeof($arr) > 0) return "$s";
-            
+
 			return '';
     }
-	
-	/* 
+
+	/*
 	Usage:
 		$stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group
-		
+
 		# note that the parameter does not have @ in front!
 		$db->Parameter($stmt,$id,'myid');
 		$db->Parameter($stmt,$group,'group',false,64);
 		$db->Execute($stmt);
-		
+
 		@param $stmt Statement returned by Prepare() or PrepareSP().
 		@param $var PHP variable to bind to. Can set to null (for isNull support).
 		@param $name Name of stored procedure variable name to bind to.
 		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
 		@param [$maxLen] Holds an maximum length of the variable.
 		@param [$type] The data type of $var. Legal values depend on driver.
-		
+
 		See mssql_bind documentation at php.net.
 	*/
 	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false)
@@ -652,8 +652,8 @@
 		}
 
 		$isNull = is_null($var); // php 4.0.4 and above...
-			
-		if ($type === false) 
+
+		if ($type === false)
 			switch(gettype($var)) {
 			default:
 			case 'string': $type = SQLVARCHAR; break;
@@ -661,7 +661,7 @@
 			case 'integer': $type = SQLINT4; break;
 			case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
 			}
-		
+
 		if  ($this->debug) {
 			$prefix = ($isOutput) ? 'Out' : 'In';
 			$ztype = (empty($type)) ? 'false' : $type;
@@ -669,32 +669,32 @@
 		}
 		/*
 			See http://phplens.com/lens/lensforum/msgs.php?id=7231
-			
+
 			RETVAL is HARD CODED into php_mssql extension:
-			The return value (a long integer value) is treated like a special OUTPUT parameter, 
-			called "RETVAL" (without the @). See the example at mssql_execute to 
-			see how it works. - type: one of this new supported PHP constants. 
-				SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8 
+			The return value (a long integer value) is treated like a special OUTPUT parameter,
+			called "RETVAL" (without the @). See the example at mssql_execute to
+			see how it works. - type: one of this new supported PHP constants.
+				SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8
 		*/
 		if ($name !== 'RETVAL') $name = '@'.$name;
 		return mssql_bind($stmt[1], $name, $var, $type, $isOutput, $isNull, $maxLen);
 	}
-	
-	/* 
+
+	/*
 		Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
 		So all your blobs must be of type "image".
-		
+
 		Remember to set in php.ini the following...
-		
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textlimit = 0 ; zero to pass through 
 
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textsize = 0 ; zero to pass through 
+		; Valid range 0 - 2147483647. Default = 4096.
+		mssql.textlimit = 0 ; zero to pass through
+
+		; Valid range 0 - 2147483647. Default = 4096.
+		mssql.textsize = 0 ; zero to pass through
 	*/
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
-	
+
 		if (strtoupper($blobtype) == 'CLOB') {
 			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
 			return $this->Execute($sql) != false;
@@ -702,14 +702,14 @@
 		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
 		return $this->Execute($sql) != false;
 	}
-	
+
 	// returns query ID if successful, otherwise false
 	function _query($sql,$inputarr=false)
 	{
 		$this->_errorMsg = false;
 		if (is_array($inputarr)) {
-			
-			# bind input params with sp_executesql: 
+
+			# bind input params with sp_executesql:
 			# see http://www.quest-pipelines.com/newsletter-v3/0402_F.htm
 			# works only with sql server 7 and newer
             $getIdentity = false;
@@ -725,11 +725,11 @@
 				if ($decl) {
 					$decl .= ', ';
 					$params .= ', ';
-				}	
+				}
 				if (is_string($v)) {
 					$len = strlen($v);
 					if ($len == 0) $len = 1;
-					
+
 					if ($len > 4000 ) {
 						// NVARCHAR is max 4000 chars. Let's use NTEXT
 						$decl .= "@P$i NTEXT";
@@ -761,57 +761,57 @@
                 $this->lastInsID = isset($arr[0]) ? $arr[0] : false;
                 @mssql_data_seek($rez, 0);
             }
-			
+
 		} else if (is_array($sql)) {
 			# PrepareSP()
 			$rez = mssql_execute($sql[1]);
             $this->lastInsID = false;
-			
+
 		} else {
 			$rez = mssql_query($sql,$this->_connectionID);
             $this->lastInsID = false;
 		}
 		return $rez;
 	}
-	
+
 	// returns true or false
 	function _close()
-	{ 
+	{
 		if ($this->transCnt) $this->RollbackTrans();
 		$rez = @mssql_close($this->_connectionID);
 		$this->_connectionID = false;
 		return $rez;
 	}
-	
+
 	// mssql uses a default date like Dec 30 2000 12:00AM
 	static function UnixDate($v)
 	{
 		return ADORecordSet_array_mssql::UnixDate($v);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_mssql::UnixTimeStamp($v);
-	}	
+	}
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordset_mssql extends ADORecordSet {	
+class ADORecordset_mssql extends ADORecordSet {
 
 	var $databaseType = "mssql";
 	var $canSeek = true;
 	var $hasFetchAssoc; // see http://phplens.com/lens/lensforum/msgs.php?id=6083
 	// _mths works only in non-localised system
-	
+
 	function ADORecordset_mssql($id,$mode=false)
 	{
 		// freedts check...
 		$this->hasFetchAssoc = function_exists('mssql_fetch_assoc');
 
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 
@@ -819,16 +819,16 @@
 		$this->fetchMode = $mode;
 		return $this->ADORecordSet($id,$mode);
 	}
-	
-	
+
+
 	function _initrs()
 	{
-	GLOBAL $ADODB_COUNTRECS;	
+	GLOBAL $ADODB_COUNTRECS;
 		$this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1;
 		$this->_numOfFields = @mssql_num_fields($this->_queryID);
 	}
-	
 
+
 	//Contributed by "Sven Axelsson" <sven.axelsson@bokochwebb.se>
 	// get next resultset - requires PHP 4.0.5 or later
 	function NextRecordSet()
@@ -852,16 +852,16 @@
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
-	/*	Returns: an object containing field information. 
+
+	/*	Returns: an object containing field information.
 		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
 		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
 		fetchField() is retrieved.	*/
 
-	function FetchField($fieldOffset = -1) 
+	function FetchField($fieldOffset = -1)
 	{
 		if ($fieldOffset != -1) {
 			$f = @mssql_fetch_field($this->_queryID, $fieldOffset);
@@ -873,19 +873,19 @@
 		if (empty($f)) return $false;
 		return $f;
 	}
-	
-	function _seek($row) 
+
+	function _seek($row)
 	{
 		return @mssql_data_seek($this->_queryID, $row);
 	}
 
 	// speedup
-	function MoveNext() 
+	function MoveNext()
 	{
 		if ($this->EOF) return false;
-		
+
 		$this->_currentRow++;
-		
+
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			if ($this->fetchMode & ADODB_FETCH_NUM) {
 				//ADODB_FETCH_BOTH mode
@@ -907,7 +907,7 @@
 						$this->fields = false;
 				}
 			}
-			
+
 			if (is_array($this->fields)) {
 				if (ADODB_ASSOC_CASE == 0) {
 					foreach($this->fields as $k=>$v) {
@@ -924,14 +924,14 @@
 		}
 		if ($this->fields) return true;
 		$this->EOF = true;
-		
+
 		return false;
 	}
 
-	
+
 	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
 	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields=false)
 	{
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			if ($this->fetchMode & ADODB_FETCH_NUM) {
@@ -952,7 +952,7 @@
 					}
 				}
 			}
-			
+
 			if (!$this->fields) {
 			} else if (ADODB_ASSOC_CASE == 0) {
 				foreach($this->fields as $k=>$v) {
@@ -968,13 +968,13 @@
 		}
 		return $this->fields;
 	}
-	
+
 	/*	close() only needs to be called if you are worried about using too much memory while your script
 		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
 
-	function _close() 
+	function _close()
 	{
-		$rez = mssql_free_result($this->_queryID);	
+		$rez = mssql_free_result($this->_queryID);
 		$this->_queryID = false;
 		return $rez;
 	}
@@ -983,36 +983,36 @@
 	{
 		return ADORecordSet_array_mssql::UnixDate($v);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_mssql::UnixTimeStamp($v);
 	}
-	
+
 }
 
 
 class ADORecordSet_array_mssql extends ADORecordSet_array {
-	function ADORecordSet_array_mssql($id=-1,$mode=false) 
+	function ADORecordSet_array_mssql($id=-1,$mode=false)
 	{
 		$this->ADORecordSet_array($id,$mode);
 	}
-	
+
 		// mssql uses a default date like Dec 30 2000 12:00AM
 	static function UnixDate($v)
 	{
-	
+
 		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
-		
+
 	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
-		//Dec 30 2000 12:00AM 
+
+		//Dec 30 2000 12:00AM
 		if ($ADODB_mssql_date_order == 'dmy') {
 			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
 				return parent::UnixDate($v);
 			}
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
+
 			$theday = $rr[1];
 			$themth =  substr(strtoupper($rr[2]),0,3);
 		} else {
@@ -1020,7 +1020,7 @@
 				return parent::UnixDate($v);
 			}
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
+
 			$theday = $rr[2];
 			$themth = substr(strtoupper($rr[1]),0,3);
 		}
@@ -1029,34 +1029,34 @@
 		// h-m-s-MM-DD-YY
 		return  mktime(0,0,0,$themth,$theday,$rr[3]);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
-	
+
 		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
-		
+
 	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
+
 		//Dec 30 2000 12:00AM
 		 if ($ADODB_mssql_date_order == 'dmy') {
 			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
 			,$v, $rr)) return parent::UnixTimeStamp($v);
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 			$theday = $rr[1];
 			$themth =  substr(strtoupper($rr[2]),0,3);
 		} else {
 			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
 			,$v, $rr)) return parent::UnixTimeStamp($v);
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 			$theday = $rr[2];
 			$themth = substr(strtoupper($rr[1]),0,3);
 		}
-		
+
 		$themth = $ADODB_mssql_mths[$themth];
 		if ($themth <= 0) return false;
-		
+
 		switch (strtoupper($rr[6])) {
 		case 'P':
 			if ($rr[4]<12) $rr[4] += 12;
@@ -1076,7 +1076,7 @@
 Code Example 1:
 
 select 	object_name(constid) as constraint_name,
-       	object_name(fkeyid) as table_name, 
+       	object_name(fkeyid) as table_name,
         col_name(fkeyid, fkey) as column_name,
 	object_name(rkeyid) as referenced_table_name,
    	col_name(rkeyid, rkey) as referenced_column_name
Index: typo3/sysext/adodb/adodb/drivers/adodb-oci805.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-oci805.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-oci805.inc.php	(working copy)
@@ -1,12 +1,12 @@
 <?php
-/** 
+/**
  * @version V5.06 16 Oct 2008  (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
  *
  * Set tabs to 4 for best viewing.
- * 
+ *
  * Latest version is available at http://php.weblogs.com
  *
  * Oracle 8.0.5 driver
@@ -18,14 +18,14 @@
 include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
 
 class ADODB_oci805 extends ADODB_oci8 {
-	var $databaseType = "oci805";	
+	var $databaseType = "oci805";
 	var $connectSID = true;
-	
-	function ADODB_oci805() 
+
+	function ADODB_oci805()
 	{
 		$this->ADODB_oci8();
 	}
-	
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		// seems that oracle only supports 1 hint comment in 8i
@@ -33,12 +33,12 @@
 			$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
 		else
 			$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-		
-		/* 
-			The following is only available from 8.1.5 because order by in inline views not 
+
+		/*
+			The following is only available from 8.1.5 because order by in inline views not
 			available before then...
 			http://www.jlcomp.demon.co.uk/faq/top_sql.html
-		if ($nrows > 0) {	
+		if ($nrows > 0) {
 			if ($offset > 0) $nrows += $offset;
 			$sql = "select * from ($sql) where rownum <= $nrows";
 			$nrows = -1;
@@ -49,7 +49,7 @@
 	}
 }
 
-class ADORecordset_oci805 extends ADORecordset_oci8 {	
+class ADORecordset_oci805 extends ADORecordset_oci8 {
 	var $databaseType = "oci805";
 	function ADORecordset_oci805($id,$mode=false)
 	{
Index: typo3/sysext/adodb/adodb/drivers/adodb-pdo_mysql.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-pdo_mysql.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-pdo_mysql.inc.php	(working copy)
@@ -3,15 +3,15 @@
 
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 8.
- 
-*/ 
 
+*/
+
 class ADODB_pdo_mysql extends ADODB_pdo {
-	var $metaTablesSQL = "SHOW TABLES";	
+	var $metaTablesSQL = "SHOW TABLES";
 	var $metaColumnsSQL = "SHOW COLUMNS FROM `%s`";
 	var $sysDate = 'CURDATE()';
 	var $sysTimeStamp = 'NOW()';
@@ -23,59 +23,59 @@
 
 	function _init($parentDriver)
 	{
-	
+
 		$parentDriver->hasTransactions = false;
 		#$parentDriver->_bindInputArray = false;
 		$parentDriver->hasInsertID = true;
 		$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
 	}
-	
+
 		// dayFraction is a day in floating point
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
-		
+
 		$fraction = $dayFraction * 24 * 3600;
 		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
+
 //		return "from_unixtime(unix_timestamp($date)+$fraction)";
 	}
-	
-	function Concat() 
-	{	
+
+	function Concat()
+	{
 		$s = "";
 		$arr = func_get_args();
 
 		// suggestion by andrew005#mnogo.ru
 		$s = implode(',',$arr);
-		if (strlen($s) > 0) return "CONCAT($s)"; return ''; 
+		if (strlen($s) > 0) return "CONCAT($s)"; return '';
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['description'] = ADOConnection::GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
 			$this->metaTablesSQL .= " from $showSchema";
 		}
-		
+
 		if ($mask) {
 			$mask = $this->qstr($mask);
 			$this->metaTablesSQL .= " like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		$this->metaTablesSQL = $save;
 		return $ret;
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -85,7 +85,7 @@
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
-	
+
  	function MetaColumns($table,$normalize=true)
 	{
 		$this->_findschema($table,$schema);
@@ -96,27 +96,27 @@
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
+
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
+
 		if ($schema) {
 			$this->SelectDB($dbName);
 		}
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!is_object($rs)) {
 			$false = false;
 			return $false;
 		}
-			
+
 		$retarr = array();
 		while (!$rs->EOF){
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$type = $rs->fields[1];
-			
+
 			// split type into type(length):
 			$fld->scale = null;
 			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
@@ -141,7 +141,7 @@
 			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
 			$fld->binary = (strpos($type,'blob') !== false);
 			$fld->unsigned = (strpos($type,'unsigned') !== false);
-				
+
 			if (!$fld->binary) {
 				$d = $rs->fields[4];
 				if ($d != '' && $d != 'NULL') {
@@ -151,7 +151,7 @@
 					$fld->has_default = false;
 				}
 			}
-			
+
 			if ($save == ADODB_FETCH_NUM) {
 				$retarr[] = $fld;
 			} else {
@@ -159,19 +159,19 @@
 			}
 				$rs->MoveNext();
 			}
-		
+
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 	}
-		
-	
+
+
 	// parameters use PostgreSQL convention, not MySQL
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
 	{
 		$offsetStr =($offset>=0) ? "$offset," : '';
 		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
-		if ($nrows < 0) $nrows = '18446744073709551615'; 
-		
+		if ($nrows < 0) $nrows = '18446744073709551615';
+
 		if ($secs)
 			$rs = $this->CacheExecute($secs,$sql." LIMIT $offsetStr$nrows",$inputarr);
 		else
Index: typo3/sysext/adodb/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-oci8.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-oci8.inc.php	(working copy)
@@ -3,14 +3,14 @@
 
   version V5.06 16 Oct 2008  (c) 2000-2009 John Lim. All rights reserved.
 
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
 
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Code contributed by George Fourlanos <fou@infomap.gr>
-  
+
   13 Nov 2000 jlim - removed all ora_* references.
 */
 
@@ -35,7 +35,7 @@
 year entries allows you to become year-2000 compliant. For example:
 NLS_DATE_FORMAT='RR-MM-DD'
 
-You can also modify the date format using the ALTER SESSION command. 
+You can also modify the date format using the ALTER SESSION command.
 */
 
 # define the LOB descriptor type for the given type
@@ -79,7 +79,7 @@
 	var $_hasOCIFetchStatement = false;
 	var $_getarray = false; // currently not working
 	var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
-	var $session_sharing_force_blob = false; // alter session on updateblob if set to true 
+	var $session_sharing_force_blob = false; // alter session on updateblob if set to true
 	var $firstrows = true; // enable first rows optimization on SelectLimit()
 	var $selectOffsetAlg1 = 1000; // when to use 1st algorithm of selectlimit.
 	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
@@ -87,27 +87,27 @@
  	var $useDBDateFormatForTextInput=false;
 	var $datetime = false; // MetaType('DATE') returns 'D' (datetime==false) or 'T' (datetime == true)
 	var $_refLOBs = array();
-		
+
 	// var $ansiOuter = true; // if oracle9
-    
-	function ADODB_oci8() 
+
+	function ADODB_oci8()
 	{
 		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
 		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
 	}
-	
+
 	/*  function MetaColumns($table, $normalize=true) added by smondino@users.sourceforge.net*/
-	function MetaColumns($table, $normalize=true) 
+	function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$false = false;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!$rs) {
@@ -123,44 +123,44 @@
 			if ($rs->fields[1] == 'NUMBER') {
 				if ($rs->fields[3] == 0) $fld->type = 'INT';
 	     		$fld->max_length = $rs->fields[4];
-	    	}	
+	    	}
 		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
 			$fld->binary = (strpos($fld->type,'BLOB') !== false);
 			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[strtoupper($fld->name)] = $fld;
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr))
 			return  $false;
-		else 
+		else
 			return $retarr;
 	}
-	
+
 	function Time()
 	{
 		$rs = $this->Execute("select TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
 		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
+
 		return false;
 	}
- 
+
 /*
 
   Multiple modes of connection are supported:
-  
+
   a. Local Database
     $conn->Connect(false,'scott','tiger');
-  
+
   b. From tnsnames.ora
-    $conn->Connect(false,'scott','tiger',$tnsname); 
-    $conn->Connect($tnsname,'scott','tiger'); 
-  
+    $conn->Connect(false,'scott','tiger',$tnsname);
+    $conn->Connect($tnsname,'scott','tiger');
+
   c. Server + service name
     $conn->Connect($serveraddress,'scott,'tiger',$service_name);
-  
+
   d. Server + SID
   	$conn->connectSID = true;
 	$conn->Connect($serveraddress,'scott,'tiger',$SID);
@@ -177,18 +177,18 @@
 	  (SERVICE_NAME = natsoft.domain)
 	)
   )
-  
+
   There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force new connection
-	
+
 */
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mode=0)
 	{
 		if (!function_exists('OCIPLogon')) return null;
-		#adodb_backtrace(); 
-		
+		#adodb_backtrace();
+
         $this->_errorMsg = false;
 		$this->_errorCode = false;
-		
+
 		if($argHostname) { // added by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
 			if (empty($argDatabasename)) $argDatabasename = $argHostname;
 			else {
@@ -199,12 +199,12 @@
 			 	} else {
 					$argHostport = empty($this->port)?  "1521" : $this->port;
 	   			}
-				
+
 				if (strncasecmp($argDatabasename,'SID=',4) == 0) {
 					$argDatabasename = substr($argDatabasename,4);
 					$this->connectSID = true;
 				}
-				
+
 				if ($this->connectSID) {
 					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 					.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
@@ -213,23 +213,23 @@
 					.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
 			}
 		}
-				
+
  		//if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
 		if ($mode==1) {
-			$this->_connectionID = ($this->charSet) ? 
+			$this->_connectionID = ($this->charSet) ?
 				OCIPLogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
 				:
 				OCIPLogon($argUsername,$argPassword, $argDatabasename)
 				;
 			if ($this->_connectionID && $this->autoRollback)  OCIrollback($this->_connectionID);
 		} else if ($mode==2) {
-			$this->_connectionID = ($this->charSet) ? 
+			$this->_connectionID = ($this->charSet) ?
 				OCINLogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
 				:
 				OCINLogon($argUsername,$argPassword, $argDatabasename);
-				
+
 		} else {
-			$this->_connectionID = ($this->charSet) ? 
+			$this->_connectionID = ($this->charSet) ?
 				OCILogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
 				:
 				OCILogon($argUsername,$argPassword, $argDatabasename);
@@ -238,14 +238,14 @@
 		if ($this->_initdate) {
 			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
 		}
-		
-		// looks like: 
+
+		// looks like:
 		// Oracle8i Enterprise Edition Release 8.1.7.0.0 - Production With the Partitioning option JServer Release 8.1.7.0.0 - Production
 		// $vers = OCIServerVersion($this->_connectionID);
 		// if (strpos($vers,'8i') !== false) $this->ansiOuter = true;
 		return true;
    	}
-	
+
 	function ServerInfo()
 	{
 		$arr['compat'] = $this->GetOne('select value from sys.database_compatible_level');
@@ -258,35 +258,35 @@
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
 	}
-	
+
 	// returns true or false
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,2);
 	}
-	
+
 	function _affectedrows()
 	{
 		if (is_resource($this->_stmt)) return @OCIRowCount($this->_stmt);
 		return 0;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " NVL($field, $ifNull) "; // if Oracle
 	}
-	
+
 	// format and return date string in database date format
 	function DBDate($d,$isfld=false)
 	{
 		if (empty($d) && $d !== 0) return 'null';
 		if ($isfld) return 'TO_DATE('.$d.",'".$this->dateformat."')";
-		
+
 		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		
+
 		if (is_object($d)) $ds = $d->format($this->fmtDate);
 		else $ds = adodb_date($this->fmtDate,$d);
-		
+
 		return "TO_DATE(".$ds.",'".$this->dateformat."')";
 	}
 
@@ -294,41 +294,41 @@
 	{
 		$d = ADOConnection::DBDate($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
+
 	function BindTimeStamp($ts)
 	{
 		if (empty($ts) && $ts !== 0) return 'null';
 		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		
+
 		if (is_object($ts)) $tss = $ts->format("'Y-m-d H:i:s'");
 		else $tss = adodb_date("'Y-m-d H:i:s'",$ts);
-		
+
 		return $tss;
 	}
-	
+
 	// format and return date string in database timestamp format
 	function DBTimeStamp($ts,$isfld=false)
 	{
 		if (empty($ts) && $ts !== 0) return 'null';
 		if ($isfld) return 'TO_DATE(substr('.$ts.",1,19),'RRRR-MM-DD, HH24:MI:SS')";
 		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		
+
 		if (is_object($ts)) $tss = $ts->format("'Y-m-d H:i:s'");
 		else $tss = adodb_date("'Y-m-d H:i:s'",$ts);
-		
+
 		return 'TO_DATE('.$tss.",'RRRR-MM-DD, HH24:MI:SS')";
 	}
-	
-	function RowLock($tables,$where,$col='1 as ignore') 
+
+	function RowLock($tables,$where,$col='1 as ignore')
 	{
 		if ($this->autoCommit) $this->BeginTrans();
 		return $this->GetOne("select $col from $tables where $where for update");
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		if ($mask) {
 			$save = $this->metaTablesSQL;
@@ -336,14 +336,14 @@
 			$this->metaTablesSQL .= " AND upper(table_name) like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
-	// Mark Newnham 
+
+	// Mark Newnham
 	function MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
         // save old fetch mode
@@ -368,7 +368,7 @@
 		   $primary_key = $row[1]; //constraint_name
 
 		if ($primary==TRUE && $primary_key=='') {
-			 if (isset($savem)) 
+			 if (isset($savem))
                 $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 			return $false; //There is no primary key
@@ -376,9 +376,9 @@
 
         $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
 
-		
+
         if (!is_object($rs)) {
-			if (isset($savem)) 
+			if (isset($savem))
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
             return $false;
@@ -403,38 +403,38 @@
             ksort ($indexes[$index]['columns']);
         }
 
-		if (isset($savem)) { 
+		if (isset($savem)) {
             $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
         return $indexes;
 	}
-	
+
 	function BeginTrans()
-	{	
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 		$this->_commit = OCI_DEFAULT;
-		
+
 		if ($this->_transmode) $ok = $this->Execute("SET TRANSACTION ".$this->_transmode);
 		else $ok = true;
-		
+
 		return $ok ? true : false;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		if ($this->transCnt) $this->transCnt -= 1;
 		$ret = OCIcommit($this->_connectionID);
 		$this->_commit = OCI_COMMIT_ON_SUCCESS;
 		$this->autoCommit = true;
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
@@ -444,14 +444,14 @@
 		$this->autoCommit = true;
 		return $ret;
 	}
-	
-	
-	function SelectDB($dbName) 
+
+
+	function SelectDB($dbName)
 	{
 		return false;
 	}
 
-	function ErrorMsg() 
+	function ErrorMsg()
 	{
 		if ($this->_errorMsg !== false) return $this->_errorMsg;
 
@@ -466,29 +466,29 @@
 		return $this->_errorMsg;
 	}
 
-	function ErrorNo() 
+	function ErrorNo()
 	{
 		if ($this->_errorCode !== false) return $this->_errorCode;
-		
+
 		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
 		if (empty($arr)) {
 			$arr = @OCIError($this->_connectionID);
 			if ($arr == false) $arr = @OCIError();
 			if ($arr == false) return '';
 		}
-		
+
 		$this->_errorMsg = $arr['message'];
 		$this->_errorCode = $arr['code'];
-		
+
 		return $arr['code'];
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'TO_CHAR('.$col.",'";
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
@@ -501,11 +501,11 @@
 			case 'q':
 				$s .= 'Q';
 				break;
-				
+
 			case 'M':
 				$s .= 'Mon';
 				break;
-				
+
 			case 'm':
 				$s .= 'MM';
 				break;
@@ -513,40 +513,40 @@
 			case 'd':
 				$s .= 'DD';
 				break;
-			
+
 			case 'H':
 				$s.= 'HH24';
 				break;
-				
+
 			case 'h':
 				$s .= 'HH';
 				break;
-				
+
 			case 'i':
 				$s .= 'MI';
 				break;
-			
+
 			case 's':
 				$s .= 'SS';
 				break;
-			
+
 			case 'a':
 			case 'A':
 				$s .= 'AM';
 				break;
-				
+
 			case 'w':
 				$s .= 'D';
 				break;
-				
+
 			case 'l':
 				$s .= 'DAY';
 				break;
-				
+
 			 case 'W':
 				$s .= 'WW';
 				break;
-				
+
 			default:
 			// handle escape characters...
 				if ($ch == '\\') {
@@ -555,31 +555,31 @@
 				}
 				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
 				else $s .= '"'.$ch.'"';
-				
+
 			}
 		}
 		return $s. "')";
 	}
-	
+
 	function GetRandRow($sql, $arr = false)
 	{
 		$sql = "SELECT * FROM ($sql ORDER BY dbms_random.value) WHERE rownum = 1";
-		
+
 		return $this->GetRow($sql,$arr);
 	}
-	
+
 	/*
 	This algorithm makes use of
-	
+
 	a. FIRST_ROWS hint
-	The FIRST_ROWS hint explicitly chooses the approach to optimize response time, 
-	that is, minimum resource usage to return the first row. Results will be returned 
-	as soon as they are identified. 
+	The FIRST_ROWS hint explicitly chooses the approach to optimize response time,
+	that is, minimum resource usage to return the first row. Results will be returned
+	as soon as they are identified.
 
 	b. Uses rownum tricks to obtain only the required rows from a given offset.
-	 As this uses complicated sql statements, we only use this if the $offset >= 100. 
+	 As this uses complicated sql statements, we only use this if the $offset >= 100.
 	 This idea by Tomas V V Cox.
-	 
+
 	 This implementation does not appear to work with oracle 8.0.5 or earlier. Comment
 	 out this function then, and the slower SelectLimit() in the base class will be used.
 	*/
@@ -592,16 +592,16 @@
 			else
 				$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
 		}
-		
+
 		if ($offset == -1 || ($offset < $this->selectOffsetAlg1 && 0 < $nrows && $nrows < 1000)) {
-			if ($nrows > 0) {	
+			if ($nrows > 0) {
 				if ($offset > 0) $nrows += $offset;
 				//$inputarr['adodb_rownum'] = $nrows;
 				if ($this->databaseType == 'oci8po') {
 					$sql = "select * from (".$sql.") where rownum <= ?";
 				} else {
 					$sql = "select * from (".$sql.") where rownum <= :adodb_offset";
-				} 
+				}
 				$inputarr['adodb_offset'] = $nrows;
 				$nrows = -1;
 			}
@@ -609,19 +609,19 @@
 
 			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 			return $rs;
-			
+
 		} else {
 			 // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
-			
+
 			 // Let Oracle return the name of the columns
 			$q_fields = "SELECT * FROM (".$sql.") WHERE NULL = NULL";
-		
+
 			$false = false;
 			if (! $stmt_arr = $this->Prepare($q_fields)) {
 				return $false;
 			}
 			$stmt = $stmt_arr[1];
-			 
+
 			if (is_array($inputarr)) {
 			 	foreach($inputarr as $k => $v) {
 					if (is_array($v)) {
@@ -636,29 +636,29 @@
 							$bindarr[$k] = $v;
 						} else { 				// dynamic sql, so rebind every time
 							OCIBindByName($stmt,":$k",$inputarr[$k],$len);
-							
+
 						}
 					}
 				}
 			}
-			
+
 			 if (!OCIExecute($stmt, OCI_DEFAULT)) {
-				 OCIFreeStatement($stmt); 
+				 OCIFreeStatement($stmt);
 				 return $false;
 			 }
-			 
+
 			 $ncols = OCINumCols($stmt);
 			 for ( $i = 1; $i <= $ncols; $i++ ) {
 				 $cols[] = '"'.OCIColumnName($stmt, $i).'"';
 			 }
 			 $result = false;
-			
-			 OCIFreeStatement($stmt); 
+
+			 OCIFreeStatement($stmt);
 			 $fields = implode(',', $cols);
 			 if ($nrows <= 0) $nrows = 999999999999;
 			 else $nrows += $offset;
 			 $offset += 1; // in Oracle rownum starts at 1
-			
+
 			if ($this->databaseType == 'oci8po') {
 					 $sql = "SELECT /*+ FIRST_ROWS */ $fields FROM".
 					  "(SELECT rownum as adodb_rownum, $fields FROM".
@@ -669,17 +669,17 @@
 					  "(SELECT rownum as adodb_rownum, $fields FROM".
 					  " ($sql) WHERE rownum <= :adodb_nrows".
 					  ") WHERE adodb_rownum >= :adodb_offset";
-				} 
+				}
 				$inputarr['adodb_nrows'] = $nrows;
 				$inputarr['adodb_offset'] = $offset;
-				
+
 			if ($secs2cache>0) $rs = $this->CacheExecute($secs2cache, $sql,$inputarr);
 			else $rs = $this->Execute($sql,$inputarr);
 			return $rs;
 		}
-	
+
 	}
-	
+
 	/**
 	* Usage:
 	* Store BLOBs and CLOBs
@@ -688,7 +688,7 @@
 	*
 	*	$conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
 	*	$conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
-	*	
+	*
 	*	$blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
 	*
 	*  to get length of LOB:
@@ -702,20 +702,20 @@
 
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
-		
+
 		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
-		
+
 		switch(strtoupper($blobtype)) {
 		default: ADOConnection::outp("<strong>UpdateBlob</strong>: Unknown blobtype=$blobtype"); return false;
 		case 'BLOB': $type = OCI_B_BLOB; break;
 		case 'CLOB': $type = OCI_B_CLOB; break;
 		}
-		
-		if ($this->databaseType == 'oci8po') 
+
+		if ($this->databaseType == 'oci8po')
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
+		else
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
+
 		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
 		$arr['blob'] = array($desc,-1,$type);
 		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
@@ -726,11 +726,11 @@
 		$desc->free();
 		if ($commit) $this->CommitTrans();
 		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
-		
+
 		if ($rez) $rs->Close();
 		return $rez;
 	}
-	
+
 	/**
 	* Usage:  store file pointed to by $val in a blob
 	*/
@@ -741,33 +741,33 @@
 		case 'BLOB': $type = OCI_B_BLOB; break;
 		case 'CLOB': $type = OCI_B_CLOB; break;
 		}
-		
-		if ($this->databaseType == 'oci8po') 
+
+		if ($this->databaseType == 'oci8po')
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
+		else
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
+
 		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
 		$arr['blob'] = array($desc,-1,$type);
-		
+
 		$this->BeginTrans();
 		$rs = ADODB_oci8::Execute($sql,$arr);
 		if ($rez = !empty($rs)) $desc->savefile($val);
 		$desc->free();
 		$this->CommitTrans();
-		
+
 		if ($rez) $rs->Close();
 		return $rez;
 	}
 
 		/**
-	 * Execute SQL 
+	 * Execute SQL
 	 *
 	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
 	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
 	 * @return 		RecordSet or false
 	 */
-	function Execute($sql,$inputarr=false) 
+	function Execute($sql,$inputarr=false)
 	{
 		if ($this->fnExecute) {
 			$fn = $this->fnExecute;
@@ -776,9 +776,9 @@
 		}
 		if ($inputarr) {
 			#if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
+
 			$element0 = reset($inputarr);
-			
+
 			if (!$this->_bindInputArray) {
 			# is_object check because oci8 descriptors can be passed in
 			if (is_array($element0) && !is_object(reset($element0))) {
@@ -786,7 +786,7 @@
 					$stmt = $this->Prepare($sql);
 				else
 					$stmt = $sql;
-					
+
 				foreach($inputarr as $arr) {
 					$ret = $this->_Execute($stmt,$arr);
 					if (!$ret) return $ret;
@@ -798,10 +798,10 @@
 				#var_dump($sqlarr);echo "<hr>";var_dump($inputarr);echo"<hr>";
 				foreach($sqlarr as $k => $str) {
 						if ($k == 0) { $sql = $str; continue; }
-						// we need $lastnomatch because of the following datetime, 
+						// we need $lastnomatch because of the following datetime,
 						// eg. '10:10:01', which causes code to think that there is bind param :10 and :1
-						$ok = preg_match('/^([0-9]*)/', $str, $arr); 
-			
+						$ok = preg_match('/^([0-9]*)/', $str, $arr);
+
 						if (!$ok) $sql .= $str;
 						else {
 							$at = $arr[1];
@@ -819,31 +819,31 @@
 							} else {
 								$sql .= ':'.$str;
 							}
-							
+
 						}
 					}
 					$inputarr = false;
 				}
 			}
 			$ret = $this->_Execute($sql,$inputarr);
-			
-			
+
+
 		} else {
 			$ret = $this->_Execute($sql,false);
 		}
 
 		return $ret;
 	}
-	
+
 	/*
 		Example of usage:
-		
+
 		$stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
 	*/
 	function Prepare($sql,$cursor=false)
 	{
 	static $BINDNUM = 0;
-	
+
 		$stmt = OCIParse($this->_connectionID,$sql);
 
 		if (!$stmt) {
@@ -851,40 +851,40 @@
 			$this->_errorCode = false;
 			$arr = @OCIError($this->_connectionID);
 			if ($arr === false) return false;
-		
+
 			$this->_errorMsg = $arr['message'];
 			$this->_errorCode = $arr['code'];
 			return false;
 		}
-		
+
 		$BINDNUM += 1;
-		
+
 		$sttype = @OCIStatementType($stmt);
 		if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
 			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? OCINewCursor($this->_connectionID) : false);
 		}
 		return array($sql,$stmt,0,$BINDNUM);
 	}
-	
+
 	/*
-		Call an oracle stored procedure and returns a cursor variable as a recordset. 
+		Call an oracle stored procedure and returns a cursor variable as a recordset.
 		Concept by Robert Tuttle robert@ud.com
-		
+
 		Example:
 			Note: we return a cursor variable in :RS2
 			$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS2); END;",'RS2');
-			
+
 			$rs = $db->ExecuteCursor(
-				"BEGIN :RS2 = adodb.getdata(:VAR1); END;", 
+				"BEGIN :RS2 = adodb.getdata(:VAR1); END;",
 				'RS2',
 				array('VAR1' => 'Mr Bean'));
-			
+
 	*/
 	function ExecuteCursor($sql,$cursorName='rs',$params=false)
 	{
 		if (is_array($sql)) $stmt = $sql;
 		else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
-	
+
 		if (is_array($stmt) && sizeof($stmt) >= 5) {
 			$hasref = true;
 			$ignoreCur = false;
@@ -896,7 +896,7 @@
 			}
 		} else
 			$hasref = false;
-			
+
 		$rs = $this->Execute($stmt);
 		if ($rs) {
 			if ($rs->databaseType == 'array') OCIFreeCursor($stmt[4]);
@@ -904,46 +904,46 @@
 		}
 		return $rs;
 	}
-	
+
 	/*
-		Bind a variable -- very, very fast for executing repeated statements in oracle. 
+		Bind a variable -- very, very fast for executing repeated statements in oracle.
 		Better than using
-			for ($i = 0; $i < $max; $i++) {	
+			for ($i = 0; $i < $max; $i++) {
 				$p1 = ?; $p2 = ?; $p3 = ?;
-				$this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)", 
+				$this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)",
 					array($p1,$p2,$p3));
 			}
-		
+
 		Usage:
 			$stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
 			$DB->Bind($stmt, $p1);
 			$DB->Bind($stmt, $p2);
 			$DB->Bind($stmt, $p3);
-			for ($i = 0; $i < $max; $i++) {	
+			for ($i = 0; $i < $max; $i++) {
 				$p1 = ?; $p2 = ?; $p3 = ?;
 				$DB->Execute($stmt);
 			}
-			
-		Some timings:		
+
+		Some timings:
 			** Test table has 3 cols, and 1 index. Test to insert 1000 records
 			Time 0.6081s (1644.60 inserts/sec) with direct OCIParse/OCIExecute
 			Time 0.6341s (1577.16 inserts/sec) with ADOdb Prepare/Bind/Execute
 			Time 1.5533s ( 643.77 inserts/sec) with pure SQL using Execute
-			
+
 		Now if PHP only had batch/bulk updating like Java or PL/SQL...
-	
+
 		Note that the order of parameters differs from OCIBindByName,
 		because we default the names to :0, :1, :2
 	*/
 	function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
 	{
-		
+
 		if (!is_array($stmt)) return false;
-        
-        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
+
+        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) {
             return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
         }
-        
+
 		if ($name == false) {
 			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
 			else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
@@ -956,13 +956,13 @@
 			$numlob = count($this->_refLOBs);
         	$this->_refLOBs[$numlob]['LOB'] = OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
 			$this->_refLOBs[$numlob]['TYPE'] = $isOutput;
-			
+
 			$tmp = $this->_refLOBs[$numlob]['LOB'];
 	        $rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
 			if ($this->debug) {
 				ADOConnection::outp("<strong>Bind</strong>: descriptor has been allocated, var (".$name.") binded");
 			}
-			
+
 			// if type is input then write data to lob now
 			if ($isOutput == false) {
 				$var = $this->BlobEncode($var);
@@ -976,35 +976,35 @@
 			}
 			$rez = $tmp;
 		} else {
-			if ($this->debug) 
+			if ($this->debug)
 				ADOConnection::outp("<strong>Bind</strong>: name = $name");
-			
+
 			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
 			else $rez = OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
 		}
-		
+
 		return $rez;
 	}
-	
+
 	function Param($name,$type=false)
 	{
 		return ':'.$name;
 	}
-	
-	/* 
+
+	/*
 	Usage:
 		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
 		$db->Parameter($stmt,$id,'myid');
 		$db->Parameter($stmt,$group,'group');
 		$db->Execute($stmt);
-		
+
 		@param $stmt Statement returned by Prepare() or PrepareSP().
 		@param $var PHP variable to bind to
 		@param $name Name of stored procedure variable name to bind to.
 		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
 		@param [$maxLen] Holds an maximum length of the variable.
 		@param [$type] The data type of $var. Legal values depend on driver.
-		
+
 		See OCIBindByName documentation at php.net.
 	*/
 	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
@@ -1016,27 +1016,27 @@
 			}
 			return $this->Bind($stmt,$var,$maxLen,$type,$name,$isOutput);
 	}
-	
+
 	/*
 	returns query ID if successful, otherwise false
 	this version supports:
-	
+
 	   1. $db->execute('select * from table');
-	   
+
 	   2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
 		  $db->execute($prepared_statement, array(1,2,3));
-		  
+
 	   3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
-	   
+
 	   4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
+		  $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3);
 		  $db->execute($stmt);
-	*/ 
+	*/
 	function _query($sql,$inputarr=false)
 	{
 		if (is_array($sql)) { // is prepared sql
 			$stmt = $sql[1];
-			
+
 			// we try to bind to permanent array, so that OCIBindByName is persistent
 			// and carried out once only - note that max array element size is 4000 chars
 			if (is_array($inputarr)) {
@@ -1057,12 +1057,12 @@
 		} else {
 			$stmt=OCIParse($this->_connectionID,$sql);
 		}
-			
+
 		$this->_stmt = $stmt;
 		if (!$stmt) return false;
-	
+
 		if (defined('ADODB_PREFETCH_ROWS')) @OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
-			
+
 		if (is_array($inputarr)) {
 			foreach($inputarr as $k => $v) {
 				if (is_array($v)) {
@@ -1070,13 +1070,13 @@
 						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
 					else
 						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					
+
 					if ($this->debug==99) {
-						if (is_object($v[0])) 
+						if (is_object($v[0]))
 							echo "name=:$k",' len='.$v[1],' type='.$v[2],'<br>';
 						else
 							echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'<br>';
-						
+
 					}
 				} else {
 					$len = -1;
@@ -1089,13 +1089,13 @@
 				}
 			}
 		}
-		
+
         $this->_errorMsg = false;
 		$this->_errorCode = false;
 		if (OCIExecute($stmt,$this->_commit)) {
-//OCIInternalDebug(1);			
+//OCIInternalDebug(1);
 			if (count($this -> _refLOBs) > 0) {
-		
+
 				foreach ($this -> _refLOBs as $key => $value) {
 					if ($this -> _refLOBs[$key]['TYPE'] == true) {
 						$tmp = $this -> _refLOBs[$key]['LOB'] -> load();
@@ -1111,20 +1111,20 @@
                         if ($this->debug) {
 							ADOConnection::outp("<strong>IN LOB</strong>: LOB has been saved. <br>");
 						}
-                    }					
+                    }
 				}
 			}
-		
+
             switch (@OCIStatementType($stmt)) {
                 case "SELECT":
 					return $stmt;
-				
+
 				case 'DECLARE':
                 case "BEGIN":
                     if (is_array($sql) && !empty($sql[4])) {
 						$cursor = $sql[4];
 						if (is_resource($cursor)) {
-							$ok = OCIExecute($cursor);	
+							$ok = OCIExecute($cursor);
 	                        return $cursor;
 						}
 						return $stmt;
@@ -1143,7 +1143,7 @@
 		}
 		return false;
 	}
-	
+
 	// From Oracle Whitepaper: PHP Scalability and High Availability
 	function IsConnectionError($err)
 	{
@@ -1169,12 +1169,12 @@
 		}
 		return false;
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
 		if (!$this->_connectionID) return;
-		
+
 		if (!$this->autoCommit) OCIRollback($this->_connectionID);
 		if (count($this->_refLOBs) > 0) {
 			foreach ($this ->_refLOBs as $key => $value) {
@@ -1183,15 +1183,15 @@
 			}
 		}
 		OCILogoff($this->_connectionID);
-		
+
 		$this->_stmt = false;
 		$this->_connectionID = false;
 	}
-	
+
 	function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
 	{
 		if ($internalKey) return array('ROWID');
-		
+
 	// tested with oracle 8.1.7
 		$table = strtoupper($table);
 		if ($owner) {
@@ -1221,12 +1221,12 @@
 		}
 		else return false;
 	}
-	
+
 	// http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
 	function MetaForeignKeys($table, $owner=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$table = $this->qstr(strtoupper($table));
@@ -1235,14 +1235,14 @@
 			$tabp = 'user_';
 		} else
 			$tabp = 'all_';
-			
+
 		$owner = ' and owner='.$this->qstr(strtoupper($owner));
-		
-		$sql = 
-"select constraint_name,r_owner,r_constraint_name 
+
+		$sql =
+"select constraint_name,r_owner,r_constraint_name
 	from {$tabp}constraints
 	where constraint_type = 'R' and table_name = $table $owner";
-		
+
 		$constraints = $this->GetArray($sql);
 		$arr = false;
 		foreach($constraints as $constr) {
@@ -1251,32 +1251,32 @@
 			$rcons = $this->qstr($constr[2]);
 			$cols = $this->GetArray("select column_name from {$tabp}cons_columns where constraint_name=$cons $owner order by position");
 			$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
-			
-			if ($cols && $tabcol) 
+
+			if ($cols && $tabcol)
 				for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
 					$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
 				}
 		}
 		$ADODB_FETCH_MODE = $save;
-		
+
 		return $arr;
 	}
 
-	
+
 	function CharMax()
 	{
 		return 4000;
 	}
-	
+
 	function TextMax()
 	{
 		return 4000;
 	}
-	
+
 	/**
 	 * Quotes a string.
 	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
+	 *
 	 * @param s			the string to quote
 	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
 	 *				This undoes the stupidity of magic quotes for GPC.
@@ -1284,17 +1284,17 @@
 	 * @return  quoted string to be sent back to database
 	 */
 	function qstr($s,$magic_quotes=false)
-	{	
+	{
 		//$nofixquotes=false;
-	
+
 		if ($this->noNullStrings && strlen($s)==0)$s = ' ';
-		if (!$magic_quotes) {	
+		if (!$magic_quotes) {
 			if ($this->replaceQuote[0] == '\\'){
 				$s = str_replace('\\','\\\\',$s);
 			}
 			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 		}
-		
+
 		// undo magic quotes for " unless sybase is on
 		if (!ini_get('magic_quotes_sybase')) {
 			$s = str_replace('\\"','"',$s);
@@ -1304,7 +1304,7 @@
 			return "'".$s."'";
 		}
 	}
-	
+
 }
 
 /*--------------------------------------------------------------------------------------
@@ -1316,12 +1316,12 @@
 	var $databaseType = 'oci8';
 	var $bind=false;
 	var $_fieldobjs;
-	
+
 	//var $_arr = false;
-		
+
 	function ADORecordset_oci8($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -1330,11 +1330,11 @@
 		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
+		case ADODB_FETCH_NUM:
 		default:
 		$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
 		}
-		
+
 		$this->adodbFetchMode = $mode;
 		$this->_queryID = $queryID;
 	}
@@ -1343,21 +1343,21 @@
 	function Init()
 	{
 		if ($this->_inited) return;
-		
+
 		$this->_inited = true;
 		if ($this->_queryID) {
-			
+
 			$this->_currentRow = 0;
 			@$this->_initrs();
 			$this->EOF = !$this->_fetch();
-			
+
 			/*
 			// based on idea by Gaetano Giunta to detect unusual oracle errors
 			// see http://phplens.com/lens/lensforum/msgs.php?id=6771
 			$err = OCIError($this->_queryID);
 			if ($err && $this->connection->debug) ADOConnection::outp($err);
 			*/
-			
+
 			if (!is_array($this->fields)) {
 				$this->_numOfRows = 0;
 				$this->fields = array();
@@ -1369,7 +1369,7 @@
 			$this->EOF = true;
 		}
 	}
-	
+
 	function _initrs()
 	{
 		$this->_numOfRows = -1;
@@ -1399,40 +1399,40 @@
 			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
 			if ($p != 0 && $sc == 0) $fld->type = 'INT';
 			break;
-		
+
 	 	case 'CLOB':
 		case 'NCLOB':
-		case 'BLOB': 
+		case 'BLOB':
 			$fld->max_length = -1;
 			break;
 		}
 		return $fld;
 	}
-	
+
 	/* For some reason, OCIcolumnname fails when called after _initrs() so we cache it */
 	function FetchField($fieldOffset = -1)
 	{
 		return $this->_fieldobjs[$fieldOffset];
 	}
-	
-	
+
+
 	/*
 	// 10% speedup to move MoveNext to child class
-	function _MoveNext() 
+	function _MoveNext()
 	{
 	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return @adodb_movenext($this);
-		
+
 		if ($this->EOF) return false;
-		
+
 		$this->_currentRow++;
 		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
 			return true;
 		$this->EOF = true;
-		
+
 		return false;
 	}	*/
-	
-	
+
+
 	function MoveNext()
 	{
 		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
@@ -1445,52 +1445,52 @@
 		}
 		return false;
 	}
-	
+
 	/*
 	# does not work as first record is retrieved in _initrs(), so is not included in GetArray()
-	function GetArray($nRows = -1) 
+	function GetArray($nRows = -1)
 	{
 	global $ADODB_OCI8_GETARRAY;
-	
+
 		if (true ||  !empty($ADODB_OCI8_GETARRAY)) {
 			# does not support $ADODB_ANSI_PADDING_OFF
-	
+
 			//OCI_RETURN_NULLS and OCI_RETURN_LOBS is set by OCIfetchstatement
 			switch($this->adodbFetchMode) {
 			case ADODB_FETCH_NUM:
-			
+
 				$ncols = @OCIfetchstatement($this->_queryID, $results, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW+OCI_NUM);
 				$results = array_merge(array($this->fields),$results);
 				return $results;
-				
-			case ADODB_FETCH_ASSOC: 
+
+			case ADODB_FETCH_ASSOC:
 				if (ADODB_ASSOC_CASE != 2 || $this->databaseType != 'oci8') break;
-				
+
 				$ncols = @OCIfetchstatement($this->_queryID, $assoc, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW);
 				$results = array_merge(array($this->fields),$assoc);
 				return $results;
-			
+
 			default:
 				break;
 			}
 		}
-			
+
 		$results = ADORecordSet::GetArray($nRows);
 		return $results;
-		
+
 	} */
-	
+
 	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function GetArrayLimit($nrows,$offset=-1) 
+	function GetArrayLimit($nrows,$offset=-1)
 	{
 		if ($offset <= 0) {
 			$arr = $this->GetArray($nrows);
 			return $arr;
 		}
 		$arr = array();
-		for ($i=1; $i < $offset; $i++) 
+		for ($i=1; $i < $offset; $i++)
 			if (!@OCIFetch($this->_queryID)) return $arr;
-			
+
 		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return $arr;;
 		$results = array();
 		$cnt = 0;
@@ -1498,11 +1498,11 @@
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
 
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
@@ -1513,18 +1513,18 @@
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
 
 
+
 	function _seek($row)
 	{
 		return false;
 	}
 
-	function _fetch() 
+	function _fetch()
 	{
 		return @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
 	}
@@ -1532,7 +1532,7 @@
 	/*		close() only needs to be called if you are worried about using too much memory while your script
 			is running. All associated result memory for the specified result identifier will automatically be freed.		*/
 
-	function _close() 
+	function _close()
 	{
 		if ($this->connection->_stmt === $this->_queryID) $this->connection->_stmt = false;
 		if (!empty($this->_refcursor)) {
@@ -1541,7 +1541,7 @@
 		}
 		@OCIFreeStatement($this->_queryID);
  		$this->_queryID = false;
-		
+
 	}
 
 	function MetaType($t,$len=-1)
@@ -1561,38 +1561,38 @@
 		case 'NVARCHAR':
 		case 'NVARCHAR2':
 				 if ($len <= $this->blobSize) return 'C';
-		
+
 		case 'NCLOB':
 		case 'LONG':
 		case 'LONG VARCHAR':
 		case 'CLOB':
 		return 'X';
-		
+
 		case 'LONG RAW':
 		case 'LONG VARBINARY':
 		case 'BLOB':
 			return 'B';
-		
-		case 'DATE': 
+
+		case 'DATE':
 			return  ($this->connection->datetime) ? 'T' : 'D';
-		
-		
+
+
 		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'SMALLINT':
-		case 'INTEGER': 
+		case 'INTEGER':
 			return 'I';
-			
+
 		default: return 'N';
 		}
 	}
 }
 
-class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {	
-	function ADORecordSet_ext_oci8($queryID,$mode=false) 
+class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {
+	function ADORecordSet_ext_oci8($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -1601,13 +1601,13 @@
 		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
+		case ADODB_FETCH_NUM:
 		default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
 		}
 		$this->adodbFetchMode = $mode;
 		$this->_queryID = $queryID;
 	}
-	
+
 	function MoveNext()
 	{
 		return adodb_movenext($this);
Index: typo3/sysext/adodb/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-postgres64.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-postgres64.inc.php	(working copy)
@@ -1,29 +1,29 @@
 <?php
 /*
  V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 8.
-  
-  Original version derived from Alberto Cerezal (acerezalp@dbnet.es) - DBNet Informatica & Comunicaciones. 
+
+  Original version derived from Alberto Cerezal (acerezalp@dbnet.es) - DBNet Informatica & Comunicaciones.
   08 Nov 2000 jlim - Minor corrections, removing mysql stuff
   09 Nov 2000 jlim - added insertid support suggested by "Christopher Kings-Lynne" <chriskl@familyhealth.com.au>
-					jlim - changed concat operator to || and data types to MetaType to match documented pgsql types 
-		 	see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm  
+					jlim - changed concat operator to || and data types to MetaType to match documented pgsql types
+		 	see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm
   22 Nov 2000 jlim - added changes to FetchField() and MetaTables() contributed by "raser" <raser@mail.zen.com.tw>
   27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by "Lennie" <leen@wirehub.nl>
-  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk. 
+  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk.
   31 Jan 2002 jlim - finally installed postgresql. testing
   01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
-  
+
   See http://www.varlena.com/varlena/GeneralBits/47.php
-  
+
 	-- What indexes are on my table?
 	select * from pg_indexes where tablename = 'tablename';
-	
+
 	-- What triggers are on my table?
-	select c.relname as "Table", t.tgname as "Trigger Name", 
+	select c.relname as "Table", t.tgname as "Trigger Name",
 	   t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
 	   t.tgisconstraint as "Is Constraint", cc.relname as "Referenced Table",
 	   p.proname as "Function Name"
@@ -31,7 +31,7 @@
 	where t.tgfoid = p.oid and t.tgrelid = c.oid
 	   and t.tgconstrrelid = cc.oid
 	   and c.relname = 'tablename';
-	
+
 	-- What constraints are on my table?
 	select r.relname as "Table", c.conname as "Constraint Name",
 	   contype as "Constraint Type", conkey as "Key Columns",
@@ -50,7 +50,7 @@
 	$len = strlen($s);
 	if ($len == 0) return "''";
 	if (strncmp($s,"'",1) === 0 && substr($s,$len-1) == "'") return $s; // already quoted
-	
+
 	return "'".addslashes($s)."'";
 }
 
@@ -63,34 +63,34 @@
 	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
     var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 	and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
-	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles') 
-	union 
+	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles')
+	union
         select viewname,'V' from pg_views where viewname not like 'pg\_%'";
 	//"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
 	var $isoDates = true; // accepts dates in ISO format
 	var $sysDate = "CURRENT_DATE";
 	var $sysTimeStamp = "CURRENT_TIMESTAMP";
 	var $blobEncodeType = 'C';
-	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
-		FROM pg_class c, pg_attribute a,pg_type t 
+	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum
+		FROM pg_class c, pg_attribute a,pg_type t
 		WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
 AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
 
 	// used when schema defined
-	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
+	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum
+FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n
 WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
+ and c.relnamespace=n.oid and n.nspname='%s'
+	and a.attname not like '....%%' AND a.attnum > 0
 	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-	
+
 	// get primary key etc -- from Freek Dijkstra
-	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
+	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key
 	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
-	
+
 	var $hasAffectedRows = true;
 	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	// below suggested by Freek Dijkstra 
+	// below suggested by Freek Dijkstra
 	var $true = 'TRUE';		// string that represents TRUE for a database
 	var $false = 'FALSE';		// string that represents FALSE for a database
 	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
@@ -104,37 +104,37 @@
 	var $random = 'random()';		/// random function
 	var $autoRollback = true; // apparently pgsql does not autorollback properly before php 4.3.4
 							// http://bugs.php.net/bug.php?id=25404
-	
+
 	var $uniqueIisR = true;
 	var $_bindInputArray = false; // requires postgresql 7.3+ and ability to modify database
 	var $disableBlobs = false; // set to true to disable blob checking, resulting in 2-5% improvement in performance.
-	
-	// The last (fmtTimeStamp is not entirely correct: 
-	// PostgreSQL also has support for time zones, 
-	// and writes these time in this format: "2001-03-01 18:59:26+02". 
-	// There is no code for the "+02" time zone information, so I just left that out. 
-	// I'm not familiar enough with both ADODB as well as Postgres 
+
+	// The last (fmtTimeStamp is not entirely correct:
+	// PostgreSQL also has support for time zones,
+	// and writes these time in this format: "2001-03-01 18:59:26+02".
+	// There is no code for the "+02" time zone information, so I just left that out.
+	// I'm not familiar enough with both ADODB as well as Postgres
 	// to know what the concequences are. The other values are correct (wheren't in 0.94)
-	// -- Freek Dijkstra 
+	// -- Freek Dijkstra
 
-	function ADODB_postgres64() 
+	function ADODB_postgres64()
 	{
 	// changes the metaColumnsSQL, adds columns: attnum[6]
 	}
-	
+
 	function ServerInfo()
 	{
 		if (isset($this->version)) return $this->version;
-		
+
 		$arr['description'] = $this->GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		$this->version = $arr;
 		return $arr;
 	}
 
-	function IfNull( $field, $ifNull ) 
+	function IfNull( $field, $ifNull )
 	{
-		return " coalesce($field, $ifNull) "; 
+		return " coalesce($field, $ifNull) ";
 	}
 
 	// get the last id - never tested
@@ -148,10 +148,10 @@
 		}
 		return false;
 	}
-	
+
 /* Warning from http://www.php.net/manual/function.pg-getlastoid.php:
-Using a OID as a unique identifier is not generally wise. 
-Unless you are very careful, you might end up with a tuple having 
+Using a OID as a unique identifier is not generally wise.
+Unless you are very careful, you might end up with a tuple having
 a different OID if a database must be reloaded. */
 	function _insertid($table,$column)
 	{
@@ -168,8 +168,8 @@
    		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
 	   	return pg_cmdtuples($this->_resultid);
    }
-   
-	
+
+
 		// returns true/false
 	function BeginTrans()
 	{
@@ -177,23 +177,23 @@
 		$this->transCnt += 1;
 		return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
 	}
-	
-	function RowLock($tables,$where,$col='1 as ignore') 
+
+	function RowLock($tables,$where,$col='1 as ignore')
 	{
 		if (!$this->transCnt) $this->BeginTrans();
 		return $this->GetOne("select $col from $tables where $where for update");
 	}
 
-	// returns true/false. 
-	function CommitTrans($ok=true) 
-	{ 
+	// returns true/false.
+	function CommitTrans($ok=true)
+	{
 		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		$this->transCnt -= 1;
 		return @pg_Exec($this->_connectionID, "commit");
 	}
-	
+
 	// returns true/false
 	function RollbackTrans()
 	{
@@ -201,14 +201,14 @@
 		$this->transCnt -= 1;
 		return @pg_Exec($this->_connectionID, "rollback");
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$info = $this->ServerInfo();
 		if ($info['version'] >= 7.3) {
 	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 			  and schemaname  not in ( 'pg_catalog','information_schema')
-	union 
+	union
         select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
 		}
 		if ($mask) {
@@ -216,55 +216,55 @@
 			$mask = $this->qstr(strtolower($mask));
 			if ($info['version']>=7.3)
 				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
- union 
+select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')
+ union
 select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
 			else
 				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
+select tablename,'T' from pg_tables where tablename like $mask
+ union
 select viewname,'V' from pg_views where viewname like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
-	
+
+
 	// if magic quotes disabled, use pg_escape_string()
 	function qstr($s,$magic_quotes=false)
 	{
 		if (is_bool($s)) return $s ? 'true' : 'false';
-		 
+
 		if (!$magic_quotes) {
 			if (ADODB_PHPVER >= 0x5200) {
 				return  "'".pg_escape_string($this->_connectionID,$s)."'";
-			} 
+			}
 			if (ADODB_PHPVER >= 0x4200) {
 				return  "'".pg_escape_string($s)."'";
 			}
 			if ($this->replaceQuote[0] == '\\'){
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\\000"),$s);
 			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
 		return "'$s'";
 	}
-	
-	
-	
+
+
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'TO_CHAR('.$col.",'";
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
@@ -277,11 +277,11 @@
 			case 'q':
 				$s .= 'Q';
 				break;
-				
+
 			case 'M':
 				$s .= 'Mon';
 				break;
-				
+
 			case 'm':
 				$s .= 'MM';
 				break;
@@ -289,36 +289,36 @@
 			case 'd':
 				$s .= 'DD';
 				break;
-			
+
 			case 'H':
 				$s.= 'HH24';
 				break;
-				
+
 			case 'h':
 				$s .= 'HH';
 				break;
-				
+
 			case 'i':
 				$s .= 'MI';
 				break;
-			
+
 			case 's':
 				$s .= 'SS';
 				break;
-			
+
 			case 'a':
 			case 'A':
 				$s .= 'AM';
 				break;
-				
+
 			case 'w':
 				$s .= 'D';
 				break;
-			
+
 			case 'l':
 				$s .= 'DAY';
 				break;
-			
+
 			 case 'W':
 				$s .= 'WW';
 				break;
@@ -331,44 +331,44 @@
 				}
 				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
 				else $s .= '"'.$ch.'"';
-				
+
 			}
 		}
 		return $s. "')";
 	}
-	
-	
-	
-	/* 
-	* Load a Large Object from a file 
-	* - the procedure stores the object id in the table and imports the object using 
-	* postgres proprietary blob handling routines 
+
+
+
+	/*
+	* Load a Large Object from a file
+	* - the procedure stores the object id in the table and imports the object using
+	* postgres proprietary blob handling routines
 	*
 	* contributed by Mattia Rossi mattia@technologist.com
 	* modified for safe mode by juraj chlebec
-	*/ 
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
-		pg_exec ($this->_connectionID, "begin"); 
-		
+	*/
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
+	{
+		pg_exec ($this->_connectionID, "begin");
+
 		$fd = fopen($path,'r');
 		$contents = fread($fd,filesize($path));
 		fclose($fd);
-		
+
 		$oid = pg_lo_create($this->_connectionID);
 		$handle = pg_lo_open($this->_connectionID, $oid, 'w');
 		pg_lo_write($handle, $contents);
 		pg_lo_close($handle);
-		
-		// $oid = pg_lo_import ($path); 
-		pg_exec($this->_connectionID, "commit"); 
-		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype); 
-		$rez = !empty($rs); 
-		return $rez; 
-	} 
-	
+
+		// $oid = pg_lo_import ($path);
+		pg_exec($this->_connectionID, "commit");
+		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype);
+		$rez = !empty($rs);
+		return $rez;
+	}
+
 	/*
-	* Deletes/Unlinks a Blob from the database, otherwise it 
+	* Deletes/Unlinks a Blob from the database, otherwise it
 	* will be left behind
 	*
 	* Returns TRUE on success or FALSE on failure.
@@ -391,8 +391,8 @@
 		if (strlen($oid)>16) return false;
 		return is_numeric($oid);
 	}
-	
-	/* 
+
+	/*
 	* If an OID is detected, then we use pg_lo_* to open the oid file and read the
 	* real blob from the db using the oid supplied as a parameter. If you are storing
 	* blobs using bytea, we autodetect and process it so this function is not needed.
@@ -403,109 +403,109 @@
 	*
 	* Since adodb 4.54, this returns the blob, instead of sending it to stdout. Also
 	* added maxsize parameter, which defaults to $db->maxblobsize if not defined.
-	*/ 
-	function BlobDecode($blob,$maxsize=false,$hastrans=true) 
+	*/
+	function BlobDecode($blob,$maxsize=false,$hastrans=true)
 	{
 		if (!$this->GuessOID($blob)) return $blob;
-		
-		if ($hastrans) @pg_exec($this->_connectionID,"begin"); 
+
+		if ($hastrans) @pg_exec($this->_connectionID,"begin");
 		$fd = @pg_lo_open($this->_connectionID,$blob,"r");
 		if ($fd === false) {
 			if ($hastrans) @pg_exec($this->_connectionID,"commit");
 			return $blob;
 		}
 		if (!$maxsize) $maxsize = $this->maxblobsize;
-		$realblob = @pg_loread($fd,$maxsize); 
-		@pg_loclose($fd); 
-		if ($hastrans) @pg_exec($this->_connectionID,"commit"); 
+		$realblob = @pg_loread($fd,$maxsize);
+		@pg_loclose($fd);
+		if ($hastrans) @pg_exec($this->_connectionID,"commit");
 		return $realblob;
 	}
-	
-	/* 
+
+	/*
 		See http://www.postgresql.org/idocs/index.php?datatype-binary.html
-	 	
-		NOTE: SQL string literals (input strings) must be preceded with two backslashes 
-		due to the fact that they must pass through two parsers in the PostgreSQL 
+
+		NOTE: SQL string literals (input strings) must be preceded with two backslashes
+		due to the fact that they must pass through two parsers in the PostgreSQL
 		backend.
 	*/
 	function BlobEncode($blob)
 	{
 		if (ADODB_PHPVER >= 0x5200) return pg_escape_bytea($this->_connectionID, $blob);
 		if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
-		
+
 		/*92=backslash, 0=null, 39=single-quote*/
 		$badch = array(chr(92),chr(0),chr(39)); # \  null  '
 		$fixch = array('\\\\134','\\\\000','\\\\047');
 		return adodb_str_replace($badch,$fixch,$blob);
-		
+
 		// note that there is a pg_escape_bytea function only for php 4.2.0 or later
 	}
-	
+
 	// assumes bytea for blob, and varchar for clob
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
-	
+
 		if ($blobtype == 'CLOB') {
     		return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
 		}
 		// do not use bind params which uses qstr(), as blobencode() already quotes data
 		return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
 	}
-	
+
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
 		else if (strncmp($date,"'",1) == 0) {
 			$len = strlen($date);
 			if (10 <= $len && $len <= 12) $date = 'date '.$date;
 			else $date = 'timestamp '.$date;
 		}
-		
-		
+
+
 		return "($date+interval'".($dayFraction * 1440)." minutes')";
 		#return "($date+interval'$dayFraction days')";
 	}
-	
 
+
 	// for schema support, pass in the $table param "$schema.$tabname".
 	// converts field names to lowercase, $upper is ignored
 	// see http://phplens.com/lens/lensforum/msgs.php?id=14018 for more info
-	function MetaColumns($table,$normalize=true) 
+	function MetaColumns($table,$normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$schema = false;
 		$false = false;
 		$this->_findschema($table,$schema);
-		
+
 		if ($normalize) $table = strtolower($table);
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
+
 		if ($schema) $rs = $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
 		else $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if ($rs === false) {
 			return $false;
 		}
 		if (!empty($this->metaKeySQL)) {
 			// If we want the primary keys, we have to issue a separate query
-			// Of course, a modified version of the metaColumnsSQL query using a 
-			// LEFT JOIN would have been much more elegant, but postgres does 
+			// Of course, a modified version of the metaColumnsSQL query using a
+			// LEFT JOIN would have been much more elegant, but postgres does
 			// not support OUTER JOINS. So here is the clumsy way.
-			
+
 			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			
+
 			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
 			// fetch all result in once for performance.
 			$keys = $rskey->GetArray();
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			$rskey->Close();
 			unset($rskey);
 		}
@@ -517,7 +517,7 @@
 			$rsdef = $this->Execute($sql);
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			if ($rsdef) {
 				while (!$rsdef->EOF) {
 					$num = $rsdef->fields['num'];
@@ -535,15 +535,15 @@
 			}
 			unset($rsdef);
 		}
-	
+
 		$retarr = array();
-		while (!$rs->EOF) { 	
+		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
 			$fld->attnum = $rs->fields[6];
-			
+
 			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
 			if ($fld->max_length <= 0) $fld->max_length = -1;
 			if ($fld->type == 'numeric') {
@@ -559,45 +559,45 @@
 
 			//Freek
 			$fld->not_null = $rs->fields[4] == 't';
-			
-			
+
+
 			// Freek
 			if (is_array($keys)) {
 				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't') 
+					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't')
 						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't') 
+					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't')
 						$fld->unique = true; // What name is more compatible?
 				}
 			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr))
 			return  $false;
 		else
-			return $retarr;	
-		
+			return $retarr;
+
 	}
 
 	  function MetaIndexes ($table, $primary = FALSE)
       {
          global $ADODB_FETCH_MODE;
-                
+
 				$schema = false;
 				$this->_findschema($table,$schema);
 
 				if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
 					$sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns" 
-FROM pg_catalog.pg_class c 
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid 
+SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
+FROM pg_catalog.pg_class c
+JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
 JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-	,pg_namespace n 
+	,pg_namespace n
 WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\'';
 				} else {
 	                $sql = '
@@ -607,17 +607,17 @@
 JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
 WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
     			}
-				            
+
                 if ($primary == FALSE) {
                 	$sql .= ' AND i.indisprimary=false;';
                 }
-                
+
                 $save = $ADODB_FETCH_MODE;
                 $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
                 if ($this->fetchMode !== FALSE) {
                         $savem = $this->SetFetchMode(FALSE);
                 }
-                
+
                 $rs = $this->Execute(sprintf($sql,$table,$table,$schema));
                 if (isset($savem)) {
                         $this->SetFetchMode($savem);
@@ -628,9 +628,9 @@
                 	$false = false;
 					return $false;
                 }
-				
-                $col_names = $this->MetaColumnNames($table,true,true); 
-				//3rd param is use attnum, 
+
+                $col_names = $this->MetaColumnNames($table,true,true);
+				//3rd param is use attnum,
 				// see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
                 $indexes = array();
                 while ($row = $rs->FetchRow()) {
@@ -638,7 +638,7 @@
                         foreach (explode(' ', $row[2]) as $col) {
                                 $columns[] = $col_names[$col];
                         }
-                        
+
                         $indexes[$row[0]] = array(
                                 'unique' => ($row[1] == 't'),
                                 'columns' => $columns
@@ -654,11 +654,11 @@
 	// 	$db->Connect('host1','user1','secret');
 	function _connect($str,$user='',$pwd='',$db='',$ctype=0)
 	{
-		
+
 		if (!function_exists('pg_connect')) return null;
-		
+
 		$this->_errorMsg = false;
-		
+
 		if ($user || $pwd || $db) {
 			$user = adodb_addslashes($user);
 			$pwd = adodb_addslashes($pwd);
@@ -677,23 +677,23 @@
 		}
 
 		//if ($user) $linea = "user=$user host=$linea password=$pwd dbname=$db port=5432";
-		
+
 		if ($ctype === 1) { // persistent
 			$this->_connectionID = pg_pconnect($str);
 		} else {
 			if ($ctype === -1) { // nconnect, we trick pgsql ext by changing the connection str
 			static $ncnt;
-			
+
 				if (empty($ncnt)) $ncnt = 1;
 				else $ncnt += 1;
-				
+
 				$str .= str_repeat(' ',$ncnt);
 			}
 			$this->_connectionID = pg_connect($str);
 		}
 		if ($this->_connectionID === false) return false;
 		$this->Execute("set datestyle='ISO'");
-		
+
 		$info = $this->ServerInfo();
 		$this->pgVersion = (float) substr($info['version'],0,3);
 		if ($this->pgVersion >= 7.1) { // good till version 999
@@ -701,12 +701,12 @@
 		}
 		return true;
 	}
-	
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
 	{
 	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
 	}
-	 
+
 	// returns true or false
 	//
 	// examples:
@@ -716,8 +716,8 @@
 	{
 		return $this->_connect($str,$user,$pwd,$db,1);
 	}
-	
 
+
 	// returns queryID or false
 	function _query($sql,$inputarr=false)
 	{
@@ -725,19 +725,19 @@
 		if ($inputarr) {
 		/*
 			It appears that PREPARE/EXECUTE is slower for many queries.
-			
+
 			For query executed 1000 times:
-			"select id,firstname,lastname from adoxyz 
+			"select id,firstname,lastname from adoxyz
 				where firstname not like ? and lastname not like ? and id = ?"
-				
+
 			with plan = 1.51861286163 secs
 			no plan =   1.26903700829 secs
 
-			
 
+
 		*/
 			$plan = 'P'.md5($sql);
-				
+
 			$execp = '';
 			foreach($inputarr as $v) {
 				if ($execp) $execp .= ',';
@@ -747,11 +747,11 @@
 					$execp .= $v;
 				}
 			}
-			
+
 			if ($execp) $exsql = "EXECUTE $plan ($execp)";
 			else $exsql = "EXECUTE $plan";
-			
-			
+
+
 			$rez = @pg_exec($this->_connectionID,$exsql);
 			if (!$rez) {
 			# Perhaps plan does not exist? Prepare/compile plan.
@@ -774,7 +774,7 @@
 					$sql .= $v.' $'.$i;
 					$i++;
 				}
-				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);		
+				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);
 				//adodb_pr($s);
 				$rez = pg_exec($this->_connectionID,$s);
 				//echo $this->ErrorMsg();
@@ -793,18 +793,18 @@
 			$this->_resultid = $rez;
 			return true;
 		}
-		
+
 		return $rez;
 	}
-	
+
 	function _errconnect()
 	{
 		if (defined('DB_ERROR_CONNECT_FAILED')) return DB_ERROR_CONNECT_FAILED;
 		else return 'Database connection failed';
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	{
 		if ($this->_errorMsg !== false) return $this->_errorMsg;
 		if (ADODB_PHPVER >= 0x4300) {
@@ -812,7 +812,7 @@
 				$this->_errorMsg = @pg_result_error($this->_resultid);
 				if ($this->_errorMsg) return $this->_errorMsg;
 			}
-			
+
 			if (!empty($this->_connectionID)) {
 				$this->_errorMsg = @pg_last_error($this->_connectionID);
 			} else $this->_errorMsg = $this->_errconnect();
@@ -822,7 +822,7 @@
 		}
 		return $this->_errorMsg;
 	}
-	
+
 	function ErrorNo()
 	{
 		$e = $this->ErrorMsg();
@@ -844,8 +844,8 @@
 		$this->_connectionID = false;
 		return true;
 	}
-	
-	
+
+
 	/*
 	* Maximum size of C field
 	*/
@@ -853,7 +853,7 @@
 	{
 		return 1000000000;  // should be 1 Gb?
 	}
-	
+
 	/*
 	* Maximum size of X field
 	*/
@@ -861,10 +861,10 @@
 	{
 		return 1000000000; // should be 1 Gb?
 	}
-	
-		
+
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
@@ -873,9 +873,9 @@
 	var $_blobArr;
 	var $databaseType = "postgres64";
 	var $canSeek = true;
-	function ADORecordSet_postgres64($queryID,$mode=false) 
+	function ADORecordSet_postgres64($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -883,7 +883,7 @@
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
 		default: $this->fetchMode = PGSQL_BOTH; break;
@@ -891,7 +891,7 @@
 		$this->adodbFetchMode = $mode;
 		$this->ADORecordSet($queryID);
 	}
-	
+
 	function GetRowAssoc($upper=true)
 	{
 		if ($this->fetchMode == PGSQL_ASSOC && !$upper) return $this->fields;
@@ -905,11 +905,11 @@
 		$qid = $this->_queryID;
 		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($qid):-1;
 		$this->_numOfFields = @pg_numfields($qid);
-		
+
 		// cache types for blob decode check
 		// apparently pg_fieldtype actually performs an sql query on the database to get the type.
 		if (empty($this->connection->noBlobs))
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {  
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
 			if (pg_fieldtype($qid,$i) == 'bytea') {
 				$this->_blobArr[$i] = pg_fieldname($qid,$i);
 			}
@@ -920,7 +920,7 @@
 	function Fields($colname)
 	{
 		if ($this->fetchMode != PGSQL_NUM) return @$this->fields[$colname];
-		
+
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -931,29 +931,29 @@
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
 
-	function FetchField($off = 0) 
+	function FetchField($off = 0)
 	{
 		// offsets begin at 0
-		
+
 		$o= new ADOFieldObject();
 		$o->name = @pg_fieldname($this->_queryID,$off);
 		$o->type = @pg_fieldtype($this->_queryID,$off);
 		$o->max_length = @pg_fieldsize($this->_queryID,$off);
-		return $o;	
+		return $o;
 	}
 
 	function _seek($row)
 	{
 		return @pg_fetch_row($this->_queryID,$row);
 	}
-	
+
 	function _decode($blob)
 	{
 		if ($blob === NULL) return NULL;
 		eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
-		return $realblob;	
+		return $realblob;
 	}
-	
+
 	function _fixblobs()
 	{
 		if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH) {
@@ -967,9 +967,9 @@
 			}
 		}
 	}
-	
+
 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
@@ -984,23 +984,23 @@
 			$this->EOF = true;
 		}
 		return false;
-	}		
-	
+	}
+
 	function _fetch()
 	{
-				
+
 		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
         	return false;
 
 		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-		
+
 		if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-			
+
 		return (is_array($this->fields));
 	}
 
-	function _close() 
-	{ 
+	function _close()
+	{
 		return @pg_freeresult($this->_queryID);
 	}
 
@@ -1023,45 +1023,45 @@
 				case 'INET':
 				case 'MACADDR':
 					if ($len <= $this->blobSize) return 'C';
-				
+
 				case 'TEXT':
 					return 'X';
-		
+
 				case 'IMAGE': // user defined type
 				case 'BLOB': // user defined type
 				case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
 				case 'VARBIT':
 				case 'BYTEA':
 					return 'B';
-				
+
 				case 'BOOL':
 				case 'BOOLEAN':
 					return 'L';
-				
+
 				case 'DATE':
 					return 'D';
-				
-				
+
+
 				case 'TIMESTAMP WITHOUT TIME ZONE':
 				case 'TIME':
 				case 'DATETIME':
 				case 'TIMESTAMP':
 				case 'TIMESTAMPTZ':
 					return 'T';
-				
-				case 'SMALLINT': 
-				case 'BIGINT': 
-				case 'INTEGER': 
-				case 'INT8': 
+
+				case 'SMALLINT':
+				case 'BIGINT':
+				case 'INTEGER':
+				case 'INT8':
 				case 'INT4':
 				case 'INT2':
 					if (isset($fieldobj) &&
 				empty($fieldobj->primary_key) && (!$this->connection->uniqueIisR || empty($fieldobj->unique))) return 'I';
-				
+
 				case 'OID':
 				case 'SERIAL':
 					return 'R';
-				
+
 				 default:
 				 	return 'N';
 			}
Index: typo3/sysext/adodb/adodb/drivers/adodb-access.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-access.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-access.inc.php	(working copy)
@@ -1,24 +1,24 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Microsoft Access data driver. Requires ODBC. Works only on MS Windows.
 */
 if (!defined('_ADODB_ODBC_LAYER')) {
 	if (!defined('ADODB_DIR')) die();
-	
+
 	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
  if (!defined('_ADODB_ACCESS')) {
  	define('_ADODB_ACCESS',1);
 
-class  ADODB_access extends ADODB_odbc {	
+class  ADODB_access extends ADODB_odbc {
 	var $databaseType = 'access';
 	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
 	var $fmtDate = "#Y-m-d#";
@@ -28,23 +28,23 @@
 	var $sysTimeStamp = 'NOW';
 	var $hasTransactions = false;
 	var $upperCase = 'ucase';
-	
+
 	function ADODB_access()
 	{
 	global $ADODB_EXTENSION;
-	
+
 		$ADODB_EXTENSION = false;
 		$this->ADODB_odbc();
 	}
-	
+
 	function Time()
 	{
 		return time();
 	}
-	
+
 	function BeginTrans() { return false;}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " IIF(IsNull($field), $ifNull, $field) "; // if Access
 	}
@@ -52,16 +52,16 @@
 	function MetaTables()
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = odbc_tables($this->_connectionID);
 		$rs = new ADORecordSet_odbc($qid);
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) return false;
-		
+
 		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
+
 		$arr = $rs->GetArray();
 		//print_pre($arr);
 		$arr2 = array();
@@ -73,15 +73,15 @@
 	}*/
 }
 
- 
-class  ADORecordSet_access extends ADORecordSet_odbc {	
-	
-	var $databaseType = "access";		
-	
+
+class  ADORecordSet_access extends ADORecordSet_odbc {
+
+	var $databaseType = "access";
+
 	function ADORecordSet_access($id,$mode=false)
 	{
 		return $this->ADORecordSet_odbc($id,$mode);
 	}
 }// class
-} 
+}
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/drivers/adodb-sybase_ase.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-sybase_ase.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-sybase_ase.inc.php	(working copy)
@@ -1,12 +1,12 @@
 <?php
 /*
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
-  
+
   Set tabs to 4.
-  
+
   Contributed by Interakt Online. Thx Cristian MARIN cristic#interaktonline.com
 */
 
@@ -15,7 +15,7 @@
 
 class ADODB_sybase_ase extends ADODB_sybase {
  	var $databaseType = "sybase_ase";
-	
+
 	 var $metaTablesSQL="SELECT sysobjects.name FROM sysobjects, sysusers WHERE sysobjects.type='U' AND sysobjects.uid = sysusers.uid";
 	 var $metaColumnsSQL = "SELECT syscolumns.name AS field_name, systypes.name AS type, systypes.length AS width FROM sysobjects, syscolumns, systypes WHERE sysobjects.name='%s' AND syscolumns.id = sysobjects.id AND systypes.type=syscolumns.type";
 	 var $metaDatabasesSQL ="SELECT a.name FROM master.dbo.sysdatabases a, master.dbo.syslogins b WHERE a.suid = b.suid and a.name like '%' and a.name != 'tempdb' and a.status3 != 256  order by 1";
@@ -23,23 +23,23 @@
 	function ADODB_sybase_ase()
 	{
 	}
-	
+
 	// split the Views, Tables and procedures.
 	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$false = false;
 		if ($this->metaTablesSQL) {
 			// complicated state saving by the need for backward compat
-			
+
 			if ($ttype == 'VIEWS'){
 						$sql = str_replace('U', 'V', $this->metaTablesSQL);
 			}elseif (false === $ttype){
 						$sql = str_replace('U',"U' OR type='V", $this->metaTablesSQL);
-			}else{ // TABLES OR ANY OTHER 
+			}else{ // TABLES OR ANY OTHER
 						$sql = $this->metaTablesSQL;
 			}
 			$rs = $this->Execute($sql);
-			
+
 			if ($rs === false || !method_exists($rs, 'GetArray')){
 					return $false;
 			}
@@ -71,11 +71,11 @@
 	}
 
 	// fix a bug which prevent the metaColumns query to be executed for Sybase ASE
-	function MetaColumns($table,$upper=false) 
+	function MetaColumns($table,$upper=false)
 	{
 		$false = false;
 		if (!empty($this->metaColumnsSQL)) {
-		
+
 			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
 			if ($rs === false) return $false;
 
@@ -89,11 +89,11 @@
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 		}
 		return $false;
 	}
-	
+
 	function getProcedureList($schema)
 	{
 			return false;
@@ -104,7 +104,7 @@
 		if (!function_exists('sybase_connect')){
 				return 'Your PHP doesn\'t contain the Sybase connection module!';
 		}
-		return parent::ErrorMsg();	
+		return parent::ErrorMsg();
 	}
 }
 
@@ -114,6 +114,6 @@
 	{
 		$this->ADORecordSet_sybase($id,$mode);
 	}
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/adodb/adodb/drivers/adodb-odbc_oracle.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-odbc_oracle.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-odbc_oracle.inc.php	(working copy)
@@ -1,14 +1,14 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
-  Oracle support via ODBC. Requires ODBC. Works on Windows. 
+
+  Oracle support via ODBC. Requires ODBC. Works on Windows.
 */
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -17,26 +17,26 @@
 	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
 
- 
-class  ADODB_odbc_oracle extends ADODB_odbc {	
+
+class  ADODB_odbc_oracle extends ADODB_odbc {
 	var $databaseType = 'odbc_oracle';
  	var $replaceQuote = "''"; // string to use to replace quotes
 	var $concat_operator='||';
-	var $fmtDate = "'Y-m-d 00:00:00'"; 
+	var $fmtDate = "'Y-m-d 00:00:00'";
 	var $fmtTimeStamp = "'Y-m-d h:i:sA'";
 	var $metaTablesSQL = 'select table_name from cat';
 	var $metaColumnsSQL = "select cname,coltype,width from col where tname='%s' order by colno";
 	var $sysDate = "TRUNC(SYSDATE)";
 	var $sysTimeStamp = 'SYSDATE';
-	
+
 	//var $_bindInputArray = false;
-	
+
 	function ADODB_odbc_oracle()
 	{
 		$this->ADODB_odbc();
 	}
-		
-	function MetaTables() 
+
+	function MetaTables()
 	{
 		$false = false;
 		$rs = $this->Execute($this->metaTablesSQL);
@@ -49,13 +49,13 @@
 		$rs->Close();
 		return $arr2;
 	}
-	
-	function MetaColumns($table, $normalize=true) 
+
+	function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		if ($rs === false) {	
+		if ($rs === false) {
 			$false = false;
 			return $false;
 		}
@@ -65,26 +65,26 @@
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
-			
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[strtoupper($fld->name)] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
-		return $retarr;	
+		return $retarr;
 	}
 
 	// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 	global $php_errormsg;
-	
+
 		$php_errormsg = '';
 		$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
 		$this->_errorMsg = $php_errormsg;
-		
+
 		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
 		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
 		return $this->_connectionID != false;
@@ -96,17 +96,17 @@
 		$php_errormsg = '';
 		$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
 		$this->_errorMsg = $php_errormsg;
-		
+
 		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
 		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
 		return $this->_connectionID != false;
 	}
-} 
- 
-class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {	
-	
+}
+
+class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {
+
 	var $databaseType = 'odbc_oracle';
-	
+
 	function ADORecordSet_odbc_oracle($id,$mode=false)
 	{
 		return $this->ADORecordSet_odbc($id,$mode);
Index: typo3/sysext/adodb/adodb/drivers/adodb-db2.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-db2.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-db2.inc.php	(working copy)
@@ -1,5 +1,5 @@
 <?php
-/* 
+/*
   V5.06 16 Oct 2008   (c) 2006 John Lim (jlim#natsoft.com). All rights reserved.
 
   This is a version of the ADODB driver for DB2.  It uses the 'ibm_db2' PECL extension
@@ -19,7 +19,7 @@
 if (!defined('ADODB_DIR')) die();
 
   define("_ADODB_DB2_LAYER", 2 );
-	 
+
 /*--------------------------------------------------------------------------------------
 --------------------------------------------------------------------------------------*/
 
@@ -28,14 +28,14 @@
 
 
 class ADODB_db2 extends ADOConnection {
-	var $databaseType = "db2";	
+	var $databaseType = "db2";
 	var $fmtDate = "'Y-m-d'";
 	var $concat_operator = '||';
-	
+
 	var $sysTime = 'CURRENT TIME';
 	var $sysDate = 'CURRENT DATE';
 	var $sysTimeStamp = 'CURRENT TIMESTAMP';
-	
+
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $dataProvider = "db2";
@@ -45,7 +45,7 @@
 
 	var $useFetchArray = false; // setting this to true will make array elements in FETCH_ASSOC mode case-sensitive
 								// breaking backward-compat
-	var $_bindInputArray = false;	
+	var $_bindInputArray = false;
 	var $_genIDSQL = "VALUES NEXTVAL FOR %s";
 	var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s NO MAXVALUE NO CYCLE";
 	var $_dropSeqSQL = "DROP SEQUENCE %s";
@@ -54,23 +54,23 @@
 	var $_lastAffectedRows = 0;
 	var $uCaseTables = true; // for meta* functions, uppercase table names
 	var $hasInsertID = true;
-	
-	
+
+
     function _insertid()
     {
         return ADOConnection::GetOne('VALUES IDENTITY_VAL_LOCAL()');
     }
-	
-	function ADODB_db2() 
-	{ 	
+
+	function ADODB_db2()
+	{
 		$this->_haserrorfunctions = ADODB_PHPVER >= 0x4050;
 	}
-	
+
 		// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 		global $php_errormsg;
-		
+
 		if (!function_exists('db2_connect')) {
 			ADOConnection::outp("Warning: The old ODBC based DB2 driver has been renamed 'odbc_db2'. This ADOdb driver calls PHP's native db2 extension which is not installed.");
 			return null;
@@ -80,7 +80,7 @@
 		ini_set('ibm_db2.binmode', $this->binmode);
 
 		if ($argDatabasename && empty($argDSN)) {
-		
+
 			if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_connect($argDatabasename,null,null);
 			else $this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword);
 		} else {
@@ -95,27 +95,27 @@
 
 		$this->_errorMsg = @db2_conn_errormsg();
 		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
+
 		if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema");
 		return $this->_connectionID != false;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 		global $php_errormsg;
-	
+
 		if (!function_exists('db2_connect')) return null;
-		
+
 		// This needs to be set before the connect().
 		// Replaces the odbc_binmode() call that was in Execute()
 		ini_set('ibm_db2.binmode', $this->binmode);
 
 		if (isset($php_errormsg)) $php_errormsg = '';
 		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		
+
 		if ($argDatabasename && empty($argDSN)) {
-		
+
 			if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_pconnect($argDatabasename,null,null);
 			else $this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword);
 		} else {
@@ -128,7 +128,7 @@
 		$this->_errorMsg = @db2_conn_errormsg();
 		if ($this->_connectionID && $this->autoRollback) @db2_rollback($this->_connectionID);
 		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
+
 		if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema");
 		return $this->_connectionID != false;
 	}
@@ -140,10 +140,10 @@
 		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
 		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'YYYY-MM-DD HH24:MI:SS')";
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 	// use right() and replace() ?
 		if (!$col) $col = $this->sysDate;
 
@@ -152,7 +152,7 @@
 			return 'TO_CHAR('.$col.", 'YYYY-MM-DD HH24:MI:SS')";
 
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= $this->concat_operator;
@@ -179,7 +179,7 @@
 			case 'H':
 			case 'h':
 				if ($len==1) return "hour($col)";
-				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";
 				else $s .= "''";
 				break;
 			case 'i':
@@ -205,21 +205,21 @@
 			}
 		}
 		return $s;
-	} 
- 
-	
+	}
+
+
 	function ServerInfo()
 	{
-	
+
 		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
 			$dsn = strtoupper($this->host);
 			$first = true;
 			$found = false;
-			
+
 			if (!function_exists('db2_data_source')) return false;
-			
+
 			while(true) {
-				
+
 				$rez = @db2_data_source($this->_connectionID,
 					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
 				$first = false;
@@ -228,7 +228,7 @@
 					$found = true;
 					break;
 				}
-			} 
+			}
 			if (!$found) return ADOConnection::ServerInfo();
 			if (!isset($rez['version'])) $rez['version'] = '';
 			return $rez;
@@ -236,7 +236,7 @@
 			return ADOConnection::ServerInfo();
 		}
 	}
-	
+
 	function CreateSequence($seqname='adodbseq',$start=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
@@ -244,13 +244,13 @@
 		if (!$ok) return false;
 		return true;
 	}
-	
+
 	function DropSequence($seqname)
 	{
 		if (empty($this->_dropSeqSQL)) return false;
 		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
 	}
-	
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
 	{
 		$nrows = (integer) $nrows;
@@ -266,18 +266,18 @@
 			}
 			$rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
 		}
-		
+
 		return $rs;
 	}
-	
+
 	/*
 		This algorithm is not very efficient, but works even if table locking
 		is not available.
-		
+
 		Will return false if unable to generate an ID after $MAXLOOPS attempts.
 	*/
 	function GenID($seq='adodbseq',$start=1)
-	{	
+	{
 		// if you have to modify the parameter below, your database is overloaded,
 		// or you need to implement generation of id's yourself!
 				$num = $this->GetOne("VALUES NEXTVAL FOR $seq");
@@ -293,40 +293,40 @@
 			return @db2_conn_errormsg($this->_connectionID);
 		} else return ADOConnection::ErrorMsg();
 	}
-	
+
 	function ErrorNo()
 	{
-		
+
 		if ($this->_haserrorfunctions) {
 			if ($this->_errorCode !== false) {
 				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
 				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
 			}
 
-			if (empty($this->_connectionID)) $e = @db2_conn_error(); 
+			if (empty($this->_connectionID)) $e = @db2_conn_error();
 			else $e = @db2_conn_error($this->_connectionID);
-			
+
 			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
 			 // so we check and patch
 			if (strlen($e)<=2) return 0;
 			return $e;
 		} else return ADOConnection::ErrorNo();
 	}
-	
-	
 
+
+
 	function BeginTrans()
-	{	
+	{
 		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->_autocommit = false;
 		return db2_autocommit($this->_connectionID,false);
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
@@ -334,21 +334,21 @@
 		db2_autocommit($this->_connectionID,true);
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
 		$ret = db2_rollback($this->_connectionID);
 		db2_autocommit($this->_connectionID,true);
 		return $ret;
 	}
-	
+
 	function MetaPrimaryKeys($table)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		if ($this->uCaseTables) $table = strtoupper($table);
 		$schema = '';
 		$this->_findschema($table,$schema);
@@ -356,16 +356,16 @@
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = @db2_primarykeys($this->_connectionID,'',$schema,$table);
-		
+
 		if (!$qid) {
 			$ADODB_FETCH_MODE = $savem;
 			return false;
 		}
 		$rs = new ADORecordSet_db2($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return false;
-		
+
 		$arr = $rs->GetArray();
 		$rs->Close();
 		$arr2 = array();
@@ -374,11 +374,11 @@
 		}
 		return $arr2;
 	}
-	
+
 	function MetaForeignKeys($table, $owner = FALSE, $upper = FALSE, $asociative = FALSE )
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		if ($this->uCaseTables) $table = strtoupper($table);
 		$schema = '';
 		$this->_findschema($table,$schema);
@@ -403,15 +403,15 @@
 		5 FKTABLE_SCHEM
 		6 FKTABLE_NAME
 		7 FKCOLUMN_NAME
-		*/	
+		*/
 		if (!$rs) return false;
 
-		$foreign_keys = array();	 	 
+		$foreign_keys = array();
 		while (!$rs->EOF) {
 			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
-				if (!is_array($foreign_keys[$rs->fields[5].'.'.$rs->fields[6]])) 
+				if (!is_array($foreign_keys[$rs->fields[5].'.'.$rs->fields[6]]))
 					$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]] = array();
-				$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]][$rs->fields[7]] = $rs->fields[3];	 		
+				$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]][$rs->fields[7]] = $rs->fields[3];
 			}
 			$rs->MoveNext();
 		}
@@ -419,28 +419,28 @@
 		$rs->Close();
 		return $foreign_key;
 	}
-	
-	
+
+
 	function MetaTables($ttype=false,$schema=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = db2_tables($this->_connectionID);
-		
+
 		$rs = new ADORecordSet_db2($qid);
-		
+
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) {
 			$false = false;
 			return $false;
 		}
-		
+
 		$arr = $rs->GetArray();
 		$rs->Close();
 		$arr2 = array();
-		
+
 		if ($ttype) {
 			$isview = strncmp($ttype,'V',1) === 0;
 		}
@@ -449,7 +449,7 @@
 			$type = $arr[$i][3];
 			$owner = $arr[$i][1];
 			$schemaval = ($schema) ? $arr[$i][1].'.' : '';
-			if ($ttype) { 
+			if ($ttype) {
 				if ($isview) {
 					if (strncmp($type,'V',1) === 0) $arr2[] = $schemaval.$arr[$i][2];
 				} else if (strncmp($owner,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
@@ -457,7 +457,7 @@
 		}
 		return $arr2;
 	}
-	
+
 /*
 See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2datetime_data_type_changes.asp
 / SQL data type codes /
@@ -489,7 +489,7 @@
 	function DB2Types($t)
 	{
 		switch ((integer)$t) {
-		case 1:	
+		case 1:
 		case 12:
 		case 0:
 		case -95:
@@ -500,56 +500,56 @@
 			return 'X';
 		case -4: //image
 			return 'B';
-				
-		case 9:	
+
+		case 9:
 		case 91:
 			return 'D';
-		
+
 		case 10:
 		case 11:
 		case 92:
 		case 93:
 			return 'T';
-			
+
 		case 4:
 		case 5:
 		case -6:
 			return 'I';
-			
+
 		case -11: // uniqidentifier
 			return 'R';
 		case -7: //bit
 			return 'L';
-		
+
 		default:
 			return 'N';
 		}
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$false = false;
 		if ($this->uCaseTables) $table = strtoupper($table);
 		$schema = '';
 		$this->_findschema($table,$schema);
-		
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
+
         	$colname = "%";
 	        $qid = db2_columns($this->_connectionID, "", $schema, $table, $colname);
 		if (empty($qid)) return $false;
-		
+
 		$rs = new ADORecordSet_db2($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return $false;
 		$rs->_fetch();
-		
+
 		$retarr = array();
-		
+
 		/*
 		$rs->fields indices
 		0 TABLE_QUALIFIER
@@ -570,7 +570,7 @@
 				$fld = new ADOFieldObject();
 				$fld->name = $rs->fields[3];
 				$fld->type = $this->DB2Types($rs->fields[4]);
-				
+
 				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
 				// access uses precision to store length for char/varchar
 				if ($fld->type == 'C' or $fld->type == 'X') {
@@ -578,28 +578,28 @@
 						$fld->max_length = $rs->fields[7]/2;
 					else
 						$fld->max_length = $rs->fields[7];
-				} else 
+				} else
 					$fld->max_length = $rs->fields[7];
 				$fld->not_null = !empty($rs->fields[10]);
 				$fld->scale = $rs->fields[8];
 				$fld->primary_key = false;
-				$retarr[strtoupper($fld->name)] = $fld;	
+				$retarr[strtoupper($fld->name)] = $fld;
 			} else if (sizeof($retarr)>0)
 				break;
 			$rs->MoveNext();
 		}
-		$rs->Close(); 
+		$rs->Close();
 		if (empty($retarr)) $retarr = false;
 
 	      $qid = db2_primary_keys($this->_connectionID, "", $schema, $table);
 		if (empty($qid)) return $false;
-		
+
 		$rs = new ADORecordSet_db2($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return $retarr;
 		$rs->_fetch();
-		
+
 		/*
 		$rs->fields indices
 		0 TABLE_CAT
@@ -616,13 +616,13 @@
 				break;
 			$rs->MoveNext();
 		}
-		$rs->Close(); 
-		
+		$rs->Close();
+
 		if (empty($retarr)) $retarr = false;
 		return $retarr;
 	}
-	
-		
+
+
 	function Prepare($sql)
 	{
 		if (! $this->_bindInputArray) return $sql; // no binding
@@ -635,24 +635,24 @@
 	}
 
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
 	GLOBAL $php_errormsg;
 		if (isset($php_errormsg)) $php_errormsg = '';
 		$this->_error = '';
-		
+
 		if ($inputarr) {
 			if (is_array($sql)) {
 				$stmtid = $sql[1];
 			} else {
 				$stmtid = db2_prepare($this->_connectionID,$sql);
-	
+
 				if ($stmtid == false) {
 					$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
 					return false;
 				}
 			}
-			
+
 			if (! db2_execute($stmtid,$inputarr)) {
 				if ($this->_haserrorfunctions) {
 					$this->_errorMsg = db2_stmt_errormsg();
@@ -660,7 +660,7 @@
 				}
 				return false;
 			}
-		
+
 		} else if (is_array($sql)) {
 			$stmtid = $sql[1];
 			if (!db2_execute($stmtid)) {
@@ -672,7 +672,7 @@
 			}
 		} else
 			$stmtid = @db2_exec($this->_connectionID,$sql);
-		
+
 		$this->_lastAffectedRows = 0;
 		if ($stmtid) {
 			if (@db2_num_fields($stmtid) == 0) {
@@ -681,7 +681,7 @@
 			} else {
 				$this->_lastAffectedRows = 0;
 			}
-			
+
 			if ($this->_haserrorfunctions) {
 				$this->_errorMsg = '';
 				$this->_errorCode = 0;
@@ -701,9 +701,9 @@
 	/*
 		Insert a null into the blob field of the table first.
 		Then use UpdateBlob to store the blob.
-		
+
 		Usage:
-		 
+
 		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
@@ -711,7 +711,7 @@
 	{
 		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -724,34 +724,34 @@
 	{
 		return $this->_lastAffectedRows;
 	}
-	
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_db2 extends ADORecordSet {	
-	
+class ADORecordSet_db2 extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "db2";		
+	var $databaseType = "db2";
 	var $dataProvider = "db2";
 	var $useFetchArray;
-	
+
 	function ADORecordSet_db2($id,$mode=false)
 	{
-		if ($mode === false) {  
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->fetchMode = $mode;
-		
+
 		$this->_queryID = $id;
 	}
 
 
 	// returns the field object
-	function FetchField($offset = -1) 
+	function FetchField($offset = -1)
 	{
 		$o= new ADOFieldObject();
 		$o->name = @db2_field_name($this->_queryID,$offset);
@@ -761,7 +761,7 @@
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
@@ -776,8 +776,8 @@
 
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
-		
+
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
@@ -785,15 +785,15 @@
 		$this->_numOfFields = @db2_num_fields($this->_queryID);
 		// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
 		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
-	}	
-	
+	}
+
 	function _seek($row)
 	{
 		return false;
 	}
-	
+
 	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
-	function GetArrayLimit($nrows,$offset=-1) 
+	function GetArrayLimit($nrows,$offset=-1)
 	{
 		if ($offset <= 0) {
 			$rs = $this->GetArray($nrows);
@@ -803,27 +803,27 @@
 		$this->fetchMode = ADODB_FETCH_NUM;
 		$this->Move($offset);
 		$this->fetchMode = $savem;
-		
+
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
 		}
-		
+
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
-	
-	
-	function MoveNext() 
+
+
+	function MoveNext()
 	{
-		if ($this->_numOfRows != 0 && !$this->EOF) {		
+		if ($this->_numOfRows != 0 && !$this->EOF) {
 			$this->_currentRow++;
-			
+
 			$this->fields = @db2_fetch_array($this->_queryID);
 			if ($this->fields) {
 				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
@@ -835,8 +835,8 @@
 		$this->fields = false;
 		$this->EOF = true;
 		return false;
-	}	
-	
+	}
+
 	function _fetch()
 	{
 
@@ -850,10 +850,10 @@
 		$this->fields = false;
 		return false;
 	}
-	
-	function _close() 
+
+	function _close()
 	{
-		return @db2_free_result($this->_queryID);		
+		return @db2_free_result($this->_queryID);
 	}
 
 }
Index: typo3/sysext/adodb/adodb/drivers/adodb-sqlitepo.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-sqlitepo.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-sqlitepo.inc.php	(working copy)
@@ -10,11 +10,11 @@
 
    1. When selecting (joining) multiple tables, in assoc mode the table
    	  names are included in the assoc keys in the "sqlite" driver.
-	  
-	  In "sqlitepo" driver, the table names are stripped from the returned column names. 
+
+	  In "sqlitepo" driver, the table names are stripped from the returned column names.
 	  When this results in a conflict,  the first field get preference.
 
-	Contributed by Herman Kuiper  herman#ozuzo.net  
+	Contributed by Herman Kuiper  herman#ozuzo.net
 */
 
 if (!defined('ADODB_DIR')) die();
@@ -42,7 +42,7 @@
    {
       $this->ADORecordset_sqlite($queryID,$mode);
    }
-   
+
    // Modified to strip table names from returned fields
    function _fetch($ignore_fields=false)
    {
Index: typo3/sysext/adodb/adodb/drivers/adodb-pdo_pgsql.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-pdo_pgsql.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-pdo_pgsql.inc.php	(working copy)
@@ -2,45 +2,45 @@
 
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 8.
- 
-*/ 
 
+*/
+
 class ADODB_pdo_pgsql extends ADODB_pdo {
 	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
     var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 	and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
-	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles') 
-	union 
+	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles')
+	union
         select viewname,'V' from pg_views where viewname not like 'pg\_%'";
 	//"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
 	var $isoDates = true; // accepts dates in ISO format
 	var $sysDate = "CURRENT_DATE";
 	var $sysTimeStamp = "CURRENT_TIMESTAMP";
 	var $blobEncodeType = 'C';
-	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
-		FROM pg_class c, pg_attribute a,pg_type t 
+	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum
+		FROM pg_class c, pg_attribute a,pg_type t
 		WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
 AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
 
 	// used when schema defined
-	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
+	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum
+FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n
 WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
+ and c.relnamespace=n.oid and n.nspname='%s'
+	and a.attname not like '....%%' AND a.attnum > 0
 	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-	
+
 	// get primary key etc -- from Freek Dijkstra
-	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
+	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key
 	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
-	
+
 	var $hasAffectedRows = true;
 	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	// below suggested by Freek Dijkstra 
+	// below suggested by Freek Dijkstra
 	var $true = 't';		// string that represents TRUE for a database
 	var $false = 'f';		// string that represents FALSE for a database
 	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
@@ -53,23 +53,23 @@
 	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
 	var $random = 'random()';		/// random function
 	var $concat_operator='||';
-	
+
 	function _init($parentDriver)
 	{
-	
+
 		$parentDriver->hasTransactions = false; ## <<< BUG IN PDO pgsql driver
 		$parentDriver->hasInsertID = true;
 		$parentDriver->_nestedSQL = true;
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['description'] = ADOConnection::GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		 $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
 		 $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';
@@ -77,17 +77,17 @@
 		  	$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
 		 else
 		  	$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-		
+
 		return $rs;
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$info = $this->ServerInfo();
 		if ($info['version'] >= 7.3) {
 	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 			  and schemaname  not in ( 'pg_catalog','information_schema')
-	union 
+	union
         select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
 		}
 		if ($mask) {
@@ -95,59 +95,59 @@
 			$mask = $this->qstr(strtolower($mask));
 			if ($info['version']>=7.3)
 				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
- union 
+select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')
+ union
 select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
 			else
 				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
+select tablename,'T' from pg_tables where tablename like $mask
+ union
 select viewname,'V' from pg_views where viewname like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
-	function MetaColumns($table,$normalize=true) 
+
+	function MetaColumns($table,$normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$schema = false;
 		$this->_findschema($table,$schema);
-		
+
 		if ($normalize) $table = strtolower($table);
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
+
 		if ($schema) $rs = $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
 		else $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if ($rs === false) {
 			$false = false;
 			return $false;
 		}
 		if (!empty($this->metaKeySQL)) {
 			// If we want the primary keys, we have to issue a separate query
-			// Of course, a modified version of the metaColumnsSQL query using a 
-			// LEFT JOIN would have been much more elegant, but postgres does 
+			// Of course, a modified version of the metaColumnsSQL query using a
+			// LEFT JOIN would have been much more elegant, but postgres does
 			// not support OUTER JOINS. So here is the clumsy way.
-			
+
 			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			
+
 			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
 			// fetch all result in once for performance.
 			$keys = $rskey->GetArray();
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			$rskey->Close();
 			unset($rskey);
 		}
@@ -159,7 +159,7 @@
 			$rsdef = $this->Execute($sql);
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			if ($rsdef) {
 				while (!$rsdef->EOF) {
 					$num = $rsdef->fields['num'];
@@ -177,9 +177,9 @@
 			}
 			unset($rsdef);
 		}
-	
+
 		$retarr = array();
-		while (!$rs->EOF) { 	
+		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
@@ -201,28 +201,28 @@
 			if ($rs->fields[4] == $this->true) {
 				$fld->not_null = true;
 			}
-			
+
 			// Freek
 			if (is_array($keys)) {
 				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true) 
+					if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true)
 						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true) 
+					if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true)
 						$fld->unique = true; // What name is more compatible?
 				}
 			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr)) {
 			$false = false;
 			return $false;
-		} else return $retarr;	
-		
+		} else return $retarr;
+
 	}
 
 }
Index: typo3/sysext/adodb/adodb/drivers/adodb-mssql_n.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-mssql_n.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-mssql_n.inc.php	(working copy)
@@ -52,7 +52,7 @@
 
 class ADODB_mssql_n extends ADODB_mssql {
 	var $databaseType = "mssql_n";
-	
+
 	function ADODB_mssqlpo()
 	{
 		ADODB_mssql::ADODB_mssql();
Index: typo3/sysext/adodb/adodb/drivers/adodb-odbc_db2.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-odbc_db2.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-odbc_db2.inc.php	(working copy)
@@ -1,15 +1,15 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   DB2 data driver. Requires ODBC.
- 
+
 From phpdb list:
 
 Hi Andrew,
@@ -40,18 +40,18 @@
 Christian Szardenings
 
 2 Oct 2001
-Mark Newnham has discovered that the SQL_CUR_USE_ODBC is not supported by 
+Mark Newnham has discovered that the SQL_CUR_USE_ODBC is not supported by
 IBM's DB2 ODBC driver, so this must be a 3rd party ODBC driver.
 
 From the IBM CLI Reference:
 
-SQL_ATTR_ODBC_CURSORS (DB2 CLI v5) 
+SQL_ATTR_ODBC_CURSORS (DB2 CLI v5)
 This connection attribute is defined by ODBC, but is not supported by DB2
 CLI. Any attempt to set or get this attribute will result in an SQLSTATE of
-HYC00 (Driver not capable). 
+HYC00 (Driver not capable).
 
 A 32-bit option specifying how the Driver Manager uses the ODBC cursor
-library. 
+library.
 
 So I guess this means the message [above] was related to using a 3rd party
 odbc driver.
@@ -69,15 +69,15 @@
 USING CLI INTERFACE
 ===================
 
-I have had reports that the $host and $database params have to be reversed in 
+I have had reports that the $host and $database params have to be reversed in
 Connect() when using the CLI interface. From Halmai Csongor csongor.halmai#nexum.hu:
 
 > The symptom is that if I change the database engine from postgres or any other to DB2 then the following
-> connection command becomes wrong despite being described this version to be correct in the docs. 
+> connection command becomes wrong despite being described this version to be correct in the docs.
 >
 > $connection_object->Connect( $DATABASE_HOST, $DATABASE_AUTH_USER_NAME, $DATABASE_AUTH_PASSWORD, $DATABASE_NAME )
 >
-> In case of DB2 I had to swap the first and last arguments in order to connect properly. 
+> In case of DB2 I had to swap the first and last arguments in order to connect properly.
 
 
 System Error 5
@@ -96,12 +96,12 @@
 define('ADODB_ODBC_DB2',1);
 
 class ADODB_ODBC_DB2 extends ADODB_odbc {
-	var $databaseType = "db2";	
+	var $databaseType = "db2";
 	var $concat_operator = '||';
 	var $sysTime = 'CURRENT TIME';
 	var $sysDate = 'CURRENT DATE';
 	var $sysTimeStamp = 'CURRENT TIMESTAMP';
-	// The complete string representation of a timestamp has the form 
+	// The complete string representation of a timestamp has the form
 	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
 	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
 	var $ansiOuter = true;
@@ -109,18 +109,18 @@
 	var $_bindInputArray = true;
 	 var $hasInsertID = true;
 	var $rsPrefix = 'ADORecordset_odbc_';
-	
+
 	function ADODB_DB2()
 	{
 		if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
 		$this->ADODB_odbc();
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " COALESCE($field, $ifNull) "; // if DB2 UDB
 	}
-	
+
 	function ServerInfo()
 	{
 		//odbc_setoption($this->_connectionID,1,101 /*SQL_ATTR_ACCESS_MODE*/, 1 /*SQL_MODE_READ_ONLY*/);
@@ -128,54 +128,54 @@
 		//odbc_setoption($this->_connectionID,1,101, 0 /*SQL_MODE_READ_WRITE*/);
 		return array('description'=>'DB2 ODBC driver', 'version'=>$vers);
 	}
-	
+
 	function _insertid()
 	{
 		return $this->GetOne($this->identitySQL);
 	}
-	
+
 	function RowLock($tables,$where,$col='1 as ignore')
 	{
 		if ($this->_autocommit) $this->BeginTrans();
 		return $this->GetOne("select $col from $tables where $where for update");
 	}
-	
+
 	function MetaTables($ttype=false,$showSchema=false, $qtable="%", $qschema="%")
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = odbc_tables($this->_connectionID, "", $qschema, $qtable, "");
-		
+
 		$rs = new ADORecordSet_odbc($qid);
-		
+
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) {
 			$false = false;
 			return $false;
 		}
 		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
+
 		$arr = $rs->GetArray();
 		//print_r($arr);
-		
+
 		$rs->Close();
 		$arr2 = array();
-		
+
 		if ($ttype) {
 			$isview = strncmp($ttype,'V',1) === 0;
 		}
 		for ($i=0; $i < sizeof($arr); $i++) {
-		
+
 			if (!$arr[$i][2]) continue;
 			if (strncmp($arr[$i][1],'SYS',3) === 0) continue;
-			
+
 			$type = $arr[$i][3];
-			
+
 			if ($showSchema) $arr[$i][2] = $arr[$i][1].'.'.$arr[$i][2];
-			
-			if ($ttype) { 
+
+			if ($ttype) {
 				if ($isview) {
 					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
 				} else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
@@ -197,11 +197,11 @@
 		// get index details
 		$table = strtoupper($table);
 		$SQL="SELECT NAME, UNIQUERULE, COLNAMES FROM SYSIBM.SYSINDEXES WHERE TBNAME='$table'";
-        if ($primary) 
+        if ($primary)
 			$SQL.= " AND UNIQUERULE='P'";
 		$rs = $this->Execute($SQL);
         if (!is_object($rs)) {
-			if (isset($savem)) 
+			if (isset($savem))
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
             return $false;
@@ -216,20 +216,20 @@
 			$cols = ltrim($row[2],'+');
 			$indexes[$row[0]]['columns'] = explode('+', $cols);
         }
-		if (isset($savem)) { 
+		if (isset($savem)) {
             $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
         return $indexes;
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 	// use right() and replace() ?
 		if (!$col) $col = $this->sysDate;
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= '||';
@@ -251,7 +251,7 @@
 				break;
 			case 'H':
 			case 'h':
-				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";
 				else $s .= "''";
 				break;
 			case 'i':
@@ -275,9 +275,9 @@
 			}
 		}
 		return $s;
-	} 
- 
-	
+	}
+
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
 	{
 		$nrows = (integer) $nrows;
@@ -293,17 +293,17 @@
 			}
 			$rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
 		}
-		
+
 		return $rs;
 	}
-	
+
 };
- 
 
-class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {	
-	
-	var $databaseType = "db2";		
-	
+
+class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {
+
+	var $databaseType = "db2";
+
 	function ADORecordSet_db2($id,$mode=false)
 	{
 		$this->ADORecordSet_odbc($id,$mode);
@@ -316,49 +316,49 @@
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		switch (strtoupper($t)) {
 		case 'VARCHAR':
 		case 'CHAR':
 		case 'CHARACTER':
 		case 'C':
 			if ($len <= $this->blobSize) return 'C';
-		
+
 		case 'LONGCHAR':
 		case 'TEXT':
 		case 'CLOB':
 		case 'DBCLOB': // double-byte
 		case 'X':
 			return 'X';
-		
+
 		case 'BLOB':
 		case 'GRAPHIC':
 		case 'VARGRAPHIC':
 			return 'B';
-			
+
 		case 'DATE':
 		case 'D':
 			return 'D';
-		
+
 		case 'TIME':
 		case 'TIMESTAMP':
 		case 'T':
 			return 'T';
-		
-		//case 'BOOLEAN': 
+
+		//case 'BOOLEAN':
 		//case 'BIT':
 		//	return 'L';
-			
+
 		//case 'COUNTER':
 		//	return 'R';
-			
+
 		case 'INT':
 		case 'INTEGER':
 		case 'BIGINT':
 		case 'SMALLINT':
 		case 'I':
 			return 'I';
-			
+
 		default: return 'N';
 		}
 	}
Index: typo3/sysext/adodb/adodb/drivers/adodb-oci8po.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-oci8po.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-oci8po.inc.php	(working copy)
@@ -1,12 +1,12 @@
 <?php
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim. All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
 
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Portable version of oci8 driver, to make it more similar to other database drivers.
   The main differences are
 
@@ -14,7 +14,7 @@
    2. bind variables are mapped using ? instead of :<bindvar>
 
    Should some emulation of RecordCount() be implemented?
-  
+
 */
 
 // security - hide paths
@@ -27,28 +27,28 @@
 	var $dataProvider = 'oci8';
 	var $metaColumnsSQL = "select lower(cname),coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
 	var $metaTablesSQL = "select lower(table_name),table_type from cat where table_type in ('TABLE','VIEW')";
-	
+
 	function ADODB_oci8po()
 	{
 		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
 		# oci8po does not support adodb extension: adodb_movenext()
 	}
-	
+
 	function Param($name)
 	{
 		return '?';
 	}
-	
+
 	function Prepare($sql,$cursor=false)
 	{
 		$sqlarr = explode('?',$sql);
 		$sql = $sqlarr[0];
 		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
 			$sql .=  ':'.($i-1) . $sqlarr[$i];
-		} 
+		}
 		return ADODB_oci8::Prepare($sql,$cursor);
 	}
-	
+
 	// emulate handling of parameters ? ?, replacing with :bind0 :bind1
 	function _query($sql,$inputarr=false)
 	{
@@ -57,7 +57,7 @@
 			if (is_array($sql)) {
 				foreach($inputarr as $v) {
 					$arr['bind'.$i++] = $v;
-				} 
+				}
 			} else {
 				$sqlarr = explode('?',$sql);
 				$sql = $sqlarr[0];
@@ -77,7 +77,7 @@
 class ADORecordset_oci8po extends ADORecordset_oci8 {
 
 	var $databaseType = 'oci8po';
-	
+
 	function ADORecordset_oci8po($queryID,$mode=false)
 	{
 		$this->ADORecordset_oci8($queryID,$mode);
@@ -86,7 +86,7 @@
 	function Fields($colname)
 	{
 		if ($this->fetchMode & OCI_ASSOC) return $this->fields[$colname];
-		
+
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -96,7 +96,7 @@
 		}
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
 	// lowercase field names...
 	function _FetchField($fieldOffset = -1)
 	{
@@ -128,12 +128,12 @@
 	}*/
 
 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
+	function MoveNext()
 	{
 		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
 		global $ADODB_ANSI_PADDING_OFF;
 			$this->_currentRow++;
-			
+
 			if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
 			if (!empty($ADODB_ANSI_PADDING_OFF)) {
 				foreach($this->fields as $k => $v) {
@@ -147,16 +147,16 @@
 			$this->_currentRow++;
 		}
 		return false;
-	}	
-	
+	}
+
 	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function GetArrayLimit($nrows,$offset=-1) 
+	function GetArrayLimit($nrows,$offset=-1)
 	{
 		if ($offset <= 0) {
 			$arr = $this->GetArray($nrows);
 			return $arr;
 		}
-		for ($i=1; $i < $offset; $i++) 
+		for ($i=1; $i < $offset; $i++)
 			if (!@OCIFetch($this->_queryID)) {
 				$arr = array();
 				return $arr;
@@ -172,7 +172,7 @@
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
 
@@ -180,10 +180,10 @@
 	function _updatefields()
 	{
 		if (ADODB_ASSOC_CASE == 2) return; // native
-	
+
 		$arr = array();
 		$lowercase = (ADODB_ASSOC_CASE == 0);
-		
+
 		foreach($this->fields as $k => $v) {
 			if (is_integer($k)) $arr[$k] = $v;
 			else {
@@ -195,13 +195,13 @@
 		}
 		$this->fields = $arr;
 	}
-	
-	function _fetch() 
+
+	function _fetch()
 	{
 		$ret = @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
 		if ($ret) {
 		global $ADODB_ANSI_PADDING_OFF;
-	
+
 				if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
 				if (!empty($ADODB_ANSI_PADDING_OFF)) {
 					foreach($this->fields as $k => $v) {
@@ -211,7 +211,7 @@
 		}
 		return $ret;
 	}
-	
+
 }
 
 
Index: typo3/sysext/adodb/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-ado_access.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-ado_access.inc.php	(working copy)
@@ -1,13 +1,13 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-Released under both BSD license and Lesser GPL library license. 
-Whenever there is any discrepancy between the two licenses, 
-the BSD license will take precedence. See License.txt. 
+Released under both BSD license and Lesser GPL library license.
+Whenever there is any discrepancy between the two licenses,
+the BSD license will take precedence. See License.txt.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
 	Microsoft Access ADO data driver. Requires ADO and ODBC. Works only on MS Windows.
 */
 
@@ -19,7 +19,7 @@
 	else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
 }
 
-class  ADODB_ado_access extends ADODB_ado {	
+class  ADODB_ado_access extends ADODB_ado {
 	var $databaseType = 'ado_access';
 	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
 	var $fmtDate = "#Y-m-d#";
@@ -27,25 +27,25 @@
 	var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
 	var $sysTimeStamp = 'NOW';
 	var $upperCase = 'ucase';
-	
+
 	function ADODB_ado_access()
 	{
 		$this->ADODB_ado();
 	}
-	
+
 	/*function BeginTrans() { return false;}
-	
+
 	function CommitTrans() { return false;}
-	
+
 	function RollbackTrans() { return false;}*/
 
 }
 
- 
-class  ADORecordSet_ado_access extends ADORecordSet_ado {	
-	
-	var $databaseType = "ado_access";		
-	
+
+class  ADORecordSet_ado_access extends ADORecordSet_ado {
+
+	var $databaseType = "ado_access";
+
 	function ADORecordSet_ado_access($id,$mode=false)
 	{
 		return $this->ADORecordSet_ado($id,$mode);
Index: typo3/sysext/adodb/adodb/drivers/adodb-netezza.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-netezza.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-netezza.inc.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 /*
   V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
- 
+
   First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
  Based on the previous postgres drivers.
  http://www.netezza.com/
@@ -20,7 +20,7 @@
 include_once(ADODB_DIR.'/drivers/adodb-postgres64.inc.php');
 
 class ADODB_netezza extends ADODB_postgres64 {
-    var $databaseType = 'netezza';	
+    var $databaseType = 'netezza';
 	var $dataProvider = 'netezza';
 	var $hasInsertID = false;
 	var $_resultid = false;
@@ -34,11 +34,11 @@
 	var $blobEncodeType = 'C';
 	var $metaColumnsSQL = "SELECT attname, atttype FROM _v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
 	var $metaColumnsSQL1 = "SELECT attname, atttype FROM _v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
-	// netezza doesn't have keys. it does have distributions, so maybe this is 
+	// netezza doesn't have keys. it does have distributions, so maybe this is
 	// something that can be pulled from the system tables
 	var $metaKeySQL = "";
 	var $hasAffectedRows = true;
-	var $hasLimit = true;	
+	var $hasLimit = true;
 	var $true = 't';		// string that represents TRUE for a database
 	var $false = 'f';		// string that represents FALSE for a database
 	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
@@ -47,52 +47,52 @@
 	var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
 							// http://bugs.php.net/bug.php?id=25404
 
-							
-	function ADODB_netezza() 
+
+	function ADODB_netezza()
 	{
-	
+
 	}
-	
-	function MetaColumns($table,$upper=true) 
+
+	function MetaColumns($table,$upper=true)
 	{
-	
+
 	// Changed this function to support Netezza which has no concept of keys
 	// could posisbly work on other things from the system table later.
-	
+
 	global $ADODB_FETCH_MODE;
-	
+
 		$table = strtolower($table);
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if ($rs === false) return false;
 
 		$retarr = array();
-		while (!$rs->EOF) { 	
+		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
-			
-			// since we're returning type and length as one string, 
+
+			// since we're returning type and length as one string,
 			// split them out here.
-			
+
 			if ($first = strstr($rs->fields[1], "(")) {
 			 $fld->max_length = trim($first, "()");
 			} else {
 			 $fld->max_length = -1;
 			}
-		
+
 			if ($first = strpos($rs->fields[1], "(")) {
 			 $fld->type = substr($rs->fields[1], 0, $first);
 			} else {
 			 $fld->type = $rs->fields[1];
 			}
-			
+
 			switch ($fld->type) {
 			 case "byteint":
 			 case "boolean":
@@ -116,20 +116,20 @@
 			 $fld->max_length = 12;
 			 break;
 			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[($upper) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
-		return $retarr;	
-		
+		return $retarr;
+
 	}
 
-		
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
@@ -138,10 +138,10 @@
 {
 	var $databaseType = "netezza";
 	var $canSeek = true;
-	
-	function ADORecordSet_netezza($queryID,$mode=false) 
+
+	function ADORecordSet_netezza($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -149,7 +149,7 @@
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
 		default: $this->fetchMode = PGSQL_BOTH; break;
@@ -157,7 +157,7 @@
 		$this->adodbFetchMode = $mode;
 		$this->ADORecordSet($queryID);
 	}
-	
+
 	// _initrs modified to disable blob handling
 	function _initrs()
 	{
Index: typo3/sysext/adodb/adodb/drivers/adodb-ado5.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-ado5.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-ado5.inc.php	(working copy)
@@ -1,31 +1,31 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
 	Microsoft ADO data driver. Requires ADO. Works only on MS Windows. PHP5 compat version.
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
-	
+
 define("_ADODB_ADO_LAYER", 1 );
 /*--------------------------------------------------------------------------------------
 --------------------------------------------------------------------------------------*/
 
-	
+
 class ADODB_ado extends ADOConnection {
-	var $databaseType = "ado";	
+	var $databaseType = "ado";
 	var $_bindInputArray = false;
 	var $fmtDate = "'Y-m-d'";
 	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
 	var $replaceQuote = "''"; // string to use to replace quotes
-	var $dataProvider = "ado";	
+	var $dataProvider = "ado";
 	var $hasAffectedRows = true;
 	var $adoParameterType = 201; // 201 = long varchar, 203=long wide varchar, 205 = long varbinary
 	var $_affectedRows = false;
@@ -34,11 +34,11 @@
 	var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
 	var $_lock_type = -1;
 	var $_execute_option = -1;
-	var $poorAffectedRows = true; 
+	var $poorAffectedRows = true;
 	var $charPage;
-		
-	function ADODB_ado() 
-	{ 	
+
+	function ADODB_ado()
+	{
 		$this->_affectedRows = new VARIANT;
 	}
 
@@ -47,14 +47,14 @@
 		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
 		return array('description' => $desc, 'version' => '');
 	}
-	
+
 	function _affectedrows()
 	{
 		if (PHP_VERSION >= 5) return $this->_affectedRows;
-		
+
 		return $this->_affectedRows->value;
 	}
-	
+
 	// you can also pass a connection string like this:
 	//
 	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
@@ -63,73 +63,73 @@
 	// two modes
 	//	-	if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat
 	//	- 	if $argProvider is not empty, then $argDBorProvider holds db
-	
-		
+
+
 		 if ($argProvider) {
 		 	$argDatabasename = $argDBorProvider;
 		 } else {
 		 	$argDatabasename = '';
 		 	if ($argDBorProvider) $argProvider = $argDBorProvider;
-			else if (stripos($argHostname,'PROVIDER') === false) /* full conn string is not in $argHostname */ 
+			else if (stripos($argHostname,'PROVIDER') === false) /* full conn string is not in $argHostname */
 				$argProvider = 'MSDASQL';
 		}
-		
-		
+
+
 		try {
 		$u = 'UID';
 		$p = 'PWD';
-	
+
 		if (!empty($this->charPage))
 			$dbc = new COM('ADODB.Connection',null,$this->charPage);
 		else
 			$dbc = new COM('ADODB.Connection');
-			
+
 		if (! $dbc) return false;
 
 		/* special support if provider is mssql or access */
 		if ($argProvider=='mssql') {
 			$u = 'User Id';  //User parameter name for OLEDB
-			$p = 'Password'; 
+			$p = 'Password';
 			$argProvider = "SQLOLEDB"; // SQL Server Provider
-			
+
 			// not yet
 			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
-			
+
 			//use trusted conection for SQL if username not specified
 			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
 		} else if ($argProvider=='access')
 			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
-		
-		if ($argProvider) $dbc->Provider = $argProvider;	
 
-		if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname";	
-		
+		if ($argProvider) $dbc->Provider = $argProvider;
 
-		if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename";		
+		if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname";
+
+
+		if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename";
 		if ($argUsername) $argHostname .= ";$u=$argUsername";
 		if ($argPassword)$argHostname .= ";$p=$argPassword";
-		
+
 		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."<BR>\n version=$dbc->version");
 		// @ added below for php 4.0.1 and earlier
 		@$dbc->Open((string) $argHostname);
-		
+
 		$this->_connectionID = $dbc;
-		
+
 		$dbc->CursorLocation = $this->_cursor_location;
 		return  $dbc->State > 0;
 		} catch (exception $e) {
 			if ($this->debug);echo "<pre>",$argHostname,"\n",$e,"</pre>\n";
 		}
-		
+
 		return false;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
 	{
 		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
-	}	
-	
+	}
+
 /*
 	adSchemaCatalogs	= 1,
 	adSchemaCharacterSets	= 2,
@@ -171,12 +171,12 @@
 	adSchemaMembers	= 38
 
 */
-	
+
 	function MetaTables()
 	{
 		$arr= array();
 		$dbc = $this->_connectionID;
-		
+
 		$adors=@$dbc->OpenSchema(20);//tables
 		if ($adors){
 			$f = $adors->Fields(2);//table/view name
@@ -190,25 +190,25 @@
 			}
 			$adors->Close();
 		}
-		
+
 		return $arr;
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
 		$table = strtoupper($table);
 		$arr= array();
 		$dbc = $this->_connectionID;
-		
+
 		$adors=@$dbc->OpenSchema(4);//tables
-	
+
 		if ($adors){
 			$t = $adors->Fields(2);//table/view name
 			while (!$adors->EOF){
-				
-				
+
+
 				if (strtoupper($t->Value) == $table) {
-				
+
 					$fld = new ADOFieldObject();
 					$c = $adors->Fields(3);
 					$fld->name = $c->Value;
@@ -216,28 +216,28 @@
 					$fld->max_length = -1;
 					$arr[strtoupper($fld->name)]=$fld;
 				}
-		
+
 				$adors->MoveNext();
 			}
 			$adors->Close();
 		}
-		
+
 		return $arr;
 	}
-	
+
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
 		try { // In PHP5, all COM errors are exceptions, so to maintain old behaviour...
-		
+
 		$dbc = $this->_connectionID;
-		
-	//	return rs	
-	
+
+	//	return rs
+
 		$false = false;
-		
+
 		if ($inputarr) {
-			
+
 			if (!empty($this->charPage))
 				$oCmd = new COM('ADODB.Command',null,$this->charPage);
 			else
@@ -261,42 +261,42 @@
 					$len=1;
 				else
 					$this->adoParameterType = 130;
-				
+
 				// name, type, direction 1 = input, len,
         		$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val);
 
 				$oCmd->Parameters->Append($p);
 			}
-			
+
 			$p = false;
 			$rs = $oCmd->Execute();
 			$e = $dbc->Errors;
 			if ($dbc->Errors->Count > 0) return $false;
 			return $rs;
 		}
-		
+
 		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
-			
+
 		if ($dbc->Errors->Count > 0) return $false;
 		if (! $rs) return $false;
-		
+
 		if ($rs->State == 0) {
 			$true = true;
 			return $true; // 0 = adStateClosed means no records returned
 		}
 		return $rs;
-		
+
 		} catch (exception $e) {
-			
+
 		}
 		return $false;
 	}
 
-	
-	function BeginTrans() 
-	{ 
+
+	function BeginTrans()
+	{
 		if ($this->transOff) return true;
-		
+
 		if (isset($this->_thisTransactions))
 			if (!$this->_thisTransactions) return false;
 		else {
@@ -308,11 +308,11 @@
 		$this->transCnt += 1;
 		return true;
 	}
-	function CommitTrans($ok=true) 
-	{ 
+	function CommitTrans($ok=true)
+	{
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transOff) return true;
-		
+
 		@$this->_connectionID->CommitTrans();
 		if ($this->transCnt) @$this->transCnt -= 1;
 		return true;
@@ -323,14 +323,14 @@
 		if ($this->transCnt) @$this->transCnt -= 1;
 		return true;
 	}
-	
-	/*	Returns: the last error message from previous database operation	*/	
 
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+
+	function ErrorMsg()
 	{
 		if (!$this->_connectionID) return "No connection established";
 		$errmsg = '';
-		
+
 		try {
 			$errc = $this->_connectionID->Errors;
 			if (!$errc) return "No Errors object found";
@@ -341,8 +341,8 @@
 		}
 		return $errmsg;
 	}
-	
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		$errc = $this->_connectionID->Errors;
 		if ($errc->Count == 0) return 0;
@@ -357,27 +357,27 @@
 		$this->_connectionID = false;
 		return true;
 	}
-	
-	
+
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_ado extends ADORecordSet {	
-	
+class ADORecordSet_ado extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "ado";	
-	var $dataProvider = "ado";	
+	var $databaseType = "ado";
+	var $dataProvider = "ado";
 	var $_tarr = false; // caches the types
 	var $_flds; // and field objects
 	var $canSeek = true;
   	var $hideErrors = true;
-		  
+
 	function ADORecordSet_ado($id,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -389,23 +389,23 @@
 	// returns the field object
 	function FetchField($fieldOffset = -1) {
 		$off=$fieldOffset+1; // offsets begin at 1
-		
+
 		$o= new ADOFieldObject();
 		$rs = $this->_queryID;
 		if (!$rs) return false;
-		
+
 		$f = $rs->Fields($fieldOffset);
 		$o->name = $f->Name;
 		$t = $f->Type;
 		$o->type = $this->MetaType($t);
 		$o->max_length = $f->DefinedSize;
 		$o->ado_type = $t;
-		
 
+
 		//print "off=$off name=$o->name type=$o->type len=$o->max_length<br>";
 		return $o;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
@@ -417,15 +417,15 @@
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
 
-		
+
 	function _initrs()
 	{
 		$rs = $this->_queryID;
-		
+
 		try {
 			$this->_numOfRows = $rs->RecordCount;
 		} catch (Exception $e) {
@@ -434,12 +434,12 @@
 		$f = $rs->Fields;
 		$this->_numOfFields = $f->Count;
 	}
-	
-	
+
+
 	 // should only be used to move forward as we normally use forward-only cursors
 	function _seek($row)
 	{
-	   $rs = $this->_queryID; 
+	   $rs = $this->_queryID;
 		// absoluteposition doesn't work -- my maths is wrong ?
 		//	$rs->AbsolutePosition->$row-2;
 		//	return true;
@@ -447,10 +447,10 @@
 		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
 		return true;
 	}
-	
+
 /*
 	OLEDB types
-	
+
 	 enum DBTYPEENUM
 	{	DBTYPE_EMPTY	= 0,
 	DBTYPE_NULL	= 1,
@@ -486,9 +486,9 @@
 	DBTYPE_DBDATE	= 133,
 	DBTYPE_DBTIME	= 134,
 	DBTYPE_DBTIMESTAMP	= 135
-	
+
 	ADO Types
-	
+
    	adEmpty	= 0,
 	adTinyInt	= 16,
 	adSmallInt	= 2,
@@ -508,7 +508,7 @@
 	adUserDefined	= 132,
 	adVariant	= 12,
 	adIDispatch	= 9,
-	adIUnknown	= 13,	
+	adIUnknown	= 13,
 	adGUID	= 72,
 	adDate	= 7,
 	adDBDate	= 133,
@@ -537,9 +537,9 @@
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		if (!is_numeric($t)) return $t;
-		
+
 		switch ($t) {
 		case 0:
 		case 12: // variant
@@ -552,7 +552,7 @@
 		case 204: // varBin
 		case 72: // guid
 			if ($len <= $this->blobSize) return 'C';
-		
+
 		case 201:
 		case 203:
 			return 'X';
@@ -562,12 +562,12 @@
 			 return 'B';
 		case 7:
 		case 133: return 'D';
-		
+
 		case 134:
 		case 135: return 'T';
-		
+
 		case 11: return 'L';
-		
+
 		case 16://	adTinyInt	= 16,
 		case 2://adSmallInt	= 2,
 		case 3://adInteger	= 3,
@@ -580,17 +580,17 @@
 		default: return 'N';
 		}
 	}
-	
+
 	// time stamp not supported yet
 	function _fetch()
-	{	
+	{
 		$rs = $this->_queryID;
 		if (!$rs or $rs->EOF) {
 			$this->fields = false;
 			return false;
 		}
 		$this->fields = array();
-	
+
 		if (!$this->_tarr) {
 			$tarr = array();
 			$flds = array();
@@ -600,12 +600,12 @@
 				$tarr[] = $f->Type;
 			}
 			// bind types and flds only once
-			$this->_tarr = $tarr; 
+			$this->_tarr = $tarr;
 			$this->_flds = $flds;
 		}
 		$t = reset($this->_tarr);
 		$f = reset($this->_flds);
-		
+
 		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
 		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
 			//echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
@@ -616,12 +616,12 @@
 					if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
 						// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
 						$val= (float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
-					else 
+					else
 						$val = $f->value;
 					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
 				}
-				break;			
-			case 133:// A date value (yyyymmdd) 
+				break;
+			case 133:// A date value (yyyymmdd)
 				if ($val = $f->value) {
 					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
 				} else
@@ -632,7 +632,7 @@
 				else {
 					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
 					else $val = $f->value;
-					
+
 					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
 					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
 				}
@@ -655,11 +655,11 @@
 					else $val = 0;
 				}
 				if(is_null($f->value)) $val = null;
-				
+
 				$this->fields[] = $val;
 				break;
 			default:
-				$this->fields[] = $f->value; 
+				$this->fields[] = $f->value;
 				break;
 			}
 			//print " $f->value $t, ";
@@ -668,27 +668,27 @@
 		} // for
 		if ($this->hideErrors) error_reporting($olde);
 		@$rs->MoveNext(); // @ needed for some versions of PHP!
-		
+
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
 		}
 		return true;
 	}
-	
+
 		function NextRecordSet()
 		{
 			$rs = $this->_queryID;
 			$this->_queryID = $rs->NextRecordSet();
 			//$this->_queryID = $this->_QueryId->NextRecordSet();
 			if ($this->_queryID == null) return false;
-			
+
 			$this->_currentRow = -1;
 			$this->_currentPage = -1;
 			$this->bind = false;
 			$this->fields = false;
 			$this->_flds = false;
 			$this->_tarr = false;
-			
+
 			$this->_inited = false;
 			$this->Init();
 			return true;
@@ -700,7 +700,7 @@
 		@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
 		} catch (Exception $e) {
 		}
-		$this->_queryID = false;	
+		$this->_queryID = false;
 	}
 
 }
Index: typo3/sysext/adodb/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-sybase.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-sybase.inc.php	(working copy)
@@ -1,25 +1,25 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim. All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
   Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Sybase driver contributed by Toni (toni.tunkkari@finebyte.com)
-  
+
   - MSSQL date patch applied.
-  
+
   Date patch by Toni 15 Feb 2002
 */
- 
+
  // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB_sybase extends ADOConnection {
-	var $databaseType = "sybase";	
+	var $databaseType = "sybase";
 	var $dataProvider = 'sybase';
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $fmtDate = "'Y-m-d'";
@@ -30,20 +30,20 @@
 	// see http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
 	var $metaColumnsSQL = "SELECT c.column_name, c.column_type, c.width FROM syscolumn c, systable t WHERE t.table_name='%s' AND c.table_id=t.table_id AND t.table_type='BASE'";
 	/*
-	"select c.name,t.name,c.length from 
-	syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id 
+	"select c.name,t.name,c.length from
+	syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id
 	where o.name='%s'";
 	*/
-	var $concat_operator = '+'; 
+	var $concat_operator = '+';
 	var $arrayClass = 'ADORecordSet_array_sybase';
 	var $sysDate = 'GetDate()';
 	var $leftOuter = '*=';
 	var $rightOuter = '=*';
-	
-	function ADODB_sybase() 
-	{			
+
+	function ADODB_sybase()
+	{
 	}
- 
+
 	// might require begintrans -- committrans
 	function _insertid()
 	{
@@ -55,28 +55,28 @@
 	   return $this->GetOne('select @@rowcount');
 	}
 
-			  
+
 	function BeginTrans()
-	{	
-	
+	{
+
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
-		   
+
 		$this->Execute('BEGIN TRAN');
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		if ($this->transOff) return true;
-		
+
 		if (!$ok) return $this->RollbackTrans();
-	
+
 		$this->transCnt -= 1;
 		$this->Execute('COMMIT TRAN');
 		return true;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
@@ -84,30 +84,30 @@
 		$this->Execute('ROLLBACK TRAN');
 		return true;
 	}
-	
+
 	// http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
-	function RowLock($tables,$where,$col='top 1 null as ignore') 
+	function RowLock($tables,$where,$col='top 1 null as ignore')
 	{
 		if (!$this->_hastrans) $this->BeginTrans();
 		$tables = str_replace(',',' HOLDLOCK,',$tables);
 		return $this->GetOne("select $col from $tables HOLDLOCK where $where");
-		
-	}	
-		
-	function SelectDB($dbName) 
+
+	}
+
+	function SelectDB($dbName)
 	{
 		$this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		if ($this->_connectionID) {
-			return @sybase_select_db($dbName);		
+			return @sybase_select_db($dbName);
 		}
-		else return false;	
+		else return false;
 	}
 
 	/*	Returns: the last error message from previous database operation
-		Note: This function is NOT available for Microsoft SQL Server.	*/	
+		Note: This function is NOT available for Microsoft SQL Server.	*/
 
-	
+
 	function ErrorMsg()
 	{
 		if ($this->_logsql) return $this->_errorMsg;
@@ -122,7 +122,7 @@
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('sybase_connect')) return null;
-		
+
 		if ($this->charSet) {
  			$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword, $this->charSet);
        	} else {
@@ -132,13 +132,13 @@
 		$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('sybase_connect')) return null;
-		
+
 		if ($this->charSet) {
  			$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword, $this->charSet);
        	} else {
@@ -146,59 +146,59 @@
        	}
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	// returns query ID if successful, otherwise false
 	function _query($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		if ($ADODB_COUNTRECS == false && ADODB_PHPVER >= 0x4300)
 			return sybase_unbuffered_query($sql,$this->_connectionID);
 		else
 			return sybase_query($sql,$this->_connectionID);
 	}
-	
+
 	// See http://www.isug.com/Sybase_FAQ/ASE/section6.2.html#6.2.12
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		if ($secs2cache > 0) {// we do not cache rowcount, so we have to load entire recordset
 			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 			return $rs;
 		}
-		
+
 		$nrows = (integer) $nrows;
 		$offset = (integer) $offset;
-		
+
 		$cnt = ($nrows >= 0) ? $nrows : 999999999;
 		if ($offset > 0 && $cnt) $cnt += $offset;
-		
-		$this->Execute("set rowcount $cnt"); 
+
+		$this->Execute("set rowcount $cnt");
 		$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,0);
 		$this->Execute("set rowcount 0");
-		
+
 		return $rs;
 	}
 
 	// returns true or false
 	function _close()
-	{ 
+	{
 		return @sybase_close($this->_connectionID);
 	}
-	
+
 	static function UnixDate($v)
 	{
 		return ADORecordSet_array_sybase::UnixDate($v);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_sybase::UnixTimeStamp($v);
-	}	
-	
-	
+	}
 
+
+
 	# Added 2003-10-05 by Chris Phillipson
     # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
     # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
@@ -261,7 +261,7 @@
         }
         return $s;
     }
-	
+
 	# Added 2003-10-07 by Chris Phillipson
     # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
     # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
@@ -279,7 +279,7 @@
         return false;
     }
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
@@ -288,16 +288,16 @@
 	'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
 	'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
 
-class ADORecordset_sybase extends ADORecordSet {	
+class ADORecordset_sybase extends ADORecordSet {
 
 	var $databaseType = "sybase";
 	var $canSeek = true;
 	// _mths works only in non-localised system
-	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);	
+	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
 
 	function ADORecordset_sybase($id,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -305,12 +305,12 @@
 		else $this->fetchMode = $mode;
 		$this->ADORecordSet($id,$mode);
 	}
-	
-	/*	Returns: an object containing field information. 
+
+	/*	Returns: an object containing field information.
 		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
 		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
 		fetchField() is retrieved.	*/
-	function FetchField($fieldOffset = -1) 
+	function FetchField($fieldOffset = -1)
 	{
 		if ($fieldOffset != -1) {
 			$o = @sybase_fetch_field($this->_queryID, $fieldOffset);
@@ -322,20 +322,20 @@
 		if ($o && !isset($o->type)) $o->type = ($o->numeric) ? 'float' : 'varchar';
 		return $o;
 	}
-	
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
 		$this->_numOfRows = ($ADODB_COUNTRECS)? @sybase_num_rows($this->_queryID):-1;
 		$this->_numOfFields = @sybase_num_fields($this->_queryID);
 	}
-	
-	function _seek($row) 
+
+	function _seek($row)
 	{
 		return @sybase_data_seek($this->_queryID, $row);
-	}		
+	}
 
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields=false)
 	{
 		if ($this->fetchMode == ADODB_FETCH_NUM) {
 			$this->fields = @sybase_fetch_row($this->_queryID);
@@ -355,19 +355,19 @@
 
 		return false;
 	}
-	
+
 	/*	close() only needs to be called if you are worried about using too much memory while your script
 		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
 	function _close() {
-		return @sybase_free_result($this->_queryID);		
+		return @sybase_free_result($this->_queryID);
 	}
-	
+
 	// sybase/mssql uses a default date like Dec 30 2000 12:00AM
 	static function UnixDate($v)
 	{
 		return ADORecordSet_array_sybase::UnixDate($v);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_sybase::UnixTimeStamp($v);
@@ -379,25 +379,25 @@
 	{
 		$this->ADORecordSet_array($id);
 	}
-	
+
 		// sybase/mssql uses a default date like Dec 30 2000 12:00AM
 	static function UnixDate($v)
 	{
 	global $ADODB_sybase_mths;
-	
+
 		//Dec 30 2000 12:00AM
 		if (!preg_match( "/([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})/"
 			,$v, $rr)) return parent::UnixDate($v);
-			
+
 		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 		$themth = substr(strtoupper($rr[1]),0,3);
 		$themth = $ADODB_sybase_mths[$themth];
 		if ($themth <= 0) return false;
 		// h-m-s-MM-DD-YY
 		return  mktime(0,0,0,$themth,$rr[2],$rr[3]);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 	global $ADODB_sybase_mths;
@@ -406,11 +406,11 @@
 		if (!preg_match( "/([A-Za-z]{3})[-/\. ]([0-9 ]{1,2})[-/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})/"
 			,$v, $rr)) return parent::UnixTimeStamp($v);
 		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 		$themth = substr(strtoupper($rr[1]),0,3);
 		$themth = $ADODB_sybase_mths[$themth];
 		if ($themth <= 0) return false;
-		
+
 		switch (strtoupper($rr[6])) {
 		case 'P':
 			if ($rr[4]<12) $rr[4] += 12;
Index: typo3/sysext/adodb/adodb/drivers/adodb-oracle.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-oracle.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-oracle.inc.php	(working copy)
@@ -1,14 +1,14 @@
 <?php
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
 
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Oracle data driver. Requires Oracle client. Works on Windows and Unix and Oracle 7.
-  
+
   If you are using Oracle 8 or later, use the oci8 driver which is much better and more reliable.
 */
 
@@ -21,13 +21,13 @@
 	var $concat_operator='||';
 	var $_curs;
 	var $_initdate = true; // init date to YYYY-MM-DD
-	var $metaTablesSQL = 'select table_name from cat';	
+	var $metaTablesSQL = 'select table_name from cat';
 	var $metaColumnsSQL = "select cname,coltype,width from col where tname='%s' order by colno";
 	var $sysDate = "TO_DATE(TO_CHAR(SYSDATE,'YYYY-MM-DD'),'YYYY-MM-DD')";
 	var $sysTimeStamp = 'SYSDATE';
 	var $connectSID = true;
-	
-	function ADODB_oracle() 
+
+	function ADODB_oracle()
 	{
 	}
 
@@ -39,7 +39,7 @@
 		else $ds = adodb_date($this->fmtDate,$d);
 		return 'TO_DATE('.$ds.",'YYYY-MM-DD')";
 	}
-	
+
 	// format and return date string in database timestamp format
 	function DBTimeStamp($ts)
 	{
@@ -49,43 +49,43 @@
 		else $ds = adodb_date($this->fmtTimeStamp,$ts);
 		return 'TO_DATE('.$ds.",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
-	
-	
+
+
 	function BindDate($d)
 	{
 		$d = ADOConnection::DBDate($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
+
 	function BindTimeStamp($d)
 	{
 		$d = ADOConnection::DBTimeStamp($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
 
-	
+
+
 	function BeginTrans()
-	{	  
+	{
 		 $this->autoCommit = false;
 		 ora_commitoff($this->_connectionID);
 		 return true;
 	}
 
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		   if (!$ok) return $this->RollbackTrans();
 		   $ret = ora_commit($this->_connectionID);
 		   ora_commiton($this->_connectionID);
 		   return $ret;
 	}
 
-	
+
 	function RollbackTrans()
 	{
 		$ret = ora_rollback($this->_connectionID);
@@ -95,8 +95,8 @@
 
 
 	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
-	function ErrorMsg() 
- 	{   
+	function ErrorMsg()
+ 	{
         if ($this->_errorMsg !== false) return $this->_errorMsg;
 
         if (is_resource($this->_curs)) $this->_errorMsg = @ora_error($this->_curs);
@@ -104,8 +104,8 @@
 		return $this->_errorMsg;
 	}
 
- 
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		if ($this->_errorCode !== false) return $this->_errorCode;
 
@@ -114,17 +114,17 @@
         return $this->_errorCode;
 	}
 
-	
 
+
 		// returns true or false
 		function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
 		{
 			if (!function_exists('ora_plogon')) return null;
-				
+
             // <G. Giunta 2003/03/03/> Reset error messages before connecting
             $this->_errorMsg = false;
 		    $this->_errorCode = false;
-        
+
             // G. Giunta 2003/08/13 - This looks danegrously suspicious: why should we want to set
             // the oracle home to the host name of remote DB?
 //			if ($argHostname) putenv("ORACLE_HOME=$argHostname");
@@ -184,7 +184,7 @@
 		    $this->_errorCode = false;
 
 			$curs = ora_open($this->_connectionID);
-		 
+
 		 	if ($curs === false) return false;
 			$this->_curs = $curs;
 			if (!ora_parse($curs,$sql)) return false;
@@ -193,7 +193,7 @@
             // that we can obtain ONLY from the cursor (and not from the connection)
             $this->_errorCode = @ora_errorcode($curs);
             $this->_errorMsg = @ora_error($curs);
-            // </G. Giunta 2004/03/03>            
+            // </G. Giunta 2004/03/03>
 		 	@ora_close($curs);
 			return false;
 		}
@@ -221,15 +221,15 @@
 
 	function ADORecordset_oracle($queryID,$mode=false)
 	{
-		
-		if ($mode === false) { 
+
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->fetchMode = $mode;
-		
+
 		$this->_queryID = $queryID;
-	
+
 		$this->_inited = true;
 		$this->fields = array();
 		if ($queryID) {
@@ -241,7 +241,7 @@
 			$this->_numOfFields = 0;
 			$this->EOF = true;
 		}
-		
+
 		return $this->_queryID;
 	}
 
@@ -271,10 +271,10 @@
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
    function _initrs()
    {
 		   $this->_numOfRows = -1;
@@ -291,14 +291,14 @@
 // should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
 		if ($this->fetchMode & ADODB_FETCH_ASSOC)
 			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
-   		else 
+   		else
 			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS);
    }
 
    /*		close() only needs to be called if you are worried about using too much memory while your script
 		   is running. All associated result memory for the specified result identifier will automatically be freed.		*/
 
-   function _close() 
+   function _close()
 {
 		   return @ora_close($this->_queryID);
    }
@@ -310,7 +310,7 @@
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		switch (strtoupper($t)) {
 		case 'VARCHAR':
 		case 'VARCHAR2':
@@ -326,13 +326,13 @@
 		case 'LONG VARBINARY':
 		case 'BLOB':
 				return 'B';
-		
+
 		case 'DATE': return 'D';
-		
+
 		//case 'T': return 'T';
-		
+
 		case 'BIT': return 'L';
-		case 'INT': 
+		case 'INT':
 		case 'SMALLINT':
 		case 'INTEGER': return 'I';
 		default: return 'N';
Index: typo3/sysext/adodb/adodb/drivers/adodb-sapdb.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-sapdb.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-sapdb.inc.php	(working copy)
@@ -1,13 +1,13 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   SAPDB data driver. Requires ODBC.
 
 */
@@ -22,7 +22,7 @@
 define('ADODB_SAPDB',1);
 
 class ADODB_SAPDB extends ADODB_odbc {
-	var $databaseType = "sapdb";	
+	var $databaseType = "sapdb";
 	var $concat_operator = '||';
 	var $sysDate = 'DATE';
 	var $sysTimeStamp = 'TIMESTAMP';
@@ -30,13 +30,13 @@
 	var $fmtTimeStamp = "'Y-m-d H:i:s'"; /// used by DBTimeStamp as the default timestamp fmt.
 	var $hasInsertId = true;
 	var $_bindInputArray = true;
-	
+
 	function ADODB_SAPDB()
 	{
 		//if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
 		$this->ADODB_odbc();
 	}
-	
+
 	function ServerInfo()
 	{
 		$info = ADODB_odbc::ServerInfo();
@@ -52,7 +52,7 @@
 
 		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos");
 	}
-		
+
  	function MetaIndexes ($table, $primary = FALSE)
 	{
 		$table = $this->Quote(strtoupper($table));
@@ -67,7 +67,7 @@
         if ($this->fetchMode !== FALSE) {
         	$savem = $this->SetFetchMode(FALSE);
         }
-        
+
         $rs = $this->Execute($sql);
         if (isset($savem)) {
         	$this->SetFetchMode($savem);
@@ -91,7 +91,7 @@
 		}
         return $indexes;
 	}
-	
+
  	function MetaColumns ($table)
 	{
 		global $ADODB_FETCH_MODE;
@@ -101,7 +101,7 @@
         	$savem = $this->SetFetchMode(FALSE);
         }
 		$table = $this->Quote(strtoupper($table));
-		
+
 		$retarr = array();
 		foreach($this->GetAll("SELECT COLUMNNAME,DATATYPE,LEN,DEC,NULLABLE,MODE,\"DEFAULT\",CASE WHEN \"DEFAULT\" IS NULL THEN 0 ELSE 1 END AS HAS_DEFAULT FROM COLUMNS WHERE tablename=$table ORDER BY pos") as $column)
 		{
@@ -130,7 +130,7 @@
 					}
 				}
 			}
-			$retarr[$fld->name] = $fld;	
+			$retarr[$fld->name] = $fld;
 		}
         if (isset($savem)) {
         	$this->SetFetchMode($savem);
@@ -139,14 +139,14 @@
 
 		return $retarr;
 	}
-	
+
 	function MetaColumnNames($table)
 	{
 		$table = $this->Quote(strtoupper($table));
 
 		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table ORDER BY pos");
 	}
-	
+
 	// unlike it seems, this depends on the db-session and works in a multiuser environment
 	function _insertid($table,$column)
 	{
@@ -155,25 +155,25 @@
 
 	/*
 		SelectLimit implementation problems:
-	
+
 	 	The following will return random 10 rows as order by performed after "WHERE rowno<10"
 	 	which is not ideal...
-		
+
 	  		select * from table where rowno < 10 order by 1
-	  
+
 	  	This means that we have to use the adoconnection base class SelectLimit when
 	  	there is an "order by".
-		
+
 		See http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
 	 */
-	
+
 };
- 
 
-class  ADORecordSet_sapdb extends ADORecordSet_odbc {	
-	
-	var $databaseType = "sapdb";		
-	
+
+class  ADORecordSet_sapdb extends ADORecordSet_odbc {
+
+	var $databaseType = "sapdb";
+
 	function ADORecordSet_sapdb($id,$mode=false)
 	{
 		$this->ADORecordSet_odbc($id,$mode);
Index: typo3/sysext/adodb/adodb/drivers/adodb-postgres.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-postgres.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-postgres.inc.php	(working copy)
@@ -1,11 +1,11 @@
 <?php
 /*
  V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 4.
-  
+
   NOTE: Since 3.31, this file is no longer used, and the "postgres" driver is
   remapped to "postgres7". Maintaining multiple postgres drivers is no easy
   job, so hopefully this will ensure greater consistency and fewer bugs.
Index: typo3/sysext/adodb/adodb/drivers/adodb-odbtp.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-odbtp.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-odbtp.inc.php	(working copy)
@@ -61,23 +61,23 @@
 	{
 		if (empty($d) && $d !== 0) return 'null';
 		if ($isfld) return "convert(date, $d, 120)";
-		
+
 		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
 		$d = adodb_date($this->fmtDate,$d);
-		return "convert(date, $d, 120)"; 
+		return "convert(date, $d, 120)";
 	}
-	
+
 	function DBTimeStamp($d,$isfld=false)
 	{
 		if (empty($d) && $d !== 0) return 'null';
 		if ($isfld) return "convert(datetime, $d, 120)";
-		
+
 		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
 		$d = adodb_date($this->fmtDate,$d);
-		return "convert(datetime, $d, 120)"; 
+		return "convert(datetime, $d, 120)";
 	}
 */
-	
+
 	function _insertid()
 	{
 	// SCOPE_IDENTITY()
@@ -177,9 +177,9 @@
 			$this->_errorMsg = $this->ErrorMsg() ;
 			return false;
 		}
-		
+
 		odbtp_convert_datetime($this->_connectionID,true);
-		
+
 		if ($this->_dontPoolDBC) {
 			if (function_exists('odbtp_dont_pool_dbc'))
 				@odbtp_dont_pool_dbc($this->_connectionID);
@@ -190,7 +190,7 @@
 		$this->odbc_driver = @odbtp_get_attr(ODB_ATTR_DRIVER, $this->_connectionID);
 		$dbms = strtolower(@odbtp_get_attr(ODB_ATTR_DBMSNAME, $this->_connectionID));
 		$this->odbc_name = $dbms;
-		
+
 		// Account for inconsistent DBMS names
 		if( $this->odbc_driver == ODB_DRIVER_ORACLE )
 			$dbms = 'oracle';
@@ -295,7 +295,7 @@
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		return true;
 	}
-	
+
 	function MetaTables($ttype='',$showSchema=false,$mask=false)
 	{
 	global $ADODB_FETCH_MODE;
@@ -303,9 +303,9 @@
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
-		
+
 		$arr = $this->GetArray("||SQLTables||||$ttype");
-		
+
 		if (isset($savefm)) $this->SetFetchMode($savefm);
 		$ADODB_FETCH_MODE = $savem;
 
@@ -317,7 +317,7 @@
 		}
 		return $arr2;
 	}
-	
+
 	function MetaColumns($table,$upper=true)
 	{
 	global $ADODB_FETCH_MODE;
@@ -329,9 +329,9 @@
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
-		
+
 		$rs = $this->Execute( "||SQLColumns||$schema|$table" );
-		
+
 		if (isset($savefm)) $this->SetFetchMode($savefm);
 		$ADODB_FETCH_MODE = $savem;
 
@@ -399,7 +399,7 @@
 			$false = false;
 			return $false;
 		}
-		
+
 		$arr2 = array();
 
 		foreach($arr as $k => $v) {
@@ -460,10 +460,10 @@
 	function Prepare($sql)
 	{
 		if (! $this->_bindInputArray) return $sql; // no binding
-		
+
         $this->_errorMsg = false;
 		$this->_errorCode = false;
-		
+
 		$stmt = @odbtp_prepare($sql,$this->_connectionID);
 		if (!$stmt) {
 		//	print "Prepare Error for ($sql) ".$this->ErrorMsg()."<br>";
@@ -478,7 +478,7 @@
 
         $this->_errorMsg = false;
 		$this->_errorCode = false;
-		
+
 		$stmt = @odbtp_prepare_proc($sql,$this->_connectionID);
 		if (!$stmt) return false;
 		return array($sql,$stmt);
@@ -550,16 +550,16 @@
 				return array();
 		}
 	}
-	
+
 	function MetaIndexes_mssql($table,$primary=false)
 	{
 		$table = strtolower($this->qstr($table));
 
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno,
 			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
 			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid
 			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
 			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND lower(O.Name) = $table
 			ORDER BY O.name, I.Name, K.keyno";
@@ -570,7 +570,7 @@
         if ($this->fetchMode !== FALSE) {
         	$savem = $this->SetFetchMode(FALSE);
         }
-        
+
         $rs = $this->Execute($sql);
         if (isset($savem)) {
         	$this->SetFetchMode($savem);
@@ -584,13 +584,13 @@
 		$indexes = array();
 		while ($row = $rs->FetchRow()) {
 			if ($primary && !$row[5]) continue;
-			
+
             $indexes[$row[0]]['unique'] = $row[6];
             $indexes[$row[0]]['columns'][] = $row[1];
     	}
         return $indexes;
 	}
-	
+
 	function IfNull( $field, $ifNull )
 	{
 		switch( $this->odbc_driver ) {
@@ -605,10 +605,10 @@
 	function _query($sql,$inputarr=false)
 	{
 	global $php_errormsg;
-	
+
         $this->_errorMsg = false;
 		$this->_errorCode = false;
-		
+
  		if ($inputarr) {
 			if (is_array($sql)) {
 				$stmtid = $sql[1];
@@ -625,7 +625,7 @@
 				@odbtp_input( $stmtid, $param );
 				@odbtp_set( $stmtid, $param, $inputarr[$param-1] );
 			}*/
-			
+
 			$param = 1;
 			foreach($inputarr as $v) {
 				@odbtp_input( $stmtid, $param );
@@ -633,7 +633,7 @@
 				$param += 1;
 				if ($param > $num_params) break;
 			}
-			
+
 			if (!@odbtp_execute($stmtid) ) {
 				return false;
 			}
Index: typo3/sysext/adodb/adodb/drivers/adodb-pdo_sqlite.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-pdo_sqlite.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-pdo_sqlite.inc.php	(working copy)
@@ -1,14 +1,14 @@
 <?php
 
-/* 
+/*
  V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Thanks Diogo Toscano (diogo#scriptcase.net) for the code.
 	And also Sid Dunayer [sdunayer#interserv.com] for extensive fixes.
 */
@@ -28,7 +28,7 @@
 	var $concat_operator = '||';
     var $pdoDriver       = false;
 	var $random='abs(random())';
-    
+
 	function _init($parentDriver)
 	{
 		$this->pdoDriver = $parentDriver;
@@ -49,8 +49,8 @@
 
 		return $arr;
 	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		$parent = $this->pdoDriver;
 		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
@@ -111,33 +111,33 @@
 	}
 
 	function BeginTrans()
-	{	
+	{
 		$parent = $this->pdoDriver;
-		if ($parent->transOff) return true; 
+		if ($parent->transOff) return true;
 		$parent->transCnt += 1;
 		$parent->_autocommit = false;
 		return $parent->Execute("BEGIN {$parent->_transmode}");
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		$parent = $this->pdoDriver;
-		if ($parent->transOff) return true; 
+		if ($parent->transOff) return true;
 		if (!$ok) return $parent->RollbackTrans();
 		if ($parent->transCnt) $parent->transCnt -= 1;
 		$parent->_autocommit = true;
-		
+
 		$ret = $parent->Execute('COMMIT');
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
 		$parent = $this->pdoDriver;
-		if ($parent->transOff) return true; 
+		if ($parent->transOff) return true;
 		if ($parent->transCnt) $parent->transCnt -= 1;
 		$parent->_autocommit = true;
-		
+
 		$ret = $parent->Execute('ROLLBACK');
 		return $ret;
 	}
@@ -156,7 +156,7 @@
 	  $rs = $parent->Execute("PRAGMA table_info('$tab')");
 	  if (isset($savem)) $parent->SetFetchMode($savem);
 	  if (!$rs) {
-	    $ADODB_FETCH_MODE = $save; 
+	    $ADODB_FETCH_MODE = $save;
 	    return $false;
 	  }
 	  $arr = array();
@@ -174,7 +174,7 @@
 	    $fld->primary_key = $r['pk'];
 	    $fld->default_value = $r['dflt_value'];
 	    $fld->scale = 0;
-	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;	
+	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;
 	    else $arr[strtoupper($fld->name)] = $fld;
 	  }
 	  $rs->Close();
@@ -185,15 +185,15 @@
 	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$parent = $this->pdoDriver;
-		
+
 		if ($mask) {
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(strtoupper($mask));
 			$this->metaTablesSQL .= " AND name LIKE $mask";
 		}
-		
+
 		$ret = $parent->GetCol($this->metaTablesSQL);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
Index: typo3/sysext/adodb/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-mssqlnative.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-mssqlnative.inc.php	(working copy)
@@ -1,16 +1,16 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
-  Native mssql driver. Requires mssql client. Works on Windows. 
+
+  Native mssql driver. Requires mssql client. Works on Windows.
     http://www.microsoft.com/sql/technologies/php/default.mspx
-  To configure for Unix, see 
+  To configure for Unix, see
    	http://phpbuilder.com/columns/alberto20000919.php3
 
     $stream = sqlsrv_get_field($stmt, $index, SQLSRV_SQLTYPE_STREAM(SQLSRV_ENC_BINARY));
@@ -44,22 +44,22 @@
 
 //----------------------------------------------------------------
 // MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
-// and this causes tons of problems because localized versions of 
-// MSSQL will return the dates in dmy or  mdy order; and also the 
-// month strings depends on what language has been configured. The 
+// and this causes tons of problems because localized versions of
+// MSSQL will return the dates in dmy or  mdy order; and also the
+// month strings depends on what language has been configured. The
 // following two variables allow you to control the localization
 // settings - Ugh.
 //
 // MORE LOCALIZATION INFO
 // ----------------------
-// To configure datetime, look for and modify sqlcommn.loc, 
+// To configure datetime, look for and modify sqlcommn.loc,
 //  	typically found in c:\mssql\install
 // Also read :
 //	 http://support.microsoft.com/default.aspx?scid=kb;EN-US;q220918
 // Alternatively use:
 // 	   CONVERT(char(12),datecol,120)
 //
-// Also if your month is showing as month-1, 
+// Also if your month is showing as month-1,
 //   e.g. Jan 13, 2002 is showing as 13/0/2002, then see
 //     http://phplens.com/lens/lensforum/msgs.php?id=7048&x=1
 //   it's a localisation problem.
@@ -69,10 +69,10 @@
 // has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
 if (ADODB_PHPVER >= 0x4300) {
 // docs say 4.2.0, but testing shows only since 4.3.0 does it work!
-	ini_set('mssql.datetimeconvert',0); 
+	ini_set('mssql.datetimeconvert',0);
 } else {
     global $ADODB_mssql_mths;		// array, months must be upper-case
-	$ADODB_mssql_date_order = 'mdy'; 
+	$ADODB_mssql_date_order = 'mdy';
 	$ADODB_mssql_mths = array(
 		'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
 		'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
@@ -99,7 +99,7 @@
 }
 
 class ADODB_mssqlnative extends ADOConnection {
-	var $databaseType = "mssqlnative";	
+	var $databaseType = "mssqlnative";
 	var $dataProvider = "mssqlnative";
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $fmtDate = "'Y-m-d'";
@@ -114,7 +114,7 @@
 	var $metaColumnsSQL = # xtype==61 is datetime
         "select c.name,t.name,c.length,
 	    (case when c.xusertype=61 then 0 else c.xprec end),
-	    (case when c.xusertype=61 then 0 else c.xscale end) 
+	    (case when c.xusertype=61 then 0 else c.xscale end)
 	    from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
 	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
 	var $hasGenID = true;
@@ -130,9 +130,9 @@
 	var $uniqueOrderBy = true;
 	var $_bindInputArray = true;
 	var $_dropSeqSQL = "drop table %s";
-	
-	function ADODB_mssqlnative() 
-	{		
+
+	function ADODB_mssqlnative()
+	{
         if ($this->debug) {
             error_log("<pre>");
             sqlsrv_set_error_handling( SQLSRV_ERRORS_LOG_ALL );
@@ -153,25 +153,25 @@
 		if ($this->fetchMode === false) {
 			$savem = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		} else 
+		} else
 			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
 		$arrServerInfo = sqlsrv_server_info($this->_connectionID);
 		$arr['description'] = $arrServerInfo['SQLServerName'].' connected to '.$arrServerInfo['CurrentDatabase'];
 		$arr['version'] = $arrServerInfo['SQLServerVersion'];//ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " ISNULL($field, $ifNull) "; // if MS SQL Server
 	}
-	
+
 	function _insertid()
 	{
 	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
+	// Returns the last IDENTITY value inserted into an IDENTITY column in
+	// the same scope. A scope is a module -- a stored procedure, trigger,
+	// function, or batch. Thus, two statements are in the same scope if
 	// they are in the same stored procedure, function, or batch.
 		return $this->GetOne($this->identitySQL);
 	}
@@ -180,7 +180,7 @@
 	{
         return sqlsrv_rows_affected($this->_queryID);
 	}
-	
+
 	function CreateSequence($seq='adodbseq',$start=1)
 	{
 		if($this->debug) error_log("<hr>CreateSequence($seq,$start)");
@@ -218,13 +218,13 @@
         if($this->debug) error_log(" Returning: $num");
 		return $num;
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= '+';
@@ -251,11 +251,11 @@
 			case 'h':
 				$s .= "substring(convert(char(14),$col,0),13,2)";
 				break;
-			
+
 			case 'H':
 				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
 				break;
-				
+
 			case 'i':
 				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
 				break;
@@ -266,7 +266,7 @@
 			case 'A':
 				$s .= "substring(convert(char(19),$col,0),18,2)";
 				break;
-				
+
 			default:
 				if ($ch == '\\') {
 					$i++;
@@ -279,19 +279,19 @@
 		return $s;
 	}
 
-	
+
 	function BeginTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$this->transCnt += 1;
         if ($this->debug) error_log('<hr>begin transaction');
 		sqlsrv_begin_transaction($this->_connectionID);
 	   	return true;
 	}
-		
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
         if ($this->debug) error_log('<hr>commit transaction');
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transCnt) $this->transCnt -= 1;
@@ -300,14 +300,14 @@
 	}
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
         if ($this->debug) error_log('<hr>rollback transaction');
 		if ($this->transCnt) $this->transCnt -= 1;
 		sqlsrv_rollback($this->_connectionID);
 		return true;
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -317,39 +317,39 @@
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET TRANSACTION ".$transaction_mode);
 	}
-	
+
 	/*
 		Usage:
-		
+
 		$this->BeginTrans();
 		$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
-		
+
 		# some operation on both tables table1 and table2
-		
+
 		$this->CommitTrans();
-		
+
 		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
 	*/
-	function RowLock($tables,$where,$col='top 1 null as ignore') 
+	function RowLock($tables,$where,$col='top 1 null as ignore')
 	{
 		if (!$this->transCnt) $this->BeginTrans();
 		return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where");
 	}
-	 
-	function SelectDB($dbName) 
+
+	function SelectDB($dbName)
 	{
 		$this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		if ($this->_connectionID) {
-            $rs = $this->Execute('USE '.$dbName); 
+            $rs = $this->Execute('USE '.$dbName);
             if($rs) {
                 return true;
-            } else return false;		
+            } else return false;
 		}
-		else return false;	
+		else return false;
 	}
-	
-	function ErrorMsg() 
+
+	function ErrorMsg()
 	{
 		$retErrors = sqlsrv_errors(SQLSRV_ERR_ALL);
 		if($retErrors != null) {
@@ -363,15 +363,15 @@
 		}
 		return $this->_errorMsg;
 	}
-	
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
 		$err = sqlsrv_errors(SQLSRV_ERR_ALL);
         if($err[0]) return $err[0]['code'];
         else return -1;
 	}
-	
+
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
@@ -379,29 +379,29 @@
         $connectionInfo = array("Database"=>$argDatabasename,'UID'=>$argUsername,'PWD'=>$argPassword);
         if ($this->debug) error_log("<hr>connecting... hostname: $argHostname params: ".var_export($connectionInfo,true));
         //if ($this->debug) error_log("<hr>_connectionID before: ".serialize($this->_connectionID));
-        if(!($this->_connectionID = sqlsrv_connect($argHostname,$connectionInfo))) { 
+        if(!($this->_connectionID = sqlsrv_connect($argHostname,$connectionInfo))) {
             if ($this->debug) error_log( "<hr><strong>errors</strong>: ".print_r( sqlsrv_errors(), true));
             return false;
         }
         //if ($this->debug) error_log(" _connectionID after: ".serialize($this->_connectionID));
         //if ($this->debug) error_log("<hr>defined functions: <pre>".var_export(get_defined_functions(),true)."</pre>");
-		return true;	
+		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		//return null;//not implemented. NOTE: Persistent connections have no effect if PHP is used as a CGI program. (FastCGI!)
         return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
 	}
-	
+
 	function Prepare($sql)
 	{
 		$stmt = sqlsrv_prepare( $this->_connectionID, $sql);
 		if (!$stmt)  return $sql;
 		return array($sql,$stmt);
 	}
-	
+
 	// returns concatenated string
     // MSSQL requires integers to be cast as strings
     // automatically cast every datatype to VARCHAR(255)
@@ -422,25 +422,25 @@
         array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
         $s = implode('+',$arr);
         if (sizeof($arr) > 0) return "$s";
-        
+
 		return '';
     }
-	
-	/* 
+
+	/*
 		Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
 		So all your blobs must be of type "image".
-		
+
 		Remember to set in php.ini the following...
-		
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textlimit = 0 ; zero to pass through 
 
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textsize = 0 ; zero to pass through 
+		; Valid range 0 - 2147483647. Default = 4096.
+		mssql.textlimit = 0 ; zero to pass through
+
+		; Valid range 0 - 2147483647. Default = 4096.
+		mssql.textsize = 0 ; zero to pass through
 	*/
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
-	
+
 		if (strtoupper($blobtype) == 'CLOB') {
 			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
 			return $this->Execute($sql) != false;
@@ -448,7 +448,7 @@
 		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
 		return $this->Execute($sql) != false;
 	}
-	
+
 	// returns query ID if successful, otherwise false
 	function _query($sql,$inputarr=false)
 	{
@@ -472,36 +472,36 @@
         if(!$rez) $rez = false;
 		return $rez;
 	}
-	
+
 	// returns true or false
 	function _close()
-	{ 
+	{
 		if ($this->transCnt) $this->RollbackTrans();
 		$rez = @sqlsrv_close($this->_connectionID);
 		$this->_connectionID = false;
 		return $rez;
 	}
-	
+
 	// mssql uses a default date like Dec 30 2000 12:00AM
 	static function UnixDate($v)
 	{
 		return ADORecordSet_array_mssql::UnixDate($v);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_mssql::UnixTimeStamp($v);
-	}	
+	}
 
 	function &MetaIndexes($table,$primary=false)
 	{
 		$table = $this->qstr($table);
 
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno,
 			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
 			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid
 			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
 			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
 			ORDER BY O.name, I.Name, K.keyno";
@@ -512,7 +512,7 @@
         if ($this->fetchMode !== FALSE) {
         	$savem = $this->SetFetchMode(FALSE);
         }
-        
+
         $rs = $this->Execute($sql);
         if (isset($savem)) {
         	$this->SetFetchMode($savem);
@@ -526,22 +526,22 @@
 		$indexes = array();
 		while ($row = $rs->FetchRow()) {
 			if (!$primary && $row[5]) continue;
-			
+
             $indexes[$row[0]]['unique'] = $row[6];
             $indexes[$row[0]]['columns'][] = $row[1];
     	}
         return $indexes;
 	}
-	
+
 	function MetaForeignKeys($table, $owner=false, $upper=false)
 	{
     	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
+
+		$sql =
             "select object_name(constid) as constraint_name,
 	            col_name(fkeyid, fkey) as column_name,
 	            object_name(rkeyid) as referenced_table_name,
@@ -549,20 +549,20 @@
             from sysforeignkeys
             where upper(object_name(fkeyid)) = $table
             order by constraint_name, referenced_table_name, keyno";
-		
+
 		$constraints =& $this->GetArray($sql);
-		
+
 		$ADODB_FETCH_MODE = $save;
-		
+
 		$arr = false;
 		foreach($constraints as $constr) {
 			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3];
 		}
 		if (!$arr) return false;
-		
+
 		$arr2 = false;
-		
+
 		foreach($arr as $k => $v) {
 			foreach($v as $a => $b) {
 				if ($upper) $a = strtoupper($a);
@@ -573,8 +573,8 @@
 	}
 
 	//From: Fernando Moreira <FMoreira@imediata.pt>
-	function MetaDatabases() 
-	{ 
+	function MetaDatabases()
+	{
 	    $this->SelectDB("master");
         $rs =& $this->Execute($this->metaDatabasesSQL);
         $rows = $rs->GetRows();
@@ -585,38 +585,38 @@
         $this->SelectDB($this->database);
         if($ret)
             return $ret;
-        else 
+        else
             return false;
-	} 
+	}
 
 	// "Stein-Aksel Basma" <basma@accelero.no>
 	// tested with MSSQL 2000
 	function &MetaPrimaryKeys($table)
 	{
     	global $ADODB_FETCH_MODE;
-	
+
 		$schema = '';
 		$this->_findschema($table,$schema);
 		if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
+		if ($schema) $schema = "and k.table_catalog like '$schema%'";
 
 		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
-		information_schema.table_constraints tc 
+		information_schema.table_constraints tc
 		where tc.constraint_name = k.constraint_name and tc.constraint_type =
 		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
-		
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$a = $this->GetCol($sql);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if ($a && sizeof($a)>0) return $a;
 		$false = false;
-		return $false;	  
+		return $false;
 	}
 
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function &MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 	    if ($mask) {
 			$save = $this->metaTablesSQL;
@@ -631,21 +631,21 @@
 		return $ret;
 	}
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordset_mssqlnative extends ADORecordSet {	
+class ADORecordset_mssqlnative extends ADORecordSet {
 
 	var $databaseType = "mssqlnative";
 	var $canSeek = false;
 	var $fieldOffset = 0;
 	// _mths works only in non-localised system
-	
+
 	function ADORecordset_mssqlnative($id,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 
@@ -653,11 +653,11 @@
 		$this->fetchMode = $mode;
 		return $this->ADORecordSet($id,$mode);
 	}
-	
-	
+
+
 	function _initrs()
 	{
-	    global $ADODB_COUNTRECS;	
+	    global $ADODB_COUNTRECS;
         if ($this->connection->debug) error_log("(before) ADODB_COUNTRECS: {$ADODB_COUNTRECS} _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
         /*$retRowsAff = sqlsrv_rows_affected($this->_queryID);//"If you need to determine the number of rows a query will return before retrieving the actual results, appending a SELECT COUNT ... query would let you get that information, and then a call to next_result would move you to the "real" results."
         error_log("rowsaff: ".serialize($retRowsAff));
@@ -667,8 +667,8 @@
         $this->_numOfFields = ($fieldmeta)? count($fieldmeta):-1;
         if ($this->connection->debug) error_log("(after) _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
 	}
-	
 
+
 	//Contributed by "Sven Axelsson" <sven.axelsson@bokochwebb.se>
 	// get next resultset - requires PHP 4.0.5 or later
 	function NextRecordSet()
@@ -692,16 +692,16 @@
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
-	/*	Returns: an object containing field information. 
+
+	/*	Returns: an object containing field information.
 		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
 		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
 		fetchField() is retrieved.	*/
 
-	function &FetchField($fieldOffset = -1) 
+	function &FetchField($fieldOffset = -1)
 	{
         if ($this->connection->debug) error_log("<hr>fetchfield: $fieldOffset, fetch array: <pre>".print_r($this->fields,true)."</pre> backtrace: ".adodb_backtrace(false));
 		if ($fieldOffset != -1) $this->fieldOffset = $fieldOffset;
@@ -718,33 +718,33 @@
         }
 		return $f;
 	}
-	
-	function _seek($row) 
+
+	function _seek($row)
 	{
 		return false;//There is no support for cursors in the driver at this time.  All data is returned via forward-only streams.
 	}
 
 	// speedup
-	function MoveNext() 
+	function MoveNext()
 	{
         if ($this->connection->debug) error_log("movenext()");
         //if ($this->connection->debug) error_log("eof (beginning): ".$this->EOF);
 		if ($this->EOF) return false;
-		
+
 		$this->_currentRow++;
         if ($this->connection->debug) error_log("_currentRow: ".$this->_currentRow);
-		
+
 		if ($this->_fetch()) return true;
 		$this->EOF = true;
         //if ($this->connection->debug) error_log("eof (end): ".$this->EOF);
-		
+
 		return false;
 	}
 
-	
+
 	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
 	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields=false)
 	{
         if ($this->connection->debug) error_log("_fetch()");
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
@@ -755,7 +755,7 @@
                 if ($this->connection->debug) error_log("fetch mode: assoc");
 				$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_ASSOC);
 			}
-			
+
 			if (ADODB_ASSOC_CASE == 0) {
 				foreach($this->fields as $k=>$v) {
 					$this->fields[strtolower($k)] = $v;
@@ -769,7 +769,7 @@
             if ($this->connection->debug) error_log("fetch mode: num");
 			$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_NUMERIC);
 		}
-        if(is_array($this->fields) && array_key_exists(1,$this->fields) && !array_key_exists(0,$this->fields)) {//fix fetch numeric keys since they're not 0 based 
+        if(is_array($this->fields) && array_key_exists(1,$this->fields) && !array_key_exists(0,$this->fields)) {//fix fetch numeric keys since they're not 0 based
             $arrFixed = array();
             foreach($this->fields as $key=>$value) {
                 if(is_numeric($key)) {
@@ -792,12 +792,12 @@
         if ($this->connection->debug) error_log("<hr>after _fetch, fields: <pre>".print_r($this->fields,true)." backtrace: ".adodb_backtrace(false));
 		return $this->fields;
 	}
-	
+
     /*	close() only needs to be called if you are worried about using too much memory while your script
 		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-	function _close() 
+	function _close()
 	{
-		$rez = sqlsrv_free_stmt($this->_queryID);	
+		$rez = sqlsrv_free_stmt($this->_queryID);
 		$this->_queryID = false;
 		return $rez;
 	}
@@ -807,7 +807,7 @@
 	{
 		return ADORecordSet_array_mssqlnative::UnixDate($v);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_mssqlnative::UnixTimeStamp($v);
@@ -816,26 +816,26 @@
 
 
 class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
-	function ADORecordSet_array_mssqlnative($id=-1,$mode=false) 
+	function ADORecordSet_array_mssqlnative($id=-1,$mode=false)
 	{
 		$this->ADORecordSet_array($id,$mode);
 	}
-	
+
 		// mssql uses a default date like Dec 30 2000 12:00AM
 	static function UnixDate($v)
 	{
-	
+
 		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
-		
+
     	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
-		//Dec 30 2000 12:00AM 
+
+		//Dec 30 2000 12:00AM
 		if ($ADODB_mssql_date_order == 'dmy') {
 			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
 				return parent::UnixDate($v);
 			}
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
+
 			$theday = $rr[1];
 			$themth =  substr(strtoupper($rr[2]),0,3);
 		} else {
@@ -843,7 +843,7 @@
 				return parent::UnixDate($v);
 			}
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
+
 			$theday = $rr[2];
 			$themth = substr(strtoupper($rr[1]),0,3);
 		}
@@ -852,34 +852,34 @@
 		// h-m-s-MM-DD-YY
 		return  mktime(0,0,0,$themth,$theday,$rr[3]);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
-	
+
 		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
-		
+
 	    global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
+
 		//Dec 30 2000 12:00AM
 		 if ($ADODB_mssql_date_order == 'dmy') {
 			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
 			,$v, $rr)) return parent::UnixTimeStamp($v);
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 			$theday = $rr[1];
 			$themth =  substr(strtoupper($rr[2]),0,3);
 		} else {
 			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
 			,$v, $rr)) return parent::UnixTimeStamp($v);
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 			$theday = $rr[2];
 			$themth = substr(strtoupper($rr[1]),0,3);
 		}
-		
+
 		$themth = $ADODB_mssql_mths[$themth];
 		if ($themth <= 0) return false;
-		
+
 		switch (strtoupper($rr[6])) {
 		case 'P':
 			if ($rr[4]<12) $rr[4] += 12;
@@ -899,7 +899,7 @@
 Code Example 1:
 
 select 	object_name(constid) as constraint_name,
-       	object_name(fkeyid) as table_name, 
+       	object_name(fkeyid) as table_name,
         col_name(fkeyid, fkey) as column_name,
 	object_name(rkeyid) as referenced_table_name,
    	col_name(rkeyid, rkey) as referenced_column_name
Index: typo3/sysext/adodb/adodb/drivers/adodb-odbc.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-odbc.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-odbc.inc.php	(working copy)
@@ -1,26 +1,26 @@
 <?php
-/* 
+/*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
 Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Requires ODBC. Works on Windows and Unix.
 */
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
   define("_ADODB_ODBC_LAYER", 2 );
-	 
+
 /*--------------------------------------------------------------------------------------
 --------------------------------------------------------------------------------------*/
 
 
 class ADODB_odbc extends ADOConnection {
-	var $databaseType = "odbc";	
+	var $databaseType = "odbc";
 	var $fmtDate = "'Y-m-d'";
 	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
 	var $replaceQuote = "''"; // string to use to replace quotes
@@ -30,7 +30,7 @@
 	var $useFetchArray = false; // setting this to true will make array elements in FETCH_ASSOC mode case-sensitive
 								// breaking backward-compat
 	//var $longreadlen = 8000; // default number of chars to return for a Blob/Long field
-	var $_bindInputArray = false;	
+	var $_bindInputArray = false;
 	var $curmode = SQL_CUR_USE_DRIVER; // See sqlext.h, SQL_CUR_DEFAULT == SQL_CUR_USE_DRIVER == 2L
 	var $_genSeqSQL = "create table %s (id integer)";
 	var $_autocommit = true;
@@ -38,20 +38,20 @@
 	var $_has_stupid_odbc_fetch_api_change = true;
 	var $_lastAffectedRows = 0;
 	var $uCaseTables = true; // for meta* functions, uppercase table names
-	
-	function ADODB_odbc() 
-	{ 	
+
+	function ADODB_odbc()
+	{
 		$this->_haserrorfunctions = ADODB_PHPVER >= 0x4050;
 		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
 	}
-	
+
 		// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 	global $php_errormsg;
-		
+
 		if (!function_exists('odbc_connect')) return null;
-		
+
 		if ($this->debug && $argDatabasename && $this->databaseType != 'vfp') {
 			ADOConnection::outp("For odbc Connect(), $argDatabasename is not used. Place dsn in 1st parameter.");
 		}
@@ -60,17 +60,17 @@
 		else $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
 		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
 		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
+
 		return $this->_connectionID != false;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 	global $php_errormsg;
-	
+
 		if (!function_exists('odbc_connect')) return null;
-		
+
 		if (isset($php_errormsg)) $php_errormsg = '';
 		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
 		if ($this->debug && $argDatabasename) {
@@ -79,27 +79,27 @@
 	//	print "dsn=$argDSN u=$argUsername p=$argPassword<br>"; flush();
 		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
 		else $this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
-		
+
 		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
 		if ($this->_connectionID && $this->autoRollback) @odbc_rollback($this->_connectionID);
 		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
+
 		return $this->_connectionID != false;
 	}
 
-	
+
 	function ServerInfo()
 	{
-	
+
 		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
 			$dsn = strtoupper($this->host);
 			$first = true;
 			$found = false;
-			
+
 			if (!function_exists('odbc_data_source')) return false;
-			
+
 			while(true) {
-				
+
 				$rez = @odbc_data_source($this->_connectionID,
 					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
 				$first = false;
@@ -108,7 +108,7 @@
 					$found = true;
 					break;
 				}
-			} 
+			}
 			if (!$found) return ADOConnection::ServerInfo();
 			if (!isset($rez['version'])) $rez['version'] = '';
 			return $rez;
@@ -117,7 +117,7 @@
 		}
 	}
 
-	
+
 	function CreateSequence($seqname='adodbseq',$start=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
@@ -126,22 +126,22 @@
 		$start -= 1;
 		return $this->Execute("insert into $seqname values($start)");
 	}
-	
+
 	var $_dropSeqSQL = 'drop table %s';
 	function DropSequence($seqname)
 	{
 		if (empty($this->_dropSeqSQL)) return false;
 		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
 	}
-	
+
 	/*
 		This algorithm is not very efficient, but works even if table locking
 		is not available.
-		
+
 		Will return false if unable to generate an ID after $MAXLOOPS attempts.
 	*/
 	function GenID($seq='adodbseq',$start=1)
-	{	
+	{
 		// if you have to modify the parameter below, your database is overloaded,
 		// or you need to implement generation of id's yourself!
 		$MAXLOOPS = 100;
@@ -149,14 +149,14 @@
 		while (--$MAXLOOPS>=0) {
 			$num = $this->GetOne("select id from $seq");
 			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));
 				$start -= 1;
 				$num = '0';
 				$ok = $this->Execute("insert into $seq values($start)");
 				if (!$ok) return false;
-			} 
+			}
 			$this->Execute("update $seq set id=id+1 where id=$num");
-			
+
 			if ($this->affected_rows() > 0) {
 				$num += 1;
 				$this->genID = $num;
@@ -184,40 +184,40 @@
 			return @odbc_errormsg($this->_connectionID);
 		} else return ADOConnection::ErrorMsg();
 	}
-	
+
 	function ErrorNo()
 	{
-		
+
 		if ($this->_haserrorfunctions) {
 			if ($this->_errorCode !== false) {
 				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
 				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
 			}
 
-			if (empty($this->_connectionID)) $e = @odbc_error(); 
+			if (empty($this->_connectionID)) $e = @odbc_error();
 			else $e = @odbc_error($this->_connectionID);
-			
+
 			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
 			 // so we check and patch
 			if (strlen($e)<=2) return 0;
 			return $e;
 		} else return ADOConnection::ErrorNo();
 	}
-	
-	
 
+
+
 	function BeginTrans()
-	{	
+	{
 		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->_autocommit = false;
 		return odbc_autocommit($this->_connectionID,false);
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
@@ -225,21 +225,21 @@
 		odbc_autocommit($this->_connectionID,true);
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
 		$ret = odbc_rollback($this->_connectionID);
 		odbc_autocommit($this->_connectionID,true);
 		return $ret;
 	}
-	
+
 	function MetaPrimaryKeys($table)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		if ($this->uCaseTables) $table = strtoupper($table);
 		$schema = '';
 		$this->_findschema($table,$schema);
@@ -247,17 +247,17 @@
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = @odbc_primarykeys($this->_connectionID,'',$schema,$table);
-		
+
 		if (!$qid) {
 			$ADODB_FETCH_MODE = $savem;
 			return false;
 		}
 		$rs = new ADORecordSet_odbc($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return false;
 		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
+
 		$arr = $rs->GetArray();
 		$rs->Close();
 		//print_r($arr);
@@ -267,39 +267,39 @@
 		}
 		return $arr2;
 	}
-	
-	
-	
+
+
+
 	function MetaTables($ttype=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = odbc_tables($this->_connectionID);
-		
+
 		$rs = new ADORecordSet_odbc($qid);
-		
+
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) {
 			$false = false;
 			return $false;
 		}
 		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
+
 		$arr = $rs->GetArray();
 		//print_r($arr);
-		
+
 		$rs->Close();
 		$arr2 = array();
-		
+
 		if ($ttype) {
 			$isview = strncmp($ttype,'V',1) === 0;
 		}
 		for ($i=0; $i < sizeof($arr); $i++) {
 			if (!$arr[$i][2]) continue;
 			$type = $arr[$i][3];
-			if ($ttype) { 
+			if ($ttype) {
 				if ($isview) {
 					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
 				} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
@@ -307,7 +307,7 @@
 		}
 		return $arr2;
 	}
-	
+
 /*
 See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp
 / SQL data type codes /
@@ -339,7 +339,7 @@
 	function ODBCTypes($t)
 	{
 		switch ((integer)$t) {
-		case 1:	
+		case 1:
 		case 12:
 		case 0:
 		case -95:
@@ -350,52 +350,52 @@
 			return 'X';
 		case -4: //image
 			return 'B';
-				
-		case 9:	
+
+		case 9:
 		case 91:
 			return 'D';
-		
+
 		case 10:
 		case 11:
 		case 92:
 		case 93:
 			return 'T';
-			
+
 		case 4:
 		case 5:
 		case -6:
 			return 'I';
-			
+
 		case -11: // uniqidentifier
 			return 'R';
 		case -7: //bit
 			return 'L';
-		
+
 		default:
 			return 'N';
 		}
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$false = false;
 		if ($this->uCaseTables) $table = strtoupper($table);
 		$schema = '';
 		$this->_findschema($table,$schema);
-		
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
+
 		/*if (false) { // after testing, confirmed that the following does not work becoz of a bug
 			$qid2 = odbc_tables($this->_connectionID);
-			$rs = new ADORecordSet_odbc($qid2);		
+			$rs = new ADORecordSet_odbc($qid2);
 			$ADODB_FETCH_MODE = $savem;
 			if (!$rs) return false;
 			$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
 			$rs->_fetch();
-			
+
 			while (!$rs->EOF) {
 				if ($table == strtoupper($rs->fields[2])) {
 					$q = $rs->fields[0];
@@ -405,38 +405,38 @@
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			
+
 			$qid = odbc_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
 		} */
-		
+
 		switch ($this->databaseType) {
 		case 'access':
 		case 'vfp':
 			$qid = odbc_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
 			break;
-		
-		
+
+
 		case 'db2':
             $colname = "%";
             $qid = odbc_columns($this->_connectionID, "", $schema, $table, $colname);
             break;
-			
+
 		default:
 			$qid = @odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
 			if (empty($qid)) $qid = odbc_columns($this->_connectionID);
 			break;
 		}
 		if (empty($qid)) return $false;
-		
+
 		$rs = new ADORecordSet_odbc($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return $false;
 		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
 		$rs->_fetch();
-		
+
 		$retarr = array();
-		
+
 		/*
 		$rs->fields indices
 		0 TABLE_QUALIFIER
@@ -458,31 +458,31 @@
 				$fld = new ADOFieldObject();
 				$fld->name = $rs->fields[3];
 				$fld->type = $this->ODBCTypes($rs->fields[4]);
-				
+
 				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
 				// access uses precision to store length for char/varchar
 				if ($fld->type == 'C' or $fld->type == 'X') {
-					if ($this->databaseType == 'access') 
+					if ($this->databaseType == 'access')
 						$fld->max_length = $rs->fields[6];
 					else if ($rs->fields[4] <= -95) // UNICODE
 						$fld->max_length = $rs->fields[7]/2;
 					else
 						$fld->max_length = $rs->fields[7];
-				} else 
+				} else
 					$fld->max_length = $rs->fields[7];
 				$fld->not_null = !empty($rs->fields[10]);
 				$fld->scale = $rs->fields[8];
-				$retarr[strtoupper($fld->name)] = $fld;	
+				$retarr[strtoupper($fld->name)] = $fld;
 			} else if (sizeof($retarr)>0)
 				break;
 			$rs->MoveNext();
 		}
 		$rs->Close(); //-- crashes 4.03pl1 -- why?
-		
+
 		if (empty($retarr)) $retarr = false;
 		return $retarr;
 	}
-	
+
 	function Prepare($sql)
 	{
 		if (! $this->_bindInputArray) return $sql; // no binding
@@ -495,24 +495,24 @@
 	}
 
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
 	GLOBAL $php_errormsg;
 		if (isset($php_errormsg)) $php_errormsg = '';
 		$this->_error = '';
-		
+
 		if ($inputarr) {
 			if (is_array($sql)) {
 				$stmtid = $sql[1];
 			} else {
 				$stmtid = odbc_prepare($this->_connectionID,$sql);
-	
+
 				if ($stmtid == false) {
 					$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
 					return false;
 				}
 			}
-			
+
 			if (! odbc_execute($stmtid,$inputarr)) {
 				//@odbc_free_result($stmtid);
 				if ($this->_haserrorfunctions) {
@@ -526,7 +526,7 @@
 				}
 				return false;
 			}
-		
+
 		} else if (is_array($sql)) {
 			$stmtid = $sql[1];
 			if (!odbc_execute($stmtid)) {
@@ -544,7 +544,7 @@
 			}
 		} else
 			$stmtid = odbc_exec($this->_connectionID,$sql);
-		
+
 		$this->_lastAffectedRows = 0;
 		if ($stmtid) {
 			if (@odbc_num_fields($stmtid) == 0) {
@@ -555,7 +555,7 @@
 				odbc_binmode($stmtid,$this->binmode);
 				odbc_longreadlen($stmtid,$this->maxblobsize);
 			}
-			
+
 			if ($this->_haserrorfunctions) {
 				$this->_errorMsg = '';
 				$this->_errorCode = 0;
@@ -574,9 +574,9 @@
 	/*
 		Insert a null into the blob field of the table first.
 		Then use UpdateBlob to store the blob.
-		
+
 		Usage:
-		 
+
 		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
@@ -584,7 +584,7 @@
 	{
 		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -597,31 +597,31 @@
 	{
 		return $this->_lastAffectedRows;
 	}
-	
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_odbc extends ADORecordSet {	
-	
+class ADORecordSet_odbc extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "odbc";		
+	var $databaseType = "odbc";
 	var $dataProvider = "odbc";
 	var $useFetchArray;
 	var $_has_stupid_odbc_fetch_api_change;
-	
+
 	function ADORecordSet_odbc($id,$mode=false)
 	{
-		if ($mode === false) {  
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->fetchMode = $mode;
-		
+
 		$this->_queryID = $id;
-		
+
 		// the following is required for mysql odbc driver in 4.3.1 -- why?
 		$this->EOF = false;
 		$this->_currentRow = -1;
@@ -630,11 +630,11 @@
 
 
 	// returns the field object
-	function FetchField($fieldOffset = -1) 
+	function FetchField($fieldOffset = -1)
 	{
-		
+
 		$off=$fieldOffset+1; // offsets begin at 1
-		
+
 		$o= new ADOFieldObject();
 		$o->name = @odbc_field_name($this->_queryID,$off);
 		$o->type = @odbc_field_type($this->_queryID,$off);
@@ -643,7 +643,7 @@
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
@@ -658,8 +658,8 @@
 
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
-		
+
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
@@ -669,15 +669,15 @@
 		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
 		//$this->useFetchArray = $this->connection->useFetchArray;
 		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
-	}	
-	
+	}
+
 	function _seek($row)
 	{
 		return false;
 	}
-	
+
 	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
-	function GetArrayLimit($nrows,$offset=-1) 
+	function GetArrayLimit($nrows,$offset=-1)
 	{
 		if ($offset <= 0) {
 			$rs = $this->GetArray($nrows);
@@ -687,27 +687,27 @@
 		$this->fetchMode = ADODB_FETCH_NUM;
 		$this->Move($offset);
 		$this->fetchMode = $savem;
-		
+
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
 		}
-		
+
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
-	
-	
-	function MoveNext() 
+
+
+	function MoveNext()
 	{
-		if ($this->_numOfRows != 0 && !$this->EOF) {		
+		if ($this->_numOfRows != 0 && !$this->EOF) {
 			$this->_currentRow++;
-			
+
 			if ($this->_has_stupid_odbc_fetch_api_change)
 				$rez = @odbc_fetch_into($this->_queryID,$this->fields);
 			else {
@@ -724,8 +724,8 @@
 		$this->fields = false;
 		$this->EOF = true;
 		return false;
-	}	
-	
+	}
+
 	function _fetch()
 	{
 
@@ -744,10 +744,10 @@
 		$this->fields = false;
 		return false;
 	}
-	
-	function _close() 
+
+	function _close()
 	{
-		return @odbc_free_result($this->_queryID);		
+		return @odbc_free_result($this->_queryID);
 	}
 
 }
Index: typo3/sysext/adodb/adodb/drivers/adodb-mysqlpo.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/drivers/adodb-mysqlpo.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/drivers/adodb-mysqlpo.inc.php	(working copy)
@@ -2,14 +2,14 @@
 
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 8.
-  
+
   MySQL code that supports transactions. For MySQL 3.23 or later.
   Code from James Poon <jpoon88@yahoo.com>
-  
+
   Requires mysql client. Works on Windows and Unix.
 */
 
@@ -23,33 +23,33 @@
 	var $databaseType = 'mysqlt';
 	var $ansiOuter = true; // for Version 3.23.17 or later
 	var $hasTransactions = true;
-	var $autoRollback = true; // apparently mysql does not autorollback properly 
-	
-	function ADODB_mysqlt() 
-	{			
+	var $autoRollback = true; // apparently mysql does not autorollback properly
+
+	function ADODB_mysqlt()
+	{
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
 	}
-	
+
 	function BeginTrans()
-	{	  
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->Execute('SET AUTOCOMMIT=0');
 		$this->Execute('BEGIN');
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
+
+	function CommitTrans($ok=true)
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->Execute('COMMIT');
 		$this->Execute('SET AUTOCOMMIT=1');
 		return true;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
@@ -58,41 +58,41 @@
 		$this->Execute('SET AUTOCOMMIT=1');
 		return true;
 	}
-	
-	function RowLock($tables,$where='',$col='1 as adodb_ignore') 
+
+	function RowLock($tables,$where='',$col='1 as adodb_ignore')
 	{
 		if ($this->transCnt==0) $this->BeginTrans();
 		if ($where) $where = ' where '.$where;
 		$rs = $this->Execute("select $col from $tables $where for update");
-		return !empty($rs); 
+		return !empty($rs);
 	}
-	
+
 }
 
-class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
+class ADORecordSet_mysqlt extends ADORecordSet_mysql{
 	var $databaseType = "mysqlt";
-	
-	function ADORecordSet_mysqlt($queryID,$mode=false) 
+
+	function ADORecordSet_mysqlt($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
-		
+
 		switch ($mode)
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
 		default: $this->fetchMode = MYSQL_BOTH; break;
 		}
-	
+
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
@@ -107,11 +107,11 @@
 	}
 }
 
-class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {	
+class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
 
-	function ADORecordSet_ext_mysqlt($queryID,$mode=false) 
+	function ADORecordSet_ext_mysqlt($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -119,16 +119,16 @@
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
-		default: 
+		default:
 			$this->fetchMode = MYSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		return adodb_movenext($this);
Index: typo3/sysext/adodb/adodb/adodb-memcache.lib.inc.php
===================================================================
--- typo3/sysext/adodb/adodb/adodb-memcache.lib.inc.php	(revision 8132)
+++ typo3/sysext/adodb/adodb/adodb-memcache.lib.inc.php	(working copy)
@@ -9,18 +9,18 @@
 global $ADODB_INCLUDED_CSV;
 if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
 
-/* 
+/*
 
   V5.06 16 Oct 2008  (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
 
 Usage:
-  
+
 $db = NewADOConnection($driver);
 $db->memCache = true; /// should we use memCache instead of caching in files
 $db->memCacheHost = array($ip1, $ip2, $ip3);
@@ -29,32 +29,32 @@
 
 $db->Connect(...);
 $db->CacheExecute($sql);
-  
+
   Note the memcache class is shared by all connections, is created during the first call to Connect/PConnect.
-  
+
   Class instance is stored in $ADODB_CACHE
 */
 
 	class ADODB_Cache_MemCache {
 		var $createdir = false; // create caching directory structure?
-		
+
 		//-----------------------------
 		// memcache specific variables
-		
+
 		var $hosts;	// array of hosts
 		var $port = 11211;
 		var $compress = false; // memcache compression with zlib
-		
+
 		var $_connected = false;
 		var $_memcache = false;
-		
+
 		function ADODB_Cache_MemCache(&$obj)
 		{
 			$this->hosts = $obj->memCacheHost;
 			$this->port = $obj->memCachePort;
 			$this->compress = $obj->memCacheCompress;
 		}
-		
+
 		// implement as lazy connection. The connection only occurs on CacheExecute call
 		function connect(&$err)
 		{
@@ -64,9 +64,9 @@
 			}
 
 			$memcache = new MemCache;
-			
+
 			if (!is_array($this->hosts)) $this->hosts = array($this->hosts);
-		
+
 			$failcnt = 0;
 			foreach($this->hosts as $host) {
 				if (!@$memcache->addServer($host,$this->port,true)) {
@@ -81,7 +81,7 @@
 			$this->_memcache = $memcache;
 			return true;
 		}
-		
+
 		// returns true or false. true if successful save
 		function writecache($filename, $contents, $debug, $secs2cache)
 		{
@@ -90,43 +90,43 @@
 				if (!$this->connect($err) && $debug) ADOConnection::outp($err);
 			}
 			if (!$this->_memcache) return false;
-			
+
 			if (!$this->_memcache->set($filename, $contents, $this->compress, $secs2cache)) {
 				if ($debug) ADOConnection::outp(" Failed to save data at the memcached server!<br>\n");
 				return false;
 			}
-			
+
 			return true;
 		}
-		
+
 		// returns a recordset
 		function readcache($filename, &$err, $secs2cache, $rsClass)
 		{
 			$false = false;
 			if (!$this->_connected) $this->connect($err);
 			if (!$this->_memcache) return $false;
-			
+
 			$rs = $this->_memcache->get($filename);
 			if (!$rs) {
 				$err = 'Item with such key doesn\'t exists on the memcached server.';
 				return $false;
 			}
-			
+
 			// hack, should actually use _csv2rs
 			$rs = explode("\n", $rs);
             unset($rs[0]);
             $rs = join("\n", $rs);
  			$rs = unserialize($rs);
 			if (! is_object($rs)) {
-				$err = 'Unable to unserialize $rs';		
+				$err = 'Unable to unserialize $rs';
 				return $false;
 			}
 			if ($rs->timeCreated == 0) return $rs; // apparently have been reports that timeCreated was set to 0 somewhere
-			
+
 			$tdiff = intval($rs->timeCreated+$secs2cache - time());
 			if ($tdiff <= 2) {
 				switch($tdiff) {
-					case 2: 
+					case 2:
 						if ((rand() & 15) == 0) {
 							$err = "Timeout 2";
 							return $false;
@@ -138,14 +138,14 @@
 							return $false;
 						}
 						break;
-					default: 
+					default:
 						$err = "Timeout 0";
 						return $false;
 				}
 			}
 			return $rs;
 		}
-		
+
 		function flushall($debug=false)
 		{
 			if (!$this->_connected) {
@@ -153,35 +153,35 @@
 				if (!$this->connect($err) && $debug) ADOConnection::outp($err);
 			}
 			if (!$this->_memcache) return false;
-			
+
 			$del = $this->_memcache->flush();
-			
-			if ($debug) 
+
+			if ($debug)
 				if (!$del) ADOConnection::outp("flushall: failed!<br>\n");
 				else ADOConnection::outp("flushall: succeeded!<br>\n");
-				
+
 			return $del;
 		}
-		
+
 		function flushcache($filename, $debug=false)
 		{
 			if (!$this->_connected) {
   				$err = '';
-  				if (!$this->connect($err) && $debug) ADOConnection::outp($err); 
-			} 
+  				if (!$this->connect($err) && $debug) ADOConnection::outp($err);
+			}
 			if (!$this->_memcache) return false;
-  
+
 			$del = $this->_memcache->delete($filename);
-			
-			if ($debug) 
+
+			if ($debug)
 				if (!$del) ADOConnection::outp("flushcache: $key entry doesn't exist on memcached server!<br>\n");
 				else ADOConnection::outp("flushcache: $key entry flushed from memcached server!<br>\n");
-				
+
 			return $del;
 		}
-		
+
 		// not used for memcache
-		function createdir($dir, $hash) 
+		function createdir($dir, $hash)
 		{
 			return true;
 		}
Index: typo3/sysext/scheduler/class.tx_scheduler.php
===================================================================
--- typo3/sysext/scheduler/class.tx_scheduler.php	(revision 8132)
+++ typo3/sysext/scheduler/class.tx_scheduler.php	(working copy)
@@ -398,7 +398,7 @@
 	/**
 	 * This is a utility method that writes some message to the BE Log
 	 * It could be expanded to write to some other log
-	 * 
+	 *
 	 * @param	string		The message to write to the log
 	 * @param	integer		Status (0 = message, 1 = error)
 	 * @param	mixed		Key for the message
Index: typo3/sysext/scheduler/tests/tx_scheduler_croncmdTest.php
===================================================================
--- typo3/sysext/scheduler/tests/tx_scheduler_croncmdTest.php	(revision 8132)
+++ typo3/sysext/scheduler/tests/tx_scheduler_croncmdTest.php	(working copy)
@@ -112,7 +112,7 @@
 		$actualResult = $cronCmdInstance->valid_values;
 		$this->assertEquals($expectedResult, $actualResult[2]);
 	}
-	
+
 	/**
 	 * Tests whether dayList is correctly calculated for stops of month days combined with ranges and lists
 	 *
Index: typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
===================================================================
--- typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php	(working copy)
@@ -96,7 +96,7 @@
 			return NULL;
 		}
 	}
-	
+
 	/**
 	 * Reconstitutes a property. Only for internal use.
 	 *
@@ -135,7 +135,7 @@
 		}
 		return $properties;
 	}
-	
+
 	/**
 	 * Returns the property value of the given property name. Only for internal use.
 	 *
@@ -163,7 +163,7 @@
 	 */
 	public function _memorizeCleanState() {
 	}
-	
+
 	/**
 	 * Returns TRUE if the properties were modified after reconstitution. However, value objects can be never updated.
 	 *
@@ -202,6 +202,6 @@
 	public function __clone() {
 		$this->_isClone = TRUE;
 	}
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/DomainObject/AbstractValueObject.php
===================================================================
--- typo3/sysext/extbase/Classes/DomainObject/AbstractValueObject.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/DomainObject/AbstractValueObject.php	(working copy)
@@ -40,7 +40,7 @@
 	public function getValue() {
 		return $this->__toString();
 	}
-	
+
 	/**
 	 * Clone method. Sets the _isClone property.
 	 *
Index: typo3/sysext/extbase/Classes/DomainObject/AbstractEntity.php
===================================================================
--- typo3/sysext/extbase/Classes/DomainObject/AbstractEntity.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/DomainObject/AbstractEntity.php	(working copy)
@@ -109,7 +109,7 @@
 			return NULL;
 		}
 	}
-	
+
 	/**
 	 * Returns TRUE if the properties were modified after reconstitution
 	 *
@@ -151,6 +151,6 @@
 		}
 		return $result;
 	}
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/Object/ManagerInterface.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/ManagerInterface.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/ManagerInterface.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Object/Exception/CannotReconstituteObject.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/Exception/CannotReconstituteObject.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/Exception/CannotReconstituteObject.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Object/Exception/InvalidObject.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/Exception/InvalidObject.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/Exception/InvalidObject.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Object/Exception/UnknownInterface.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/Exception/UnknownInterface.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/Exception/UnknownInterface.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Object/Exception/UnresolvedDependencies.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/Exception/UnresolvedDependencies.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/Exception/UnresolvedDependencies.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Object/Exception/ObjectAlreadyRegistered.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/Exception/ObjectAlreadyRegistered.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/Exception/ObjectAlreadyRegistered.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Object/Exception/UnknownClass.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/Exception/UnknownClass.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/Exception/UnknownClass.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Object/Exception/UnknownObject.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/Exception/UnknownObject.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/Exception/UnknownObject.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Object/Exception/InvalidClass.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/Exception/InvalidClass.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/Exception/InvalidClass.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Object/Exception/InvalidObjectConfiguration.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/Exception/InvalidObjectConfiguration.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/Exception/InvalidObjectConfiguration.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Object/Exception/WrongScope.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/Exception/WrongScope.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/Exception/WrongScope.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Object/Exception.php
===================================================================
--- typo3/sysext/extbase/Classes/Object/Exception.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Object/Exception.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php	(working copy)
@@ -280,7 +280,7 @@
 	/**
 	 * Removes escapings from a given argument string and trims the outermost
 	 * quotes.
-	 * 
+	 *
 	 * This method is meant as a helper for regular expression results.
 	 *
 	 * @param string &$quotedValue Value to unquote
Index: typo3/sysext/extbase/Classes/Validation/Validator/ValidatorInterface.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/ValidatorInterface.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/ValidatorInterface.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/StringValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/StringValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/StringValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/AbstractObjectValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/AbstractObjectValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/AbstractObjectValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/IntegerValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/IntegerValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/IntegerValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/RegularExpressionValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/RegularExpressionValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/RegularExpressionValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/FloatValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/FloatValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/FloatValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/NumberRangeValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/NumberRangeValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/NumberRangeValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -37,7 +37,7 @@
 	/**
 	 * Checks if the given value is a valid email address.
 	 * If at least one error occurred, the result is FALSE.
-	 * 
+	 *
 	 * The regexp is a modified version of the last one shown on
 	 * http://www.regular-expressions.info/email.html
 	 *
Index: typo3/sysext/extbase/Classes/Validation/Validator/ObjectValidatorInterface.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/ObjectValidatorInterface.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/ObjectValidatorInterface.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/RawValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/RawValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/RawValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/StringLengthValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/StringLengthValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/StringLengthValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Validation/Validator/AlphanumericValidator.php
===================================================================
--- typo3/sysext/extbase/Classes/Validation/Validator/AlphanumericValidator.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Validation/Validator/AlphanumericValidator.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Utility/TypeHandling.php
===================================================================
--- typo3/sysext/extbase/Classes/Utility/TypeHandling.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Utility/TypeHandling.php	(working copy)
@@ -85,6 +85,6 @@
 		}
 		return $type;
 	}
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/Utility/ExtbaseRequirementsCheck.php
===================================================================
--- typo3/sysext/extbase/Classes/Utility/ExtbaseRequirementsCheck.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Utility/ExtbaseRequirementsCheck.php	(working copy)
@@ -44,7 +44,7 @@
 		$reports = array(
 			'docCommentsShouldBePreserved' => $this->checkIfDocCommentsArePreserved()
 		);
-		
+
 		return $reports;
 	}
 
Index: typo3/sysext/extbase/Classes/Utility/ClassLoader.php
===================================================================
--- typo3/sysext/extbase/Classes/Utility/ClassLoader.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Utility/ClassLoader.php	(working copy)
@@ -33,7 +33,7 @@
  * @version $Id: ClassLoader.php 1729 2009-11-25 21:37:20Z stucki $
  */
 class Tx_Extbase_Utility_ClassLoader {
-	
+
 	/**
 	 * Loads php files containing classes or interfaces found in the classes directory of
 	 * an extension.
@@ -52,6 +52,6 @@
 			}
 		}
 	}
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidOrNoRequestHash.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidOrNoRequestHash.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidOrNoRequestHash.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidControllerName.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidControllerName.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidControllerName.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidArgumentType.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidArgumentType.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidArgumentType.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidActionName.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidActionName.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidActionName.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidRequestMethod.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidRequestMethod.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidRequestMethod.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidArgumentName.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidArgumentName.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidArgumentName.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidArgumentValue.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidArgumentValue.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidArgumentValue.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/NoSuchArgument.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/NoSuchArgument.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/NoSuchArgument.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidRequestType.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidRequestType.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidRequestType.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/UnsupportedRequestType.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/UnsupportedRequestType.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/UnsupportedRequestType.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidUriPattern.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidUriPattern.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidUriPattern.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/NoSuchAction.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/NoSuchAction.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/NoSuchAction.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/StopAction.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/StopAction.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/StopAction.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/NoSuchController.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/NoSuchController.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/NoSuchController.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidViewHelper.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidViewHelper.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidViewHelper.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidMarker.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidMarker.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidMarker.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidExtensionName.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidExtensionName.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidExtensionName.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidController.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidController.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidController.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Exception/InvalidTemplateResource.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Exception/InvalidTemplateResource.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Exception/InvalidTemplateResource.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/MVC/Web/Request.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Web/Request.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Web/Request.php	(working copy)
@@ -180,18 +180,18 @@
 	public function getContentObjectData() {
 		return $this->contentObjectData;
 	}
-	
+
 	/**
 	 * Set if the current request is cached.
-	 * 
+	 *
 	 * @param boolean $isCached
 	 */
 	public function setIsCached($isCached) {
 		$this->isCached = (boolean) $isCached;
-	} 
+	}
 	/**
 	 * Return whether the current request is a cached request or not.
-	 * 
+	 *
 	 * @api (v4 only)
 	 * @return boolean the caching status.
 	 */
Index: typo3/sysext/extbase/Classes/MVC/Web/RequestBuilder.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Web/RequestBuilder.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Web/RequestBuilder.php	(working copy)
@@ -121,8 +121,8 @@
 		} else {
 			$controllerName = $this->defaultControllerName;
 			$actionName = $this->defaultActionName;
-		}				
-		
+		}
+
 		$request = t3lib_div::makeInstance('Tx_Extbase_MVC_Web_Request');
 		$request->setPluginName($this->pluginName);
 		$request->setControllerExtensionName($this->extensionName);
@@ -135,7 +135,7 @@
 		if (is_string($parameters['format']) && (strlen($parameters['format']))) {
 			$request->setFormat(filter_var($parameters['format'], FILTER_SANITIZE_STRING));
 		}
-		
+
 		foreach ($parameters as $argumentName => $argumentValue) {
 			$request->setArgument($argumentName, $argumentValue);
 		}
Index: typo3/sysext/extbase/Classes/MVC/Web/Routing/UriBuilder.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Web/Routing/UriBuilder.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Web/Routing/UriBuilder.php	(working copy)
@@ -422,7 +422,7 @@
 
 		return $this->build();
 	}
-	
+
 	/**
 	 * Builds the URI
 	 * Depending on the current context this calls buildBackendUri() or buildFrontendUri()
@@ -561,11 +561,11 @@
 		}
 		return $arguments;
 	}
-	
+
 	/**
 	 * Converts a given object recursively into an array.
 	 *
-	 * @param Tx_Extbase_DomainObject_AbstractDomainObject $object 
+	 * @param Tx_Extbase_DomainObject_AbstractDomainObject $object
 	 * @return void
 	 */
 	// TODO Refactore this into convertDomainObjectsToIdentityArrays()
Index: typo3/sysext/extbase/Classes/MVC/Controller/AbstractController.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Controller/AbstractController.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Controller/AbstractController.php	(working copy)
@@ -330,7 +330,7 @@
 		$this->response->setHeader('Location', (string)$uri);
 		throw new Tx_Extbase_MVC_Exception_StopAction();
 	}
-	
+
 	/**
 	 * Adds the base uri if not already in place.
 	 *
Index: typo3/sysext/extbase/Classes/MVC/Controller/Arguments.php
===================================================================
--- typo3/sysext/extbase/Classes/MVC/Controller/Arguments.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/MVC/Controller/Arguments.php	(working copy)
@@ -157,7 +157,7 @@
 		$this->addArgument($argument);
 		return $argument;
 	}
-	
+
 	/**
 	 * Creates a new argument. This is a replacement for $this->objectFactory->create() of FLOW3.
 	 *
Index: typo3/sysext/extbase/Classes/Persistence/LazyLoadingProxy.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/LazyLoadingProxy.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/LazyLoadingProxy.php	(working copy)
@@ -55,7 +55,7 @@
 	 * @var mixed
 	 */
 	private $fieldValue;
-	
+
 	/**
 	 * Constructs this proxy instance.
 	 *
@@ -146,7 +146,7 @@
 		$realInstance = $this->_loadRealInstance();
 		unset($realInstance->$propertyName);
 	}
-	
+
 	/**
 	 * Magic toString call implementation.
 	 *
@@ -156,7 +156,7 @@
 		$realInstance = $this->_loadRealInstance();
 		return $realInstance->__toString();
 	}
-	
+
 	/**
 	 * Returns the current value of the storage array
 	 *
@@ -186,7 +186,7 @@
 		$realInstance = $this->_loadRealInstance();
 		next($realInstance);
 	}
-	
+
 	/**
 	 * Resets the array pointer of the storage
 	 *
@@ -206,7 +206,7 @@
 		return $this->current() !== FALSE;
 	}
 
-	
-	
+
+
 }
 ?>
Index: typo3/sysext/extbase/Classes/Persistence/Repository.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Repository.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Repository.php	(working copy)
@@ -208,7 +208,7 @@
 		$result = $this->createQuery()->execute();
 		return $result;
 	}
-	
+
 	/**
 	 * Returns the total number objects of this repository.
 	 *
@@ -218,7 +218,7 @@
 	public function countAll() {
 		return $this->createQuery()->count();
 	}
-	
+
 	/**
 	 * Removes all objects of this repository as if remove() was called for
 	 * all of them.
Index: typo3/sysext/extbase/Classes/Persistence/Backend.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Backend.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Backend.php	(working copy)
@@ -146,7 +146,7 @@
 	public function injectQueryFactory(Tx_Extbase_Persistence_QueryFactoryInterface $queryFactory) {
 		$this->queryFactory = $queryFactory;
 	}
-	
+
 	/**
 	 * Injects the QueryObjectModelFactory
 	 *
@@ -193,7 +193,7 @@
 	public function getQomFactory() {
 		return $this->qomFactory;
 	}
-	
+
 	/**
 	 * Returns the current identityMap
 	 *
@@ -371,11 +371,11 @@
 		$className = get_class($object);
 		$dataMap = $this->dataMapper->getDataMap($className);
 		$classSchema = $this->reflectionService->getClassSchema($className);
-		
+
 		$properties = $object->_getProperties();
 		foreach ($properties as $propertyName => $propertyValue) {
 			if (!$dataMap->isPersistableProperty($propertyName) || $this->propertyValueIsLazyLoaded($propertyValue)) continue;
-			
+
 			$columnMap = $dataMap->getColumnMap($propertyName);
 			$propertyMetaData = $classSchema->getProperty($propertyName);
 			$propertyType = $propertyMetaData['type'];
@@ -410,7 +410,7 @@
 		if (count($row) > 0) {
 			$this->updateObject($object, $row);
 		}
-		
+
 		if ($object instanceof Tx_Extbase_DomainObject_AbstractEntity) {
 			$object->_memorizeCleanState();
 		}
@@ -418,7 +418,7 @@
 		foreach ($queue as $queuedObject) {
 			$this->persistObject($queuedObject);
 		}
-		
+
 	}
 
 	/**
@@ -437,13 +437,13 @@
 
 		if (is_object($value)) {
 			if (!($value instanceof $expectedType)) {
-				throw new Tx_Extbase_Persistence_Exception_UnexpectedTypeException('Expected property of type ' . $expectedType . ', but got ' . get_class($value), 1244465558);				
+				throw new Tx_Extbase_Persistence_Exception_UnexpectedTypeException('Expected property of type ' . $expectedType . ', but got ' . get_class($value), 1244465558);
 			}
-		} elseif ($expectedType !== gettype($value)) {			
+		} elseif ($expectedType !== gettype($value)) {
 			throw new Tx_Extbase_Persistence_Exception_UnexpectedTypeException('Expected property of type ' . $expectedType . ', but got ' . gettype($value), 1244465558);
 		}
 	}
-	
+
 	/**
 	 * Checks, if the property value is lazy loaded and was not initialized
 	 *
@@ -459,7 +459,7 @@
 		}
 		return FALSE;
 	}
-	
+
 	/**
 	 * Persists the given value object.
 	 *
@@ -489,7 +489,7 @@
 			$this->insertObject($object, $row);
 		}
 	}
-	
+
 	/**
 	 * Tests, if the given Value Object already exists in the storage backend and if so, it returns the uid.
 	 *
@@ -498,7 +498,7 @@
 	protected function getUidOfAlreadyPersistedValueObject(Tx_Extbase_DomainObject_AbstractValueObject $object) {
 		return $this->storageBackend->getUidOfAlreadyPersistedValueObject($object);
 	}
-	
+
 	/**
 	 * Persists a an object storage. Objects of a 1:n or m:n relation are queued and processed with the parent object. A 1:1 relation
 	 * gets persisted immediately. Objects which were removed from the property were detached from the parent object. They will not be
@@ -506,13 +506,13 @@
 	 *
 	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $object The object
 	 * @param string $propertyName The name of the property the related objects are stored in
-	 * @param mixed $propertyValue The property value 
+	 * @param mixed $propertyValue The property value
 	 * @return void
 	 */
 	protected function persistObjectStorage(Tx_Extbase_Persistence_ObjectStorage $objectStorage, Tx_Extbase_DomainObject_DomainObjectInterface $parentObject, $propertyName, array &$queue, array &$row) {
 		$className = get_class($parentObject);
 		$columnMap = $this->dataMapper->getDataMap($className)->getColumnMap($propertyName);
-		$columnName = $columnMap->getColumnName();		
+		$columnName = $columnMap->getColumnName();
 		$propertyMetaData = $this->reflectionService->getClassSchema($className)->getProperty($propertyName);
 
 		foreach ($this->getRemovedChildObjects($parentObject, $propertyName) as $removedObject) {
@@ -541,14 +541,14 @@
 			$this->attachObjectToParentObject($object, $parentObject, $propertyName, $sortingPosition);
 			$sortingPosition++;
 		}
-		
+
 		if ($columnMap->getParentKeyFieldName() === NULL) {
 			$row[$columnMap->getColumnName()] = implode(',', $currentUids);
 		} else {
 			$row[$columnMap->getColumnName()] = $this->dataMapper->countRelated($parentObject, $propertyName);
 		}
 	}
-	
+
 	/**
 	 * Returns the current field value of the given object property from the storage backend.
 	 *
@@ -566,7 +566,7 @@
 		$fieldValue = $currentRow[$columnMap->getColumnName()];
 		return $fieldValue;
 	}
-	
+
 	/**
 	 * Returns the removed objects determined by a comparison of the clean property value
 	 * with the actual property value.
@@ -588,13 +588,13 @@
 		}
 		return $removedObjects;
 	}
-	
+
 	/**
 	 * Updates the fields defining the relation between the object and the parent object.
 	 *
-	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $object 
-	 * @param Tx_Extbase_DomainObject_AbstractEntity $parentObject 
-	 * @param string $parentPropertyName 
+	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $object
+	 * @param Tx_Extbase_DomainObject_AbstractEntity $parentObject
+	 * @param string $parentPropertyName
 	 * @return void
 	 */
 	protected function attachObjectToParentObject(Tx_Extbase_DomainObject_DomainObjectInterface $object, Tx_Extbase_DomainObject_AbstractEntity $parentObject, $parentPropertyName, $sortingPosition = 0) {
@@ -616,18 +616,18 @@
 			}
 			if (count($row) > 0) {
 				$this->updateObject($object, $row);
-			}			
+			}
 		} elseif ($parentColumnMap->getTypeOfRelation() === Tx_Extbase_Persistence_Mapper_ColumnMap::RELATION_HAS_AND_BELONGS_TO_MANY) {
 			$this->insertRelationInRelationtable($object, $parentObject, $parentPropertyName, $sortingPosition);
 		}
 	}
-	
+
 	/**
 	 * Updates the fields defining the relation between the object and the parent object.
 	 *
-	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $object 
-	 * @param Tx_Extbase_DomainObject_AbstractEntity $parentObject 
-	 * @param string $parentPropertyName 
+	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $object
+	 * @param Tx_Extbase_DomainObject_AbstractEntity $parentObject
+	 * @param string $parentPropertyName
 	 * @return void
 	 */
 	protected function detachObjectFromParentObject(Tx_Extbase_DomainObject_DomainObjectInterface $object, Tx_Extbase_DomainObject_AbstractEntity $parentObject, $parentPropertyName) {
@@ -654,7 +654,7 @@
 			$this->deleteRelationFromRelationtable($object, $parentObject, $parentPropertyName);
 		}
 	}
-	
+
 	/**
 	 * Inserts an object in the storage backend
 	 *
@@ -677,7 +677,7 @@
 		}
 		$this->identityMap->registerObject($object, $uid);
 	}
-	
+
 	/**
 	 * Inserts mm-relation into a relation table
 	 *
@@ -703,7 +703,7 @@
 		if ($columnMap->getRelationTablePageIdColumnName() !== NULL) {
 			$row[$columnMap->getRelationTablePageIdColumnName()] = $this->determineStoragePageIdForNewRecord();
 		}
-		
+
 		$relationTableInsertFields = $columnMap->getRelationTableInsertFields();
 		if (count($relationTableInsertFields)) {
 			foreach($relationTableInsertFields as $insertField => $insertValue) {
@@ -795,7 +795,7 @@
 		}
 		return $res;
 	}
-	
+
 	/**
 	 * Returns a table row to be inserted or updated in the database
 	 *
@@ -863,9 +863,9 @@
 		$this->removeRelatedObjects($object);
 		if ($this->extbaseSettings['persistence']['updateReferenceIndex'] === '1') {
 			$this->referenceIndex->updateRefIndexTable($tableName, $object->getUid());
-		}		
+		}
 	}
-	
+
 	/**
 	 * Remove related objects
 	 *
@@ -876,7 +876,7 @@
 		$className = get_class($object);
 		$dataMap = $this->dataMapper->getDataMap($className);
 		$classSchema = $this->reflectionService->getClassSchema($className);
-				
+
 		$properties = $object->_getProperties();
 		foreach ($properties as $propertyName => $propertyValue) {
 			$columnMap = $dataMap->getColumnMap($propertyName);
@@ -886,7 +886,7 @@
 					foreach ($propertyValue as $containedObject) {
 						$this->removeObject($containedObject);
 					}
-				} elseif ($propertyValue instanceof Tx_Extbase_DomainObject_DomainObjectInterface) {				
+				} elseif ($propertyValue instanceof Tx_Extbase_DomainObject_DomainObjectInterface) {
 					$this->removeObject($propertyValue);
 				}
 			}
@@ -914,7 +914,7 @@
 		$storagePidList = t3lib_div::intExplode(',', $extbaseSettings['persistence']['storagePid']);
 		return (int) $storagePidList[0];
 	}
-	
+
 	/**
 	 * Returns a plain value, i.e. objects are flattened out if possible.
 	 *
Index: typo3/sysext/extbase/Classes/Persistence/QuerySettingsInterface.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/QuerySettingsInterface.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/QuerySettingsInterface.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php	(working copy)
@@ -25,7 +25,7 @@
 /**
  * The storage for objects. It ensures the uniqueness of an object in the storage. It's a remake of the
  * SplObjectStorage introduced in PHP 5.3.
- * 
+ *
  * Opposed to the SplObjectStorage the ObjectStorage does not implement the Serializable interface.
  *
  * @package Extbase
@@ -35,7 +35,7 @@
 class Tx_Extbase_Persistence_ObjectStorage implements Countable, Iterator, ArrayAccess, Tx_Extbase_Persistence_ObjectMonitoringInterface {
 
 	/**
-	 * An array holding the objects and the stored information. The key of the array items ist the 
+	 * An array holding the objects and the stored information. The key of the array items ist the
 	 * spl_object_hash of the given object.
 	 *
 	 * array(
@@ -55,7 +55,7 @@
 	 * @var bool
 	 */
 	protected $isModified = FALSE;
-		
+
 	/**
 	 * Rewind the iterator to the first storage element.
 	 *
@@ -75,7 +75,7 @@
 	}
 
 	/**
-	 * Returns the index at which the iterator currently is. This is different from the SplObjectStorage 
+	 * Returns the index at which the iterator currently is. This is different from the SplObjectStorage
 	 * as the key in this implementation is the object hash.
 	 *
 	 * @return string The index corresponding to the position of the iterator.
@@ -113,7 +113,7 @@
 	}
 
 	/**
-	 * Associate data to an object in the storage. offsetSet() is an alias of attach(). 
+	 * Associate data to an object in the storage. offsetSet() is an alias of attach().
 	 *
 	 * @param object $object The object to add.
 	 * @param mixed $information The data to associate with the object.
@@ -149,7 +149,7 @@
 	 * Returns the data associated with an object in the storage.
 	 *
 	 * @param string $object The object to look for.
-	 * @return mixed The data previously associated with the object in the storage. 
+	 * @return mixed The data previously associated with the object in the storage.
 	 */
 	public function offsetGet($object) {
 		return $this->storage[spl_object_hash($object)]['inf'];
@@ -185,7 +185,7 @@
 	public function detach($object) {
 		$this->offsetUnset($object);
 	}
-	
+
 	/**
 	 * Returns the data, or info, associated with the object pointed by the current iterator position.
 	 *
@@ -195,7 +195,7 @@
 		$item = current($this->storage);
 		return $item['inf'];
 	}
-	
+
 	public function setInfo($data) {
 		$this->isModified = TRUE;
 		$key = key($this->storage);
@@ -225,7 +225,7 @@
 			$this->detach($object);
 		}
 	}
-	
+
 	/**
 	 * Returns this object storage as an array
 	 *
@@ -246,7 +246,7 @@
 	public function unserialize($serialized) {
 		throw new RuntimeException('A ObjectStorage instance cannot be unserialized.', 1267700870);
 	}
-	
+
 	/**
 	 * Register an object's clean state, e.g. after it has been reconstituted
 	 * from the database
@@ -265,7 +265,7 @@
 	public function _isDirty() {
 		return $this->isModified;
 	}
-	
+
 }
 
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapFactory.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapFactory.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapFactory.php	(working copy)
@@ -30,7 +30,7 @@
  * @version $ID:$
  */
 class Tx_Extbase_Persistence_Mapper_DataMapFactory {
-	
+
 	/**
 	 * @var Tx_Extbase_Reflection_Service
 	 */
@@ -45,7 +45,7 @@
 	public function injectReflectionService(Tx_Extbase_Reflection_Service $reflectionService) {
 		$this->reflectionService = $reflectionService;
 	}
-	
+
 	/**
 	 * Builds a data map by adding column maps for all the configured columns in the $TCA.
 	 * It also resolves the type of values the column is holding and the typo of relation the column
@@ -63,7 +63,7 @@
 		$subclasses = array();
 		$tableName = strtolower($className);
 		$columnMapping = array();
-		
+
 		$extbaseFrameworkConfiguration = Tx_Extbase_Dispatcher::getExtbaseFrameworkConfiguration();
 		$classSettings = $extbaseFrameworkConfiguration['persistence']['classes'][$className];
 		if ($classSettings !== NULL) {
@@ -113,7 +113,7 @@
 		// debug($dataMap);
 		return $dataMap;
 	}
-		
+
 	/**
 	 * Returns the TCA ctrl section of the specified table; or NULL if not set
 	 *
@@ -124,7 +124,7 @@
 		$this->includeTca($tableName);
 		return is_array($GLOBALS['TCA'][$tableName]['ctrl']) ? $GLOBALS['TCA'][$tableName]['ctrl'] : NULL;
 	}
-	
+
 	/**
 	 * Returns the TCA columns array of the specified table
 	 *
@@ -135,7 +135,7 @@
 		$this->includeTca($tableName);
 		return is_array($GLOBALS['TCA'][$tableName]['columns']) ? $GLOBALS['TCA'][$tableName]['columns'] : array();
 	}
-	
+
 	/**
 	 * Includes the TCA for the given table
 	 *
@@ -148,7 +148,7 @@
 		}
 		t3lib_div::loadTCA($tableName);
 	}
-	
+
 	protected function addMetaDataColumnNames(Tx_Extbase_Persistence_Mapper_DataMap $dataMap, $tableName) {
 		$controlSection = $GLOBALS['TCA'][$tableName]['ctrl'];
 		$dataMap->setPageIdColumnName('pid');
@@ -165,7 +165,7 @@
 		if (isset($controlSection['enablecolumns']['fe_group'])) $dataMap->setFrontEndUserGroupColumnName($controlSection['enablecolumns']['fe_group']);
 		return $dataMap;
 	}
-		
+
 	/**
 	 * This method tries to determine the type of type of relation to other tables and sets it based on
 	 * the $TCA column configuration
@@ -191,7 +191,7 @@
 		}
 		return $columnMap;
 	}
-	
+
 	/**
 	 * This method sets the configuration for a 1:1 relation based on
 	 * the $TCA column configuration
@@ -209,7 +209,7 @@
 		$columnMap->setParentTableFieldName($columnConfiguration['foreign_table_field']);
 		return $columnMap;
 	}
-	
+
 	/**
 	 * This method sets the configuration for a 1:n relation based on
 	 * the $TCA column configuration
@@ -227,7 +227,7 @@
 		$columnMap->setParentTableFieldName($columnConfiguration['foreign_table_field']);
 		return $columnMap;
 	}
-	
+
 	/**
 	 * This method sets the configuration for a m:n relation based on
 	 * the $TCA column configuration
@@ -274,5 +274,5 @@
 		}
 		return $columnMap;
 	}
-		
+
 }
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/Persistence/Mapper/ColumnMap.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Mapper/ColumnMap.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Mapper/ColumnMap.php	(working copy)
@@ -55,7 +55,7 @@
 	const STRATEGY_EAGER = 'eager';
 	const STRATEGY_LAZY_PROXY = 'proxy';
 	const STRATEGY_LAZY_STORAGE = 'storage';
-	
+
 	/**
 	 * The property name corresponding to the table name
 	 *
@@ -197,7 +197,7 @@
 	public function getColumnName() {
 		return $this->columnName;
 	}
-	
+
 	public function setChildTableName($childTableName) {
 		$this->childTableName = $childTableName;
 	}
Index: typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapper.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapper.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapper.php	(working copy)
@@ -69,7 +69,7 @@
 	 * @var Tx_Extbase_Persistence_Mapper_DataMapFactory
 	 */
 	protected $dataMapFactory;
-	
+
 	/**
 	 * @var Tx_Extbase_Persistence_QueryFactoryInterface
 	 */
@@ -119,7 +119,7 @@
 	public function injectReflectionService(Tx_Extbase_Reflection_Service $reflectionService) {
 		$this->reflectionService = $reflectionService;
 	}
-	
+
 	/**
 	 * Injects the DataMap Factory
 	 *
@@ -129,7 +129,7 @@
 	public function injectDataMapFactory(Tx_Extbase_Persistence_Mapper_DataMapFactory $dataMapFactory) {
 		$this->dataMapFactory = $dataMapFactory;
 	}
-	
+
 	/**
 	 * Sets the query object model factory
 	 *
@@ -154,7 +154,7 @@
 		}
 		return $objects;
 	}
-	
+
 	/**
 	 * Returns the target type for the given row.
 	 *
@@ -176,7 +176,7 @@
 		}
 		return $targetType;
 	}
-	
+
 	/**
 	 * Maps a single row on an object of the given class
 	 *
@@ -234,7 +234,7 @@
 			if (!$dataMap->isPersistableProperty($propertyName)) continue;
 			$columnMap = $dataMap->getColumnMap($propertyName);
 			$columnName = $columnMap->getColumnName();
-			$propertyData = $this->reflectionService->getClassSchema($className)->getProperty($propertyName);			
+			$propertyData = $this->reflectionService->getClassSchema($className)->getProperty($propertyName);
 			$propertyValue = NULL;
 			if ($row[$columnName] !== NULL) {
 				switch ($propertyData['type']) {
@@ -273,7 +273,7 @@
 			}
 		}
 	}
-	
+
 	/**
 	 * Creates a DateTime from an unix timestamp. If the input is empty
 	 * NULL is returned.
@@ -304,7 +304,7 @@
 		$propertyMetaData = $this->reflectionService->getClassSchema(get_class($parentObject))->getProperty($propertyName);
 		if ($enableLazyLoading === TRUE && $propertyMetaData['lazy']) {
 			if ($propertyMetaData['type'] === 'Tx_Extbase_Persistence_ObjectStorage') {
-				$result = t3lib_div::makeInstance('Tx_Extbase_Persistence_LazyObjectStorage', $parentObject, $propertyName, $fieldValue);				
+				$result = t3lib_div::makeInstance('Tx_Extbase_Persistence_LazyObjectStorage', $parentObject, $propertyName, $fieldValue);
 			} else {
 				if (empty($fieldValue)) {
 					$result = NULL;
@@ -317,7 +317,7 @@
 		}
 		return $result;
 	}
-	
+
 	/**
 	 * Fetches the related objects from the storage backend.
 	 *
@@ -332,13 +332,13 @@
 		$query = $this->getPreparedQuery($parentObject, $propertyName, $fieldValue);
 		return $query->execute();
 	}
-	
+
 	/**
 	 * Builds and returns the prepared query, ready to be executed.
 	 *
-	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $parentObject 
-	 * @param string $propertyName 
-	 * @param string $fieldValue 
+	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $parentObject
+	 * @param string $propertyName
+	 * @param string $fieldValue
 	 * @return void
 	 */
 	protected function getPreparedQuery(Tx_Extbase_DomainObject_DomainObjectInterface $parentObject, $propertyName, $fieldValue = '') {
@@ -366,15 +366,15 @@
 		$query->matching($this->getConstraint($query, $parentObject, $propertyName, $fieldValue, $columnMap->getRelationTableMatchFields()));
 		return $query;
 	}
-	
+
 	/**
 	 * Builds and returns the constraint for multi value properties.
 	 *
 	 * @param Tx_Extbase_Persistence_QueryInterface $query
-	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $parentObject 
-	 * @param string $propertyName 
-	 * @param string $fieldValue 
-	 * @param array $relationTableMatchFields 
+	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $parentObject
+	 * @param string $propertyName
+	 * @param string $fieldValue
+	 * @param array $relationTableMatchFields
 	 * @return Tx_Extbase_Persistence_QOM_ConstraintInterface $constraint
 	 */
 	protected function getConstraint(Tx_Extbase_Persistence_QueryInterface $query, Tx_Extbase_DomainObject_DomainObjectInterface $parentObject, $propertyName, $fieldValue = '', $relationTableMatchFields = array()) {
@@ -401,8 +401,8 @@
 	/**
 	 * Builds and returns the source to build a join for a m:n relation.
 	 *
-	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $parentObject 
-	 * @param string $propertyName 
+	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $parentObject
+	 * @param string $propertyName
 	 * @return Tx_Extbase_Persistence_QOM_SourceInterface $source
 	 */
 	protected function getSource(Tx_Extbase_DomainObject_DomainObjectInterface $parentObject, $propertyName) {
@@ -419,13 +419,13 @@
 			);
 		return $source;
 	}
-	
+
 	/**
 	 * Returns the given result as property value of the specified property type.
 	 *
-	 * @param mixed $result The result could be an object or an ObjectStorage 
+	 * @param mixed $result The result could be an object or an ObjectStorage
 	 * @param array $propertyMetaData The property meta data
-	 * @param array $result The result 
+	 * @param array $result The result
 	 * @return void
 	 */
 	public function mapResultToPropertyValue(Tx_Extbase_DomainObject_DomainObjectInterface $parentObject, $propertyName, $result) {
@@ -462,7 +462,7 @@
 		}
 		return $propertyValue;
 	}
-	
+
 	/**
 	 * Counts the number of related objects assigned to a property of a parent object
 	 *
@@ -474,7 +474,7 @@
 		$query = $this->getPreparedQuery($parentObject, $propertyName, $fieldValue);
 		return $query->count();
 	}
-	
+
 	/**
 	 * Delegates the call to the Data Map.
 	 * Returns TRUE if the property is persistable (configured in $TCA)
@@ -490,7 +490,7 @@
 
 	/**
 	 * Returns a data map for a given class name
-	 * 
+	 *
 	 * @param string $className The class name you want to fetch the Data Map for
 	 * @return Tx_Extbase_Persistence_Mapper_DataMap The data map
 	 */
@@ -536,7 +536,7 @@
 		}
 		return Tx_Extbase_Utility_Extension::convertCamelCaseToLowerCaseUnderscored($propertyName);
 	}
-	
+
 	/**
 	 * Returns the type of a child object.
 	 *
Index: typo3/sysext/extbase/Classes/Persistence/Mapper/DataMap.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Mapper/DataMap.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Mapper/DataMap.php	(working copy)
@@ -30,7 +30,7 @@
  * @version $ID:$
  */
 class Tx_Extbase_Persistence_Mapper_DataMap {
-	
+
 	/**
 	 * The class name
 	 *
@@ -65,7 +65,7 @@
 	 * @var array
 	 **/
 	protected $columnMaps = array();
-		
+
 	/**
 	 * @var string
 	 **/
@@ -105,7 +105,7 @@
 	 * @var string
 	 **/
 	protected $disabledFlagColumnName;
-	
+
 	/**
 	 * @var string
 	 **/
@@ -176,7 +176,7 @@
 	public function getTableName() {
 		return $this->tableName;
 	}
-	
+
 	/**
 	 * Sets the record type
 	 *
@@ -195,7 +195,7 @@
 	public function getRecordType() {
 		return $this->recordType;
 	}
-	
+
 	/**
 	 * Sets the subclasses
 	 *
@@ -214,7 +214,7 @@
 	public function getSubclasses() {
 		return $this->subclasses;
 	}
-	
+
 	/**
 	 * Adds a given column map to the data map.
 	 *
@@ -224,7 +224,7 @@
 	public function addColumnMap(Tx_Extbase_Persistence_Mapper_ColumnMap $columnMap) {
 		$this->columnMaps[$columnMap->getPropertyName()] = $columnMap;
 	}
-	
+
 	/**
 	 * Returns the column map corresponding to the given property name.
 	 *
@@ -244,8 +244,8 @@
 	public function isPersistableProperty($propertyName) {
 		return isset($this->columnMaps[$propertyName]);
 	}
-	
-	
+
+
 	/**
 	 * Sets the name of a column holding the page id
 	 *
@@ -255,7 +255,7 @@
 	public function setPageIdColumnName($pageIdColumnName) {
 		$this->pageIdColumnName = $pageIdColumnName;
 	}
-	
+
 	/**
 	 * Sets the name of a column holding the page id
 	 *
@@ -264,7 +264,7 @@
 	public function getPageIdColumnName() {
 		return $this->pageIdColumnName;
 	}
-	
+
  	/**
  	 * Sets the name of a column holding the language id of the record
  	 *
@@ -274,7 +274,7 @@
  	public function setLanguageIdColumnName($languageIdColumnName) {
  		$this->languageIdColumnName = $languageIdColumnName;
  	}
-		
+
  	/**
  	 * Returns the name of a column holding the language id of the record.
  	 *
@@ -283,7 +283,7 @@
  	public function getLanguageIdColumnName() {
  		return $this->languageIdColumnName;
  	}
-	
+
  	/**
  	 * Sets the name of a column holding the the uid of the record which this record is a translation of.
  	 *
@@ -293,7 +293,7 @@
  	public function setTranslationOriginColumnName($translationOriginColumnName) {
  		$this->translationOriginColumnName = $translationOriginColumnName;
  	}
-		
+
  	/**
  	 * Returns the name of a column holding the the uid of the record which this record is a translation of.
  	 *
@@ -302,7 +302,7 @@
  	public function getTranslationOriginColumnName() {
  		return $this->translationOriginColumnName;
  	}
-	
+
 	/**
 	 * Sets the name of a column holding the timestamp the record was modified
 	 *
@@ -312,7 +312,7 @@
 	public function setModificationDateColumnName($modificationDateColumnName) {
 		$this->modificationDateColumnName = $modificationDateColumnName;
 	}
-	
+
 	/**
 	 * Returns the name of a column holding the timestamp the record was modified
 	 *
@@ -321,7 +321,7 @@
 	public function getModificationDateColumnName() {
 		return $this->modificationDateColumnName;
 	}
-	
+
 	/**
 	 * Sets the name of a column holding the creation date timestamp
 	 *
@@ -331,7 +331,7 @@
 	public function setCreationDateColumnName($creationDateColumnName) {
 		$this->creationDateColumnName = $creationDateColumnName;
 	}
-	
+
 	/**
 	 * Returns the name of a column holding the creation date timestamp
 	 *
@@ -340,7 +340,7 @@
 	public function getCreationDateColumnName() {
 		return $this->creationDateColumnName;
 	}
-	
+
 	/**
 	 * Sets the name of a column holding the uid of the back-end user who created this record
 	 *
@@ -369,7 +369,7 @@
 	public function setDeletedFlagColumnName($deletedFlagColumnName) {
 		$this->deletedFlagColumnName = $deletedFlagColumnName;
 	}
-	
+
 	/**
 	 * Returns the name of a column indicating the 'deleted' state of the row
 	 *
@@ -378,7 +378,7 @@
 	public function getDeletedFlagColumnName() {
 		return $this->deletedFlagColumnName;
 	}
-	
+
 	/**
 	 * Sets the name of a column indicating the 'hidden' state of the row
 	 *
@@ -388,7 +388,7 @@
 	public function setDisabledFlagColumnName($disabledFlagColumnName) {
 		$this->disabledFlagColumnName = $disabledFlagColumnName;
 	}
-	
+
 	/**
 	 * Returns the name of a column indicating the 'hidden' state of the row
 	 *
@@ -397,7 +397,7 @@
 	public function getDisabledFlagColumnName() {
 		return $this->disabledFlagColumnName;
 	}
-	
+
 	/**
 	 * Sets the name of a column holding the timestamp the record should not displayed before
 	 *
Index: typo3/sysext/extbase/Classes/Persistence/Manager.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Manager.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Manager.php	(working copy)
@@ -124,7 +124,7 @@
 	public function getRepositoryClassNames() {
 		return $this->repositoryClassNames;
 	}
-	
+
 	/**
 	 * Returns the number of records matching the query.
 	 *
Index: typo3/sysext/extbase/Classes/Persistence/QueryFactory.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/QueryFactory.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/QueryFactory.php	(working copy)
@@ -41,7 +41,7 @@
 		$persistenceManager = Tx_Extbase_Dispatcher::getPersistenceManager();
 
 		$reflectionService = $persistenceManager->getBackend()->getReflectionService();
-		
+
 		$dataMapFactory = t3lib_div::makeInstance('Tx_Extbase_Persistence_Mapper_DataMapFactory');
 		$dataMapFactory->injectReflectionService($reflectionService);
 
@@ -50,7 +50,7 @@
 		$dataMapper->injectSession($persistenceManager->getSession());
 		$dataMapper->injectReflectionService($reflectionService);
 		$dataMapper->injectDataMapFactory($dataMapFactory);
-		
+
 		$querySettings = t3lib_div::makeInstance('Tx_Extbase_Persistence_Typo3QuerySettings');
 
 		$query = t3lib_div::makeInstance('Tx_Extbase_Persistence_Query', $className);
Index: typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php	(working copy)
@@ -36,7 +36,7 @@
 
 	const OPERATOR_EQUAL_TO_NULL = 'operatorEqualToNull';
 	const OPERATOR_NOT_EQUAL_TO_NULL = 'operatorNotEqualToNull';
-	
+
 	/**
 	 * The TYPO3 database object
 	 *
@@ -193,7 +193,7 @@
 			return FALSE;
 		}
 	}
-	
+
 	protected function parseIdentifier(array $identifier) {
 		$fieldNames = array_keys($identifier);
 		$suffixedFieldNames = array();
@@ -202,7 +202,7 @@
 		}
 		return implode(' AND ', $suffixedFieldNames);
 	}
-	
+
 	/**
 	 * Returns the object data matching the $query.
 	 *
@@ -219,7 +219,7 @@
 			$parameters = $statement->getBoundVariables();
 		} else {
 			$parameters = array();
-			$statementParts = $this->parseQuery($query, $parameters);			
+			$statementParts = $this->parseQuery($query, $parameters);
 			$sql = $this->buildQuery($statementParts, $parameters);
 		}
 		$this->replacePlaceholders($sql, $parameters);
@@ -252,7 +252,7 @@
 		$rows = $this->getRowsFromResult($query->getSource(), $result);
 		return current(current($rows));
 	}
-		
+
 	/**
 	 * Parses the query and returns the SQL statement parts.
 	 *
@@ -271,7 +271,7 @@
 		$sql['limit'] = array();
 
 		$source = $query->getSource();
-		
+
 		$this->parseSource($source, $sql, $parameters);
 		$this->parseConstraint($query->getConstraint(), $source, $sql, $parameters);
 		$this->parseOrderings($query->getOrderings(), $source, $sql);
@@ -286,7 +286,7 @@
 
 		return $sql;
 	}
-	
+
 	/**
 	 * Returns the statement, ready to be executed.
 	 *
@@ -339,7 +339,7 @@
 
 		$tableName = $dataMap->getTableName();
 		$this->addEnableFieldsStatement($tableName, $sql);
-		
+
 		$statement = 'SELECT * FROM ' . $tableName;
 		$statement .= ' WHERE ' . implode(' AND ', $fields);
 		if (!empty($sql['additionalWhereClause'])) {
@@ -376,7 +376,7 @@
 			$this->parseJoin($source, $sql);
 		}
 	}
-	
+
 	/**
 	 * Adda a constrint to ensure that the record type of the returned tuples is matching the data type of the repository.
 	 *
@@ -432,7 +432,7 @@
 			$sql['fields'][$leftTableName] = $rightTableName . '.*';
 		}
 		$this->addRecordTypeConstraint($rightClassName, $sql);
-		
+
 		$sql['tables'][$leftTableName] = $leftTableName;
 		$sql['unions'][$rightTableName] = 'LEFT JOIN ' . $rightTableName;
 
@@ -461,13 +461,13 @@
 		if ($constraint instanceof Tx_Extbase_Persistence_QOM_AndInterface) {
 			$sql['where'][] = '(';
 			$this->parseConstraint($constraint->getConstraint1(), $source, $sql, $parameters);
-			$sql['where'][] = ' AND ';                                                      
+			$sql['where'][] = ' AND ';
 			$this->parseConstraint($constraint->getConstraint2(), $source, $sql, $parameters);
-			$sql['where'][] = ')';                                                          
-		} elseif ($constraint instanceof Tx_Extbase_Persistence_QOM_OrInterface) {          
-			$sql['where'][] = '(';                                                          
+			$sql['where'][] = ')';
+		} elseif ($constraint instanceof Tx_Extbase_Persistence_QOM_OrInterface) {
+			$sql['where'][] = '(';
 			$this->parseConstraint($constraint->getConstraint1(), $source, $sql, $parameters);
-			$sql['where'][] = ' OR ';                                                       
+			$sql['where'][] = ' OR ';
 			$this->parseConstraint($constraint->getConstraint2(), $source, $sql, $parameters);
 			$sql['where'][] = ')';
 		} elseif ($constraint instanceof Tx_Extbase_Persistence_QOM_NotInterface) {
@@ -497,7 +497,7 @@
 			// this else branch enables equals() to behave like in(). This behavior is deprecated and will be removed in future. Use in() instead.
 			$operator = Tx_Extbase_Persistence_QueryInterface::OPERATOR_IN;
 		}
-				
+
 		if ($operator === Tx_Extbase_Persistence_QueryInterface::OPERATOR_IN) {
 			$items = array();
 			$hasValue = FALSE;
@@ -559,7 +559,7 @@
 			$parameters[] = $this->getPlainValue($operand2);
 		}
 	}
-	
+
 	/**
 	 * Returns a plain value, i.e. objects are flattened out if possible.
 	 *
@@ -620,10 +620,10 @@
 				$constraintSQL .= $valueFunction . '(' . (!empty($tableName) ? $tableName . '.' : '') . $columnName .  ' ' . $operator . ' ?';
 			}
 
-			$sql['where'][] = $constraintSQL;			
+			$sql['where'][] = $constraintSQL;
 		}
 	}
-	
+
 	protected function addUnionStatement(&$className, &$tableName, &$propertyPath, array &$sql) {
 		$explodedPropertyPath = explode('.', $propertyPath, 2);
 		$propertyName = $explodedPropertyPath[0];
@@ -783,7 +783,7 @@
 			}
 		}
 	}
-	
+
 	/**
 	 * Builds the language field statement
 	 *
@@ -798,7 +798,7 @@
 			}
 		}
 	}
-	
+
 	/**
 	 * Builds the page ID checking statement
 	 *
@@ -890,8 +890,8 @@
 			}
 		}
 		return $rows;
-	} 
-	
+	}
+
 	/**
 	 * Performs workspace and language overlay on the given row array. The language and workspace id is automatically
 	 * detected (depending on FE or BE context). You can also explicitly set the language/workspace id.
@@ -987,7 +987,7 @@
 			// if disabled, return
 			return;
 		}
-		
+
 		$pageIdsToClear = array();
 		$storagePage = NULL;
 
@@ -1020,7 +1020,7 @@
 			}
 		}
 
-		// TODO check if we can hand this over to the Dispatcher to clear the page only once, this will save around 10% time while inserting and updating 
+		// TODO check if we can hand this over to the Dispatcher to clear the page only once, this will save around 10% time while inserting and updating
 		Tx_Extbase_Utility_Cache::clearPageCache($pageIdsToClear);
 	}
 }
Index: typo3/sysext/extbase/Classes/Persistence/Storage/BackendInterface.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Storage/BackendInterface.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Storage/BackendInterface.php	(working copy)
@@ -81,6 +81,6 @@
 	 * @api
 	 */
 	public function getObjectDataByQuery(Tx_Extbase_Persistence_QueryInterface $query);
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/Persistence/QOM/Constraint.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/QOM/Constraint.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/QOM/Constraint.php	(working copy)
@@ -33,7 +33,7 @@
  * @scope prototype
  */
 class Tx_Extbase_Persistence_QOM_Constraint implements Tx_Extbase_Persistence_QOM_ConstraintInterface {
-	
+
 }
 
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/Persistence/QOM/Selector.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/QOM/Selector.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/QOM/Selector.php	(working copy)
@@ -82,7 +82,7 @@
 	public function getSelectorName() {
 		return $this->selectorName;
 	}
-	
+
 }
 
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/Persistence/QOM/Statement.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/QOM/Statement.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/QOM/Statement.php	(working copy)
@@ -49,7 +49,7 @@
 	 * @var array
 	 */
 	protected $boundVariables = array();
-	
+
 	/**
 	 * @var string
 	 */
@@ -76,7 +76,7 @@
 	public function getStatement() {
 		return $this->statement;
 	}
-	
+
 	/**
 	 * Gets the bound variables
 	 *
@@ -85,7 +85,7 @@
 	public function getBoundVariables() {
 		return $this->boundVariables;
 	}
-	
+
 	/**
 	 * Gets the language.
 	 *
Index: typo3/sysext/extbase/Classes/Persistence/QOM/QueryObjectModelFactory.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/QOM/QueryObjectModelFactory.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/QOM/QueryObjectModelFactory.php	(working copy)
@@ -87,7 +87,7 @@
 		}
 		return t3lib_div::makeInstance('Tx_Extbase_Persistence_QOM_Selector', $selectorName, $nodeTypeName);
 	}
-	
+
 	/**
 	 * Sets a statement as constraint. This is not part of the JCR 2.0 Specification!
 	 *
@@ -162,7 +162,7 @@
 	public function not(Tx_Extbase_Persistence_QOM_ConstraintInterface $constraint) {
 		return t3lib_div::makeInstance('Tx_Extbase_Persistence_QOM_LogicalNot', $constraint);
 	}
-	
+
 	/**
 	 * Filters node-tuples based on the outcome of a binary operation.
 	 *
@@ -175,7 +175,7 @@
 	public function comparison(Tx_Extbase_Persistence_QOM_DynamicOperandInterface $operand1, $operator, $operand2) {
 		return t3lib_div::makeInstance('Tx_Extbase_Persistence_QOM_Comparison', $operand1, $operator, $operand2);
 	}
-	
+
 	/**
 	 * Evaluates to the value (or values, if multi-valued) of a property in the specified or default selector.
 	 *
@@ -187,7 +187,7 @@
 	public function propertyValue($propertyName, $selectorName = '') {
 		return t3lib_div::makeInstance('Tx_Extbase_Persistence_QOM_PropertyValue', $propertyName, $selectorName);
 	}
-	
+
 	/**
 	 * Evaluates to the lower-case string value (or values, if multi-valued) of an operand.
 	 *
@@ -209,7 +209,7 @@
 	public function upperCase(Tx_Extbase_Persistence_QOM_DynamicOperandInterface $operand) {
 		return t3lib_div::makeInstance('Tx_Extbase_Persistence_QOM_UpperCase', $operand);
 	}
-	
+
 	/**
 	 * Orders by the value of the specified operand, in ascending order.
 	 *
@@ -235,7 +235,7 @@
 	public function descending(Tx_Extbase_Persistence_QOM_DynamicOperandInterface $operand) {
 		return t3lib_div::makeInstance('Tx_Extbase_Persistence_QOM_Ordering', $operand, Tx_Extbase_Persistence_QOM_QueryObjectModelConstantsInterface::JCR_ORDER_DESCENDING);
 	}
-	
+
 	/**
 	 * Evaluates to the value of a bind variable.
 	 *
@@ -246,6 +246,6 @@
 	public function bindVariable($bindVariableName) {
 		return t3lib_div::makeInstance('Tx_Extbase_Persistence_QOM_BindVariableValue', $bindVariableName);
 	}
-	
+
 }
 ?>
Index: typo3/sysext/extbase/Classes/Persistence/Typo3QuerySettings.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Typo3QuerySettings.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Typo3QuerySettings.php	(working copy)
@@ -101,7 +101,7 @@
 	public function getRespectSysLanguage() {
 		return $this->respectSysLanguage;
 	}
-	
+
 	/**
 	 * Sets the flag if the visibility in the frontend should be respected.
 	 *
@@ -122,7 +122,7 @@
 	public function getRespectEnableFields() {
 		return $this->respectEnableFields;
 	}
-	
+
 	/**
 	 * Sets the state, if the QueryResult should be returned unmapped.
 	 *
@@ -132,7 +132,7 @@
 	public function setReturnRawQueryResult($returnRawQueryResult) {
 		$this->returnRawQueryResult = $returnRawQueryResult;
 	}
-	
+
 	/**
 	 * Returns the state, if the QueryResult should be returned unmapped.
 	 *
@@ -140,7 +140,7 @@
 	 */
 	public function getReturnRawQueryResult() {
 		return $this->returnRawQueryResult;
-	}	
+	}
 
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/Persistence/Query.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Query.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Query.php	(working copy)
@@ -137,7 +137,7 @@
 
 	/**
 	 * Returns the Query Settings.
-	 * 
+	 *
 	 * @return Tx_Extbase_Persistence_QuerySettingsInterface $querySettings The Query Settings
 	 * @api This method is not part of FLOW3 API
 	 */
@@ -164,7 +164,7 @@
 	public function setSource(Tx_Extbase_Persistence_QOM_SourceInterface $source) {
 		$this->source = $source;
 	}
-	
+
 	/**
 	 * Returns the selectorn name or an empty string, if the source is not a selector
 	 * // TODO This has to be checked at another place
@@ -204,7 +204,7 @@
 			return $this->dataMapper->map($this->getType(), $rows);
 		}
 	}
-	
+
 	/**
 	 * Executes the number of matching objects for the query
 	 *
@@ -214,7 +214,7 @@
 	public function count() {
 		return $this->persistenceManager->getObjectCountByQuery($this);
 	}
-	
+
 	/**
 	 * Sets the property names to order the result by. Expected like this:
 	 * array(
@@ -231,7 +231,7 @@
 		$this->orderings = $orderings;
 		return $this;
 	}
-	
+
 	/**
 	 * Returns the property names to order the result by. Like this:
 	 * array(
@@ -293,7 +293,7 @@
 	public function getOffset() {
 		return $this->offset;
 	}
-	
+
 	/**
 	 * The constraint used to limit the result set. Returns $this to allow
 	 * for chaining (fluid interface)
@@ -319,7 +319,7 @@
 		$this->statement = $this->qomFactory->statement($statement, $parameters);
 		return $this;
 	}
-	
+
 	/**
 	 * Returns the statement of this query.
 	 *
@@ -328,7 +328,7 @@
 	public function getStatement() {
 		return $this->statement;
 	}
-	
+
 	/**
 	 * Gets the constraint for this query.
 	 *
@@ -366,7 +366,7 @@
 		}
 		return $resultingConstraint;
 	}
-	
+
 	/**
 	 * Performs a logical disjunction of the two given constraints
 	 *
@@ -465,7 +465,7 @@
 			$operand
 			);
 	}
-	
+
 	/**
 	 * Returns a "contains" criterion used for matching objects against a query.
 	 * It matches if the multivalued property contains the given operand.
@@ -496,7 +496,7 @@
 		if (!is_array($operand) && (!$operand instanceof ArrayAccess) && (!$operand instanceof Traversable)) {
 			throw new Tx_Extbase_Persistence_Exception_UnexpectedTypeException('The "in" operator must be given a mutlivalued operand (array, ArrayAccess, Traversable).', 1264678095);
 		}
-		
+
 		return $this->qomFactory->comparison(
 			$this->qomFactory->propertyValue($propertyName, $this->getSelectorName()),
 			Tx_Extbase_Persistence_QueryInterface::OPERATOR_IN,
@@ -567,6 +567,6 @@
 			$operand
 			);
 	}
-		
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php	(working copy)
@@ -48,6 +48,6 @@
 	 * @return boolean
 	 */
 	public function _isDirty();
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedMethod.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedMethod.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedMethod.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObject.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObject.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObject.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedRelation.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedRelation.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedRelation.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/Exception/MissingBackend.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Exception/MissingBackend.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Exception/MissingBackend.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/Exception/UnexpectedTypeException.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Exception/UnexpectedTypeException.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Exception/UnexpectedTypeException.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedOrder.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedOrder.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedOrder.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/Exception/CleanStateNotMemorized.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Exception/CleanStateNotMemorized.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Exception/CleanStateNotMemorized.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/Exception/InvalidNumberOfConstraints.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Exception/InvalidNumberOfConstraints.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Exception/InvalidNumberOfConstraints.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/Exception/InvalidPropertyType.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Exception/InvalidPropertyType.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Exception/InvalidPropertyType.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/Exception/InvalidClass.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Exception/InvalidClass.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Exception/InvalidClass.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/Exception/TooDirty.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/Exception/TooDirty.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/Exception/TooDirty.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Persistence/LazyObjectStorage.php
===================================================================
--- typo3/sysext/extbase/Classes/Persistence/LazyObjectStorage.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Persistence/LazyObjectStorage.php	(working copy)
@@ -70,7 +70,7 @@
 	public function isInitialized() {
 		return $this->isInitialized;
 	}
-	
+
 	/**
 	 * Constructs this proxy instance.
 	 *
@@ -83,9 +83,9 @@
 		$this->propertyName = $propertyName;
 		$this->fieldValue = $fieldValue;
 	}
-	
+
 	/**
-	 * This is a function lazy load implementation. 
+	 * This is a function lazy load implementation.
 	 *
 	 * @return void
 	 */
@@ -101,7 +101,7 @@
 			$this->parentObject->_memorizeCleanState($this->propertyName);
 		}
 	}
-		
+
 	// Delegation to the ObjectStorage methods below
 
 	/**
@@ -141,7 +141,7 @@
 			$numberOfElements = $dataMapper->countRelated($this->parentObject, $this->propertyName, $this->fieldValue);
 		} else {
 			$this->initialize();
-			$numberOfElements = count($this->storage);			
+			$numberOfElements = count($this->storage);
 		}
 		if (is_null($numberOfElements)) {
 			throw new Tx_Extbase_Persistence_Exception('The number of elements could not be determined.', 1252514486);
@@ -236,7 +236,7 @@
 		$this->initialize();
 		return parent::valid();
 	}
-	
+
 	/**
 	 * @see Tx_Extbase_Persistence_ObjectStorage::toArray
 	 */
@@ -244,6 +244,6 @@
 		$this->initialize();
 		return parent::toArray();
 	}
-		
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
===================================================================
--- typo3/sysext/extbase/Classes/Reflection/ClassSchema.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Reflection/ClassSchema.php	(working copy)
@@ -38,7 +38,7 @@
 	 */
 	const MODELTYPE_ENTITY = 1;
 	const MODELTYPE_VALUEOBJECT = 2;
-	
+
 	/**
 	 * Name of the class this schema is referring to
 	 *
Index: typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php
===================================================================
--- typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php	(working copy)
@@ -177,7 +177,7 @@
 		}
 		return $properties;
 	}
-	
+
 	/**
 	 * Tells if the value of the specified property can be retrieved by this Object Accessor.
 	 *
Index: typo3/sysext/extbase/Classes/Property/Exception/InvalidSource.php
===================================================================
--- typo3/sysext/extbase/Classes/Property/Exception/InvalidSource.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Property/Exception/InvalidSource.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Property/Exception/FormatNotSupported.php
===================================================================
--- typo3/sysext/extbase/Classes/Property/Exception/FormatNotSupported.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Property/Exception/FormatNotSupported.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Property/Exception/InvalidDataType.php
===================================================================
--- typo3/sysext/extbase/Classes/Property/Exception/InvalidDataType.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Property/Exception/InvalidDataType.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Property/Exception/InvalidProperty.php
===================================================================
--- typo3/sysext/extbase/Classes/Property/Exception/InvalidProperty.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Property/Exception/InvalidProperty.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Property/Exception/InvalidTarget.php
===================================================================
--- typo3/sysext/extbase/Classes/Property/Exception/InvalidTarget.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Property/Exception/InvalidTarget.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Property/Exception/InvalidFormat.php
===================================================================
--- typo3/sysext/extbase/Classes/Property/Exception/InvalidFormat.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Property/Exception/InvalidFormat.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Classes/Dispatcher.php
===================================================================
--- typo3/sysext/extbase/Classes/Dispatcher.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Dispatcher.php	(working copy)
@@ -103,7 +103,7 @@
 			t3lib_div::sysLog('Extbase was not able to dispatch the request. No configuration.', 'extbase', t3lib_div::SYSLOG_SEVERITY_ERROR);
 			return $content;
 		}
-		
+
 		$this->initializeConfigurationManagerAndFrameworkConfiguration($configuration);
 
 		$requestBuilder = t3lib_div::makeInstance('Tx_Extbase_MVC_Web_RequestBuilder');
@@ -143,7 +143,7 @@
 		$this->timeTrackPull();
 
 		self::$reflectionService->shutdown();
-		
+
 		if (count($response->getAdditionalHeaderData()) > 0) {
 			$GLOBALS['TSFE']->additionalHeaderData[$request->getControllerExtensionName()] = implode("\n", $response->getAdditionalHeaderData());
 		}
@@ -229,7 +229,7 @@
 		$propertyMapper = t3lib_div::makeInstance('Tx_Extbase_Property_Mapper');
 		$propertyMapper->injectReflectionService(self::$reflectionService);
 		$controller->injectPropertyMapper($propertyMapper);
-		
+
 		$controller->injectSettings(is_array(self::$extbaseFrameworkConfiguration['settings']) ? self::$extbaseFrameworkConfiguration['settings'] : array());
 
 		$flashMessageContainer = t3lib_div::makeInstance('Tx_Extbase_MVC_Controller_FlashMessages'); // singleton
@@ -264,12 +264,12 @@
 			$dataMapper->injectSession($persistenceSession);
 			$dataMapper->injectReflectionService(self::$reflectionService);
 			$dataMapper->injectDataMapFactory($dataMapFactory);
-			
+
 			$storageBackend = t3lib_div::makeInstance('Tx_Extbase_Persistence_Storage_Typo3DbBackend', $GLOBALS['TYPO3_DB']); // singleton
 			$storageBackend->injectDataMapper($dataMapper);
 
 			$qomFactory = t3lib_div::makeInstance('Tx_Extbase_Persistence_QOM_QueryObjectModelFactory', $storageBackend);
-			
+
 			$dataMapper->setQomFactory($qomFactory);
 
 			$persistenceBackend = t3lib_div::makeInstance('Tx_Extbase_Persistence_Backend', $persistenceSession, $storageBackend); // singleton
Index: typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php
===================================================================
--- typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php	(revision 8132)
+++ typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php	(working copy)
@@ -77,7 +77,7 @@
 			$extbaseConfiguration = Tx_Extbase_Utility_TypoScript::convertTypoScriptArrayToPlainArray($extbaseConfiguration);
 			$frameworkConfiguration = t3lib_div::array_merge_recursive_overrule($frameworkConfiguration, $extbaseConfiguration);
 		}
-		
+
 		if (isset($pluginConfiguration['settings'])) {
 			$pluginConfiguration = $this->resolveTyposcriptReference($pluginConfiguration, 'settings');
 		}
Index: typo3/sysext/extbase/ext_tables.php
===================================================================
--- typo3/sysext/extbase/ext_tables.php	(revision 8132)
+++ typo3/sysext/extbase/ext_tables.php	(working copy)
@@ -18,7 +18,7 @@
 	}
 
 	$TBE_MODULES['_dispatcher'][] = 'Tx_Extbase_Dispatcher';
-	
+
 }
 
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['extbase'][] = 'tx_extbase_utility_extbaserequirementscheck';
Index: typo3/sysext/extbase/Tests/DomainObject/AbstractEntity_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/DomainObject/AbstractEntity_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/DomainObject/AbstractEntity_testcase.php	(working copy)
@@ -37,7 +37,7 @@
 		$domainObject->foo = 'Test';
 		$domainObject->bar = 'It is raining outside';
 		$domainObject->_memorizeCleanState();
-		
+
 		$this->assertFalse($domainObject->_isDirty());
 	}
 
@@ -94,8 +94,8 @@
 		}');
 		$secondDomainObject = new $secondDomainObjectName;
 		$secondDomainObject->_memorizeCleanState();
-		
 
+
 		$domainObject = new $domainObjectName();
 		$domainObject->foo = $secondDomainObject;
 		$domainObject->bar = 'It is raining outside';
Index: typo3/sysext/extbase/Tests/Persistence/Query_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Persistence/Query_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Persistence/Query_testcase.php	(working copy)
@@ -23,10 +23,10 @@
 ***************************************************************/
 
 class Tx_Extbase_Persistence_Query_testcase extends Tx_Extbase_BaseTestCase {
-	
+
 	public function setUp() {
 	}
-	
+
 	/**
 	 * @test
 	 * @expectedException InvalidArgumentException
@@ -62,6 +62,6 @@
 		$query = new Tx_Extbase_Persistence_Query('Foo_Class_Name');
 		$query->setOffset(-1);
 	}
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Tests/Persistence/ObjectStorage_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Persistence/ObjectStorage_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Persistence/ObjectStorage_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -26,7 +26,7 @@
 ***************************************************************/
 
 class Tx_Extbase_Persistence_ObjectStorage_testcase extends Tx_Extbase_BaseTestCase {
-	
+
 	/**
 	 * @test
 	 */
@@ -39,7 +39,7 @@
 		$this->assertEquals($objectStorage[$object1], NULL);
 		$this->assertEquals($objectStorage[$object2], 'foo');
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -55,7 +55,7 @@
 		$objectStorage->detach($object2);
 		$this->assertEquals(count($objectStorage), 0);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -68,7 +68,7 @@
 		$objectStorage[$object2] = 'bar';
 		$this->assertEquals(count($objectStorage), 2);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -84,7 +84,7 @@
 		$objectStorage->offsetUnset($object1);
 		$this->assertEquals(count($objectStorage), 0);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -97,7 +97,7 @@
 		$this->assertEquals($objectStorage->offsetGet($object1), 'foo');
 		$this->assertEquals($objectStorage->offsetGet($object2), NULL);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -109,7 +109,7 @@
 		$this->assertEquals($objectStorage->offsetExists($object1), TRUE);
 		$this->assertEquals($objectStorage->offsetExists($object2), FALSE);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -128,7 +128,7 @@
 		$objectStorage->next();
 		$this->assertEquals($objectStorage->getInfo(), array('bar', 'baz'));
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -145,7 +145,7 @@
 		$this->assertEquals($objectStorage[$object1], 42);
 		$this->assertEquals($objectStorage[$object2], 'bar');
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -178,7 +178,7 @@
 		$this->assertEquals($objectStorageB[$object2], 'baz');
 	}
 
-	
+
 	/**
 	 * @test
 	 */
Index: typo3/sysext/extbase/Tests/Persistence/Storage/Typo3DbBackend_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Persistence/Storage/Typo3DbBackend_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Persistence/Storage/Typo3DbBackend_testcase.php	(working copy)
@@ -26,7 +26,7 @@
  ***************************************************************/
 
 class Tx_Extbase_Persistence_Storage_Typo3DbBackend_testcase extends Tx_Extbase_BaseTestCase {
-	
+
 	/**
 	 * This is the data provider for the statement generation with a basic comparison
 	 *
@@ -54,20 +54,20 @@
 				Tx_Extbase_Persistence_QueryInterface::OPERATOR_GREATER_THAN_OR_EQUAL_TO,
 				"SELECT table_name_from_selector.* FROM table_name_from_selector WHERE table_name_from_property.foo >= 'baz'"
 				),
-			
+
 			);
 	}
 
 	/**
 	 * @test
-	 */	
+	 */
 	public function getStatementWorksWithMinimalisticQueryObjectModel() {
 		$this->markTestIncomplete();
 	}
 
 	/**
 	 * @test
-	 */	
+	 */
 	public function getStatementWorksWithBasicEqualsCondition() {
 		$this->markTestIncomplete();
 	}
@@ -75,7 +75,7 @@
 	/**
 	 * @test
 	 * @expectedException Tx_Extbase_Persistence_Storage_Exception_BadConstraint
-	 */	
+	 */
 	public function countRowsWithStatementConstraintResultsInAnException() {
 		$this->markTestIncomplete();
 	}
@@ -97,13 +97,13 @@
 		$mockDataMapper = $this->getMock('Tx_Extbase_Persistence_Mapper_DataMapper', array('convertPropertyNameToColumnName', 'convertClassNameToTableName'), array(), '', FALSE);
 		$mockDataMapper->expects($this->once())->method('convertClassNameToTableName')->with('Tx_MyExt_ClassName')->will($this->returnValue('tx_myext_tablename'));
 		$mockDataMapper->expects($this->once())->method('convertPropertyNameToColumnName')->with('fooProperty', 'Tx_MyExt_ClassName')->will($this->returnValue('converted_fieldname'));
-		
+
 		$sql = array();
 		$orderings = array('fooProperty' => Tx_Extbase_Persistence_QOM_QueryObjectModelConstantsInterface::JCR_ORDER_ASCENDING);
-		$mockTypo3DbBackend = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Storage_Typo3DbBackend'), array('parserOrderings'), array(), '', FALSE);		
+		$mockTypo3DbBackend = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Storage_Typo3DbBackend'), array('parserOrderings'), array(), '', FALSE);
 		$mockTypo3DbBackend->_set('dataMapper', $mockDataMapper);
 		$mockTypo3DbBackend->_callRef('parseOrderings', $orderings, $mockSource, $sql);
-			
+
 		$expecedSql = array('orderings' => array('tx_myext_tablename.converted_fieldname ASC'));
 		$this->assertSame($expecedSql, $sql);
 	}
@@ -119,10 +119,10 @@
 		$mockDataMapper = $this->getMock('Tx_Extbase_Persistence_Mapper_DataMapper', array('convertPropertyNameToColumnName', 'convertClassNameToTableName'), array(), '', FALSE);
 		$mockDataMapper->expects($this->never())->method('convertClassNameToTableName');
 		$mockDataMapper->expects($this->never())->method('convertPropertyNameToColumnName');
-		
+
 		$sql = array();
 		$orderings = array('fooProperty' => 'unsupported_order');
-		$mockTypo3DbBackend = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Storage_Typo3DbBackend'), array('parserOrderings'), array(), '', FALSE);		
+		$mockTypo3DbBackend = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Storage_Typo3DbBackend'), array('parserOrderings'), array(), '', FALSE);
 		$mockTypo3DbBackend->_set('dataMapper', $mockDataMapper);
 		$mockTypo3DbBackend->_callRef('parseOrderings', $orderings, $mockSource, $sql);
 	}
@@ -137,19 +137,19 @@
 		$mockDataMapper = $this->getMock('Tx_Extbase_Persistence_Mapper_DataMapper', array('convertPropertyNameToColumnName', 'convertClassNameToTableName'), array(), '', FALSE);
 		$mockDataMapper->expects($this->any())->method('convertClassNameToTableName')->with('Tx_MyExt_ClassName')->will($this->returnValue('tx_myext_tablename'));
 		$mockDataMapper->expects($this->any())->method('convertPropertyNameToColumnName')->will($this->returnValue('converted_fieldname'));
-		
+
 		$sql = array();
 		$orderings = array(
 			'fooProperty' => Tx_Extbase_Persistence_QOM_QueryObjectModelConstantsInterface::JCR_ORDER_ASCENDING,
 			'barProperty' => Tx_Extbase_Persistence_QOM_QueryObjectModelConstantsInterface::JCR_ORDER_DESCENDING
 			);
-		$mockTypo3DbBackend = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Storage_Typo3DbBackend'), array('parserOrderings'), array(), '', FALSE);		
+		$mockTypo3DbBackend = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Storage_Typo3DbBackend'), array('parserOrderings'), array(), '', FALSE);
 		$mockTypo3DbBackend->_set('dataMapper', $mockDataMapper);
 		$mockTypo3DbBackend->_callRef('parseOrderings', $orderings, $mockSource, $sql);
-			
+
 		$expecedSql = array('orderings' => array('tx_myext_tablename.converted_fieldname ASC', 'tx_myext_tablename.converted_fieldname DESC'));
 		$this->assertSame($expecedSql, $sql);
 	}
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Tests/Persistence/Mapper/DataMapFactory_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Persistence/Mapper/DataMapFactory_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Persistence/Mapper/DataMapFactory_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -28,7 +28,7 @@
 require_once(PATH_tslib . 'class.tslib_content.php');
 
 class Tx_Extbase_Persistence_Mapper_DataMapFactory_testcase extends Tx_Extbase_BaseTestCase {
-			
+
 	/**
 	 * @test
 	 */
@@ -49,7 +49,7 @@
 		$mockDataMapFactory->expects($this->never())->method('setManyToManyRelation');
 		$mockDataMapFactory->_callRef('setRelations', $mockColumnMap, $columnConfiguration, $propertyMetaData);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -70,7 +70,7 @@
 		$mockDataMapFactory->expects($this->once())->method('setManyToManyRelation');
 		$mockDataMapFactory->_callRef('setRelations', $mockColumnMap, $columnConfiguration, $propertyMetaData);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -92,7 +92,7 @@
 		$mockDataMapFactory->expects($this->never())->method('setManyToManyRelation');
 		$mockDataMapFactory->_callRef('setRelations', $mockColumnMap, $columnConfiguration, $propertyMetaData);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -113,7 +113,7 @@
 		$mockDataMapFactory->expects($this->once())->method('setManyToManyRelation');
 		$mockDataMapFactory->_callRef('setRelations', $mockColumnMap, $columnConfiguration, $propertyMetaData);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -134,7 +134,7 @@
 		$mockDataMapFactory->expects($this->once())->method('setManyToManyRelation');
 		$mockDataMapFactory->_callRef('setRelations', $mockColumnMap, $columnConfiguration, $propertyMetaData);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -156,7 +156,7 @@
 		$mockDataMapFactory->expects($this->once())->method('setManyToManyRelation');
 		$mockDataMapFactory->_callRef('setRelations', $mockColumnMap, $columnConfiguration, $propertyMetaData);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -180,11 +180,11 @@
 		$mockColumnMap->expects($this->never())->method('setParentTableFieldName');
 		$mockColumnMap->expects($this->never())->method('setRelationTableMatchFields');
 		$mockColumnMap->expects($this->never())->method('setRelationTableInsertFields');
-		
+
 		$mockDataMapFactory = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Mapper_DataMapFactory'), array('dummy'), array(), '', FALSE);
 		$mockDataMapFactory->_callRef('setManyToManyRelation', $mockColumnMap, $leftColumnsDefinition['rights']);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -197,7 +197,7 @@
 				'MM_opposite_field' => 'rights'
 				),
 			);
-		$leftColumnsDefinition['rights']['MM_opposite_field'] = 'opposite_field';		
+		$leftColumnsDefinition['rights']['MM_opposite_field'] = 'opposite_field';
 		$mockColumnMap = $this->getMock('Tx_Extbase_Persistence_Mapper_ColumnMap', array(), array(), '', FALSE);
 		$mockColumnMap->expects($this->once())->method('setTypeOfRelation')->with($this->equalTo(Tx_Extbase_Persistence_Mapper_ColumnMap::RELATION_HAS_AND_BELONGS_TO_MANY));
 		$mockColumnMap->expects($this->once())->method('setRelationTableName')->with($this->equalTo('tx_myextension_mm'));
@@ -208,11 +208,11 @@
 		$mockColumnMap->expects($this->never())->method('setParentTableFieldName');
 		$mockColumnMap->expects($this->never())->method('setRelationTableMatchFields');
 		$mockColumnMap->expects($this->never())->method('setRelationTableInsertFields');
-		
+
 		$mockDataMapFactory = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Mapper_DataMapFactory'), array('dummy'), array(), '', FALSE);
 		$mockDataMapFactory->_callRef('setManyToManyRelation', $mockColumnMap, $rightColumnsDefinition['lefts']);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -235,7 +235,7 @@
 		$mockColumnMap->expects($this->never())->method('setParentTableFieldName');
 		$mockColumnMap->expects($this->never())->method('setRelationTableMatchFields');
 		$mockColumnMap->expects($this->never())->method('setRelationTableInsertFields');
-		
+
 		$mockDataMapFactory = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Mapper_DataMapFactory'), array('getColumnsDefinition'), array(), '', FALSE);
 		$mockDataMapFactory->expects($this->never())->method('getColumnsDefinition');
 		$mockDataMapFactory->_callRef('setManyToManyRelation', $mockColumnMap, $leftColumnsDefinition['rights']);
@@ -281,12 +281,12 @@
 		$mockColumnMap->expects($this->never())->method('setParentTableFieldName');
 		$mockColumnMap->expects($this->never())->method('setRelationTableMatchFields');
 		$mockColumnMap->expects($this->never())->method('setRelationTableInsertFields');
-		
+
 		$mockDataMapFactory = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Mapper_DataMapFactory'), array('getColumnsDefinition'), array(), '', FALSE);
 		$mockDataMapFactory->expects($this->once())->method('getColumnsDefinition')->with($this->equalTo('tx_myextension_mm'))->will($this->returnValue($relationTableColumnsDefiniton));
 		$mockDataMapFactory->_callRef('setManyToManyRelation', $mockColumnMap, $leftColumnsDefinition['rights']);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -303,12 +303,12 @@
 		$mockColumnMap->expects($this->once())->method('setRelationTableName')->with($this->equalTo('tx_myextension_mm'));
 		$mockColumnMap->expects($this->once())->method('getRelationTableName')->will($this->returnValue('tx_myextension_mm'));
 		$mockColumnMap->expects($this->never())->method('setrelationTablePageIdColumnName');
-		
+
 		$mockDataMapFactory = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Mapper_DataMapFactory'), array('getControlSection'), array(), '', FALSE);
 		$mockDataMapFactory->expects($this->once())->method('getControlSection')->with($this->equalTo('tx_myextension_mm'))->will($this->returnValue(NULL));
 		$mockDataMapFactory->_callRef('setManyToManyRelation', $mockColumnMap, $leftColumnsDefinition['rights']);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -325,12 +325,12 @@
 		$mockColumnMap->expects($this->once())->method('setRelationTableName')->with($this->equalTo('tx_myextension_mm'));
 		$mockColumnMap->expects($this->once())->method('getRelationTableName')->will($this->returnValue('tx_myextension_mm'));
 		$mockColumnMap->expects($this->once())->method('setrelationTablePageIdColumnName')->with($this->equalTo('pid'));
-		
+
 		$mockDataMapFactory = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Mapper_DataMapFactory'), array('getControlSection'), array(), '', FALSE);
 		$mockDataMapFactory->expects($this->once())->method('getControlSection')->with($this->equalTo('tx_myextension_mm'))->will($this->returnValue(array('ctrl' => array('foo' => 'bar'))));
 		$mockDataMapFactory->_callRef('setManyToManyRelation', $mockColumnMap, $leftColumnsDefinition['rights']);
 	}
-	
+
 	/**
 	 * @test
 	 * @expectedException Tx_Extbase_Persistence_Exception_InvalidClass
@@ -339,6 +339,6 @@
 		$mockDataMapFactory = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Persistence_Mapper_DataMapFactory'), array('getControlSection'), array(), '', FALSE);
 		$mockDataMapFactory->buildDataMap('UnknownObject');
 	}
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Tests/MVC/Controller/AbstractController_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/MVC/Controller/AbstractController_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/MVC/Controller/AbstractController_testcase.php	(working copy)
@@ -127,7 +127,7 @@
 		$controller->_set('request', $mockRequest);
 		$actualResult = $controller->_call('addBaseUriIfNecessary', 'bar/baz/boom.html');
 		$expectedResult = 'http://www.example.com/foo/bar/baz/boom.html';
-		
+
 		$this->assertEquals($expectedResult, $actualResult);
 	}
 
@@ -142,7 +142,7 @@
 		$controller->_set('request', $mockRequest);
 		$actualResult = $controller->_call('addBaseUriIfNecessary', 'http://www.example.com/foo/bar/baz/boom.html');
 		$expectedResult = 'http://www.example.com/foo/bar/baz/boom.html';
-		
+
 		$this->assertEquals($expectedResult, $actualResult);
 	}
 
@@ -177,15 +177,15 @@
 		$mockArgumentFoo = $this->getMock('Tx_Extbase_MVC_Controller_Argument', array(), array('foo'), '', FALSE);
 		$mockArgumentFoo->expects($this->once())->method('getDataType')->will($this->returnValue('FooType'));
 		$mockArgumentFoo->expects($this->once())->method('setValidator')->with($mockValidators['foo']);
-		
+
 		$mockArgumentBar = $this->getMock('Tx_Extbase_MVC_Controller_Argument', array(), array('bar'), '', FALSE);
 		$mockArgumentBar->expects($this->once())->method('getDataType')->will($this->returnValue('BarType'));
 		$mockArgumentBar->expects($this->never())->method('setValidator');
-		
+
 		$mockArguments = new Tx_Extbase_MVC_Controller_Arguments();
 		$mockArguments->addArgument($mockArgumentFoo);
 		$mockArguments->addArgument($mockArgumentBar);
-		
+
 		$controller = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_MVC_Controller_AbstractController'), array('dummy'), array(), '', FALSE);
 		$controller->_set('arguments', $mockArguments);
 		$controller->injectValidatorResolver($mockValidatorResolver);
Index: typo3/sysext/extbase/Tests/MVC/Controller/ActionController_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/MVC/Controller/ActionController_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/MVC/Controller/ActionController_testcase.php	(working copy)
@@ -201,7 +201,7 @@
 		$mockRequest->expects($this->once())->method('getFormat')->will($this->returnValue('MyFormat'));
 
 		$mockObjectManager = $this->getMock('Tx_Extbase_Object_ManagerInterface', array(), array(), '', FALSE);
-		
+
 		$mockController = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_MVC_Controller_ActionController'), array('dummy'), array(), '', FALSE);
 		$mockController->_set('request', $mockRequest);
 		$mockController->_set('objectManager', $mockObjectManager);
@@ -573,25 +573,25 @@
 		$argument1Origin = Tx_Extbase_MVC_Controller_Argument::ORIGIN_PERSISTENCE_AND_MODIFIED;
 		$argument2Origin = Tx_Extbase_MVC_Controller_Argument::ORIGIN_PERSISTENCE;
 		$methodTagsValues = array();
-		
+
 		$mockRequest = $this->getMock('Tx_Extbase_MVC_Web_Request', array('isHmacVerified'), array(), '', FALSE);
 		$mockRequest->expects($this->once())->method('isHmacVerified')->will($this->returnValue($hmacVerified));
-		
+
 		$argument1 = $this->getMock('Tx_Extbase_MVC_Controller_Argument', array('getOrigin'), array(), '', FALSE);
 		$argument1->expects($this->any())->method('getOrigin')->will($this->returnValue($argument1Origin));
 		$argument2 = $this->getMock('Tx_Extbase_MVC_Controller_Argument', array('getOrigin'), array(), '', FALSE);
 		$argument2->expects($this->any())->method('getOrigin')->will($this->returnValue($argument2Origin));
-		
+
 		$mockController = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_MVC_Controller_ActionController'), array('dummy'), array(), '', FALSE);
-		
+
 		$mockReflectionService = $this->getMock('Tx_Extbase_Reflection_Service', array('getMethodTagsValues'), array(), '', FALSE);
 		$mockReflectionService->expects($this->any())->method('getMethodTagsValues')->with(get_class($mockController), 'fooAction')->will($this->returnValue($methodTagsValues));
-		
+
 		$mockController->_set('arguments', array($argument1, $argument2));
 		$mockController->_set('request', $mockRequest);
 		$mockController->_set('actionMethodName', 'fooAction');
 		$mockController->injectReflectionService($mockReflectionService);
-		
+
 		$mockController->_call('checkRequestHash');
 	}
 
Index: typo3/sysext/extbase/Tests/MVC/Controller/Arguments_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/MVC/Controller/Arguments_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/MVC/Controller/Arguments_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -71,7 +71,7 @@
 		$mockArgument = $this->getMock('Tx_Extbase_MVC_Controller_Argument', array(), array(), '', FALSE);
 		$mockArguments = $this->getMock('Tx_Extbase_MVC_Controller_Arguments', array('createArgument'));
 		$mockArguments->expects($this->any())->method('createArgument')->will($this->returnValue($mockArgument));
-		
+
 		$newArgument = $mockArguments->addNewArgument('someArgument');
 		$this->assertType('Tx_Extbase_MVC_Controller_Argument', $newArgument, 'addNewArgument() did not return an argument object.');
 	}
@@ -83,7 +83,7 @@
 		$mockArgument = $this->getMock('Tx_Extbase_MVC_Controller_Argument', array('getName'), array(), '', FALSE);
 		$mockArgument->expects($this->any())->method('getName')->will($this->returnValue('argumentName1234'));
 		$arguments = new Tx_Extbase_MVC_Controller_Arguments;
-		
+
 		$arguments[] = $mockArgument;
 		$this->assertTrue($arguments->hasArgument('argumentName1234'), 'Added argument does not exist.');
 		$this->assertSame($mockArgument, $arguments->getArgument('argumentName1234'), 'Added and retrieved arguments are not the same.');
Index: typo3/sysext/extbase/Tests/MVC/Web/Routing/UriBuilder_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/MVC/Web/Routing/UriBuilder_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/MVC/Web/Routing/UriBuilder_testcase.php	(working copy)
@@ -295,7 +295,7 @@
 
 		$this->assertSame($expectedResult, $actualResult);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -307,7 +307,7 @@
 
 		$this->assertSame($expectedResult, $actualResult);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -492,7 +492,7 @@
 
 		$this->assertEquals($expectedResult, $actualResult);
 	}
-	
+
 	/**
 	 * @test
 	 */
@@ -509,7 +509,7 @@
 		$expectedResult = array('object' => array('foo' => 'bar'));
 		$this->assertEquals($expectedResult, $actualResult);
 	}
-	
+
 	/**
 	 * @test
 	 * @expectedException Tx_Extbase_MVC_Exception_InvalidArgumentValue
@@ -523,7 +523,7 @@
 		$mockUriBuilder = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_MVC_Web_Routing_UriBuilder'), array('dummy'));
 		$actualResult = $mockUriBuilder->_call('convertDomainObjectsToIdentityArrays', array('object' => $mockEntity));
 	}
-		
+
 	/**
 	 * @test
 	 */
@@ -532,14 +532,14 @@
 		eval('class ' . $className . ' extends Tx_Extbase_DomainObject_AbstractValueObject { public $name; public $uid; }');
 		$mockValueObject = new $className;
 		$mockValueObject->name = 'foo';
-		
+
 		$mockUriBuilder = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_MVC_Web_Routing_UriBuilder'), array('dummy'));
 		$actualResult = $mockUriBuilder->_call('convertTransientObjectToArray', $mockValueObject);
 
 		$expectedResult = array('name' => 'foo', 'uid' => NULL);
 		$this->assertEquals($expectedResult, $actualResult);
 	}
-		
+
 	/**
 	 * @test
 	 */
@@ -570,7 +570,7 @@
 			'uid' => NULL);
 		$this->assertEquals($expectedResult, $actualResult);
 	}
-		
 
+
 }
 ?>
Index: typo3/sysext/extbase/Tests/MVC/Web/RequestTest.php
===================================================================
--- typo3/sysext/extbase/Tests/MVC/Web/RequestTest.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/MVC/Web/RequestTest.php	(working copy)
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /***************************************************************
 *  Copyright notice
 *
Index: typo3/sysext/extbase/Tests/Reflection/Service_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Reflection/Service_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Reflection/Service_testcase.php	(working copy)
@@ -26,19 +26,19 @@
  * Some functional tests for the backport of the reflection service
  */
 class Tx_Extbase_Reflection_Service_testcase extends Tx_Extbase_BaseTestCase {
-	
+
 	/**
 	 * @param array $foo The foo parameter
 	 * @return nothing
 	 */
 	public function fixtureMethodForMethodTagsValues(array $foo) {
-		
+
 	}
-	
+
 	public function test_GetMethodTagsValues() {
 		$service = new Tx_Extbase_Reflection_Service();
 		$tagsValues = $service->getMethodTagsValues('Tx_Extbase_Reflection_Service_testcase', 'fixtureMethodForMethodTagsValues');
-		
+
 		$this->assertEquals(array(
 			'param' => array('array $foo The foo parameter'),
 			'return' => array('nothing')
@@ -48,7 +48,7 @@
 	public function test_GetMethodParameters() {
 		$service = new Tx_Extbase_Reflection_Service();
 		$parameters = $service->getMethodParameters('Tx_Extbase_Reflection_Service_testcase', 'fixtureMethodForMethodTagsValues');
-		
+
 		$this->assertEquals(array(
 			'foo' => array(
 				'position' => 0,
Index: typo3/sysext/extbase/Tests/Validation/Validator/GenericObjectValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/GenericObjectValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/GenericObjectValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Tests/Validation/Validator/StringLengthValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/StringLengthValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/StringLengthValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Tests/Validation/Validator/NotEmptyValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/NotEmptyValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/NotEmptyValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Tests/Validation/Validator/EmailAddressValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/EmailAddressValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/EmailAddressValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Tests/Validation/Validator/ConjunctionValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/ConjunctionValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/ConjunctionValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -60,7 +60,7 @@
 
 		$thirdValidatorObject = $this->getMock('Tx_Extbase_Validation_Validator_ValidatorInterface');
 		$thirdValidatorObject->expects($this->once())->method('isValid')->will($this->returnValue(TRUE));
-		
+
 		$validatorConjunction->addValidator($validatorObject);
 		$validatorConjunction->addValidator($secondValidatorObject);
 		$validatorConjunction->addValidator($thirdValidatorObject);
Index: typo3/sysext/extbase/Tests/Validation/Validator/RawValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/RawValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/RawValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Tests/Validation/Validator/AlphanumericValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/AlphanumericValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/AlphanumericValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Tests/Validation/Validator/DateTimeValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/DateTimeValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/DateTimeValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Tests/Validation/Validator/RegularExpressionValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/RegularExpressionValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/RegularExpressionValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Tests/Validation/Validator/NumberRangeValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/NumberRangeValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/NumberRangeValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Tests/Validation/Validator/IntegerValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/IntegerValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/IntegerValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -39,13 +39,13 @@
 	 * @var array
 	 */
 	protected $validIntegerNumbers;
-	
+
 	/**
 	 * An array of invalid floating point numbers addresses
 	 * @var array
 	 */
 	protected $invalidIntegerNumbers;
-	
+
 	public function setUp() {
 		$this->validIntegerNumbers = array(
 			1029437,
@@ -53,14 +53,14 @@
 			'+12345',
 			'-12345'
 			);
-			
+
 		$this->invalidIntegerNumbers = array(
 			'not a number',
 			3.1415,
 			'12345.987'
 			);
 	}
-	
+
 	/**
 	 * @test
 	 */
Index: typo3/sysext/extbase/Tests/Validation/Validator/FloatValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/FloatValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/FloatValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -39,13 +39,13 @@
 	 * @var array
 	 */
 	protected $validFloatingPointNumbers;
-	
+
 	/**
 	 * An array of invalid floating point numbers addresses
 	 * @var array
 	 */
 	protected $invalidFloatingPointNumbers;
-	
+
 	public function setUp() {
 		$this->validFloatingPointNumbers = array(
 			1029437.234726,
@@ -55,14 +55,14 @@
 			'123.45e3',
 			123.45e3
 			);
-			
+
 		$this->invalidFloatingPointNumbers = array(
 			1029437,
 			'1029437',
 			'not a number'
 			);
 	}
-	
+
 	/**
 	 * @test
 	 */
Index: typo3/sysext/extbase/Tests/Validation/Validator/NumberValidator_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/Validator/NumberValidator_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/Validator/NumberValidator_testcase.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
Index: typo3/sysext/extbase/Tests/Validation/ValidatorResolver_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Validation/ValidatorResolver_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Validation/ValidatorResolver_testcase.php	(working copy)
@@ -329,7 +329,7 @@
 		$mockValidator = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Validation_ValidatorResolver'), array('dummy'));
 		$this->assertEquals('Raw', $mockValidator->_call('unifyDataType', 'mixed'));
 	}
-	
+
 	/**
 	 * dataProvider for parseValidatorAnnotationCanParseAnnotations
 	 * @author Karsten Dambekalns <karsten@typo3.org>
@@ -382,7 +382,7 @@
 
 		$this->assertEquals($result, $expectedResult);
 	}
-	
+
 }
 
 ?>
\ No newline at end of file
Index: typo3/sysext/extbase/Tests/Security/Channel/RequestHashService_testcase.php
===================================================================
--- typo3/sysext/extbase/Tests/Security/Channel/RequestHashService_testcase.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Security/Channel/RequestHashService_testcase.php	(working copy)
@@ -389,7 +389,7 @@
 				// Expected result
 				FALSE
 			),
-			
+
 			// hierarchical fields with requestfields != responsefields (different types)
 			// This case happens if an array of checkboxes is rendered, in case they are fully unchecked.
 			array(
Index: typo3/sysext/extbase/Tests/Fixtures/Entity.php
===================================================================
--- typo3/sysext/extbase/Tests/Fixtures/Entity.php	(revision 8132)
+++ typo3/sysext/extbase/Tests/Fixtures/Entity.php	(working copy)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  This class is a backport of the corresponding class of FLOW3.
 *  All credits go to the v5 team.
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -52,7 +52,7 @@
 	public function __construct($name) {
 		$this->setName($name);
 	}
-	
+
 	/**
 	 * Sets this entity's name
 	 *
@@ -71,6 +71,6 @@
 	public function getName() {
 		return $this->name;
 	}
-	
+
 }
 ?>
\ No newline at end of file
Index: typo3/classes/class.clearcachemenu.php
===================================================================
--- typo3/classes/class.clearcachemenu.php	(revision 8132)
+++ typo3/classes/class.clearcachemenu.php	(working copy)
@@ -138,7 +138,7 @@
 		$cacheMenu = array();
 
 		$cacheMenu[] = '<a href="#" class="toolbar-item">' .
-			t3lib_iconWorks::getSpriteIcon('apps-toolbar-menu-cache', array('title' => $title)) . 
+			t3lib_iconWorks::getSpriteIcon('apps-toolbar-menu-cache', array('title' => $title)) .
 			'</a>';
 
 		$cacheMenu[] = '<ul class="toolbar-item-menu" style="display: none;">';
Index: typo3/classes/class.workspaceselector.php
===================================================================
--- typo3/classes/class.workspaceselector.php	(revision 8132)
+++ typo3/classes/class.workspaceselector.php	(working copy)
@@ -190,7 +190,7 @@
 		));
 
 		$workspaceMenu[] = '<a href="#" class="toolbar-item">' .
-			t3lib_iconWorks::getSpriteIcon('apps-toolbar-menu-workspace', array('title' => $title)) . 
+			t3lib_iconWorks::getSpriteIcon('apps-toolbar-menu-workspace', array('title' => $title)) .
 				'</a>';
 		$workspaceMenu[] = '<ul class="toolbar-item-menu" style="display: none;">';
 
Index: typo3/alt_file_navframe.php
===================================================================
--- typo3/alt_file_navframe.php	(revision 8132)
+++ typo3/alt_file_navframe.php	(working copy)
@@ -274,7 +274,7 @@
 
 			// Refresh
 		$buttons['refresh'] = '<a href="' . htmlspecialchars(t3lib_div::getIndpEnv('REQUEST_URI')) . '">' .
-				t3lib_iconWorks::getSpriteIcon('actions-system-refresh') . 
+				t3lib_iconWorks::getSpriteIcon('actions-system-refresh') .
 		'</a>';
 
 			// CSH
Index: typo3/wizard_tsconfig.php
===================================================================
--- typo3/wizard_tsconfig.php	(revision 8132)
+++ typo3/wizard_tsconfig.php	(working copy)
@@ -347,7 +347,7 @@
 
 				// Title and description:
 			$out.='<a href="'.htmlspecialchars(t3lib_div::linkThisScript(array('show'=>''))).'" class="typo3-goBack">'.
-					t3lib_iconWorks::getSpriteIcon('actions-view-go-back') . 
+					t3lib_iconWorks::getSpriteIcon('actions-view-go-back') .
 					htmlspecialchars($obj_string).
 					'</a><br />';
 			if ($rec['title'])	$out.= '<strong>'.htmlspecialchars($rec['title']).': </strong>';
@@ -609,7 +609,7 @@
 		if(!$this->onlyProperty)	{
 			$aOnClick = 'document.editform.mixer.value=unescape(\'  '.rawurlencode($propertyName.'='.$propertyVal).'\')+\'\n\'+document.editform.mixer.value; return false;';
 			$out.= '<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.
-					t3lib_iconWorks::getSpriteIcon('actions-edit-add', array('title' => $GLOBALS['LANG']->getLL('tsprop_addToList', TRUE))) . 
+					t3lib_iconWorks::getSpriteIcon('actions-edit-add', array('title' => $GLOBALS['LANG']->getLL('tsprop_addToList', TRUE))) .
 			'</a>';
 			$propertyName = $prefix.'.'.$propertyName;
 		}
Index: typo3/wizard_forms.php
===================================================================
--- typo3/wizard_forms.php	(revision 8132)
+++ typo3/wizard_forms.php	(working copy)
@@ -291,7 +291,7 @@
 
 			// Close
 			$buttons['close'] = '<a href="#" onclick="' . htmlspecialchars('jumpToUrl(unescape(\'' . rawurlencode($this->P['returnUrl']) . '\')); return false;') . '">' .
-				t3lib_iconWorks::getSpriteIcon('actions-document-close', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', TRUE))) . 
+				t3lib_iconWorks::getSpriteIcon('actions-document-close', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', TRUE))) .
 		  '</a>';
 
 			// Save
Index: typo3/file_list.php
===================================================================
--- typo3/file_list.php	(revision 8132)
+++ typo3/file_list.php	(working copy)
@@ -411,11 +411,11 @@
 		$buttons['csh'] = t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'filelist_module', $GLOBALS['BACK_PATH'], '', TRUE);
 
 			// upload button
-		$buttons['upload'] = '<a href="' . $BACK_PATH . 'file_upload.php?target=' . rawurlencode($this->id) . '&amp;returnUrl=' . rawurlencode($this->filelist->listURL()) . '" id="button-upload" title="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.upload',1)).'">' . 
+		$buttons['upload'] = '<a href="' . $BACK_PATH . 'file_upload.php?target=' . rawurlencode($this->id) . '&amp;returnUrl=' . rawurlencode($this->filelist->listURL()) . '" id="button-upload" title="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.upload',1)).'">' .
 			t3lib_iconWorks::getSpriteIcon('actions-edit-upload') .
 		'</a>';
 
-		$buttons['new'] = '<a href="' . $BACK_PATH . 'file_newfolder.php?target=' . rawurlencode($this->id) . '&amp;returnUrl=' . rawurlencode($this->filelist->listURL()) . '" title="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.new',1)).'">' . 
+		$buttons['new'] = '<a href="' . $BACK_PATH . 'file_newfolder.php?target=' . rawurlencode($this->id) . '&amp;returnUrl=' . rawurlencode($this->filelist->listURL()) . '" title="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.new',1)).'">' .
 			t3lib_iconWorks::getSpriteIcon('actions-document-new') .
 		'</a>';
 
Index: typo3/db_new.php
===================================================================
--- typo3/db_new.php	(revision 8132)
+++ typo3/db_new.php	(working copy)
@@ -381,7 +381,7 @@
 		$table = 'pages';
 		$v = $GLOBALS['TCA'][$table];
 		$pageIcon = t3lib_iconWorks::getSpriteIconForRecord($table,array());
-						
+
 		$newPageIcon = t3lib_iconWorks::getSpriteIcon('actions-page-new');
 		$rowContent = $firstLevel . $newPageIcon . '&nbsp;<strong>' . $GLOBALS['LANG']->getLL('createNewPage') . '</strong>';
 
Index: typo3/class.filelistfoldertree.php
===================================================================
--- typo3/class.filelistfoldertree.php	(revision 8132)
+++ typo3/class.filelistfoldertree.php	(working copy)
@@ -339,8 +339,8 @@
 
 				// Add tree:
 			$treeArr = array_merge($treeArr, $this->tree);
-			
-				// if this is an AJAX call, don't run through all mounts, only 
+
+				// if this is an AJAX call, don't run through all mounts, only
 				// show the expansion of the current one, not the rest of the mounts
 			if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_AJAX) {
 				break;
@@ -416,7 +416,7 @@
 				} else {
 					$type = 'readonly';
 					$overlays= array('status-overlay-locked'=>array());
-					
+
 				}
 
 				if($webpath == 'web') {
Index: typo3/install/index.php
===================================================================
--- typo3/install/index.php	(revision 8132)
+++ typo3/install/index.php	(working copy)
@@ -81,7 +81,7 @@
 		'../contrib/prototype/prototype.js"></script>' . LF;
 	$javascript .= '<script type="text/javascript" src="' .
 		'../sysext/install/Resources/Public/Javascript/install.js"></script>';
-	
+
 		// Get the template file
 	$template = @file_get_contents($PATH_site . '/typo3/templates/install.html');
 		// Define the markers content
@@ -95,12 +95,12 @@
 			</p>
 			<ul>
 				<li>
-					In the typo3conf/ folder, create a file named ENABLE_INSTALL_TOOL. The file name is 
+					In the typo3conf/ folder, create a file named ENABLE_INSTALL_TOOL. The file name is
 					case sensitive, but the file itself can simply be an empty file.
 				</li>
 				<li class="t3-install-locked-user-settings">
 					Alternatively, in the Backend, go to <a href="../sysext/setup/mod/index.php">User tools &gt; User settings</a>
-					and let TYPO3 create this file for you. When you\'re finished, you can also visit 
+					and let TYPO3 create this file for you. When you\'re finished, you can also visit
 					<a href="../sysext/setup/mod/index.php">User tools &gt; User settings</a> and delete the file from there.
 				</li>
 			</ul>
Index: typo3/mod/user/ws/index.php
===================================================================
--- typo3/mod/user/ws/index.php	(revision 8132)
+++ typo3/mod/user/ws/index.php	(working copy)
@@ -160,7 +160,7 @@
 			),
 			'expandSubElements' => '',
 		);
-		
+
 		if($this->showDraftWorkspace === TRUE) {
 			$this->MOD_MENU['display'][-1] = '[' . $LANG->getLL('shortcut_offlineWS') . ']';
 		}
Index: typo3/mod/tools/em/class.em_index.php
===================================================================
--- typo3/mod/tools/em/class.em_index.php	(revision 8132)
+++ typo3/mod/tools/em/class.em_index.php	(working copy)
@@ -3637,7 +3637,7 @@
 	 * @return	string		<img> + text string.
 	 */
 	function noImportMsg()	{
-		return t3lib_iconWorks::getSpriteIcon('status-dialog-warning') . 
+		return t3lib_iconWorks::getSpriteIcon('status-dialog-warning') .
 			'<strong>' . $GLOBALS['LANG']->getLL('helperFunction_import_not_possible') . '</strong>';
 	}
 
@@ -5434,7 +5434,7 @@
 							<td><img src="clear.gif" width="10" height="1" alt="" /></td>
 							<td nowrap="nowrap">' .
 								($exist ?
-									t3lib_iconWorks::getSpriteIcon('status-dialog-warning') . 
+									t3lib_iconWorks::getSpriteIcon('status-dialog-warning') .
 									$GLOBALS['LANG']->getLL('checkDBupdates_table_exists')
 									: '') .
 							'</td>
Index: typo3/mod/web/perm/index.php
===================================================================
--- typo3/mod/web/perm/index.php	(revision 8132)
+++ typo3/mod/web/perm/index.php	(working copy)
@@ -602,7 +602,7 @@
 					<td align="center">' . $LANG->getLL('Everybody', TRUE) . '</td>
 					<td><img' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/line.gif', 'width="5" height="16"') . ' alt="" /></td>
 					<td align="center">' . $LANG->getLL('EditLock', TRUE) . '</td>
-				</tr>   
+				</tr>
 			';
 		} else {
 			$code.='
Index: t3lib/class.t3lib_treeview.php
===================================================================
--- t3lib/class.t3lib_treeview.php	(revision 8132)
+++ t3lib/class.t3lib_treeview.php	(working copy)
@@ -661,7 +661,7 @@
 				'title' => ($this->showDefaultTitleAttribute ? 'UID: ' . $row['uid'] : $this->getTitleAttrib($row)),
 				'class' => 'c-recIcon'
 			));
-		
+
 		}
 
 		return $this->wrapIcon($icon,$row);
Index: t3lib/class.t3lib_admin.php
===================================================================
--- t3lib/class.t3lib_admin.php	(revision 8132)
+++ t3lib/class.t3lib_admin.php	(working copy)
@@ -652,7 +652,7 @@
 		global $TCA;
 		foreach ($theArray as $table => $dbArr) {
 			if ($TCA[$table])	{
-				$idlist = array_keys($dbArr); 
+				$idlist = array_keys($dbArr);
 
 				$theList = implode(',',$idlist);
 				if ($theList)	{
Index: t3lib/class.t3lib_stdgraphic.php
===================================================================
--- t3lib/class.t3lib_stdgraphic.php	(revision 8132)
+++ t3lib/class.t3lib_stdgraphic.php	(working copy)
@@ -146,7 +146,7 @@
 /**
  * Class contains a bunch of cool functions for manipulating graphics with GDlib/Freetype and ImageMagick
  * VERY OFTEN used with gifbuilder that extends this class and provides a TypoScript API to using these functions
- * 
+ *
  * With TYPO3 4.4 GDlib 1.x support was dropped, also an option from config_default.php:
  * $TYPO3_CONF_VARS['GFX']['gdlib_2'] = 0,	// String/Boolean. Set this if you are using the new GDlib 2.0.1+. If you don't set this flag and still use GDlib2, you might encounter strange behaviours like black images etc. This feature might take effect only if ImageMagick is installed and working as well! You can also use the value "no_imagecopyresized_fix" - in that case it will NOT try to fix a known issue where "imagecopyresized" does not work correctly.
  *
@@ -259,7 +259,7 @@
 			$this->im_version_4 = true;
 		}
 
-			// When GIFBUILDER gets used in truecolor mode 
+			// When GIFBUILDER gets used in truecolor mode
 			// No colors parameter if we generate truecolor images.
 		if ($this->png_truecolor) {
 			$this->cmds['png'] = '';
@@ -3010,7 +3010,7 @@
 
 
 	/**
-	 * Creates a new GD image resource. 
+	 * Creates a new GD image resource.
 	 * Wrapper for imagecreate(truecolor) depended if GD2 is used.
 	 * This function however got obsolete, as PHP now recommends to use
 	 * imagecreatetruecolor() only.
@@ -3022,7 +3022,7 @@
 	 */
 	function imagecreate($w, $h) {
 		t3lib_div::logDeprecatedFunction();
-		
+
 		return imagecreatetruecolor($w, $h);
 	}
 
Index: t3lib/class.t3lib_tstemplate.php
===================================================================
--- t3lib/class.t3lib_tstemplate.php	(revision 8132)
+++ t3lib/class.t3lib_tstemplate.php	(working copy)
@@ -572,7 +572,7 @@
 					$GLOBALS['TYPO3_DB']->sql_free_result($res);
 				}
 			} else {
-					// Normal Operation, which is to include the "based-on" sys_templates, 
+					// Normal Operation, which is to include the "based-on" sys_templates,
 					// if they are not already included, and maintaining the sorting of the templates
 				$basedOnIds = t3lib_div::intExplode(',', $row['basedOn']);
 
@@ -591,7 +591,7 @@
 				);
 
 					// traversing list again to ensure the sorting of the templates
-				foreach ($basedOnIds as $id) { 
+				foreach ($basedOnIds as $id) {
 					if (is_array($subTemplates[$id])) {
 						$this->versionOL($subTemplates[$id]);
 						$this->processTemplate($subTemplates[$id], $idList . ',sys_' . $id, $pid, 'sys_' . $id, $templateID);
Index: t3lib/class.t3lib_iconworks.php
===================================================================
--- t3lib/class.t3lib_iconworks.php	(revision 8132)
+++ t3lib/class.t3lib_iconworks.php	(working copy)
@@ -797,7 +797,7 @@
 				if ($row['module']) {
 					$recordType[4] = 'contains-' . $row['module'];
 				}
-			} 
+			}
 
 			if (is_array($GLOBALS['TCA'][$table]['ctrl']['typeicon_classes'])) {
 				foreach ($recordType AS $key => $type) {
@@ -824,7 +824,7 @@
 		krsort($recordType);
 		foreach ($recordType as $record) {
 			if (in_array($record, $GLOBALS['TBE_STYLES']['spriteIconApi']['iconsAvailable'])) {
-				return self::getSpriteIconClasses($record); 
+				return self::getSpriteIconClasses($record);
 			}
 		}
 		return self::getSpriteIconClasses('status-status-icon-missing');
Index: t3lib/class.t3lib_spritemanager.php
===================================================================
--- t3lib/class.t3lib_spritemanager.php	(revision 8132)
+++ t3lib/class.t3lib_spritemanager.php	(working copy)
@@ -73,7 +73,7 @@
 			// create a fileName, the hash includes all icons and css-styles registered and the extlist
 		$this->tempFileName = PATH_site . self::$tempPath .
 							md5(serialize($GLOBALS['TBE_STYLES']['spritemanager']) .
-							md5(serialize($GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageNames'])) . 
+							md5(serialize($GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageNames'])) .
 							$GLOBALS['TYPO3_CONF_VARS']['EXT']['extList']) . '.inc';
 			// if no cache-file for the current config ist present, regenerate it
 		if(!@file_exists($this->tempFileName)) {
Index: t3lib/class.t3lib_beuserauth.php
===================================================================
--- t3lib/class.t3lib_beuserauth.php	(revision 8132)
+++ t3lib/class.t3lib_beuserauth.php	(working copy)
@@ -376,7 +376,7 @@
 	 *	+ backend user is a regular user and adminOnly is not defined
 	 *	+ backend user is an admin user
 	 *	+ backend user is used in CLI context and adminOnly is explicitely set to "2"
-	 * 
+	 *
 	 * @return	boolean		Whether a backend user is allowed to access the backend
 	 */
 	protected function isUserAllowedToLogin() {
Index: t3lib/class.t3lib_install.php
===================================================================
--- t3lib/class.t3lib_install.php	(revision 8132)
+++ t3lib/class.t3lib_install.php	(working copy)
@@ -126,7 +126,7 @@
 	 * @param	array		$line_array	the localconf.php file exploded into an array by linebreaks. (see writeToLocalconf_control())
 	 * @param	string		$variable	The variable name to find and substitute. This string must match the first part of a trimmed line in the line-array. Matching is done backwards so the last appearing line will be substituted.
 	 * @param	string		$value		Is the value to be insert for the variable
-	 * @param	boolean		$quoteValue	Whether the given value should be quoted before being written 
+	 * @param	boolean		$quoteValue	Whether the given value should be quoted before being written
 	 * @return	void
 	 * @see writeToLocalconf_control()
 	 */
Index: t3lib/stddb/tables.php
===================================================================
--- t3lib/stddb/tables.php	(revision 8132)
+++ t3lib/stddb/tables.php	(working copy)
@@ -179,7 +179,7 @@
 			'contains-board' => 'apps-pagetree-folder-contains-board',
 			'contains-news' => 'apps-pagetree-folder-contains-news',
 			'default' => 'apps-pagetree-page-default',
-			
+
 		),
 		'typeicons' => array(
 			'1' => 'pages.gif',
@@ -329,7 +329,7 @@
 			'0' => 'status-user-backend',
 			'1' => 'status-user-admin',
 			'default' => 'status-user-backend',
-		), 
+		),
 		'mainpalette' => '1',
 		'useColumnsForDefaultValues' => 'usergroup,lockToDomain,options,db_mountpoints,file_mountpoints,fileoper_perms,userMods',
 		'dividers2tabs' => true,
@@ -361,7 +361,7 @@
 		),
 		'typeicon_classes' => array(
 			'default' => 'status-user-group-backend',
-		), 
+		),
 		'enablecolumns' => array(
 			'disabled' => 'hidden'
 		),
@@ -417,7 +417,7 @@
 		),
 		'typeicon_classes' => array(
 			'default' => 'mimetypes-x-sys_language',
-		), 
+		),
 		'dynamicConfigFile' => 'T3LIB:tbl_be.php',
 		'versioningWS_alwaysAllowLiveEdit' => TRUE
 	)
Index: t3lib/class.t3lib_parsehtml.php
===================================================================
--- t3lib/class.t3lib_parsehtml.php	(revision 8132)
+++ t3lib/class.t3lib_parsehtml.php	(working copy)
@@ -1075,7 +1075,7 @@
 	 * @access private
 	 */
 	function prefixRelPath($prefix, $srcVal, $suffix = '') {
-			// Only prefix if it's not an absolute URL or 
+			// Only prefix if it's not an absolute URL or
 			// only a link to a section within the page.
 		if (substr($srcVal, 0, 1) != '/' && substr($srcVal, 0, 1) != '#') {
 			$urlParts = parse_url($srcVal);
Index: t3lib/class.t3lib_htmlmail.php
===================================================================
--- t3lib/class.t3lib_htmlmail.php	(revision 8132)
+++ t3lib/class.t3lib_htmlmail.php	(working copy)
@@ -751,7 +751,7 @@
 			$theParts = explode('/',$this->auto_respond_msg,2);
 			$theParts[0] = str_replace('###SUBJECT###', $this->subject, $theParts[0]);
 			$theParts[1] = str_replace("/",LF,$theParts[1]);
-			$theParts[1] = str_replace("###MESSAGE###", $this->getContent('plain'), $theParts[1]);			
+			$theParts[1] = str_replace("###MESSAGE###", $this->getContent('plain'), $theParts[1]);
 			if ($returnPathPossible) {
 				$mailWasSent = t3lib_utility_Mail::mail($this->from_email,
 					$theParts[0],
Index: t3lib/class.t3lib_clipboard.php
===================================================================
--- t3lib/class.t3lib_clipboard.php	(revision 8132)
+++ t3lib/class.t3lib_clipboard.php	(working copy)
@@ -366,7 +366,7 @@
 				'</td>
 				<td>'.
 				'<a href="'.htmlspecialchars($rmall_url).'#clip_head">'.
-					t3lib_iconWorks::getSpriteIcon('actions-document-close', array('title' => $LANG->sL('LLL:EXT:lang/locallang_core.php:buttons.clear', TRUE))) . 
+					t3lib_iconWorks::getSpriteIcon('actions-document-close', array('title' => $LANG->sL('LLL:EXT:lang/locallang_core.php:buttons.clear', TRUE))) .
 				'</a></td>
 			</tr>';
 
Index: t3lib/class.t3lib_browsetree.php
===================================================================
--- t3lib/class.t3lib_browsetree.php	(revision 8132)
+++ t3lib/class.t3lib_browsetree.php	(working copy)
@@ -183,7 +183,7 @@
 							</span>';
 		}
 		return $str;
-	}		
+	}
 }
 
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_browsetree.php'])	{
Index: t3lib/class.t3lib_loadmodules.php
===================================================================
--- t3lib/class.t3lib_loadmodules.php	(revision 8132)
+++ t3lib/class.t3lib_loadmodules.php	(working copy)
@@ -133,9 +133,9 @@
 			//
 		$this->absPathArray = $modulesArray['_PATHS'];
 		unset($modulesArray['_PATHS']);
-			// unset the array for calling external backend module dispatchers in typo3/mod.php 
+			// unset the array for calling external backend module dispatchers in typo3/mod.php
 		unset($modulesArray['_dispatcher']);
-			// unset the array for calling backend modules based on external backend module dispatchers in typo3/mod.php 
+			// unset the array for calling backend modules based on external backend module dispatchers in typo3/mod.php
 		unset($modulesArray['_configuration']);
 
 			/*
Index: t3lib/class.t3lib_sqlparser.php
===================================================================
--- t3lib/class.t3lib_sqlparser.php	(revision 8132)
+++ t3lib/class.t3lib_sqlparser.php	(working copy)
@@ -681,7 +681,7 @@
 
 	/**
 	 * Parsing TRUNCATE TABLE query
-	 * 
+	 *
 	 * @param	string		SQL string starting with TRUNCATE TABLE
 	 * @return	mixed		Returns array with components of TRUNCATE TABLE query on success, otherwise an error message string.
 	 */
@@ -810,7 +810,7 @@
 							// Otherwise, look for regular fieldname:
 						if (($fieldName = $this->nextPart($parseString, '^([[:alnum:]\*._]+)(,|[[:space:]]+)')) !== '') {
 							$stack[$pnt]['type'] = 'field';
-	
+
 								// Explode fieldname into field and table:
 							$tableField = explode('.',$fieldName,2);
 							if (count($tableField)==2)	{
@@ -881,7 +881,7 @@
 		if (!preg_match('/^when[[:space:]]+/i', $parseString)) {
 			$value = $this->getValue($parseString);
 			if (!(isset($value[1]) || is_numeric($value[0]))) {
-				$result['case_field'] = $value[0]; 
+				$result['case_field'] = $value[0];
 			} else {
 				$result['case_value'] = $value;
 			}
@@ -1075,7 +1075,7 @@
 							return $this->parseError('No comma found as expected in parseWhereClause()');
 						}
 						if ($fieldName = $this->nextPart($parseString, '^([[:alnum:]\*._]+)[[:space:]]*')) {
- 
+
 								// Parse field name into field and table:
 							$tableField = explode('.', $fieldName, 2);
 							if (count($tableField) == 2) {
@@ -1089,7 +1089,7 @@
 							return $this->parseError('No field name found as expected in parseWhereClause()', $parseString);
  						}
 						if ($this->nextPart($parseString, '^(,)')) {
-							$stack[$level][$pnt[$level]]['func']['pos'] = $this->getValue($parseString); 
+							$stack[$level][$pnt[$level]]['func']['pos'] = $this->getValue($parseString);
 						}
 						if (!$this->nextPart($parseString, '^([)])')) {
 							return $this->parseError('No ) parenthesis at end of function');
@@ -1098,7 +1098,7 @@
 						$stack[$level][$pnt[$level]]['func']['type'] = $this->nextPart($parseString, '^(IFNULL)[[:space:]]*');
 						$parseString = trim(substr($parseString, 1));	// Strip of "("
 						if ($fieldName = $this->nextPart($parseString, '^([[:alnum:]\*._]+)[[:space:]]*')) {
- 
+
 								// Parse field name into field and table:
 							$tableField = explode('.', $fieldName, 2);
 							if (count($tableField) == 2) {
@@ -1143,7 +1143,7 @@
 						} else {
 							return $this->parseError('No field name found as expected in parseWhereClause()', $parseString);
  						}
-		
+
 							// See if the value is calculated:
 						$stack[$level][$pnt[$level]]['calc'] = $this->nextPart($parseString, '^(' . $calcOperators . ')');
 						if (strlen($stack[$level][$pnt[$level]]['calc'])) {
@@ -1163,7 +1163,7 @@
 							}
 						}
  					}
- 	
+
  						// Find "comparator":
 					$stack[$level][$pnt[$level]]['comparator'] = $this->nextPart($parseString, '^(<=|>=|<|>|=|!=|NOT[[:space:]]+IN|IN|NOT[[:space:]]+LIKE|LIKE|IS[[:space:]]+NOT|IS|BETWEEN|NOT[[:space]]+BETWEEN)');
 					if (strlen($stack[$level][$pnt[$level]]['comparator'])) {
@@ -1752,7 +1752,7 @@
 
 	/**
 	 * Compiles a TRUNCATE TABLE statement from components array
-	 * 
+	 *
 	 * @param	array		Array of SQL query components
 	 * @return	string		SQL TRUNCATE TABLE query
 	 * @see parseTRUNCATETABLE()
@@ -1944,7 +1944,7 @@
 				} else {
 
 					if (isset($v['func']) && $v['func']['type'] === 'LOCATE') {
-						$output .= ' ' . trim($v['modifier']) . ' LOCATE('; 
+						$output .= ' ' . trim($v['modifier']) . ' LOCATE(';
 						$output .= $v['func']['substr'][1] . $v['func']['substr'][0] . $v['func']['substr'][1];
 						$output .= ', ' . ($v['func']['table'] ? $v['func']['table'] . '.' : '') . $v['func']['field'];
 						$output .= isset($v['func']['pos']) ? ', ' . $v['func']['pos'][0] : '';
@@ -1955,10 +1955,10 @@
 						$output .= ', ' . $v['func']['default'][1] . $this->compileAddslashes($v['func']['default'][0]) . $v['func']['default'][1];
 						$output .= ')';
 					} else {
-						
+
 							// Set field/table with modifying prefix if any:
 						$output .= ' ' . trim($v['modifier'] . ' ' . ($v['table'] ? $v['table'] . '.' : '') . $v['field']);
-	
+
 							// Set calculation, if any:
 						if ($v['calc']) {
 							$output .= $v['calc'] . $v['calc_value'][1] . $this->compileAddslashes($v['calc_value'][0]) . $v['calc_value'][1];
@@ -1972,7 +1972,7 @@
 							// Detecting value type; list or plain:
 						if (t3lib_div::inList('NOTIN,IN', strtoupper(str_replace(array(' ', TAB, CR, LF), '', $v['comparator'])))) {
 							if (isset($v['subquery'])) {
-								$output .= ' (' . $this->compileSELECT($v['subquery']) . ')';	
+								$output .= ' (' . $this->compileSELECT($v['subquery']) . ')';
 							} else {
 								$valueBuffer = array();
 								foreach ($v['value'] as $realValue) {
Index: t3lib/class.t3lib_userauthgroup.php
===================================================================
--- t3lib/class.t3lib_userauthgroup.php	(revision 8132)
+++ t3lib/class.t3lib_userauthgroup.php	(working copy)
@@ -1568,7 +1568,7 @@
 	 */
 	function checkWorkspace($wsRec,$fields='uid,title,adminusers,members,reviewers,publish_access,stagechg_notification')	{
 		$retVal = FALSE;
-		
+
 			// Show draft workspace only if it's enabled in version extension
 		if (t3lib_extMgm::isLoaded('version')) {
 			$versionExtConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['version']);
@@ -1576,15 +1576,15 @@
 				if (!is_array($wsRec)) {
 					if ((string) $wsRec === '-1') {
 						return FALSE;
-					} 
+					}
 				} else {
 					if ((string) $wsRec['uid'] === '-1') {
 						return FALSE;
-					} 
+					}
 				}
-			} 
-		} 
-		
+			}
+		}
+
 			// If not array, look up workspace record:
 		if (!is_array($wsRec))	{
 			switch((string)$wsRec)	{
Index: t3lib/class.t3lib_tsparser_ext.php
===================================================================
--- t3lib/class.t3lib_tsparser_ext.php	(revision 8132)
+++ t3lib/class.t3lib_tsparser_ext.php	(working copy)
@@ -599,8 +599,8 @@
 			$alttext = '[' . $row['templateID'] . ']';
 			$alttext .= $row['pid'] ? ' - ' . t3lib_BEfunc::getRecordPath($row['pid'], $GLOBALS['SOBE']->perms_clause, 20) : '';
 
-			$icon = (substr($row['templateID'],0,3) == 'sys' ? 
-						t3lib_iconWorks::getSpriteIconForRecord('sys_template', $row, array('title' => $alttext)) 
+			$icon = (substr($row['templateID'],0,3) == 'sys' ?
+						t3lib_iconWorks::getSpriteIconForRecord('sys_template', $row, array('title' => $alttext))
 						: t3lib_iconWorks::getSpriteIcon('mimetypes-x-content-template-static', array('title' => $alttext))
 					);
 			if (in_array($row['templateID'], $this->clearList_const) || in_array($row['templateID'], $this->clearList_setup)) {