Index: tests/regularexpression_testcase.php =================================================================== --- tests/regularexpression_testcase.php (revision 6029) +++ tests/regularexpression_testcase.php (working copy) @@ -161,4 +161,4 @@ } } } -?> +?> \ No newline at end of file Index: tests/t3lib/cache/frontend/t3lib_cache_frontend_variablefrontendtestcase.php =================================================================== --- tests/t3lib/cache/frontend/t3lib_cache_frontend_variablefrontendtestcase.php (revision 6029) +++ tests/t3lib/cache/frontend/t3lib_cache_frontend_variablefrontendtestcase.php (working copy) @@ -191,5 +191,4 @@ } } - ?> \ No newline at end of file Index: tests/t3lib/cache/frontend/t3lib_cache_frontend_abstractfrontendtestcase.php =================================================================== --- tests/t3lib/cache/frontend/t3lib_cache_frontend_abstractfrontendtestcase.php (revision 6029) +++ tests/t3lib/cache/frontend/t3lib_cache_frontend_abstractfrontendtestcase.php (working copy) @@ -193,5 +193,4 @@ } } } - ?> \ No newline at end of file Index: tests/t3lib/cache/frontend/t3lib_cache_frontend_stringfrontendtestcase.php =================================================================== --- tests/t3lib/cache/frontend/t3lib_cache_frontend_stringfrontendtestcase.php (revision 6029) +++ tests/t3lib/cache/frontend/t3lib_cache_frontend_stringfrontendtestcase.php (working copy) @@ -165,5 +165,4 @@ $this->assertEquals($entries, $cache->getByTag($tag), 'Did not receive the expected entries'); } } - ?> \ No newline at end of file Index: tests/t3lib/cache/backend/class.t3lib_cache_backend_mockbackend.php =================================================================== --- tests/t3lib/cache/backend/class.t3lib_cache_backend_mockbackend.php (revision 6029) +++ tests/t3lib/cache/backend/class.t3lib_cache_backend_mockbackend.php (working copy) @@ -62,5 +62,4 @@ } } - ?> \ No newline at end of file Index: tests/t3lib/cache/backend/t3lib_cache_backend_abstractbackendtestcase.php =================================================================== --- tests/t3lib/cache/backend/t3lib_cache_backend_abstractbackendtestcase.php (revision 6029) +++ tests/t3lib/cache/backend/t3lib_cache_backend_abstractbackendtestcase.php (working copy) @@ -80,5 +80,4 @@ $this->assertSame('someValue', $backend->getSomeOption()); } } - ?> \ No newline at end of file Index: tests/t3lib/cache/backend/t3lib_cache_backend_transientmemorybackendtestcase.php =================================================================== --- tests/t3lib/cache/backend/t3lib_cache_backend_transientmemorybackendtestcase.php (revision 6029) +++ tests/t3lib/cache/backend/t3lib_cache_backend_transientmemorybackendtestcase.php (working copy) @@ -237,5 +237,4 @@ $this->assertFalse($backend->has('TransientMemoryBackendTest3'), 'TransientMemoryBackendTest3'); } } - ?> \ No newline at end of file Index: tests/t3lib/cache/backend/t3lib_cache_backend_filebackendtestcase.php =================================================================== --- tests/t3lib/cache/backend/t3lib_cache_backend_filebackendtestcase.php (revision 6029) +++ tests/t3lib/cache/backend/t3lib_cache_backend_filebackendtestcase.php (working copy) @@ -728,5 +728,4 @@ } } } - ?> \ No newline at end of file Index: tests/t3lib/cache/backend/t3lib_cache_backend_dbbackendtestcase.php =================================================================== --- tests/t3lib/cache/backend/t3lib_cache_backend_dbbackendtestcase.php (revision 6029) +++ tests/t3lib/cache/backend/t3lib_cache_backend_dbbackendtestcase.php (working copy) @@ -618,5 +618,4 @@ } } - ?> \ No newline at end of file Index: tests/t3lib/cache/backend/t3lib_cache_backend_apcbackendtestcase.php =================================================================== --- tests/t3lib/cache/backend/t3lib_cache_backend_apcbackendtestcase.php (revision 6029) +++ tests/t3lib/cache/backend/t3lib_cache_backend_apcbackendtestcase.php (working copy) @@ -289,5 +289,4 @@ return $backend; } } - ?> \ No newline at end of file Index: tests/t3lib/cache/backend/t3lib_cache_backend_memcachedbackendtestcase.php =================================================================== --- tests/t3lib/cache/backend/t3lib_cache_backend_memcachedbackendtestcase.php (revision 6029) +++ tests/t3lib/cache/backend/t3lib_cache_backend_memcachedbackendtestcase.php (working copy) @@ -344,5 +344,4 @@ return $backend; } } - ?> \ No newline at end of file Index: tests/t3lib/cache/t3lib_cache_factorytestcase.php =================================================================== --- tests/t3lib/cache/t3lib_cache_factorytestcase.php (revision 6029) +++ tests/t3lib/cache/t3lib_cache_factorytestcase.php (working copy) @@ -129,5 +129,4 @@ } */ } - ?> \ No newline at end of file Index: tests/t3lib/cache/t3lib_cache_managertestcase.php =================================================================== --- tests/t3lib/cache/t3lib_cache_managertestcase.php (revision 6029) +++ tests/t3lib/cache/t3lib_cache_managertestcase.php (working copy) @@ -177,7 +177,5 @@ $manager->flushCaches(); } - } - ?> \ No newline at end of file Index: tests/t3lib/t3lib_div_testcase.php =================================================================== --- tests/t3lib/t3lib_div_testcase.php (revision 6029) +++ tests/t3lib/t3lib_div_testcase.php (working copy) @@ -397,5 +397,4 @@ $this->assertEquals($expectedResult, t3lib_div::removeDotsFromTS($typoScript)); } } - ?> \ No newline at end of file Index: tests/t3lib/t3lib_pagerenderer_testcase.php =================================================================== --- tests/t3lib/t3lib_pagerenderer_testcase.php (revision 6029) +++ tests/t3lib/t3lib_pagerenderer_testcase.php (working copy) @@ -60,17 +60,17 @@ $this->fixture instanceof t3lib_PageRenderer ); } - + ////////////////////// // test functions ////////////////////// /** * test set xml prolog and doctype - * + * */ public function testSetXmlPrologAndDocType() { - + $expectedReturnValue = ''; $this->fixture->setXmlPrologAndDocType(''); $out = $this->fixture->render(); @@ -83,10 +83,10 @@ /** * test set title - * + * */ public function testSetTitle() { - + $expectedReturnValue = 'This is the title'; $this->fixture->setTitle('This is the title'); $out = $this->fixture->render(); @@ -99,10 +99,10 @@ /** * test set charset - * + * */ public function testSetCharset() { - + $expectedReturnValue = ''; $this->fixture->setCharset('utf-8'); $out = $this->fixture->render(); @@ -115,10 +115,10 @@ /** * test set favicon - * + * */ public function testSetFavIcon() { - + $expectedReturnValue1 = ''; $expectedReturnValue2 = ''; $this->fixture->setFavIcon('http://google.com/favicon.ico'); @@ -132,15 +132,15 @@ $expectedReturnValue2, $out ); - + } /** * test set baseUrl - * + * */ public function testSetBaseUrl() { - + $expectedReturnValue = ''; $this->fixture->setBaseUrl('http://ggogle.com/'); $out = $this->fixture->render(); @@ -153,10 +153,10 @@ /** * test add meta tag - * + * */ public function testAddMetaTag() { - + $expectedReturnValue = ''; $this->fixture->addMetaTag(''); $out = $this->fixture->render(); @@ -169,10 +169,10 @@ /** * test add inline comment - * + * */ public function testAddInlineComment() { - + $expectedReturnValue = 'this is an inline comment written by unit test'; $this->fixture->addInlineComment('this is an inline comment written by unit test'); $out = $this->fixture->render(); @@ -185,10 +185,10 @@ /** * test add header data - * + * */ public function testAddHeaderData() { - + $expectedReturnValue = ''; $this->fixture->addHeaderData(''); $out = $this->fixture->render(); @@ -201,10 +201,10 @@ /** * test add footer data - * + * */ public function testAddFooterData() { - + $expectedReturnValue = ''; $this->fixture->addFooterData(''); $out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER); @@ -217,10 +217,10 @@ /** * test add JS library file - * + * */ public function testAddJsLibrary() { - + $expectedReturnValue = ''; $this->fixture->addJsLibrary('test', 'fileadmin/test.js'); $out = $this->fixture->render(); @@ -230,14 +230,14 @@ $out ); } - - + + /** * test add JS footer library file - * + * */ public function testAddJsFooterLibrary() { - + $expectedReturnValue = ''; $this->fixture->addJsFooterLibrary('test', 'fileadmin/test.js'); $out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER); @@ -250,10 +250,10 @@ /** * test add JS file - * + * */ public function testAddJsFile() { - + $expectedReturnValue = ''; $this->fixture->addJsFile('fileadmin/test.js'); $out = $this->fixture->render(); @@ -266,10 +266,10 @@ /** * test add JS file for footer - * + * */ public function testAddJsFooterFile() { - + $expectedReturnValue = ''; $this->fixture->addJsFooterFile('fileadmin/test.js'); $out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER); @@ -282,10 +282,10 @@ /** * test add JS inline - * + * */ public function testAddJsInlineCode() { - + $expectedReturnValue = 'var x = "testvar"'; $this->fixture->addJsInlineCode('test', 'var x = "testvar"'); $out = $this->fixture->render(); @@ -298,10 +298,10 @@ /** * test add JS inline for footer - * + * */ public function testAddJsFooterInlineCode() { - + $expectedReturnValue = 'var x = "testvar"'; $this->fixture->addJsFooterInlineCode('test', 'var x = "testvar"'); $out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER); @@ -314,10 +314,10 @@ /** * test add JS handler - * + * */ public function testAddExtOnReadyCode() { - + $expectedReturnValue1 = 'Ext.onReady(function() {'; $expectedReturnValue2 = 'var x = "testvar";'; $this->fixture->loadExtJS(); @@ -328,20 +328,20 @@ $expectedReturnValue1, $out ); - + $this->assertContains( $expectedReturnValue2, $out ); - + } /** * test add CSS file - * + * */ public function testAddCssFile() { - + $expectedReturnValue = ''; $this->fixture->addCssFile('fileadmin/test.css'); $out = $this->fixture->render(); @@ -354,10 +354,10 @@ /** * test add CSS inline - * + * */ public function testAddCssInlineBlock() { - + $expectedReturnValue = 'body {margin:20px;}'; $this->fixture->addCssInlineBlock('general', 'body {margin:20px;}'); $out = $this->fixture->render(); @@ -370,10 +370,10 @@ /** * test add CSS inline and force on top - * + * */ public function testAddCssInlineBlockForceOnTop() { - + $expectedReturnValue = '/*general1*/' . chr(10) . 'h1 {margin:20px;}' . chr(10) . '/*general*/' . chr(10) . 'body {margin:20px;}'; $this->fixture->addCssInlineBlock('general', 'body {margin:20px;}'); $this->fixture->addCssInlineBlock('general1', 'h1 {margin:20px;}', NULL, TRUE); @@ -387,10 +387,10 @@ /** * test load prototype - * + * */ public function testLoadPrototype() { - + $expectedReturnValue = ''; $this->fixture->loadPrototype(); $out = $this->fixture->render(); @@ -403,10 +403,10 @@ /** * test load Scriptaculous - * + * */ public function testLoadScriptaculous() { - + $expectedReturnValue = ''; $this->fixture->loadScriptaculous('slider,controls'); $out = $this->fixture->render(); @@ -419,10 +419,10 @@ /** * test load ExtJS - * + * */ public function testLoadExtJS() { - + $expectedReturnValue = '' . chr(10) . ''; $this->fixture->loadExtJS(TRUE, TRUE, 'jquery'); $out = $this->fixture->render(); @@ -432,13 +432,13 @@ $out ); } - + /** * test load ExtCore - * + * */ public function testLoadExtCore() { - + $expectedReturnValue = ''; $this->fixture->loadExtCore(); $out = $this->fixture->render(); @@ -448,13 +448,13 @@ $out ); } - + /** - * test enable ExtJsDebug - * + * test enable ExtJsDebug + * */ public function testEnableExtJsDebug() { - + $expectedReturnValue = '' . chr(10) . ''; $this->fixture->loadExtJS(TRUE, TRUE, 'jquery'); $this->fixture->enableExtJsDebug(); @@ -465,13 +465,13 @@ $out ); } - + /** * test enable ExtCoreDebug - * + * */ - public function testEnableExtCoreDebug() { - + public function testEnableExtCoreDebug() { + $expectedReturnValue = ''; $this->fixture->loadExtCore(); $this->fixture->enableExtCoreDebug(); @@ -482,13 +482,13 @@ $out ); } - + /** * test inline language label - * + * */ public function testAddInlineLanguageLabel() { - + $expectedReturnValue = 'TYPO3.lang = {"myKey":"myValue"}'; $this->fixture->loadExtJS(); $this->fixture->addInlineLanguageLabel('myKey', 'myValue'); @@ -500,13 +500,13 @@ $out ); } - + /** * test inline language label as array - * + * */ public function testAddInlineLanguageLabelArray() { - + $expectedReturnValue = 'TYPO3.lang = {"myKey1":"myValue1","myKey2":"myValue2"}'; $this->fixture->loadExtJS(); $this->fixture->addInlineLanguageLabelArray(array('myKey1' => 'myValue1', 'myKey2' => 'myValue2',)); @@ -518,13 +518,13 @@ $out ); } - + /** * test inline language label as array get merged - * + * */ public function testAddInlineLanguageLabelArrayMerged() { - + $expectedReturnValue = 'TYPO3.lang = {"myKey1":"myValue1","myKey2":"myValue2"}'; $this->fixture->loadExtJS(); $this->fixture->addInlineLanguageLabelArray(array('myKey1' => 'myValue1',)); @@ -537,13 +537,13 @@ $out ); } - + /** * test inline setting - * + * */ public function testAddInlineSetting() { - + $expectedReturnValue = 'TYPO3.settings = {"myApp":{"myKey":"myValue"}};'; $this->fixture->loadExtJS(); $this->fixture->addInlineSetting('myApp', 'myKey', 'myValue'); @@ -555,13 +555,13 @@ $out ); } - + /** * test inline settings with array - * + * */ public function testAddInlineSettingArray() { - + $expectedReturnValue = 'TYPO3.settings = {"myApp":{"myKey1":"myValue1","myKey2":"myValue2"}};'; $this->fixture->loadExtJS(); $this->fixture->addInlineSettingArray('myApp', array('myKey1' => 'myValue1', 'myKey2' => 'myValue2',)); @@ -573,13 +573,13 @@ $out ); } - + /** * test inline settings with array get merged - * + * */ public function testAddInlineSettingArrayMerged() { - + $expectedReturnValue = 'TYPO3.settings = {"myApp":{"myKey1":"myValue1","myKey2":"myValue2"}};'; $this->fixture->loadExtJS(); $this->fixture->addInlineSettingArray('myApp', array('myKey1' => 'myValue1',)); @@ -592,10 +592,10 @@ $out ); } - + /** * test add body content - * + * */ public function testAddBodyContent() { $expectedReturnValue = 'ABCDE'; @@ -604,29 +604,29 @@ $this->fixture->addBodyContent('C'); $this->fixture->addBodyContent('D'); $this->fixture->addBodyContent('E'); - + $out = $this->fixture->getBodyContent(); $this->assertEquals( $expectedReturnValue, $out ); } - - + + /** * test set body content - * + * */ public function testSetBodyContent() { $expectedReturnValue = 'ABCDE'; $this->fixture->setBodyContent('ABCDE'); - + $out = $this->fixture->getBodyContent(); $this->assertEquals( $expectedReturnValue, $out ); - + $out = $this->fixture->render(); $this->assertContains( @@ -634,8 +634,5 @@ $out ); } - - - } ?> \ No newline at end of file Index: tests/t3lib/t3lib_tcemain_testcase.php =================================================================== --- tests/t3lib/t3lib_tcemain_testcase.php (revision 6029) +++ tests/t3lib/t3lib_tcemain_testcase.php (working copy) @@ -256,4 +256,4 @@ $this->assertTrue($this->fixture->checkModifyAccessList('tt_content')); } } -?> +?> \ No newline at end of file Index: tests/t3lib/t3lib_registry_testcase.php =================================================================== --- tests/t3lib/t3lib_registry_testcase.php (revision 6029) +++ tests/t3lib/t3lib_registry_testcase.php (working copy) @@ -352,5 +352,4 @@ ); } } - ?> \ No newline at end of file Index: tests/t3lib/t3lib_pageselect_testcase.php =================================================================== --- tests/t3lib/t3lib_pageselect_testcase.php (revision 6029) +++ tests/t3lib/t3lib_pageselect_testcase.php (working copy) @@ -96,5 +96,4 @@ $this->assertTrue($parent instanceof t3lib_pageSelect); } } - -?> +?> \ No newline at end of file Index: tests/t3lib/t3lib_matchcondition_testcase.php =================================================================== --- tests/t3lib/t3lib_matchcondition_testcase.php (revision 6029) +++ tests/t3lib/t3lib_matchcondition_testcase.php (working copy) @@ -58,7 +58,7 @@ /** * Tests whether a condition matches Internet Explorer 7 on Windows. - * + * * @return void * @test */ @@ -70,7 +70,7 @@ /** * Tests whether a condition does not match Internet Explorer 7 on Windows. - * + * * @return void * @test */ @@ -82,7 +82,7 @@ /** * Tests whether the browserInfo hook is called. - * + * * @return void * @test */ Index: tests/t3lib/t3lib_extmgm_testcase.php =================================================================== --- tests/t3lib/t3lib_extmgm_testcase.php (revision 6029) +++ tests/t3lib/t3lib_extmgm_testcase.php (working copy) @@ -345,5 +345,4 @@ return $tca; } } - ?> \ No newline at end of file Index: tests/typo3/sysext/cms/tslib/tslib_content_testcase.php =================================================================== --- tests/typo3/sysext/cms/tslib/tslib_content_testcase.php (revision 6029) +++ tests/typo3/sysext/cms/tslib/tslib_content_testcase.php (working copy) @@ -86,7 +86,7 @@ /** * Tests whether the getImgResource hook is called correctly. - * + * * @test */ public function isGetImgResourceHookCalled() { Index: t3lib/class.t3lib_formmail.php =================================================================== --- t3lib/class.t3lib_formmail.php (revision 6029) +++ t3lib/class.t3lib_formmail.php (working copy) @@ -239,9 +239,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_formmail.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_formmail.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_bedisplaylog.php =================================================================== --- t3lib/class.t3lib_bedisplaylog.php (revision 6029) +++ t3lib/class.t3lib_bedisplaylog.php (working copy) @@ -276,7 +276,6 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_bedisplaylog.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_bedisplaylog.php']); } Index: t3lib/class.t3lib_tsfebeuserauth.php =================================================================== --- t3lib/class.t3lib_tsfebeuserauth.php (revision 6029) +++ t3lib/class.t3lib_tsfebeuserauth.php (working copy) @@ -441,9 +441,7 @@ } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tsfebeuserauth.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tsfebeuserauth.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_browsetree.php =================================================================== --- t3lib/class.t3lib_browsetree.php (revision 6029) +++ t3lib/class.t3lib_browsetree.php (working copy) @@ -172,5 +172,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_browsetree.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_browsetree.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_pagerenderer.php =================================================================== --- t3lib/class.t3lib_pagerenderer.php (revision 6029) +++ t3lib/class.t3lib_pagerenderer.php (working copy) @@ -35,7 +35,7 @@ * $Id$ */ class t3lib_PageRenderer implements t3lib_Singleton { - + protected $compressJavascript = FALSE; protected $compressCss = FALSE; protected $removeLineBreaksFromTemplate = FALSE; @@ -104,10 +104,10 @@ const EXTJS_ADAPTER_JQUERY = 'jquery'; const EXTJS_ADAPTER_PROTOTYPE = 'prototype'; const EXTJS_ADAPTER_YUI = 'yui'; - + protected $extJStheme = TRUE; protected $extJScss = TRUE; - + protected $enableExtJSQuickTips = false; protected $inlineLanguageLabels = array (); @@ -133,7 +133,7 @@ $this->templateFile = $templateFile; } $this->backPath = isset($backPath) ? $backPath : $GLOBALS['BACK_PATH']; - + $this->inlineJavascriptWrap = array( '' . chr(10) @@ -147,7 +147,7 @@ /** * reset all vars to initial values - * + * * @return void */ protected function reset() { @@ -261,10 +261,10 @@ public function setTemplateFile($file) { $this->templateFile = $file; } - + /** * Sets back path - * + * * @param string $backPath * @return void */ @@ -421,7 +421,7 @@ /** * Gets MoveJsFromHeaderToFooter * - * @return boolean + * @return boolean */ public function getMoveJsFromHeaderToFooter() { return $this->moveJsFromHeaderToFooter; @@ -430,7 +430,7 @@ /** * Gets compress of javascript * - * @return boolean + * @return boolean */ public function getCompressJavascript() { return $this->compressJavascript; @@ -439,7 +439,7 @@ /** * Gets compress of css * - * @return boolean + * @return boolean */ public function getCompressCss() { return $this->compressCss; @@ -448,7 +448,7 @@ /** * Gets concatenate of files * - * @return boolean + * @return boolean */ public function getConcatenateFiles() { return $this->concatenateFiles; @@ -457,7 +457,7 @@ /** * Gets remove of empty lines from template * - * @return boolean + * @return boolean */ public function getRemoveLineBreaksFromTemplate() { return $this->removeLineBreaksFromTemplate; @@ -478,7 +478,7 @@ /* */ /* */ /*****************************************************/ - + /** * Adds meta data * @@ -528,7 +528,7 @@ } /* Javascript Files */ - + /** * Adds JS Library. JS Library block is rendered on top of the JS files. * @@ -543,15 +543,15 @@ public function addJsLibrary($name, $file, $type = 'text/javascript', $compress = FALSE, $forceOnTop = FALSE, $allWrap = '') { if (!in_array(strtolower($name), $this->jsLibs)) { $this->jsLibs[strtolower($name)] = array ( - 'file' => $file, - 'type' => $type, + 'file' => $file, + 'type' => $type, 'section' => self::PART_HEADER, - 'compress' => $compress, + 'compress' => $compress, 'forceOnTop' => $forceOnTop, 'allWrap' => $allWrap ); } - + } /** @@ -568,15 +568,15 @@ public function addJsFooterLibrary($name, $file, $type = 'text/javascript', $compress = FALSE, $forceOnTop = FALSE, $allWrap = '') { if (!in_array(strtolower($name), $this->jsLibs)) { $this->jsLibs[strtolower($name)] = array ( - 'file' => $file, - 'type' => $type, + 'file' => $file, + 'type' => $type, 'section' => self::PART_FOOTER, - 'compress' => $compress, + 'compress' => $compress, 'forceOnTop' => $forceOnTop, 'allWrap' => $allWrap ); } - + } /** @@ -592,10 +592,10 @@ public function addJsFile($file, $type = 'text/javascript', $compress = TRUE, $forceOnTop = FALSE, $allWrap = '') { if (!isset($this->jsFiles[$file])) { $this->jsFiles[$file] = array ( - 'type' => $type, - 'section' => self::PART_HEADER, - 'compress' => $compress, - 'forceOnTop' => $forceOnTop, + 'type' => $type, + 'section' => self::PART_HEADER, + 'compress' => $compress, + 'forceOnTop' => $forceOnTop, 'allWrap' => $allWrap ); } @@ -613,17 +613,17 @@ public function addJsFooterFile($file, $type = 'text/javascript', $compress = TRUE, $forceOnTop = FALSE, $allWrap = '') { if (!isset($this->jsFiles[$file])) { $this->jsFiles[$file] = array ( - 'type' => $type, - 'section' => self::PART_FOOTER, - 'compress' => $compress, - 'forceOnTop' => $forceOnTop, + 'type' => $type, + 'section' => self::PART_FOOTER, + 'compress' => $compress, + 'forceOnTop' => $forceOnTop, 'allWrap' => $allWrap ); } } /*Javascript Inline Blocks */ - + /** * Adds JS inline code * @@ -637,7 +637,7 @@ if (!isset($this->jsInline[$name])) { $this->jsInline[$name] = array ( 'code' => $block . chr(10), - 'section' => self::PART_HEADER, + 'section' => self::PART_HEADER, 'compress' => $compress, 'forceOnTop' => $forceOnTop ); @@ -677,7 +677,7 @@ } /* CSS Files */ - + /** * Adds CSS file * @@ -692,18 +692,18 @@ public function addCssFile($file, $rel = 'stylesheet', $media = 'screen', $title = '', $compress = TRUE, $forceOnTop = FALSE, $allWrap = '') { if (!isset($this->cssFiles[$file])) { $this->cssFiles[$file] = array ( - 'rel' => $rel, - 'media' => $media, - 'title' => $title, - 'compress' => $compress, - 'forceOnTop' => $forceOnTop, + 'rel' => $rel, + 'media' => $media, + 'title' => $title, + 'compress' => $compress, + 'forceOnTop' => $forceOnTop, 'allWrap' => $allWrap ); } } /*CSS Inline Blocks */ - + /** * Adds CSS inline code * @@ -716,15 +716,15 @@ public function addCssInlineBlock($name, $block, $compressed = FALSE, $forceOnTop = FALSE) { if (!isset($this->cssInline[$name])) { $this->cssInline[$name] = array ( - 'code' => $block, - 'compress' => $compress, + 'code' => $block, + 'compress' => $compress, 'forceOnTop' => $forceOnTop ); } } /* JS Libraries */ - + /** * call function if you need the prototype library * @@ -792,9 +792,9 @@ /** * Enables ExtJs QuickTips * Need extJs loaded - * + * * @return void - * + * */ public function enableExtJSQuickTips() { $this->enableExtJSQuickTips = TRUE; @@ -810,7 +810,7 @@ $this->addExtCore = TRUE; } - /** + /** * call this function to load debug version of ExtJS. Use this for development only * */ @@ -831,7 +831,7 @@ * Adds Javascript Inline Label. This will occur in TYPO3.lang - object * The label can be used in scripts with TYPO3.lang. * Need extJs loaded - * + * * @param string $key * @param string $value * @return void @@ -844,8 +844,8 @@ * Adds Javascript Inline Label Array. This will occur in TYPO3.lang - object * The label can be used in scripts with TYPO3.lang. * Array will be merged with existing array. - * Need extJs loaded - * + * Need extJs loaded + * * @param array $array * @return void */ @@ -856,8 +856,8 @@ /** * Adds Javascript Inline Setting. This will occur in TYPO3.settings - object * The label can be used in scripts with TYPO3.setting. - * Need extJs loaded - * + * Need extJs loaded + * * @param string $namespace * @param string $key * @param string $value @@ -884,8 +884,8 @@ * Adds Javascript Inline Setting. This will occur in TYPO3.settings - object * The label can be used in scripts with TYPO3.setting. * Array will be merged with existing array. - * Need extJs loaded - * + * Need extJs loaded + * * @param string $namespace * @param array $array * @return void @@ -923,7 +923,7 @@ /* */ /* */ /*****************************************************/ - + /** * render the section (Header or Footer) * @@ -970,7 +970,7 @@ } if (count($this->cssInline)) { - + foreach ($this->cssInline as $name => $properties) { if ($properties['forceOnTop']) { $cssInline = '/*' . htmlspecialchars($name) . '*/' . chr(10) . $properties['code'] . chr(10) . $cssInline; @@ -1002,7 +1002,7 @@ $jsFooterLibs .= chr(10) . $tag; } } - + } } @@ -1033,7 +1033,7 @@ foreach ($this->jsInline as $name => $properties) { if ($properties['forceOnTop']) { if ($properties['section'] === self::PART_HEADER) { - $jsInline = '/*' . htmlspecialchars($name) . '*/' . chr(10) . $properties['code'] . chr(10) . $jsInline; + $jsInline = '/*' . htmlspecialchars($name) . '*/' . chr(10) . $properties['code'] . chr(10) . $jsInline; } else { $jsFooterInline = '/*' . htmlspecialchars($name) . '*/' . chr(10) . $properties['code'] . chr(10) . $jsFooterInline; } @@ -1076,29 +1076,29 @@ $jsFiles = ''; $jsFooterInline = $jsInline . chr(10) . $jsFooterInline; $jsInline = ''; - } + } $markerArray = array( - 'XMLPROLOG_DOCTYPE' => $this->xmlPrologAndDocType, - 'HTMLTAG' => $this->htmlTag, - 'HEADTAG' => $this->headTag, - 'METACHARSET' => $this->charSet ? str_replace('|', htmlspecialchars($this->charSet), $this->metaCharsetTag) : '', - 'INLINECOMMENT' => $this->inlineComments ? chr(10) . chr(10) . '' . chr(10) . chr(10) : '', + 'XMLPROLOG_DOCTYPE' => $this->xmlPrologAndDocType, + 'HTMLTAG' => $this->htmlTag, + 'HEADTAG' => $this->headTag, + 'METACHARSET' => $this->charSet ? str_replace('|', htmlspecialchars($this->charSet), $this->metaCharsetTag) : '', + 'INLINECOMMENT' => $this->inlineComments ? chr(10) . chr(10) . '' . chr(10) . chr(10) : '', 'BASEURL' => $this->baseUrl ? str_replace('|', $this->baseUrl, $this->baseUrlTag) : '', - 'SHORTCUT' => $this->favIcon ? sprintf($this->shortcutTag, htmlspecialchars($this->favIcon), $this->iconMimeType) : '', - 'CSS_INCLUDE' => $cssFiles, - 'CSS_INLINE' => $cssInline, - 'JS_INLINE' => $jsInline, - 'JS_INCLUDE' => $jsFiles, - 'JS_LIBS' => $jsLibs, - 'TITLE' => $this->title ? str_replace('|', htmlspecialchars($this->title), $this->titleTag) : '', - 'META' => $metaTags, - 'HEADERDATA' => $this->headerData ? implode(chr(10), $this->headerData) : '', - 'FOOTERDATA' => $this->footerData ? implode(chr(10), $this->footerData) : '', - 'JS_LIBS_FOOTER' => $jsFooterLibs, - 'JS_INCLUDE_FOOTER' => $jsFooterFiles, + 'SHORTCUT' => $this->favIcon ? sprintf($this->shortcutTag, htmlspecialchars($this->favIcon), $this->iconMimeType) : '', + 'CSS_INCLUDE' => $cssFiles, + 'CSS_INLINE' => $cssInline, + 'JS_INLINE' => $jsInline, + 'JS_INCLUDE' => $jsFiles, + 'JS_LIBS' => $jsLibs, + 'TITLE' => $this->title ? str_replace('|', htmlspecialchars($this->title), $this->titleTag) : '', + 'META' => $metaTags, + 'HEADERDATA' => $this->headerData ? implode(chr(10), $this->headerData) : '', + 'FOOTERDATA' => $this->footerData ? implode(chr(10), $this->footerData) : '', + 'JS_LIBS_FOOTER' => $jsFooterLibs, + 'JS_INCLUDE_FOOTER' => $jsFooterFiles, 'JS_INLINE_FOOTER' => $jsFooterInline, - 'BODY' => $this->bodyContent, + 'BODY' => $this->bodyContent, ); $markerArray = array_map('trim', $markerArray); @@ -1174,10 +1174,10 @@ $this->jsFiles[$this->backPath . 'contrib/extjs/ext-all.js'], $this->jsFiles[$this->backPath . 'contrib/extjs/ext-all-debug.js'] ); } - + $inlineSettings = $this->inlineLanguageLabels ? 'TYPO3.lang = ' . json_encode($this->inlineLanguageLabels) . ';' : ''; $inlineSettings .= $this->inlineSettings ? 'TYPO3.settings = ' . json_encode($this->inlineSettings) . ';' : ''; - + if ($this->addExtCore || $this->addExtJS) { // set clear.gif, move it on top, add handler code $code = ''; @@ -1189,13 +1189,13 @@ $out .= $this->inlineJavascriptWrap[0] . ' Ext.ns("TYPO3"); - Ext.BLANK_IMAGE_URL = "' . htmlspecialchars(t3lib_div::locationHeaderUrl($this->backPath . 'gfx/clear.gif')) . '";' . chr(10) . + Ext.BLANK_IMAGE_URL = "' . htmlspecialchars(t3lib_div::locationHeaderUrl($this->backPath . 'gfx/clear.gif')) . '";' . chr(10) . $inlineSettings . 'Ext.onReady(function() {' . ($this->enableExtJSQuickTips ? 'Ext.QuickTips.init();' . chr(10) : '') . $code . ' });' . $this->inlineJavascriptWrap[1]; unset ($this->extOnReadyCode); - + if ($this->extJStheme) { if (isset($GLOBALS['TBE_STYLES']['extJS']['theme'])) { $this->addCssFile($this->backPath . $GLOBALS['TBE_STYLES']['extJS']['theme'], 'stylesheet', 'screen', '', FALSE, TRUE); @@ -1225,7 +1225,7 @@ /* */ /* */ /*****************************************************/ - + /** * concatenate files into one file * registered handler @@ -1242,9 +1242,9 @@ if ($this->concatenateFiles && $GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['concatenateHandler']) { // use extern concatenate routine $params = array ( - 'jsLibs' => &$this->jsLibs, - 'jsFiles' => &$this->jsFiles, - 'jsFooterFiles' => &$this->jsFiles, + 'jsLibs' => &$this->jsLibs, + 'jsFiles' => &$this->jsFiles, + 'jsFooterFiles' => &$this->jsFiles, 'cssFiles' => &$this->cssFiles, ); t3lib_div::callUserFunction($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['concatenateHandler'], $params, $this); @@ -1264,17 +1264,17 @@ if ($this->compressJavascript && $GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['jsCompressHandler']) { // use extern compress routine $params = array ( - 'jsInline' => &$this->jsInline, + 'jsInline' => &$this->jsInline, 'jsFooterInline' => &$this->jsFooterInline, - 'jsLibs' => &$this->jsLibs, - 'jsFiles' => &$this->jsFiles, - 'jsFooterFiles' => &$this->jsFiles, + 'jsLibs' => &$this->jsLibs, + 'jsFiles' => &$this->jsFiles, + 'jsFooterFiles' => &$this->jsFiles, ); t3lib_div::callUserFunction($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['jsCompressHandler'], $params, $this); } else { // traverse the arrays, compress files $this->compressError = ''; - + if ($this->compressJavascript) { if (count($this->jsInline)) { foreach ($this->jsInline as $name => $properties) { @@ -1303,7 +1303,6 @@ } } } - } if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_pagerenderer.php']) { Index: t3lib/class.t3lib_modsettings.php =================================================================== --- t3lib/class.t3lib_modsettings.php (revision 6029) +++ t3lib/class.t3lib_modsettings.php (working copy) @@ -564,7 +564,6 @@ * ********************************/ - /** * Processing entry for the stored settings array * Can be overwritten by extended class @@ -580,5 +579,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_modSettings.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_modSettings.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_registry.php =================================================================== --- t3lib/class.t3lib_registry.php (revision 6029) +++ t3lib/class.t3lib_registry.php (working copy) @@ -195,9 +195,7 @@ } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_registry.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_registry.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_frontendedit.php =================================================================== --- t3lib/class.t3lib_frontendedit.php (revision 6029) +++ t3lib/class.t3lib_frontendedit.php (working copy) @@ -441,7 +441,7 @@ $this->doSave($table, $uid); } - + /** * Stub for closing a record. No real functionality needed since content * element rendering will take care of everything. @@ -614,5 +614,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_frontendedit.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_frontendedit.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_extfilefunc.php =================================================================== --- t3lib/class.t3lib_extfilefunc.php (revision 6029) +++ t3lib/class.t3lib_extfilefunc.php (working copy) @@ -885,5 +885,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_extfilefunc.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_extfilefunc.php']); } - -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_loadmodules.php =================================================================== --- t3lib/class.t3lib_loadmodules.php (revision 6029) +++ t3lib/class.t3lib_loadmodules.php (working copy) @@ -448,7 +448,7 @@ if ($MCONF['extbase']) { $modconf['script'] = 'mod.php?M=Tx_' . rawurlencode($name); } else { - $modconf['script'] = 'mod.php?M=' . rawurlencode($name); + $modconf['script'] = 'mod.php?M=' . rawurlencode($name); } } elseif ($MCONF['script'] && file_exists($path.'/'.$MCONF['script'])) { $modconf['script'] = $this->getRelativePath(PATH_typo3,$fullpath.'/'.$MCONF['script']); @@ -602,9 +602,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_loadmodules.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_loadmodules.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_foldertree.php =================================================================== --- t3lib/class.t3lib_foldertree.php (revision 6029) +++ t3lib/class.t3lib_foldertree.php (working copy) @@ -374,5 +374,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_foldertree.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_foldertree.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_sqlengine.php =================================================================== --- t3lib/class.t3lib_sqlengine.php (revision 6029) +++ t3lib/class.t3lib_sqlengine.php (working copy) @@ -896,10 +896,7 @@ } } - - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_sqlengine.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_sqlengine.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_cache.php =================================================================== --- t3lib/class.t3lib_cache.php (revision 6029) +++ t3lib/class.t3lib_cache.php (working copy) @@ -145,9 +145,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_cache.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_cache.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_xml.php =================================================================== --- t3lib/class.t3lib_xml.php (revision 6029) +++ t3lib/class.t3lib_xml.php (working copy) @@ -317,7 +317,6 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_xml.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_xml.php']); } Index: t3lib/class.t3lib_autoloader.php =================================================================== --- t3lib/class.t3lib_autoloader.php (revision 6029) +++ t3lib/class.t3lib_autoloader.php (working copy) @@ -188,9 +188,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_autoload.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_autoload.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_befunc.php =================================================================== --- t3lib/class.t3lib_befunc.php (revision 6029) +++ t3lib/class.t3lib_befunc.php (working copy) @@ -4338,4 +4338,4 @@ return $script; } } -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_stdgraphic.php =================================================================== --- t3lib/class.t3lib_stdgraphic.php (revision 6029) +++ t3lib/class.t3lib_stdgraphic.php (working copy) @@ -3080,12 +3080,9 @@ } return $retCol; } - - } if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_stdgraphic.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_stdgraphic.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_tstemplate.php =================================================================== --- t3lib/class.t3lib_tstemplate.php (revision 6029) +++ t3lib/class.t3lib_tstemplate.php (working copy) @@ -1401,7 +1401,7 @@ * @param array Array with overriding values for the $page array. * @param string Additional URL parameters to set in the URL. Syntax is "&foo=bar&foo2=bar2" etc. Also used internally to add parameters if needed. * @param string If you set this value to something else than a blank string, then the typeNumber used in the link will be forced to this value. Normally the typeNum is based on the target set OR on $GLOBALS['TSFE']->config['config']['forceTypeValue'] if found. - * @param string The target Doamin, if any was detected in typolink + * @param string The target Doamin, if any was detected in typolink * @return array Contains keys like "totalURL", "url", "sectionIndex", "linkVars", "no_cache", "type", "target" of which "totalURL" is normally the value you would use while the other keys contains various parts that was used to construct "totalURL" * @see tslib_frameset::frameParams(), tslib_cObj::typoLink(), tslib_cObj::SEARCHRESULT(), TSpagegen::pagegenInit(), tslib_menu::link() */ @@ -1612,9 +1612,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tstemplate.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tstemplate.php']); } - -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_userauth.php =================================================================== --- t3lib/class.t3lib_userauth.php (revision 6029) +++ t3lib/class.t3lib_userauth.php (working copy) @@ -611,7 +611,7 @@ /** * Creates a new session ID. - * + * * @return string The new session ID */ public function createSessionId() { @@ -1328,10 +1328,7 @@ } } - - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_userauth.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_userauth.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_matchcondition.php =================================================================== --- t3lib/class.t3lib_matchcondition.php (revision 6029) +++ t3lib/class.t3lib_matchcondition.php (working copy) @@ -634,9 +634,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_matchcondition.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_matchcondition.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_transl8tools.php =================================================================== --- t3lib/class.t3lib_transl8tools.php (revision 6029) +++ t3lib/class.t3lib_transl8tools.php (working copy) @@ -224,7 +224,6 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_transl8tools.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_transl8tools.php']); } Index: t3lib/class.t3lib_iconworks.php =================================================================== --- t3lib/class.t3lib_iconworks.php (revision 6029) +++ t3lib/class.t3lib_iconworks.php (working copy) @@ -540,4 +540,4 @@ } } } -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_timetracknull.php =================================================================== --- t3lib/class.t3lib_timetracknull.php (revision 6029) +++ t3lib/class.t3lib_timetracknull.php (working copy) @@ -130,9 +130,7 @@ * @return integer The microtime value as milliseconds value */ public function getMilliseconds($microtime = NULL) {} - } // XCLASSing is not possible for this class - ?> \ No newline at end of file Index: t3lib/class.t3lib_syntaxhl.php =================================================================== --- t3lib/class.t3lib_syntaxhl.php (revision 6029) +++ t3lib/class.t3lib_syntaxhl.php (working copy) @@ -423,9 +423,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_syntaxhl.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_syntaxhl.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_querygenerator.php =================================================================== --- t3lib/class.t3lib_querygenerator.php (revision 6029) +++ t3lib/class.t3lib_querygenerator.php (working copy) @@ -1531,9 +1531,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_querygenerator.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_querygenerator.php']); } - -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_admin.php =================================================================== --- t3lib/class.t3lib_admin.php (revision 6029) +++ t3lib/class.t3lib_admin.php (working copy) @@ -764,7 +764,6 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_admin.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_admin.php']); } Index: t3lib/class.t3lib_parsehtml.php =================================================================== --- t3lib/class.t3lib_parsehtml.php (revision 6029) +++ t3lib/class.t3lib_parsehtml.php (working copy) @@ -1448,10 +1448,7 @@ } } - - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_parsehtml.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_parsehtml.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_db.php =================================================================== --- t3lib/class.t3lib_db.php (revision 6029) +++ t3lib/class.t3lib_db.php (working copy) @@ -1366,12 +1366,9 @@ return false; } - } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_db.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_db.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_refindex.php =================================================================== --- t3lib/class.t3lib_refindex.php (revision 6029) +++ t3lib/class.t3lib_refindex.php (working copy) @@ -1063,9 +1063,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_refindex.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_refindex.php']); } - ?> \ No newline at end of file Index: t3lib/class.gzip_encode.php =================================================================== --- t3lib/class.gzip_encode.php (revision 6029) +++ t3lib/class.gzip_encode.php (working copy) @@ -385,5 +385,4 @@ return max((float)$load[2], (float)$load[3], (float)$load[4]); } } - ?> \ No newline at end of file Index: t3lib/class.t3lib_extmgm.php =================================================================== --- t3lib/class.t3lib_extmgm.php (revision 6029) +++ t3lib/class.t3lib_extmgm.php (working copy) @@ -376,8 +376,8 @@ } /** - * Adds a list of new fields to the TYPO3 USER SETTINGS configuration "showitem" list, the array with - * the new fields itself needs to be added additionally to show up in the user setup, like + * Adds a list of new fields to the TYPO3 USER SETTINGS configuration "showitem" list, the array with + * the new fields itself needs to be added additionally to show up in the user setup, like * $GLOBALS['TYPO3_USER_SETTINGS']['columns'] += $tempColumns * * @param string $addFields: List of fields to be added to the user settings @@ -1473,5 +1473,4 @@ return $out; } } - ?> \ No newline at end of file Index: t3lib/class.t3lib_scbase.php =================================================================== --- t3lib/class.t3lib_scbase.php (revision 6029) +++ t3lib/class.t3lib_scbase.php (working copy) @@ -389,5 +389,4 @@ } } } - ?> \ No newline at end of file Index: t3lib/class.t3lib_svbase.php =================================================================== --- t3lib/class.t3lib_svbase.php (revision 6029) +++ t3lib/class.t3lib_svbase.php (working copy) @@ -692,12 +692,10 @@ $this->unlinkTempFiles(); } - - /* every service type has it's own API + /* every service type has its own API function process($content='', $type='', $conf=array()) { // } */ - } /** @@ -706,5 +704,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]["XCLASS"]["t3lib/class.t3lib_svbase.php"]); } */ - ?> \ No newline at end of file Index: t3lib/config_default.php =================================================================== --- t3lib/config_default.php (revision 6029) +++ t3lib/config_default.php (working copy) @@ -559,4 +559,4 @@ $ACCESS_TIME = $EXEC_TIME - ($EXEC_TIME % 60); // $ACCESS_TIME is a common time in minutes for access control $SIM_ACCESS_TIME = $ACCESS_TIME; // if $SIM_EXEC_TIME is changed this value must be set accordingly -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_tcemain.php =================================================================== --- t3lib/class.t3lib_tcemain.php (revision 6029) +++ t3lib/class.t3lib_tcemain.php (working copy) @@ -261,7 +261,7 @@ var $defaultValues = array(); // Array [table][fields]=value: New records are created with default values and you can set this array on the form $defaultValues[$table][$field] = $value to override the default values fetched from TCA. If ->setDefaultsFromUserTS is called UserTSconfig default values will overrule existing values in this array (thus UserTSconfig overrules externally set defaults which overrules TCA defaults) var $overrideValues = array(); // Array [table][fields]=value: You can set this array on the form $overrideValues[$table][$field] = $value to override the incoming data. You must set this externally. You must make sure the fields in this array are also found in the table, because it's not checked. All columns can be set by this array! var $alternativeFileName = array(); // Array [filename]=alternative_filename: Use this array to force another name onto a file. Eg. if you set ['/tmp/blablabal'] = 'my_file.txt' and '/tmp/blablabal' is set for a certain file-field, then 'my_file.txt' will be used as the name instead. - var $alternativeFilePath = array(); // Array [filename]=alternative_filepath: Same as alternativeFileName but with relative path to the file + var $alternativeFilePath = array(); // Array [filename]=alternative_filepath: Same as alternativeFileName but with relative path to the file var $data_disableFields=array(); // If entries are set in this array corresponding to fields for update, they are ignored and thus NOT updated. You could set this array from a series of checkboxes with value=0 and hidden fields before the checkbox with 1. Then an empty checkbox will disable the field. var $suggestedInsertUids=array(); // Use this array to validate suggested uids for tables by setting [table]:[uid]. This is a dangerous option since it will force the inserted record to have a certain UID. The value just have to be true, but if you set it to "DELETE" it will make sure any record with that UID will be deleted first (raw delete). The option is used for import of T3D files when synchronizing between two mirrored servers. As a security measure this feature is available only for Admin Users (for now) @@ -578,11 +578,11 @@ if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['checkModifyAccessList'])) { foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['checkModifyAccessList'] as $classData) { $hookObject = t3lib_div::getUserObj($classData); - + if(!($hookObject instanceof t3lib_TCEmain_checkModifyAccessListHook)) { throw new UnexpectedValueException('$hookObject must implement interface t3lib_TCEmain_checkModifyAccessListHook', 1251892472); } - + $this->checkModifyAccessListHookObjects[] = $hookObject; } } @@ -1730,7 +1730,7 @@ if (count($valueArray)){ if (!$this->bypassFileHandling) { // If filehandling should NOT be bypassed, do processing: $propArr = $this->getRecordProperties($table, $id); // For logging.. - foreach($valueArray as &$theFile){ + foreach($valueArray as &$theFile){ // if alernative File Path is set for the file, then it was an import if ($this->alternativeFilePath[$theFile]){ @@ -7627,10 +7627,7 @@ } } - - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tcemain.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tcemain.php']); } - -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_cs.php =================================================================== --- t3lib/class.t3lib_cs.php (revision 6029) +++ t3lib/class.t3lib_cs.php (working copy) @@ -2200,11 +2200,9 @@ return $out; } - } if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_cs.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_cs.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_timetrack.php =================================================================== --- t3lib/class.t3lib_timetrack.php (revision 6029) +++ t3lib/class.t3lib_timetrack.php (working copy) @@ -643,5 +643,4 @@ } // XCLASSing is not possible for this class - ?> \ No newline at end of file Index: t3lib/class.t3lib_userauthgroup.php =================================================================== --- t3lib/class.t3lib_userauthgroup.php (revision 6029) +++ t3lib/class.t3lib_userauthgroup.php (working copy) @@ -1763,10 +1763,7 @@ } } - - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_userauthgroup.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_userauthgroup.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_pagetree.php =================================================================== --- t3lib/class.t3lib_pagetree.php (revision 6029) +++ t3lib/class.t3lib_pagetree.php (working copy) @@ -142,7 +142,6 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_pagetree.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_pagetree.php']); } Index: t3lib/class.t3lib_tceforms_fe.php =================================================================== --- t3lib/class.t3lib_tceforms_fe.php (revision 6029) +++ t3lib/class.t3lib_tceforms_fe.php (working copy) @@ -139,7 +139,7 @@ /** @var $pageRenderer t3lib_PageRenderer */ $pageRenderer = $GLOBALS['TSFE']->getPageRenderer(); $pageRenderer->addJsLibrary($lib, $this->backPath . $lib); - + } /** @@ -175,5 +175,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tceforms_fe.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tceforms_fe.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_sqlparser.php =================================================================== --- t3lib/class.t3lib_sqlparser.php (revision 6029) +++ t3lib/class.t3lib_sqlparser.php (working copy) @@ -1745,9 +1745,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_sqlparser.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_sqlparser.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_basicfilefunc.php =================================================================== --- t3lib/class.t3lib_basicfilefunc.php (revision 6029) +++ t3lib/class.t3lib_basicfilefunc.php (working copy) @@ -509,10 +509,7 @@ } } - - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_basicfilefunc.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_basicfilefunc.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_treeview.php =================================================================== --- t3lib/class.t3lib_treeview.php (revision 6029) +++ t3lib/class.t3lib_treeview.php (working copy) @@ -1088,9 +1088,7 @@ */ } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_treeview.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_treeview.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_tceforms_inline.php =================================================================== --- t3lib/class.t3lib_tceforms_inline.php (revision 6029) +++ t3lib/class.t3lib_tceforms_inline.php (working copy) @@ -2406,9 +2406,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tceforms_inline.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tceforms_inline.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_transferdata.php =================================================================== --- t3lib/class.t3lib_transferdata.php (revision 6029) +++ t3lib/class.t3lib_transferdata.php (working copy) @@ -1026,9 +1026,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_transferdata.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_transferdata.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_tsparser_ext.php =================================================================== --- t3lib/class.t3lib_tsparser_ext.php (revision 6029) +++ t3lib/class.t3lib_tsparser_ext.php (working copy) @@ -1787,9 +1787,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tsparser_ext.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tsparser_ext.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_tsstyleconfig.php =================================================================== --- t3lib/class.t3lib_tsstyleconfig.php (revision 6029) +++ t3lib/class.t3lib_tsstyleconfig.php (working copy) @@ -289,7 +289,6 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tsstyleconfig.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tsstyleconfig.php']); } Index: t3lib/class.t3lib_lock.php =================================================================== --- t3lib/class.t3lib_lock.php (revision 6029) +++ t3lib/class.t3lib_lock.php (working copy) @@ -289,7 +289,6 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_lock.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_lock.php']); } Index: t3lib/class.t3lib_cli.php =================================================================== --- t3lib/class.t3lib_cli.php (revision 6029) +++ t3lib/class.t3lib_cli.php (working copy) @@ -294,5 +294,4 @@ return implode(chr(10),$lines); } } - ?> \ No newline at end of file Index: t3lib/class.t3lib_htmlmail.php =================================================================== --- t3lib/class.t3lib_htmlmail.php (revision 6029) +++ t3lib/class.t3lib_htmlmail.php (working copy) @@ -1514,5 +1514,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_htmlmail.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_htmlmail.php']); } - -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_clipboard.php =================================================================== --- t3lib/class.t3lib_clipboard.php (revision 6029) +++ t3lib/class.t3lib_clipboard.php (working copy) @@ -1016,10 +1016,7 @@ } } - - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_clipboard.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_clipboard.php']); } - -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_parsehtml_proc.php =================================================================== --- t3lib/class.t3lib_parsehtml_proc.php (revision 6029) +++ t3lib/class.t3lib_parsehtml_proc.php (working copy) @@ -1608,9 +1608,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_parsehtml_proc.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_parsehtml_proc.php']); } - -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_page.php =================================================================== --- t3lib/class.t3lib_page.php (revision 6029) +++ t3lib/class.t3lib_page.php (working copy) @@ -1441,10 +1441,7 @@ } } - - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_page.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_page.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_flexformtools.php =================================================================== --- t3lib/class.t3lib_flexformtools.php (revision 6029) +++ t3lib/class.t3lib_flexformtools.php (working copy) @@ -474,4 +474,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_flexformtools.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_flexformtools.php']); } -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_ajax.php =================================================================== --- t3lib/class.t3lib_ajax.php (revision 6029) +++ t3lib/class.t3lib_ajax.php (working copy) @@ -124,7 +124,6 @@ } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_ajax.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_ajax.php']); } Index: t3lib/class.t3lib_recordlist.php =================================================================== --- t3lib/class.t3lib_recordlist.php (revision 6029) +++ t3lib/class.t3lib_recordlist.php (working copy) @@ -394,9 +394,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_recordlist.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_recordlist.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_rteapi.php =================================================================== --- t3lib/class.t3lib_rteapi.php (revision 6029) +++ t3lib/class.t3lib_rteapi.php (working copy) @@ -204,5 +204,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rte/class.tx_rte_base.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rte/class.tx_rte_base.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_tceforms.php =================================================================== --- t3lib/class.t3lib_tceforms.php (revision 6029) +++ t3lib/class.t3lib_tceforms.php (working copy) @@ -6246,9 +6246,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tceforms.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tceforms.php']); } - -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_install.php =================================================================== --- t3lib/class.t3lib_install.php (revision 6029) +++ t3lib/class.t3lib_install.php (working copy) @@ -1033,5 +1033,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_install.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_install.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_flashmessage.php =================================================================== --- t3lib/class.t3lib_flashmessage.php (revision 6029) +++ t3lib/class.t3lib_flashmessage.php (working copy) @@ -173,9 +173,7 @@ } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_flashmessage.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_flashmessage.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_beuserauth.php =================================================================== --- t3lib/class.t3lib_beuserauth.php (revision 6029) +++ t3lib/class.t3lib_beuserauth.php (working copy) @@ -400,11 +400,7 @@ } } - - - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_beuserauth.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_beuserauth.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_loaddbgroup.php =================================================================== --- t3lib/class.t3lib_loaddbgroup.php (revision 6029) +++ t3lib/class.t3lib_loaddbgroup.php (working copy) @@ -826,9 +826,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_loaddbgroup.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_loaddbgroup.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_superadmin.php =================================================================== --- t3lib/class.t3lib_superadmin.php (revision 6029) +++ t3lib/class.t3lib_superadmin.php (working copy) @@ -1369,5 +1369,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_superadmin.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_superadmin.php']); } - -?> +?> \ No newline at end of file Index: t3lib/class.t3lib_div.php =================================================================== --- t3lib/class.t3lib_div.php (revision 6029) +++ t3lib/class.t3lib_div.php (working copy) @@ -1988,8 +1988,8 @@ } } } - - + + /** * Merges two arrays recursively and "binary safe" (integer keys are * overridden as well), overruling similar values in the first array @@ -5672,5 +5672,4 @@ return '\''.$value.'\''; } } - ?> \ No newline at end of file Index: t3lib/class.t3lib_softrefproc.php =================================================================== --- t3lib/class.t3lib_softrefproc.php (revision 6029) +++ t3lib/class.t3lib_softrefproc.php (working copy) @@ -844,5 +844,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_softrefproc.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_softrefproc.php']); } - ?> \ No newline at end of file Index: t3lib/class.t3lib_tsparser.php =================================================================== --- t3lib/class.t3lib_tsparser.php (revision 6029) +++ t3lib/class.t3lib_tsparser.php (working copy) @@ -703,9 +703,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tsparser.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tsparser.php']); } - -?> +?> \ No newline at end of file Index: typo3/dummy.php =================================================================== --- typo3/dummy.php (revision 6029) +++ typo3/dummy.php (working copy) @@ -104,5 +104,4 @@ $SOBE = t3lib_div::makeInstance('SC_dummy'); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/show_item.php =================================================================== --- typo3/show_item.php (revision 6029) +++ typo3/show_item.php (working copy) @@ -567,5 +567,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/wizard_table.php =================================================================== --- typo3/wizard_table.php (revision 6029) +++ typo3/wizard_table.php (working copy) @@ -680,5 +680,4 @@ $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/file_newfolder.php =================================================================== --- typo3/file_newfolder.php (revision 6029) +++ typo3/file_newfolder.php (working copy) @@ -313,5 +313,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/alt_main.php =================================================================== --- typo3/alt_main.php (revision 6029) +++ typo3/alt_main.php (working copy) @@ -584,5 +584,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/interfaces/interface.backend_cacheActionsHook.php =================================================================== --- typo3/interfaces/interface.backend_cacheActionsHook.php (revision 6029) +++ typo3/interfaces/interface.backend_cacheActionsHook.php (working copy) @@ -45,5 +45,4 @@ public function manipulateCacheActions(&$cacheActions, &$optionValues); } - -?> +?> \ No newline at end of file Index: typo3/interfaces/interface.filelist_editiconshook.php =================================================================== --- typo3/interfaces/interface.filelist_editiconshook.php (revision 6029) +++ typo3/interfaces/interface.filelist_editiconshook.php (working copy) @@ -45,5 +45,4 @@ public function manipulateEditIcons(&$cells, &$parentObject); } - ?> \ No newline at end of file Index: typo3/interfaces/interface.localrecordlist_actionsHook.php =================================================================== --- typo3/interfaces/interface.localrecordlist_actionsHook.php (revision 6029) +++ typo3/interfaces/interface.localrecordlist_actionsHook.php (working copy) @@ -84,5 +84,4 @@ } - ?> \ No newline at end of file Index: typo3/interfaces/interface.backend_toolbaritem.php =================================================================== --- typo3/interfaces/interface.backend_toolbaritem.php (revision 6029) +++ typo3/interfaces/interface.backend_toolbaritem.php (working copy) @@ -63,5 +63,4 @@ */ public function getAdditionalAttributes(); } - ?> \ No newline at end of file Index: typo3/interfaces/interface.cms_newcontentelementwizarditemshook.php =================================================================== --- typo3/interfaces/interface.cms_newcontentelementwizarditemshook.php (revision 6029) +++ typo3/interfaces/interface.cms_newcontentelementwizarditemshook.php (working copy) @@ -45,5 +45,4 @@ public function manipulateWizardItems(&$wizardItems, &$parentObject); } - -?> +?> \ No newline at end of file Index: typo3/show_rechis.php =================================================================== --- typo3/show_rechis.php (revision 6029) +++ typo3/show_rechis.php (working copy) @@ -174,5 +174,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/file_rename.php =================================================================== --- typo3/file_rename.php (revision 6029) +++ typo3/file_rename.php (working copy) @@ -232,5 +232,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/backend.php =================================================================== --- typo3/backend.php (revision 6029) +++ typo3/backend.php (working copy) @@ -209,7 +209,7 @@ $pageRenderer = $GLOBALS['TBE_TEMPLATE']->getPageRenderer(); $pageRenderer->loadScriptaculous('builder,effects,controls,dragdrop'); $pageRenderer->loadExtJS(); - + // remove duplicate entries $this->jsFiles = array_unique($this->jsFiles); @@ -220,12 +220,12 @@ $GLOBALS['TBE_TEMPLATE']->JScode .= chr(10); $this->generateJavascript(); $GLOBALS['TBE_TEMPLATE']->JScode .= $GLOBALS['TBE_TEMPLATE']->wrapScriptTags($this->js) . chr(10); - + foreach($this->jsFilesAfterInline as $jsFile) { $GLOBALS['TBE_TEMPLATE']->JScode .= ' '; } - + // FIXME abusing the JS container to add CSS, need to fix template.php foreach($this->cssFiles as $cssFileName => $cssFile) { @@ -359,7 +359,7 @@ // t3lib_div::locationHeaderUrl() will include '/typo3/' in the URL htmlspecialchars(t3lib_div::locationHeaderUrl('gfx/clear.gif')) . '"; - + TYPO3.configuration = ' . json_encode(array( 'siteUrl' => t3lib_div::getIndpEnv('TYPO3_SITE_URL'), @@ -376,7 +376,7 @@ 'veriCode' => $GLOBALS['BE_USER']->veriCode(), 'denyFileTypes' => PHP_EXTENSIONS_DEFAULT, )) . '; - TYPO3.LLL = { + TYPO3.LLL = { core : ' . json_encode(array( 'waitTitle' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_logging_in') , 'refresh_login_failed' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_failed'), @@ -394,7 +394,7 @@ 'login_about_to_expire' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.login_about_to_expire'), 'login_about_to_expire_title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.login_about_to_expire_title'), 'refresh_login_refresh_button' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_refresh_button'), - 'refresh_direct_logout_button' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_direct_logout_button'), + 'refresh_direct_logout_button' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_direct_logout_button'), )) . ', fileUpload: ' . json_encode(array( 'windowTitle' => $GLOBALS['LANG']->getLL('fileUpload_windowTitle'), @@ -441,7 +441,7 @@ var TS = new typoSetup(); var currentModuleLoaded = ""; - var goToModule = ' . $goToModuleSwitch . '; + var goToModule = ' . $goToModuleSwitch . '; /** * Frameset Module object @@ -685,5 +685,4 @@ } $TYPO3backend->render(); - ?> \ No newline at end of file Index: typo3/listframe_loader.php =================================================================== --- typo3/listframe_loader.php (revision 6029) +++ typo3/listframe_loader.php (working copy) @@ -99,5 +99,4 @@ // Make instance: $SOBE = t3lib_div::makeInstance('SC_listframe_loader'); $SOBE->main(); - ?> \ No newline at end of file Index: typo3/classes/class.typo3_tcefile.php =================================================================== --- typo3/classes/class.typo3_tcefile.php (revision 6029) +++ typo3/classes/class.typo3_tcefile.php (working copy) @@ -181,5 +181,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.typo3_tcefile.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.typo3_tcefile.php']); } - ?> \ No newline at end of file Index: typo3/classes/class.typo3ajax.php =================================================================== --- typo3/classes/class.typo3ajax.php (revision 6029) +++ typo3/classes/class.typo3ajax.php (working copy) @@ -295,9 +295,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.typo3ajax.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.typo3ajax.php']); } - ?> \ No newline at end of file Index: typo3/classes/class.clearcachemenu.php =================================================================== --- typo3/classes/class.clearcachemenu.php (revision 6029) +++ typo3/classes/class.clearcachemenu.php (working copy) @@ -170,8 +170,7 @@ } -if(defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.clearcachemenu.php']) { +if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.clearcachemenu.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.clearcachemenu.php']); } - -?> +?> \ No newline at end of file Index: typo3/classes/class.ajaxlogin.php =================================================================== --- typo3/classes/class.ajaxlogin.php (revision 6029) +++ typo3/classes/class.ajaxlogin.php (working copy) @@ -118,5 +118,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.ajaxlogin.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.ajaxlogin.php']); } - -?> +?> \ No newline at end of file Index: typo3/classes/class.shortcutmenu.php =================================================================== --- typo3/classes/class.shortcutmenu.php (revision 6029) +++ typo3/classes/class.shortcutmenu.php (working copy) @@ -789,9 +789,7 @@ } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.shortcutmenu.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.shortcutmenu.php']); } - -?> +?> \ No newline at end of file Index: typo3/classes/class.modulemenu.php =================================================================== --- typo3/classes/class.modulemenu.php (revision 6029) +++ typo3/classes/class.modulemenu.php (working copy) @@ -568,9 +568,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.modulemenu.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.modulemenu.php']); } - -?> +?> \ No newline at end of file Index: typo3/classes/class.backendsearchmenu.php =================================================================== --- typo3/classes/class.backendsearchmenu.php (revision 6029) +++ typo3/classes/class.backendsearchmenu.php (working copy) @@ -102,9 +102,7 @@ } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.backendsearchmenu.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.backendsearchmenu.php']); } - ?> \ No newline at end of file Index: typo3/classes/class.typo3logo.php =================================================================== --- typo3/classes/class.typo3logo.php (revision 6029) +++ typo3/classes/class.typo3logo.php (working copy) @@ -96,9 +96,7 @@ } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.typo3logo.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.typo3logo.php']); } - ?> \ No newline at end of file Index: typo3/classes/class.workspaceselector.php =================================================================== --- typo3/classes/class.workspaceselector.php (revision 6029) +++ typo3/classes/class.workspaceselector.php (working copy) @@ -265,5 +265,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.workspaceselector.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.workspaceselector.php']); } - ?> \ No newline at end of file Index: typo3/class.file_list.inc =================================================================== --- typo3/class.file_list.inc (revision 6029) +++ typo3/class.file_list.inc (working copy) @@ -253,7 +253,7 @@ // Header line is drawn $theData = Array(); - + foreach ($this->fieldArray as $v) { if ($v == '_CLIPBOARD_' && $this->clipBoard) { $cells=array(); @@ -676,7 +676,7 @@ /** * Creates the edit control section - * + * * @param array Array with information about the file/directory for which to make the edit control section for the listing. * @return string HTML-table */ @@ -684,25 +684,25 @@ $cells = array(); $fullIdent = $theData['path'].$theData['file']; $canEdit = t3lib_div::inList($GLOBALS['TYPO3_CONF_VARS']['SYS']['textfile_ext'], $theData['realFileext']); - + // prepare space icon $iconWidth = $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['iconSizeWidth'] ? $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['iconSizeWidth'] : 12; $iconHeight = $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['iconSizeHeight'] ? $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['iconSizeHeight'] : 12; $spaceIcon = ''; - + //edit if ($theData['type'] == 'dir' || !$canEdit) { $cells['edit'] = $spaceIcon; } else { $editOnClick = 'top.content.list_frame.location.href=top.TS.PATH_typo3+\'file_edit.php?target=' . - rawurlencode($fullIdent) . + rawurlencode($fullIdent) . '&returnUrl=\'+top.rawurlencode(top.content.list_frame.document.location);return false;'; $cells['edit'] = ''; } //rename $renameOnClick = 'top.content.list_frame.location.href=top.TS.PATH_typo3+\'file_rename.php?target=' . - rawurlencode($fullIdent) . + rawurlencode($fullIdent) . '&returnUrl=\'+top.rawurlencode(top.content.list_frame.document.location);return false;'; $cells['rename'] = ''; @@ -722,7 +722,7 @@ $hookObject->manipulateEditIcons($cells, $this); } } - + // Compile items into a DIV-element: return '
@@ -730,7 +730,7 @@ ', $cells).'
'; } - + /** * Make reference count * @@ -767,9 +767,7 @@ } } - - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.file_list.inc']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.file_list.inc']); } -?> +?> \ No newline at end of file Index: typo3/login_frameset.php =================================================================== --- typo3/login_frameset.php (revision 6029) +++ typo3/login_frameset.php (working copy) @@ -121,5 +121,4 @@ $SOBE = t3lib_div::makeInstance('SC_login_frameset'); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/wizard_add.php =================================================================== --- typo3/wizard_add.php (revision 6029) +++ typo3/wizard_add.php (working copy) @@ -105,7 +105,7 @@ // Init GPvars: $this->P = t3lib_div::_GP('P'); $this->returnEditConf = t3lib_div::_GP('returnEditConf'); - + // Get this record $origRow = t3lib_BEfunc::getRecord($this->P['table'],$this->P['uid']); @@ -173,7 +173,7 @@ // Setting the new field data: if ($this->P['flexFormPath']) { // If the field is a flexform field, work with the XML structure instead: - + $currentFlexFormData = t3lib_div::xml2array($current[$this->P['field']]); // Current value of flexform path: $flexToolObj = t3lib_div::makeInstance('t3lib_flexformtools'); $curValueOfFlexform = $flexToolObj->getArrayValueByPath($this->P['flexFormPath'], $currentFlexFormData); @@ -238,5 +238,4 @@ foreach($SOBE->include_once as $INC_FILE) include_once($INC_FILE); $SOBE->main(); - ?> \ No newline at end of file Index: typo3/thumbs.php =================================================================== --- typo3/thumbs.php (revision 6029) +++ typo3/thumbs.php (working copy) @@ -49,5 +49,4 @@ // ****************** require (PATH_t3lib.'thumbs.php'); - ?> \ No newline at end of file Index: typo3/tce_db.php =================================================================== --- typo3/tce_db.php (revision 6029) +++ typo3/tce_db.php (working copy) @@ -249,5 +249,4 @@ $SOBE->initClipboard(); $SOBE->main(); $SOBE->finish(); - ?> \ No newline at end of file Index: typo3/view_help.php =================================================================== --- typo3/view_help.php (revision 6029) +++ typo3/view_help.php (working copy) @@ -881,5 +881,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/wizard_colorpicker.php =================================================================== --- typo3/wizard_colorpicker.php (revision 6029) +++ typo3/wizard_colorpicker.php (working copy) @@ -448,5 +448,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/browser.php =================================================================== --- typo3/browser.php (revision 6029) +++ typo3/browser.php (working copy) @@ -135,5 +135,4 @@ $SOBE = t3lib_div::makeInstance('SC_browser'); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/wizard_list.php =================================================================== --- typo3/wizard_list.php (revision 6029) +++ typo3/wizard_list.php (working copy) @@ -135,5 +135,4 @@ $SOBE = t3lib_div::makeInstance('SC_wizard_list'); $SOBE->init(); $SOBE->main(); - ?> \ No newline at end of file Index: typo3/class.browse_links.php =================================================================== --- typo3/class.browse_links.php (revision 6029) +++ typo3/class.browse_links.php (working copy) @@ -2758,5 +2758,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.browse_links.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.browse_links.php']); } - ?> \ No newline at end of file Index: typo3/ajax.php =================================================================== --- typo3/ajax.php (revision 6029) +++ typo3/ajax.php (working copy) @@ -77,5 +77,4 @@ // outputting the content (and setting the X-JSON-Header) $ajaxObj->render(); - -?> +?> \ No newline at end of file Index: typo3/browse_links.php =================================================================== --- typo3/browse_links.php (revision 6029) +++ typo3/browse_links.php (working copy) @@ -232,5 +232,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/init.php =================================================================== --- typo3/init.php (revision 6029) +++ typo3/init.php (working copy) @@ -424,5 +424,4 @@ } ob_start('ob_gzhandler'); } - -?> +?> \ No newline at end of file Index: typo3/tce_file.php =================================================================== --- typo3/tce_file.php (revision 6029) +++ typo3/tce_file.php (working copy) @@ -60,5 +60,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->finish(); - ?> \ No newline at end of file Index: typo3/mod/web/perm/class.sc_mod_web_perm_ajax.php =================================================================== --- typo3/mod/web/perm/class.sc_mod_web_perm_ajax.php (revision 6029) +++ typo3/mod/web/perm/class.sc_mod_web_perm_ajax.php (working copy) @@ -393,5 +393,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/web/perm/class.sc_mod_web_perm_ajax.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/web/perm/class.sc_mod_web_perm_ajax.php']); } - ?> \ No newline at end of file Index: typo3/mod/web/perm/index.php =================================================================== --- typo3/mod/web/perm/index.php (revision 6029) +++ typo3/mod/web/perm/index.php (working copy) @@ -845,5 +845,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - -?> +?> \ No newline at end of file Index: typo3/mod/web/info/index.php =================================================================== --- typo3/mod/web/info/index.php (revision 6029) +++ typo3/mod/web/info/index.php (working copy) @@ -232,5 +232,4 @@ $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/mod/web/func/index.php =================================================================== --- typo3/mod/web/func/index.php (revision 6029) +++ typo3/mod/web/func/index.php (working copy) @@ -229,5 +229,4 @@ $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/mod/user/ws/cli/ws_cli.phpsh =================================================================== --- typo3/mod/user/ws/cli/ws_cli.phpsh (revision 6029) +++ typo3/mod/user/ws/cli/ws_cli.phpsh (working copy) @@ -25,5 +25,4 @@ $autopubObj = t3lib_div::makeInstance('wslib'); $autopubObj->CLI_main(); - ?> \ No newline at end of file Index: typo3/mod/user/ws/publish.php =================================================================== --- typo3/mod/user/ws/publish.php (revision 6029) +++ typo3/mod/user/ws/publish.php (working copy) @@ -264,5 +264,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/mod/user/ws/index.php =================================================================== --- typo3/mod/user/ws/index.php (revision 6029) +++ typo3/mod/user/ws/index.php (working copy) @@ -1075,5 +1075,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/mod/user/ws/workspaceforms.php =================================================================== --- typo3/mod/user/ws/workspaceforms.php (revision 6029) +++ typo3/mod/user/ws/workspaceforms.php (working copy) @@ -657,5 +657,4 @@ $SOBE->init(); $SOBE->main(); $SOBE->printContent(); - ?> \ No newline at end of file Index: typo3/mod/user/ws/class.wslib.php =================================================================== --- typo3/mod/user/ws/class.wslib.php (revision 6029) +++ typo3/mod/user/ws/class.wslib.php (working copy) @@ -228,8 +228,6 @@ } } - - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/user/ws/class.wslib.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/user/ws/class.wslib.php']); } Index: typo3/mod/user/ws/class.wslib_gui.php =================================================================== --- typo3/mod/user/ws/class.wslib_gui.php (revision 6029) +++ typo3/mod/user/ws/class.wslib_gui.php (working copy) @@ -182,7 +182,7 @@ $browse.= '
'; } $browse.= '
'; - + $workspaceOverviewList = $this->displayWorkspaceOverview_list($pArray); if ($workspaceOverviewList || $this->alwaysDisplayHeader) { // Make header of overview: @@ -196,13 +196,13 @@ ' . $LANG->getLL('label_publish') . ' ' . $LANG->getLL('label_lifecycle') . ' '.($this->showWorkspaceCol ? '' . $LANG->getLL('label_workspace') . '' : '').' '; $tableRows[] = $tableHeader; - + // Add lines from overview: $tableRows = array_merge($tableRows, $workspaceOverviewList); @@ -1303,9 +1303,7 @@ } } - if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/user/ws/class.wslib_gui.php']) { include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/user/ws/class.wslib_gui.php']); } - -?> +?> \ No newline at end of file Index: typo3/mod/tools/em/class.em_unzip.php =================================================================== --- typo3/mod/tools/em/class.em_unzip.php (revision 6029) +++ typo3/mod/tools/em/class.em_unzip.php (working copy) @@ -1347,5 +1347,4 @@ } } - ?> \ No newline at end of file Index: typo3/mod/tools/em/class.em_soap.php =================================================================== --- typo3/mod/tools/em/class.em_soap.php (revision 6029) +++ typo3/mod/tools/em/class.em_soap.php (working copy) @@ -409,5 +409,4 @@ return false; } } - ?> \ No newline at end of file Index: typo3/mod/tools/em/class.em_xmlhandler.php =================================================================== --- typo3/mod/tools/em/class.em_xmlhandler.php (revision 6029) +++ typo3/mod/tools/em/class.em_xmlhandler.php (working copy) @@ -630,5 +630,4 @@ } } } - ?> \ No newline at end of file Index: typo3/mod/tools/em/class.em_index.php =================================================================== --- typo3/mod/tools/em/class.em_index.php (revision 6029) +++ typo3/mod/tools/em/class.em_index.php (working copy) @@ -363,12 +363,12 @@ 'G' => $GLOBALS['LANG']->getLL('type_global'), 'L' => $GLOBALS['LANG']->getLL('type_local'), ); - $this->typeDescr = array( + $this->typeDescr = array( 'S' => $GLOBALS['LANG']->getLL('descr_system'), 'G' => $GLOBALS['LANG']->getLL('descr_global'), 'L' => $GLOBALS['LANG']->getLL('descr_local'), ); - + // Setting paths of install scopes: $this->typePaths = Array ( 'S' => TYPO3_mainDir.'sysext/', @@ -945,7 +945,7 @@ $onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;"; $content .= '