Index: tests/t3lib/t3lib_befuncTest.php =================================================================== --- tests/t3lib/t3lib_befuncTest.php (revision 8127) +++ tests/t3lib/t3lib_befuncTest.php (working copy) @@ -65,4 +65,4 @@ ); } } -?> +?> \ No newline at end of file Index: tests/t3lib/cache/backend/t3lib_cache_backend_pdobackendTest.php =================================================================== --- tests/t3lib/cache/backend/t3lib_cache_backend_pdobackendTest.php (revision 8127) +++ tests/t3lib/cache/backend/t3lib_cache_backend_pdobackendTest.php (working copy) @@ -382,4 +382,4 @@ } } -?> +?> \ No newline at end of file Index: tests/t3lib/cache/backend/t3lib_cache_backend_filebackendTest.php =================================================================== --- tests/t3lib/cache/backend/t3lib_cache_backend_filebackendTest.php (revision 8127) +++ tests/t3lib/cache/backend/t3lib_cache_backend_filebackendTest.php (working copy) @@ -488,4 +488,4 @@ } } -?> +?> \ No newline at end of file Index: tests/t3lib/cache/frontend/t3lib_cache_frontend_phpfrontendTest.php =================================================================== --- tests/t3lib/cache/frontend/t3lib_cache_frontend_phpfrontendTest.php (revision 8127) +++ tests/t3lib/cache/frontend/t3lib_cache_frontend_phpfrontendTest.php (working copy) @@ -85,4 +85,4 @@ $this->assertSame('hello world!', $result); } } -?> +?> \ No newline at end of file Index: tests/t3lib/t3lib_pageselectTest.php =================================================================== --- tests/t3lib/t3lib_pageselectTest.php (revision 8127) +++ tests/t3lib/t3lib_pageselectTest.php (working copy) @@ -160,4 +160,4 @@ ); } } -?> +?> \ No newline at end of file Index: tests/t3lib/utility/t3lib_utility_clientTest.php =================================================================== --- tests/t3lib/utility/t3lib_utility_clientTest.php (revision 8127) +++ tests/t3lib/utility/t3lib_utility_clientTest.php (working copy) @@ -202,4 +202,4 @@ ); } } -?> +?> \ No newline at end of file Index: tests/t3lib/t3lib_tcemainTest.php =================================================================== --- tests/t3lib/t3lib_tcemainTest.php (revision 8127) +++ tests/t3lib/t3lib_tcemainTest.php (working copy) @@ -230,4 +230,4 @@ $this->assertTrue($this->fixture->checkModifyAccessList('tt_content')); } } -?> +?> \ No newline at end of file Index: tests/typo3/sysext/cms/tslib/tslib_feTest.php =================================================================== --- tests/typo3/sysext/cms/tslib/tslib_feTest.php (revision 8127) +++ tests/typo3/sysext/cms/tslib/tslib_feTest.php (working copy) @@ -131,4 +131,4 @@ ); } } -?> +?> \ No newline at end of file Index: typo3/alt_clickmenu.php =================================================================== --- typo3/alt_clickmenu.php (revision 8127) +++ typo3/alt_clickmenu.php (working copy) @@ -1765,4 +1765,4 @@ $SOBE->main(); $SOBE->printContent(); -?> +?> \ No newline at end of file Index: typo3/sysext/rtehtmlarea/hooks/clearrtecache/ext_localconf.php =================================================================== --- typo3/sysext/rtehtmlarea/hooks/clearrtecache/ext_localconf.php (revision 8127) +++ typo3/sysext/rtehtmlarea/hooks/clearrtecache/ext_localconf.php (working copy) @@ -5,4 +5,4 @@ // Register Ajax call $TYPO3_CONF_VARS['BE']['AJAX']['rtehtmlarea::clearTempDir'] = 'EXT:rtehtmlarea/hooks/clearrtecache/class.tx_rtehtmlarea_clearrtecache.php:tx_rtehtmlarea_clearrtecache->clearTempDir'; -?> +?> \ No newline at end of file Index: typo3/sysext/rtehtmlarea/hooks/clearrtecache/class.tx_rtehtmlarea_clearcachemenu.php =================================================================== --- typo3/sysext/rtehtmlarea/hooks/clearrtecache/class.tx_rtehtmlarea_clearcachemenu.php (revision 8127) +++ typo3/sysext/rtehtmlarea/hooks/clearrtecache/class.tx_rtehtmlarea_clearcachemenu.php (working copy) @@ -61,4 +61,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/hooks/clearrtecache/class.tx_rtehtmlarea_clearcachemenu.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/hooks/clearrtecache/class.tx_rtehtmlarea_clearcachemenu.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/rtehtmlarea/hooks/clearrtecache/class.tx_rtehtmlarea_clearrtecache.php =================================================================== --- typo3/sysext/rtehtmlarea/hooks/clearrtecache/class.tx_rtehtmlarea_clearrtecache.php (revision 8127) +++ typo3/sysext/rtehtmlarea/hooks/clearrtecache/class.tx_rtehtmlarea_clearrtecache.php (working copy) @@ -46,4 +46,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/hooks/clearrtecache/class.tx_rtehtmlarea_clearrtecache.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/hooks/clearrtecache/class.tx_rtehtmlarea_clearrtecache.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php =================================================================== --- typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php (revision 8127) +++ typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php (working copy) @@ -1228,4 +1228,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/about/mod/conf.php =================================================================== --- typo3/sysext/about/mod/conf.php (revision 8127) +++ typo3/sysext/about/mod/conf.php (working copy) @@ -8,4 +8,4 @@ $MCONF['access'] = 'user,group'; $MCONF['script']='index.php'; $MCONF['name']='help_about'; -?> +?> \ No newline at end of file Index: typo3/sysext/about/mod/index.php =================================================================== --- typo3/sysext/about/mod/index.php (revision 8127) +++ typo3/sysext/about/mod/index.php (working copy) @@ -187,4 +187,4 @@ $SOBE = t3lib_div::makeInstance('SC_mod_help_about_index'); $SOBE->main(); $SOBE->printContent(); -?> +?> \ No newline at end of file Index: typo3/sysext/sv/ext_autoload.php =================================================================== --- typo3/sysext/sv/ext_autoload.php (revision 8127) +++ typo3/sysext/sv/ext_autoload.php (working copy) @@ -8,4 +8,4 @@ return array( 'tx_sv_reports_serviceslist' => $extensionPath . 'reports/class.tx_sv_reports_serviceslist.php', ); -?> +?> \ No newline at end of file Index: typo3/sysext/taskcenter/ext_autoload.php =================================================================== --- typo3/sysext/taskcenter/ext_autoload.php (revision 8127) +++ typo3/sysext/taskcenter/ext_autoload.php (working copy) @@ -7,4 +7,4 @@ return array ( 'tx_taskcenter_task' => $extensionPath . 'interfaces/interface.tx_taskcenter_task.php' ); -?> +?> \ No newline at end of file Index: typo3/sysext/aboutmodules/ext_tables.php =================================================================== --- typo3/sysext/aboutmodules/ext_tables.php (revision 8127) +++ typo3/sysext/aboutmodules/ext_tables.php (working copy) @@ -2,4 +2,4 @@ if (!defined ('TYPO3_MODE')) die ('Access denied.'); if (TYPO3_MODE=='BE') t3lib_extMgm::addModule('help','aboutmodules','after:about',t3lib_extMgm::extPath($_EXTKEY).'mod/'); -?> +?> \ No newline at end of file Index: typo3/sysext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php =================================================================== --- typo3/sysext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php (revision 8127) +++ typo3/sysext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php (working copy) @@ -259,4 +259,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/reports/ext_autoload.php =================================================================== --- typo3/sysext/reports/ext_autoload.php (revision 8127) +++ typo3/sysext/reports/ext_autoload.php (working copy) @@ -16,4 +16,4 @@ 'tx_reports_reports_status_configurationstatus' => $extensionPath . 'reports/status/class.tx_reports_reports_status_configurationstatus.php', 'tx_reports_reports_status_status' => $extensionPath . 'reports/status/class.tx_reports_reports_status_status.php', ); -?> +?> \ No newline at end of file Index: typo3/sysext/install/ext_localconf.php =================================================================== --- typo3/sysext/install/ext_localconf.php (revision 8127) +++ typo3/sysext/install/ext_localconf.php (working copy) @@ -39,4 +39,4 @@ // Version 4.4: warn for set CompressionLevel and warn user to update his .htaccess $TYPO3_CONF_VARS['SC_OPTIONS']['ext/install']['update']['checkForCompressionLevel'] = 'tx_coreupdates_compressionlevel'; -?> +?> \ No newline at end of file Index: typo3/sysext/install/updates/class.tx_coreupdates_imagescols.php =================================================================== --- typo3/sysext/install/updates/class.tx_coreupdates_imagescols.php (revision 8127) +++ typo3/sysext/install/updates/class.tx_coreupdates_imagescols.php (working copy) @@ -90,4 +90,4 @@ return $result; } } -?> +?> \ No newline at end of file Index: typo3/sysext/install/ext_autoload.php =================================================================== --- typo3/sysext/install/ext_autoload.php (revision 8127) +++ typo3/sysext/install/ext_autoload.php (working copy) @@ -7,4 +7,4 @@ return array( 'tx_install_report_installstatus' => t3lib_extMgm::extPath('install', 'report/class.tx_install_report_installstatus.php'), ); -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/RenderFlashMessagesViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/RenderFlashMessagesViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/RenderFlashMessagesViewHelper.php (working copy) @@ -31,4 +31,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/CycleViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/CycleViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/CycleViewHelper.php (working copy) @@ -134,4 +134,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/RenderViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/RenderViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/RenderViewHelper.php (working copy) @@ -54,4 +54,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/IfViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/IfViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/IfViewHelper.php (working copy) @@ -192,4 +192,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php (working copy) @@ -82,4 +82,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php (working copy) @@ -81,4 +81,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/ThenViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/ThenViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/ThenViewHelper.php (working copy) @@ -45,4 +45,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php (working copy) @@ -47,4 +47,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php (working copy) @@ -100,4 +100,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/LayoutViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/LayoutViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/LayoutViewHelper.php (working copy) @@ -23,9 +23,9 @@ /** * With this tag, you can select a layout to be used.. * - * * * + * * @version $Id: LayoutViewHelper.php 1734 2009-11-25 21:53:57Z stucki $ * @package Fluid * @subpackage ViewHelpers @@ -79,4 +79,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Be/AbstractBackendViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Be/AbstractBackendViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Be/AbstractBackendViewHelper.php (working copy) @@ -52,4 +52,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuViewHelper.php (working copy) @@ -110,4 +110,4 @@ return '
' . $this->tag->render() . '
'; } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuItemViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuItemViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuItemViewHelper.php (working copy) @@ -68,4 +68,4 @@ return $this->tag->render(); } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Be/PageInfoViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Be/PageInfoViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Be/PageInfoViewHelper.php (working copy) @@ -75,4 +75,4 @@ return $pageInfo; } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/IconViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/IconViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/IconViewHelper.php (working copy) @@ -72,4 +72,4 @@ return ''; } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/ShortcutViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/ShortcutViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/ShortcutViewHelper.php (working copy) @@ -78,4 +78,4 @@ return $doc->makeShortcutIcon($getList, $setList, $moduleName); } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/CshViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/CshViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/CshViewHelper.php (working copy) @@ -68,4 +68,4 @@ return '
' . $cshButton . '
'; } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php (working copy) @@ -76,4 +76,4 @@ return $pagePath; } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php (working copy) @@ -110,4 +110,4 @@ return $dblist->HTMLcode; } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/ElseViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/ElseViewHelper.php (revision 8127) +++ 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 $ @@ -44,4 +44,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/BaseViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/BaseViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/BaseViewHelper.php (working copy) @@ -59,4 +59,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/GroupedForViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/GroupedForViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/GroupedForViewHelper.php (working copy) @@ -143,4 +143,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php (working copy) @@ -88,4 +88,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/Uri/ResourceViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/Uri/ResourceViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/Uri/ResourceViewHelper.php (working copy) @@ -60,4 +60,4 @@ return $uri; } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/ForViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/ForViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/ForViewHelper.php (working copy) @@ -119,4 +119,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/SectionViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/SectionViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Classes/ViewHelpers/SectionViewHelper.php (working copy) @@ -78,4 +78,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/ViewHelpers/AliasViewHelper.php =================================================================== --- typo3/sysext/fluid/Classes/ViewHelpers/AliasViewHelper.php (revision 8127) +++ 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 * @api @@ -74,4 +74,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/View/TemplateViewInterface.php =================================================================== --- typo3/sysext/fluid/Classes/View/TemplateViewInterface.php (revision 8127) +++ typo3/sysext/fluid/Classes/View/TemplateViewInterface.php (working copy) @@ -77,4 +77,4 @@ public function hasTemplate(); } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Classes/Core/ViewHelper/Exception.php =================================================================== --- typo3/sysext/fluid/Classes/Core/ViewHelper/Exception.php (revision 8127) +++ typo3/sysext/fluid/Classes/Core/ViewHelper/Exception.php (working copy) @@ -31,4 +31,4 @@ */ class Tx_Fluid_Core_ViewHelper_Exception extends Tx_Fluid_Core_Exception { } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/ext_emconf.php =================================================================== --- typo3/sysext/fluid/ext_emconf.php (revision 8127) +++ typo3/sysext/fluid/ext_emconf.php (working copy) @@ -44,4 +44,4 @@ ), ); -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/GroupedForViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/GroupedForViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/GroupedForViewHelperTest.php (working copy) @@ -186,4 +186,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Fixtures/ConstraintSyntaxTreeNode.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Fixtures/ConstraintSyntaxTreeNode.php (revision 8127) +++ 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,9 +43,9 @@ } $this->callProtocol[] = $callElement; } - + public function evaluate() {} } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/ThenViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/ThenViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/ThenViewHelperTest.php (working copy) @@ -43,4 +43,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/EmptySyntaxTreeNode.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/EmptySyntaxTreeNode.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/EmptySyntaxTreeNode.php (working copy) @@ -29,12 +29,12 @@ * @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() { - + } - + } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/Fixture_UserDomainClass.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/Fixture_UserDomainClass.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/Fixture_UserDomainClass.php (working copy) @@ -82,4 +82,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php (working copy) @@ -91,4 +91,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/ForViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/ForViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/ForViewHelperTest.php (working copy) @@ -361,4 +361,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/IfViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/IfViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/IfViewHelperTest.php (working copy) @@ -170,4 +170,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/ElseViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/ElseViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/ElseViewHelperTest.php (working copy) @@ -43,4 +43,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php (working copy) @@ -58,4 +58,4 @@ $this->assertEquals('Line 1
' . chr(13) . chr(10) . 'Line 2', $actualResult); } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php (working copy) @@ -98,4 +98,4 @@ $this->assertEquals('1980-12-12', $actualResult); } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php (working copy) @@ -91,4 +91,4 @@ $this->assertEquals('-123,46', $actualResult); } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/AliasViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/AliasViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/AliasViewHelperTest.php (working copy) @@ -90,4 +90,4 @@ -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php (working copy) @@ -71,4 +71,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php (working copy) @@ -56,4 +56,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/ViewHelpers/CycleViewHelperTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/ViewHelpers/CycleViewHelperTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/ViewHelpers/CycleViewHelperTest.php (working copy) @@ -143,4 +143,4 @@ } } -?> +?> \ 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 8127) +++ typo3/sysext/fluid/Tests/Unit/View/Fixtures/TransparentSyntaxTreeNode.php (working copy) @@ -30,10 +30,10 @@ */ class Tx_Fluid_View_Fixture_TransparentSyntaxTreeNode extends Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode { public $variableContainer; - + public function evaluate() { } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/View/Fixtures/TemplateViewFixture.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/View/Fixtures/TemplateViewFixture.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/View/Fixtures/TemplateViewFixture.php (working copy) @@ -41,4 +41,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/Core/TagBuilderTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/Core/TagBuilderTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/Core/TagBuilderTest.php (working copy) @@ -218,4 +218,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/TextNodeTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/TextNodeTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/TextNodeTest.php (working copy) @@ -50,4 +50,4 @@ -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/TemplateParserTestFixture01-shorthand-split.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/TemplateParserTestFixture01-shorthand-split.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/TemplateParserTestFixture01-shorthand-split.php (working copy) @@ -3,4 +3,4 @@ return array(' a{f:base()}b'); -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/TemplateParserTestFixture14-split.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/TemplateParserTestFixture14-split.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/TemplateParserTestFixture14-split.php (working copy) @@ -6,4 +6,4 @@ '' ); -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/ChildNodeAccessFacetViewHelper.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/ChildNodeAccessFacetViewHelper.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/ChildNodeAccessFacetViewHelper.php (working copy) @@ -32,4 +32,4 @@ } -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/TemplateParserTestFixture06-split.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/TemplateParserTestFixture06-split.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/TemplateParserTestFixture06-split.php (working copy) @@ -2,4 +2,4 @@ return array('{namespace f3=Tx_Fluid_ViewHelpers}{number}'); -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ArgumentDefinitionTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ArgumentDefinitionTest.php (revision 8127) +++ typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ArgumentDefinitionTest.php (working copy) @@ -50,4 +50,4 @@ -?> +?> \ No newline at end of file Index: typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TemplateVariableContainerTest.php =================================================================== --- typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TemplateVariableContainerTest.php (revision 8127) +++ 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 @@ -72,7 +72,7 @@ $this->assertTrue($this->variableContainer->exists('variable')); $this->assertTrue(isset($this->variableContainer['variable'])); } - + /** * @test * @author Sebastian Kurfürst @@ -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 @@ -134,4 +134,4 @@ -?> +?> \ No newline at end of file Index: typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php =================================================================== --- typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php (revision 8127) +++ typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php (working copy) @@ -2475,4 +2475,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/indexed_search/pi/class.tx_indexedsearch.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/tsconfig_help/mod1/index.php =================================================================== --- typo3/sysext/tsconfig_help/mod1/index.php (revision 8127) +++ typo3/sysext/tsconfig_help/mod1/index.php (working copy) @@ -794,4 +794,4 @@ $SOBE->main(); $SOBE->printContent(); -?> +?> \ No newline at end of file Index: typo3/sysext/beuser/mod/index.php =================================================================== --- typo3/sysext/beuser/mod/index.php (revision 8127) +++ typo3/sysext/beuser/mod/index.php (working copy) @@ -1376,7 +1376,7 @@ $allCells = array(); $link_createNewUser=''. - t3lib_iconWorks::getSpriteIcon('actions-document-new') . + t3lib_iconWorks::getSpriteIcon('actions-document-new') . ''; $allCells['USERS'] = '
' . $GLOBALS['LANG']->getLL('usernames', TRUE) . '' . $link_createNewUser . '
'; @@ -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 .= '' . + $uItem .= '' . t3lib_iconWorks::getSpriteIcon('actions-system-backend-user-switch') . ''. - '' . + '' . t3lib_iconWorks::getSpriteIcon('actions-system-backend-user-emulate') . ''; } @@ -1477,14 +1477,14 @@ ''; } else { $params='&data[' . $table . '][' . $row['uid'] . '][' . $hiddenField . ']=1'; - $cells[]='' . + $cells[]='' . t3lib_iconWorks::getSpriteIcon('actions-edit-hide') . ''; } // Delete $params='&cmd[' . $table . '][' . $row['uid'] . '][delete]=1'; - $cells[]='' . + $cells[]='' . t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . ''; @@ -1629,4 +1629,4 @@ $SOBE->main(); $SOBE->printContent(); -?> +?> \ No newline at end of file Index: typo3/sysext/lang/lang.php =================================================================== --- typo3/sysext/lang/lang.php (revision 8127) +++ 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
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']) @@ -521,4 +521,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/lang/lang.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/sys_action/toolbarmenu/class.tx_sysaction_toolbarmenu.php =================================================================== --- typo3/sysext/sys_action/toolbarmenu/class.tx_sysaction_toolbarmenu.php (revision 8127) +++ typo3/sysext/sys_action/toolbarmenu/class.tx_sysaction_toolbarmenu.php (working copy) @@ -202,4 +202,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/sys_action/toolbarmenu/class.tx_sysaction_toolbarmenu.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/statictemplates/ext_localconf.php =================================================================== --- typo3/sysext/statictemplates/ext_localconf.php (revision 8127) +++ typo3/sysext/statictemplates/ext_localconf.php (working copy) @@ -4,4 +4,4 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tstemplate.php']['includeStaticTypoScriptSources'][] = 'EXT:statictemplates/class.tx_statictemplates.php:tx_statictemplates->includeStaticTypoScriptSources'; -?> +?> \ No newline at end of file Index: typo3/sysext/statictemplates/class.tx_statictemplates.php =================================================================== --- typo3/sysext/statictemplates/class.tx_statictemplates.php (revision 8127) +++ 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']); @@ -60,4 +60,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/statictemplates/ext_tables.php =================================================================== --- typo3/sysext/statictemplates/ext_tables.php (revision 8127) +++ typo3/sysext/statictemplates/ext_tables.php (working copy) @@ -39,4 +39,4 @@ t3lib_extMgm::addTCAcolumns('sys_template', $tempField, 1); t3lib_extMgm::addToAllTCAtypes('sys_template', 'include_static;;2;;5-5-5', '', 'before:includeStaticAfterBasedOn'); -?> +?> \ No newline at end of file Index: typo3/sysext/impexp/class.tx_impexp.php =================================================================== --- typo3/sysext/impexp/class.tx_impexp.php (revision 8127) +++ typo3/sysext/impexp/class.tx_impexp.php (working copy) @@ -3338,4 +3338,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/impexp/class.tx_impexp.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/impexp/class.tx_impexp.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/OpenID/BigMath.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/OpenID/BigMath.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/OpenID/BigMath.php (working copy) @@ -469,4 +469,4 @@ return defined('Auth_OpenID_NO_MATH_SUPPORT'); } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/OpenID/SQLStore.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/OpenID/SQLStore.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/OpenID/SQLStore.php (working copy) @@ -566,4 +566,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/OpenID/Discover.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/OpenID/Discover.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/OpenID/Discover.php (working copy) @@ -545,4 +545,4 @@ return $result; } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/OpenID/DiffieHellman.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/OpenID/DiffieHellman.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/OpenID/DiffieHellman.php (working copy) @@ -110,4 +110,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/OpenID/SReg.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/OpenID/SReg.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/OpenID/SReg.php (working copy) @@ -518,4 +518,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/OpenID/Message.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/OpenID/Message.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/OpenID/Message.php (working copy) @@ -912,4 +912,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/OpenID/URINorm.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/OpenID/URINorm.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/OpenID/URINorm.php (working copy) @@ -246,4 +246,4 @@ return $scheme . '://' . $authority . $path . $query . $fragment; } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/OpenID/FileStore.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/OpenID/FileStore.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/OpenID/FileStore.php (working copy) @@ -615,4 +615,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/OpenID.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/OpenID.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/OpenID.php (working copy) @@ -549,4 +549,4 @@ ""); } } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/Yadis/XRIRes.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/Yadis/XRIRes.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/Yadis/XRIRes.php (working copy) @@ -69,4 +69,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/Yadis/XRI.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/Yadis/XRI.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/Yadis/XRI.php (working copy) @@ -231,4 +231,4 @@ return $canonicalID; } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/Yadis/Yadis.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/Yadis/Yadis.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/Yadis/Yadis.php (working copy) @@ -379,4 +379,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/lib/php-openid/Auth/Yadis/XML.php =================================================================== --- typo3/sysext/openid/lib/php-openid/Auth/Yadis/XML.php (revision 8127) +++ typo3/sysext/openid/lib/php-openid/Auth/Yadis/XML.php (working copy) @@ -371,4 +371,4 @@ return $p; } -?> +?> \ No newline at end of file Index: typo3/sysext/openid/class.tx_openid_return.php =================================================================== --- typo3/sysext/openid/class.tx_openid_return.php (revision 8127) +++ typo3/sysext/openid/class.tx_openid_return.php (working copy) @@ -74,4 +74,4 @@ /* @var tx_openid_return $module */ $module->main(); -?> +?> \ No newline at end of file Index: typo3/sysext/openid/class.tx_openid_eid.php =================================================================== --- typo3/sysext/openid/class.tx_openid_eid.php (revision 8127) +++ typo3/sysext/openid/class.tx_openid_eid.php (working copy) @@ -73,4 +73,4 @@ /* @var tx_openid_eID $module */ $module->main(); -?> +?> \ No newline at end of file Index: typo3/sysext/openid/sv1/class.tx_openid_sv1.php =================================================================== --- typo3/sysext/openid/sv1/class.tx_openid_sv1.php (revision 8127) +++ typo3/sysext/openid/sv1/class.tx_openid_sv1.php (working copy) @@ -577,4 +577,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/openid/sv1/class.tx_openid_sv1.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/feedit/view/class.tx_feedit_editpanel.php =================================================================== --- typo3/sysext/feedit/view/class.tx_feedit_editpanel.php (revision 8127) +++ typo3/sysext/feedit/view/class.tx_feedit_editpanel.php (working copy) @@ -422,4 +422,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/feedit/view/class.tx_feedit_editpanel.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/cms/layout/class.tx_cms_layout.php =================================================================== --- typo3/sysext/cms/layout/class.tx_cms_layout.php (revision 8127) +++ typo3/sysext/cms/layout/class.tx_cms_layout.php (working copy) @@ -33,7 +33,7 @@ * * @author Kasper Skaarhoj */ - + /** * [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__'].= '' . - t3lib_iconWorks::getSpriteIcon('actions-document-open') . + t3lib_iconWorks::getSpriteIcon('actions-document-open') . ''; } 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.=''. - t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . + t3lib_iconWorks::getSpriteIcon('actions-edit-delete') . ''; if (!$disableMoveAndNewButtons) { @@ -2668,4 +2668,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/cms/layout/class.tx_cms_layout.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/cms/layout/db_new_content_el.php =================================================================== --- typo3/sysext/cms/layout/db_new_content_el.php (revision 8127) +++ typo3/sysext/cms/layout/db_new_content_el.php (working copy) @@ -638,4 +638,4 @@ $SOBE->main(); $SOBE->printContent(); -?> +?> \ No newline at end of file Index: typo3/sysext/cms/ext_localconf.php =================================================================== --- typo3/sysext/cms/ext_localconf.php (revision 8127) +++ typo3/sysext/cms/ext_localconf.php (working copy) @@ -194,4 +194,4 @@ $TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['moveRecordClass'][] = 'EXT:cms/tslib/hooks/class.tx_cms_treelistcacheupdate.php:&tx_cms_treelistCacheUpdate'; -?> +?> \ No newline at end of file Index: typo3/sysext/cms/tslib/class.tslib_fe.php =================================================================== --- typo3/sysext/cms/tslib/class.tslib_fe.php (revision 8127) +++ typo3/sysext/cms/tslib/class.tslib_fe.php (working copy) @@ -4835,4 +4835,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/class.tslib_fe.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/cms/tslib/class.tslib_pagegen.php =================================================================== --- typo3/sysext/cms/tslib/class.tslib_pagegen.php (revision 8127) +++ typo3/sysext/cms/tslib/class.tslib_pagegen.php (working copy) @@ -1180,4 +1180,4 @@ var $fromTC = 0; // Means that everything is returned instead of only uid and label-field } -?> +?> \ No newline at end of file Index: typo3/sysext/cms/tslib/class.tslib_menu.php =================================================================== --- typo3/sysext/cms/tslib/class.tslib_menu.php (revision 8127) +++ 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); @@ -2989,4 +2989,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/class.tslib_menu.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/cms/tslib/hooks/class.tx_cms_mediaitems.php =================================================================== --- typo3/sysext/cms/tslib/hooks/class.tx_cms_mediaitems.php (revision 8127) +++ typo3/sysext/cms/tslib/hooks/class.tx_cms_mediaitems.php (working copy) @@ -73,4 +73,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/hooks/class.tx_cms_mediaitems.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/hooks/class.tx_cms_mediaitems.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/cms/tslib/interfaces/interface.tslib_menu_filterMenuPagesHook.php =================================================================== --- typo3/sysext/cms/tslib/interfaces/interface.tslib_menu_filterMenuPagesHook.php (revision 8127) +++ typo3/sysext/cms/tslib/interfaces/interface.tslib_menu_filterMenuPagesHook.php (working copy) @@ -47,4 +47,4 @@ public function tslib_menu_filterMenuPagesHook (array &$data, array $banUidArray, $spacer, tslib_tmenu $obj); } -?> +?> \ No newline at end of file Index: typo3/sysext/dbal/handlers/class.tx_dbal_handler_rawmysql.php =================================================================== --- typo3/sysext/dbal/handlers/class.tx_dbal_handler_rawmysql.php (revision 8127) +++ typo3/sysext/dbal/handlers/class.tx_dbal_handler_rawmysql.php (working copy) @@ -353,4 +353,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/handlers/class.tx_dbal_handler_rawmysql.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/handlers/class.tx_dbal_handler_rawmysql.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/dbal/handlers/class.tx_dbal_handler_xmldb.php =================================================================== --- typo3/sysext/dbal/handlers/class.tx_dbal_handler_xmldb.php (revision 8127) +++ typo3/sysext/dbal/handlers/class.tx_dbal_handler_xmldb.php (working copy) @@ -422,4 +422,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/handlers/class.tx_dbal_handler_xmldb.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/handlers/class.tx_dbal_handler_xmldb.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/dbal/handlers/class.tx_dbal_handler_openoffice.php =================================================================== --- typo3/sysext/dbal/handlers/class.tx_dbal_handler_openoffice.php (revision 8127) +++ typo3/sysext/dbal/handlers/class.tx_dbal_handler_openoffice.php (working copy) @@ -232,4 +232,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/handlers/class.tx_dbal_handler_openoffice.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/dbal/ext_autoload.php =================================================================== --- typo3/sysext/dbal/ext_autoload.php (revision 8127) +++ typo3/sysext/dbal/ext_autoload.php (working copy) @@ -8,4 +8,4 @@ 'tx_dbal_sqlengine' => $extensionPath . 'lib/class.tx_dbal_sqlengine.php', 'ux_t3lib_sqlparser' => $extensionPath . 'class.ux_t3lib_sqlparser.php', ); -?> +?> \ No newline at end of file Index: typo3/sysext/dbal/ext_tables.php =================================================================== --- typo3/sysext/dbal/ext_tables.php (revision 8127) +++ typo3/sysext/dbal/ext_tables.php (working copy) @@ -6,4 +6,4 @@ if (TYPO3_MODE === 'BE') { t3lib_extMgm::addModule('tools', 'txdbalM1', '', t3lib_extMgm::extPath($_EXTKEY) . 'mod1/'); } -?> +?> \ No newline at end of file Index: typo3/sysext/dbal/ext_localconf.php =================================================================== --- typo3/sysext/dbal/ext_localconf.php (revision 8127) +++ typo3/sysext/dbal/ext_localconf.php (working copy) @@ -10,4 +10,4 @@ // Register a hook for the installer $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['stepOutput'][] = 'EXT:dbal/class.tx_dbal_installtool.php:tx_dbal_installtool'; $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['writeLocalconf'][] = 'EXT:dbal/class.tx_dbal_installtool.php:tx_dbal_installtool'; -?> +?> \ No newline at end of file Index: typo3/sysext/dbal/lib/class.tx_dbal_sqlengine.php =================================================================== --- typo3/sysext/dbal/lib/class.tx_dbal_sqlengine.php (revision 8127) +++ typo3/sysext/dbal/lib/class.tx_dbal_sqlengine.php (working copy) @@ -905,4 +905,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/lib/class.tx_dbal_sqlengine.php']); } -?> +?> \ No newline at end of file Index: typo3/sysext/adodb/adodb/adodb-errorhandler.inc.php =================================================================== --- typo3/sysext/adodb/adodb/adodb-errorhandler.inc.php (revision 8127) +++ 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 "

$s

"; - trigger_error($s,ADODB_ERROR_HANDLER_TYPE); + trigger_error($s,ADODB_ERROR_HANDLER_TYPE); } -?> +?> \ No newline at end of file Index: typo3/sysext/adodb/adodb/adodb-active-recordx.inc.php =================================================================== --- typo3/sysext/adodb/adodb/adodb-active-recordx.inc.php (revision 8127) +++ 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 @@ # 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; @@ -1418,4 +1418,4 @@ return $arr; } -?> +?> \ 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 8127) +++ typo3/sysext/adodb/adodb/drivers/adodb-sqlanywhere.inc.php (working copy) @@ -1,10 +1,10 @@ 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) { @@ -166,4 +166,4 @@ } //define -?> +?> \ No newline at end of file Index: typo3/sysext/adodb/adodb/drivers/adodb-odbtp_unicode.inc.php =================================================================== --- typo3/sysext/adodb/adodb/drivers/adodb-odbtp_unicode.inc.php (revision 8127) +++ typo3/sysext/adodb/adodb/drivers/adodb-odbtp_unicode.inc.php (working copy) @@ -36,4 +36,4 @@ $this->ADODB_odbtp(); } } -?> +?> \ No newline at end of file Index: typo3/sysext/adodb/adodb/drivers/adodb-pdo_pgsql.inc.php =================================================================== --- typo3/sysext/adodb/adodb/drivers/adodb-pdo_pgsql.inc.php (revision 8127) +++ 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,30 +201,30 @@ 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; + } } -?> +?> \ No newline at end of file Index: typo3/sysext/adodb/adodb/drivers/adodb-netezza.inc.php =================================================================== --- typo3/sysext/adodb/adodb/drivers/adodb-netezza.inc.php (revision 8127) +++ typo3/sysext/adodb/adodb/drivers/adodb-netezza.inc.php (working copy) @@ -1,7 +1,7 @@ 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() { @@ -167,4 +167,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/adodb/adodb/drivers/adodb-sybase.inc.php =================================================================== --- typo3/sysext/adodb/adodb/drivers/adodb-sybase.inc.php (revision 8127) +++ typo3/sysext/adodb/adodb/drivers/adodb-sybase.inc.php (working copy) @@ -1,25 +1,25 @@ 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; @@ -425,4 +425,4 @@ return mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]); } } -?> +?> \ No newline at end of file Index: typo3/sysext/adodb/adodb/drivers/adodb-odbtp.inc.php =================================================================== --- typo3/sysext/adodb/adodb/drivers/adodb-odbtp.inc.php (revision 8127) +++ 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()."
"; @@ -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; } @@ -833,4 +833,4 @@ return $this->ADORecordSet_odbtp($id,$mode); } } -?> +?> \ No newline at end of file Index: typo3/sysext/adodb/checkconnectionwizard.php =================================================================== --- typo3/sysext/adodb/checkconnectionwizard.php (revision 8127) +++ typo3/sysext/adodb/checkconnectionwizard.php (working copy) @@ -129,4 +129,4 @@ $SOBE->main(); -?> +?> \ No newline at end of file Index: typo3/sysext/scheduler/ext_autoload.php =================================================================== --- typo3/sysext/scheduler/ext_autoload.php (revision 8127) +++ typo3/sysext/scheduler/ext_autoload.php (working copy) @@ -16,4 +16,4 @@ 'tx_scheduler_sleeptask' => t3lib_extMgm::extPath('scheduler', 'examples/class.tx_scheduler_sleeptask.php'), 'tx_scheduler_sleeptask_additionalfieldprovider' => t3lib_extMgm::extPath('scheduler', 'examples/class.tx_scheduler_sleeptask_additionalfieldprovider.php') ); -?> +?> \ No newline at end of file Index: typo3/sysext/scheduler/ext_localconf.php =================================================================== --- typo3/sysext/scheduler/ext_localconf.php (revision 8127) +++ typo3/sysext/scheduler/ext_localconf.php (working copy) @@ -29,4 +29,4 @@ 'additionalFields' => 'tx_scheduler_SleepTask_AdditionalFieldProvider' ); } -?> +?> \ No newline at end of file Index: typo3/sysext/lowlevel/config/index.php =================================================================== --- typo3/sysext/lowlevel/config/index.php (revision 8127) +++ typo3/sysext/lowlevel/config/index.php (working copy) @@ -377,4 +377,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); -?> +?> \ No newline at end of file Index: typo3/sysext/lowlevel/clmods/class.rte_images.php =================================================================== --- typo3/sysext/lowlevel/clmods/class.rte_images.php (revision 8127) +++ typo3/sysext/lowlevel/clmods/class.rte_images.php (working copy) @@ -300,4 +300,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/lowlevel/dbint/index.php =================================================================== --- typo3/sysext/lowlevel/dbint/index.php (revision 8127) +++ typo3/sysext/lowlevel/dbint/index.php (working copy) @@ -712,4 +712,4 @@ $SOBE->main(); $SOBE->printContent(); -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/ext_emconf.php =================================================================== --- typo3/sysext/extbase/ext_emconf.php (revision 8127) +++ typo3/sysext/extbase/ext_emconf.php (working copy) @@ -45,4 +45,4 @@ '_md5_values_when_last_written' => 'a:278:{s:17:"RELEASE_NOTES.txt";s:4:"a3ac";s:16:"ext_autoload.php";s:4:"5b90";s:12:"ext_icon.gif";s:4:"e922";s:17:"ext_localconf.php";s:4:"6130";s:14:"ext_tables.php";s:4:"6271";s:14:"ext_tables.sql";s:4:"c6a7";s:24:"ext_typoscript_setup.txt";s:4:"f395";s:14:"svn-commit.tmp";s:4:"aa6b";s:22:"Classes/Dispatcher.php";s:4:"05f1";s:21:"Classes/Exception.php";s:4:"c346";s:54:"Classes/Configuration/AbstractConfigurationManager.php";s:4:"9a4c";s:53:"Classes/Configuration/BackendConfigurationManager.php";s:4:"1741";s:35:"Classes/Configuration/Exception.php";s:4:"31e6";s:54:"Classes/Configuration/FrontendConfigurationManager.php";s:4:"660e";s:53:"Classes/Configuration/Exception/ContainerIsLocked.php";s:4:"a34d";s:60:"Classes/Configuration/Exception/InvalidConfigurationType.php";s:4:"e100";s:46:"Classes/Configuration/Exception/NoSuchFile.php";s:4:"ba93";s:48:"Classes/Configuration/Exception/NoSuchOption.php";s:4:"1369";s:46:"Classes/Configuration/Exception/ParseError.php";s:4:"da56";s:37:"Classes/Domain/Model/FrontendUser.php";s:4:"bf08";s:42:"Classes/Domain/Model/FrontendUserGroup.php";s:4:"f606";s:57:"Classes/Domain/Repository/FrontendUserGroupRepository.php";s:4:"0b75";s:52:"Classes/Domain/Repository/FrontendUserRepository.php";s:4:"82e9";s:45:"Classes/DomainObject/AbstractDomainObject.php";s:4:"4df2";s:39:"Classes/DomainObject/AbstractEntity.php";s:4:"de7f";s:44:"Classes/DomainObject/AbstractValueObject.php";s:4:"42f0";s:46:"Classes/DomainObject/DomainObjectInterface.php";s:4:"9977";s:23:"Classes/Error/Error.php";s:4:"d136";s:25:"Classes/MVC/Exception.php";s:4:"606f";s:23:"Classes/MVC/Request.php";s:4:"f11e";s:32:"Classes/MVC/RequestInterface.php";s:4:"09c5";s:24:"Classes/MVC/Response.php";s:4:"1f30";s:33:"Classes/MVC/ResponseInterface.php";s:4:"3c5e";s:45:"Classes/MVC/Controller/AbstractController.php";s:4:"e6d6";s:43:"Classes/MVC/Controller/ActionController.php";s:4:"b987";s:35:"Classes/MVC/Controller/Argument.php";s:4:"b82f";s:40:"Classes/MVC/Controller/ArgumentError.php";s:4:"501b";s:36:"Classes/MVC/Controller/Arguments.php";s:4:"20ff";s:45:"Classes/MVC/Controller/ArgumentsValidator.php";s:4:"e859";s:44:"Classes/MVC/Controller/ControllerContext.php";s:4:"dc69";s:46:"Classes/MVC/Controller/ControllerInterface.php";s:4:"99d2";s:40:"Classes/MVC/Controller/FlashMessages.php";s:4:"ef89";s:38:"Classes/MVC/Exception/InfiniteLoop.php";s:4:"7f60";s:43:"Classes/MVC/Exception/InvalidActionName.php";s:4:"73e8";s:45:"Classes/MVC/Exception/InvalidArgumentName.php";s:4:"e66f";s:45:"Classes/MVC/Exception/InvalidArgumentType.php";s:4:"766c";s:46:"Classes/MVC/Exception/InvalidArgumentValue.php";s:4:"b8fc";s:43:"Classes/MVC/Exception/InvalidController.php";s:4:"2819";s:47:"Classes/MVC/Exception/InvalidControllerName.php";s:4:"a435";s:46:"Classes/MVC/Exception/InvalidExtensionName.php";s:4:"ed0e";s:39:"Classes/MVC/Exception/InvalidMarker.php";s:4:"848e";s:48:"Classes/MVC/Exception/InvalidOrNoRequestHash.php";s:4:"124a";s:46:"Classes/MVC/Exception/InvalidRequestMethod.php";s:4:"1a40";s:44:"Classes/MVC/Exception/InvalidRequestType.php";s:4:"2b21";s:49:"Classes/MVC/Exception/InvalidTemplateResource.php";s:4:"4655";s:43:"Classes/MVC/Exception/InvalidUriPattern.php";s:4:"adfa";s:43:"Classes/MVC/Exception/InvalidViewHelper.php";s:4:"fa39";s:38:"Classes/MVC/Exception/NoSuchAction.php";s:4:"c917";s:40:"Classes/MVC/Exception/NoSuchArgument.php";s:4:"6f97";s:42:"Classes/MVC/Exception/NoSuchController.php";s:4:"b3e6";s:36:"Classes/MVC/Exception/StopAction.php";s:4:"e705";s:48:"Classes/MVC/Exception/UnsupportedRequestType.php";s:4:"1c56";s:33:"Classes/MVC/View/AbstractView.php";s:4:"0ac2";s:30:"Classes/MVC/View/EmptyView.php";s:4:"00cd";s:34:"Classes/MVC/View/ViewInterface.php";s:4:"a38b";s:27:"Classes/MVC/Web/Request.php";s:4:"1934";s:34:"Classes/MVC/Web/RequestBuilder.php";s:4:"0954";s:28:"Classes/MVC/Web/Response.php";s:4:"9564";s:38:"Classes/MVC/Web/Routing/UriBuilder.php";s:4:"1ddb";s:28:"Classes/Object/Exception.php";s:4:"bab4";s:26:"Classes/Object/Manager.php";s:4:"c356";s:35:"Classes/Object/ManagerInterface.php";s:4:"7b3c";s:36:"Classes/Object/RegistryInterface.php";s:4:"2389";s:36:"Classes/Object/TransientRegistry.php";s:4:"6170";s:46:"Classes/Object/Exception/CannotBuildObject.php";s:4:"1147";s:53:"Classes/Object/Exception/CannotReconstituteObject.php";s:4:"b920";s:41:"Classes/Object/Exception/InvalidClass.php";s:4:"21b7";s:42:"Classes/Object/Exception/InvalidObject.php";s:4:"03bb";s:55:"Classes/Object/Exception/InvalidObjectConfiguration.php";s:4:"dff6";s:52:"Classes/Object/Exception/ObjectAlreadyRegistered.php";s:4:"9e39";s:41:"Classes/Object/Exception/UnknownClass.php";s:4:"7db3";s:45:"Classes/Object/Exception/UnknownInterface.php";s:4:"8571";s:42:"Classes/Object/Exception/UnknownObject.php";s:4:"cc13";s:51:"Classes/Object/Exception/UnresolvedDependencies.php";s:4:"174b";s:39:"Classes/Object/Exception/WrongScope.php";s:4:"d2ca";s:31:"Classes/Persistence/Backend.php";s:4:"f781";s:40:"Classes/Persistence/BackendInterface.php";s:4:"36cf";s:33:"Classes/Persistence/Exception.php";s:4:"1713";s:35:"Classes/Persistence/IdentityMap.php";s:4:"fe01";s:41:"Classes/Persistence/IteratorInterface.php";s:4:"d179";s:40:"Classes/Persistence/LazyLoadingProxy.php";s:4:"3bf9";s:41:"Classes/Persistence/LazyObjectStorage.php";s:4:"1101";s:48:"Classes/Persistence/LoadingStrategyInterface.php";s:4:"d4ed";s:31:"Classes/Persistence/Manager.php";s:4:"ef11";s:40:"Classes/Persistence/ManagerInterface.php";s:4:"d304";s:37:"Classes/Persistence/ObjectStorage.php";s:4:"e737";s:36:"Classes/Persistence/PropertyType.php";s:4:"3dbb";s:29:"Classes/Persistence/Query.php";s:4:"ff46";s:36:"Classes/Persistence/QueryFactory.php";s:4:"f4a3";s:45:"Classes/Persistence/QueryFactoryInterface.php";s:4:"a61d";s:38:"Classes/Persistence/QueryInterface.php";s:4:"4685";s:35:"Classes/Persistence/QueryResult.php";s:4:"02b3";s:44:"Classes/Persistence/QueryResultInterface.php";s:4:"eb10";s:46:"Classes/Persistence/QuerySettingsInterface.php";s:4:"132b";s:37:"Classes/Persistence/RangeIterator.php";s:4:"04fa";s:46:"Classes/Persistence/RangeIteratorInterface.php";s:4:"28bd";s:34:"Classes/Persistence/Repository.php";s:4:"b26e";s:43:"Classes/Persistence/RepositoryInterface.php";s:4:"164f";s:27:"Classes/Persistence/Row.php";s:4:"c6ce";s:36:"Classes/Persistence/RowInterface.php";s:4:"6b5a";s:35:"Classes/Persistence/RowIterator.php";s:4:"e493";s:44:"Classes/Persistence/RowIteratorInterface.php";s:4:"3997";s:31:"Classes/Persistence/Session.php";s:4:"43b4";s:42:"Classes/Persistence/Typo3QuerySettings.php";s:4:"4629";s:51:"Classes/Persistence/Typo3QuerySettingsInterface.php";s:4:"08f2";s:29:"Classes/Persistence/Value.php";s:4:"0efb";s:36:"Classes/Persistence/ValueFactory.php";s:4:"ea2b";s:45:"Classes/Persistence/ValueFactoryInterface.php";s:4:"0a49";s:38:"Classes/Persistence/ValueInterface.php";s:4:"a11c";s:56:"Classes/Persistence/Exception/CleanStateNotMemorized.php";s:4:"7689";s:51:"Classes/Persistence/Exception/IllegalObjectType.php";s:4:"73e7";s:46:"Classes/Persistence/Exception/InvalidClass.php";s:4:"761b";s:53:"Classes/Persistence/Exception/InvalidPropertyType.php";s:4:"cd9a";s:48:"Classes/Persistence/Exception/MissingBackend.php";s:4:"1d0d";s:53:"Classes/Persistence/Exception/RepositoryException.php";s:4:"d09e";s:42:"Classes/Persistence/Exception/TooDirty.php";s:4:"3347";s:57:"Classes/Persistence/Exception/UnexpectedTypeException.php";s:4:"5b57";s:47:"Classes/Persistence/Exception/UnknownObject.php";s:4:"21a6";s:51:"Classes/Persistence/Exception/UnsupportedMethod.php";s:4:"9915";s:50:"Classes/Persistence/Exception/UnsupportedOrder.php";s:4:"f4b9";s:54:"Classes/Persistence/Exception/ValueFormatException.php";s:4:"0d30";s:40:"Classes/Persistence/Mapper/ColumnMap.php";s:4:"801f";s:38:"Classes/Persistence/Mapper/DataMap.php";s:4:"901d";s:41:"Classes/Persistence/Mapper/DataMapper.php";s:4:"544a";s:40:"Classes/Persistence/QOM/AndInterface.php";s:4:"ae8d";s:45:"Classes/Persistence/QOM/BindVariableValue.php";s:4:"f52e";s:54:"Classes/Persistence/QOM/BindVariableValueInterface.php";s:4:"eb03";s:38:"Classes/Persistence/QOM/Comparison.php";s:4:"afdc";s:47:"Classes/Persistence/QOM/ComparisonInterface.php";s:4:"10ac";s:47:"Classes/Persistence/QOM/ConstraintInterface.php";s:4:"3b4b";s:42:"Classes/Persistence/QOM/DynamicOperand.php";s:4:"5266";s:51:"Classes/Persistence/QOM/DynamicOperandInterface.php";s:4:"91b0";s:45:"Classes/Persistence/QOM/EquiJoinCondition.php";s:4:"35c2";s:54:"Classes/Persistence/QOM/EquiJoinConditionInterface.php";s:4:"b873";s:32:"Classes/Persistence/QOM/Join.php";s:4:"4c13";s:50:"Classes/Persistence/QOM/JoinConditionInterface.php";s:4:"4b8d";s:41:"Classes/Persistence/QOM/JoinInterface.php";s:4:"144a";s:38:"Classes/Persistence/QOM/LogicalAnd.php";s:4:"a250";s:38:"Classes/Persistence/QOM/LogicalNot.php";s:4:"75e9";s:37:"Classes/Persistence/QOM/LogicalOr.php";s:4:"6da2";s:37:"Classes/Persistence/QOM/LowerCase.php";s:4:"93e4";s:46:"Classes/Persistence/QOM/LowerCaseInterface.php";s:4:"e093";s:40:"Classes/Persistence/QOM/NotInterface.php";s:4:"0ec5";s:35:"Classes/Persistence/QOM/Operand.php";s:4:"7efd";s:44:"Classes/Persistence/QOM/OperandInterface.php";s:4:"1928";s:39:"Classes/Persistence/QOM/OrInterface.php";s:4:"9cf8";s:36:"Classes/Persistence/QOM/Ordering.php";s:4:"8427";s:45:"Classes/Persistence/QOM/OrderingInterface.php";s:4:"c949";s:41:"Classes/Persistence/QOM/PropertyValue.php";s:4:"5905";s:50:"Classes/Persistence/QOM/PropertyValueInterface.php";s:4:"80ef";s:44:"Classes/Persistence/QOM/QueryObjectModel.php";s:4:"ac1a";s:62:"Classes/Persistence/QOM/QueryObjectModelConstantsInterface.php";s:4:"5b34";s:51:"Classes/Persistence/QOM/QueryObjectModelFactory.php";s:4:"6c37";s:60:"Classes/Persistence/QOM/QueryObjectModelFactoryInterface.php";s:4:"3c82";s:53:"Classes/Persistence/QOM/QueryObjectModelInterface.php";s:4:"fa26";s:36:"Classes/Persistence/QOM/Selector.php";s:4:"e942";s:45:"Classes/Persistence/QOM/SelectorInterface.php";s:4:"5afa";s:43:"Classes/Persistence/QOM/SourceInterface.php";s:4:"0885";s:37:"Classes/Persistence/QOM/Statement.php";s:4:"d687";s:46:"Classes/Persistence/QOM/StatementInterface.php";s:4:"ec99";s:41:"Classes/Persistence/QOM/StaticOperand.php";s:4:"a244";s:50:"Classes/Persistence/QOM/StaticOperandInterface.php";s:4:"a163";s:37:"Classes/Persistence/QOM/UpperCase.php";s:4:"9d77";s:46:"Classes/Persistence/QOM/UpperCaseInterface.php";s:4:"bfc0";s:48:"Classes/Persistence/Storage/BackendInterface.php";s:4:"2e02";s:46:"Classes/Persistence/Storage/Typo3DbBackend.php";s:4:"82a4";s:55:"Classes/Persistence/Storage/Exception/BadConstraint.php";s:4:"3a87";s:50:"Classes/Persistence/Storage/Exception/SqlError.php";s:4:"850b";s:30:"Classes/Property/Exception.php";s:4:"e64b";s:27:"Classes/Property/Mapper.php";s:4:"1dea";s:35:"Classes/Property/MappingResults.php";s:4:"abac";s:49:"Classes/Property/Exception/FormatNotSupported.php";s:4:"50b1";s:46:"Classes/Property/Exception/InvalidDataType.php";s:4:"76ad";s:44:"Classes/Property/Exception/InvalidFormat.php";s:4:"432e";s:46:"Classes/Property/Exception/InvalidProperty.php";s:4:"e4c0";s:44:"Classes/Property/Exception/InvalidSource.php";s:4:"4067";s:44:"Classes/Property/Exception/InvalidTarget.php";s:4:"5bc8";s:38:"Classes/Reflection/ClassReflection.php";s:4:"4763";s:34:"Classes/Reflection/ClassSchema.php";s:4:"5cb7";s:39:"Classes/Reflection/DocCommentParser.php";s:4:"fd1a";s:32:"Classes/Reflection/Exception.php";s:4:"ec59";s:39:"Classes/Reflection/MethodReflection.php";s:4:"32fd";s:35:"Classes/Reflection/ObjectAccess.php";s:4:"0c55";s:42:"Classes/Reflection/ParameterReflection.php";s:4:"351b";s:41:"Classes/Reflection/PropertyReflection.php";s:4:"d5fd";s:30:"Classes/Reflection/Service.php";s:4:"3a7e";s:52:"Classes/Reflection/Exception/InvalidPropertyType.php";s:4:"82e0";s:30:"Classes/Security/Exception.php";s:4:"3b45";s:47:"Classes/Security/Channel/RequestHashService.php";s:4:"77bb";s:45:"Classes/Security/Cryptography/HashService.php";s:4:"91ca";s:63:"Classes/Security/Exception/InvalidArgumentForHashGeneration.php";s:4:"8d5c";s:70:"Classes/Security/Exception/InvalidArgumentForRequestHashGeneration.php";s:4:"81bd";s:60:"Classes/Security/Exception/SyntacticallyWrongRequestHash.php";s:4:"23d0";s:26:"Classes/Utility/Arrays.php";s:4:"587b";s:25:"Classes/Utility/Cache.php";s:4:"2501";s:31:"Classes/Utility/ClassLoader.php";s:4:"4d60";s:44:"Classes/Utility/ExtbaseRequirementsCheck.php";s:4:"46d3";s:29:"Classes/Utility/Extension.php";s:4:"5cf5";s:32:"Classes/Utility/Localization.php";s:4:"446f";s:30:"Classes/Utility/TypoScript.php";s:4:"5bdc";s:28:"Classes/Validation/Error.php";s:4:"247a";s:32:"Classes/Validation/Exception.php";s:4:"44f8";s:36:"Classes/Validation/PropertyError.php";s:4:"3267";s:40:"Classes/Validation/ValidatorResolver.php";s:4:"86c9";s:47:"Classes/Validation/Exception/InvalidSubject.php";s:4:"5040";s:63:"Classes/Validation/Exception/InvalidValidationConfiguration.php";s:4:"9cfa";s:57:"Classes/Validation/Exception/InvalidValidationOptions.php";s:4:"a3a8";s:48:"Classes/Validation/Exception/NoSuchValidator.php";s:4:"64f4";s:49:"Classes/Validation/Exception/NoValidatorFound.php";s:4:"be96";s:59:"Classes/Validation/Validator/AbstractCompositeValidator.php";s:4:"7eaf";s:56:"Classes/Validation/Validator/AbstractObjectValidator.php";s:4:"cd9a";s:50:"Classes/Validation/Validator/AbstractValidator.php";s:4:"8477";s:54:"Classes/Validation/Validator/AlphanumericValidator.php";s:4:"315b";s:53:"Classes/Validation/Validator/ConjunctionValidator.php";s:4:"d60b";s:50:"Classes/Validation/Validator/DateTimeValidator.php";s:4:"2791";s:53:"Classes/Validation/Validator/DisjunctionValidator.php";s:4:"d964";s:54:"Classes/Validation/Validator/EmailAddressValidator.php";s:4:"a42e";s:47:"Classes/Validation/Validator/FloatValidator.php";s:4:"8122";s:55:"Classes/Validation/Validator/GenericObjectValidator.php";s:4:"2a06";s:49:"Classes/Validation/Validator/IntegerValidator.php";s:4:"d60c";s:50:"Classes/Validation/Validator/NotEmptyValidator.php";s:4:"3169";s:53:"Classes/Validation/Validator/NumberRangeValidator.php";s:4:"8374";s:48:"Classes/Validation/Validator/NumberValidator.php";s:4:"cd21";s:57:"Classes/Validation/Validator/ObjectValidatorInterface.php";s:4:"e28e";s:45:"Classes/Validation/Validator/RawValidator.php";s:4:"a4e6";s:59:"Classes/Validation/Validator/RegularExpressionValidator.php";s:4:"34cb";s:54:"Classes/Validation/Validator/StringLengthValidator.php";s:4:"246b";s:48:"Classes/Validation/Validator/StringValidator.php";s:4:"5aba";s:46:"Classes/Validation/Validator/TextValidator.php";s:4:"b359";s:51:"Classes/Validation/Validator/ValidatorInterface.php";s:4:"1c82";s:24:"Documentation/README.txt";s:4:"35d4";s:22:"Tests/BaseTestCase.php";s:4:"8548";s:60:"Tests/Configuration/BackendConfigurationManager_testcase.php";s:4:"8fa5";s:61:"Tests/Configuration/FrontendConfigurationManager_testcase.php";s:4:"d1d2";s:46:"Tests/DomainObject/AbstractEntity_testcase.php";s:4:"80c4";s:25:"Tests/Fixtures/Entity.php";s:4:"8af7";s:52:"Tests/MVC/Controller/AbstractController_testcase.php";s:4:"7d2c";s:50:"Tests/MVC/Controller/ActionController_testcase.php";s:4:"107d";s:42:"Tests/MVC/Controller/Argument_testcase.php";s:4:"edaa";s:43:"Tests/MVC/Controller/Arguments_testcase.php";s:4:"5bb9";s:41:"Tests/MVC/Web/RequestBuilder_testcase.php";s:4:"c537";s:45:"Tests/MVC/Web/Routing/UriBuilder_testcase.php";s:4:"70a7";s:44:"Tests/Persistence/ObjectStorage_testcase.php";s:4:"5a12";s:36:"Tests/Persistence/Query_testcase.php";s:4:"249e";s:41:"Tests/Persistence/Repository_testcase.php";s:4:"c0f8";s:38:"Tests/Persistence/Session_testcase.php";s:4:"6f9f";s:45:"Tests/Persistence/Mapper/DataMap_testcase.php";s:4:"98ec";s:53:"Tests/Persistence/Storage/Typo3DbBackend_testcase.php";s:4:"effd";s:37:"Tests/Reflection/Service_testcase.php";s:4:"b1e1";s:54:"Tests/Security/Channel/RequestHashService_testcase.php";s:4:"6c8a";s:52:"Tests/Security/Cryptography/HashService_testcase.php";s:4:"3ae2";s:36:"Tests/Utility/Extension_testcase.php";s:4:"ad36";s:37:"Tests/Utility/TypoScript_testcase.php";s:4:"bb97";s:47:"Tests/Validation/ValidatorResolver_testcase.php";s:4:"ecca";s:61:"Tests/Validation/Validator/AlphanumericValidator_testcase.php";s:4:"313c";s:60:"Tests/Validation/Validator/ConjunctionValidator_testcase.php";s:4:"39c2";s:57:"Tests/Validation/Validator/DateTimeValidator_testcase.php";s:4:"62c8";s:61:"Tests/Validation/Validator/EmailAddressValidator_testcase.php";s:4:"7f92";s:54:"Tests/Validation/Validator/FloatValidator_testcase.php";s:4:"4f3b";s:62:"Tests/Validation/Validator/GenericObjectValidator_testcase.php";s:4:"c0d2";s:56:"Tests/Validation/Validator/IntegerValidator_testcase.php";s:4:"b3b7";s:57:"Tests/Validation/Validator/NotEmptyValidator_testcase.php";s:4:"b714";s:60:"Tests/Validation/Validator/NumberRangeValidator_testcase.php";s:4:"70ec";s:55:"Tests/Validation/Validator/NumberValidator_testcase.php";s:4:"af8b";s:52:"Tests/Validation/Validator/RawValidator_testcase.php";s:4:"2fe1";s:66:"Tests/Validation/Validator/RegularExpressionValidator_testcase.php";s:4:"1aa9";s:61:"Tests/Validation/Validator/StringLengthValidator_testcase.php";s:4:"5afc";s:53:"Tests/Validation/Validator/TextValidator_testcase.php";s:4:"5454";}', ); -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/ext_autoload.php =================================================================== --- typo3/sysext/extbase/ext_autoload.php (revision 8127) +++ typo3/sysext/extbase/ext_autoload.php (working copy) @@ -226,4 +226,4 @@ 'tx_extbase_validation_validator_textvalidator' => $extensionClassesPath . 'Validation/Validator/TextValidator.php', 'tx_extbase_validation_validator_validatorinterface' => $extensionClassesPath . 'Validation/Validator/ValidatorInterface.php', ); -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Classes/Utility/Extension.php =================================================================== --- typo3/sysext/extbase/Classes/Utility/Extension.php (revision 8127) +++ typo3/sysext/extbase/Classes/Utility/Extension.php (working copy) @@ -491,4 +491,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Classes/MVC/Controller/AbstractController.php =================================================================== --- typo3/sysext/extbase/Classes/MVC/Controller/AbstractController.php (revision 8127) +++ 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. * @@ -397,4 +397,4 @@ $this->argumentsMappingResults = $this->propertyMapper->getMappingResults(); } } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Classes/MVC/RequestInterface.php =================================================================== --- typo3/sysext/extbase/Classes/MVC/RequestInterface.php (revision 8127) +++ typo3/sysext/extbase/Classes/MVC/RequestInterface.php (working copy) @@ -207,4 +207,4 @@ public function getErrors(); } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Classes/Persistence/LazyLoadingProxy.php =================================================================== --- typo3/sysext/extbase/Classes/Persistence/LazyLoadingProxy.php (revision 8127) +++ 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; } - - + + } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Classes/Persistence/QOM/QueryObjectModelFactory.php =================================================================== --- typo3/sysext/extbase/Classes/Persistence/QOM/QueryObjectModelFactory.php (revision 8127) +++ 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); } - + } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Classes/Reflection/Service.php =================================================================== --- typo3/sysext/extbase/Classes/Reflection/Service.php (revision 8127) +++ typo3/sysext/extbase/Classes/Reflection/Service.php (working copy) @@ -512,4 +512,4 @@ return $frameworkConfiguration['extensionName'] . '_' . $frameworkConfiguration['pluginName']; } } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Classes/Reflection/ClassSchema.php =================================================================== --- typo3/sysext/extbase/Classes/Reflection/ClassSchema.php (revision 8127) +++ 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 * @@ -253,4 +253,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php =================================================================== --- typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php (revision 8127) +++ typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php (working copy) @@ -95,4 +95,4 @@ return $frameworkConfiguration; } } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Tests/SeleniumBaseTestCase.php =================================================================== --- typo3/sysext/extbase/Tests/SeleniumBaseTestCase.php (revision 8127) +++ typo3/sysext/extbase/Tests/SeleniumBaseTestCase.php (working copy) @@ -30,4 +30,4 @@ abstract class Tx_Extbase_SeleniumBaseTestCase extends tx_phpunit_selenium_testcase { } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Tests/MVC/Controller/ActionController_testcase.php =================================================================== --- typo3/sysext/extbase/Tests/MVC/Controller/ActionController_testcase.php (revision 8127) +++ 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,27 +573,27 @@ $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'); } } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Tests/MVC/Web/RequestBuilder_testcase.php =================================================================== --- typo3/sysext/extbase/Tests/MVC/Web/RequestBuilder_testcase.php (revision 8127) +++ typo3/sysext/extbase/Tests/MVC/Web/RequestBuilder_testcase.php (working copy) @@ -180,4 +180,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Tests/MVC/Web/Routing/UriBuilder_testcase.php =================================================================== --- typo3/sysext/extbase/Tests/MVC/Web/Routing/UriBuilder_testcase.php (revision 8127) +++ 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); } - + } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Tests/Configuration/FrontendConfigurationManager_testcase.php =================================================================== --- typo3/sysext/extbase/Tests/Configuration/FrontendConfigurationManager_testcase.php (revision 8127) +++ typo3/sysext/extbase/Tests/Configuration/FrontendConfigurationManager_testcase.php (working copy) @@ -60,4 +60,4 @@ } } -?> +?> \ No newline at end of file Index: typo3/sysext/extbase/Tests/Configuration/BackendConfigurationManager_testcase.php =================================================================== --- typo3/sysext/extbase/Tests/Configuration/BackendConfigurationManager_testcase.php (revision 8127) +++ typo3/sysext/extbase/Tests/Configuration/BackendConfigurationManager_testcase.php (working copy) @@ -167,4 +167,4 @@ $this->assertEquals($expectedResult, $actualResult); } } -?> +?> \ No newline at end of file Index: typo3/classes/class.shortcutmenu.php =================================================================== --- typo3/classes/class.shortcutmenu.php (revision 8127) +++ typo3/classes/class.shortcutmenu.php (working copy) @@ -798,4 +798,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.shortcutmenu.php']); } -?> +?> \ No newline at end of file Index: typo3/classes/class.clearcachemenu.php =================================================================== --- typo3/classes/class.clearcachemenu.php (revision 8127) +++ typo3/classes/class.clearcachemenu.php (working copy) @@ -138,7 +138,7 @@ $cacheMenu = array(); $cacheMenu[] = '' . - t3lib_iconWorks::getSpriteIcon('apps-toolbar-menu-cache', array('title' => $title)) . + t3lib_iconWorks::getSpriteIcon('apps-toolbar-menu-cache', array('title' => $title)) . ''; $cacheMenu[] = '