[!!!][CLEANUP] Remove deprecated code in multiple sysexts 68/33768/5
authorMarkus Klein <klein.t3@reelworx.at>
Mon, 3 Nov 2014 22:59:29 +0000 (23:59 +0100)
committerBenjamin Mack <benni@typo3.org>
Thu, 6 Nov 2014 09:28:26 +0000 (10:28 +0100)
Does not touch extbase and fluid.

Resolves: #62670
Releases: master
Change-Id: I853fd1814b7ea5853cdf75abf16be238a27af9f5
Reviewed-on: http://review.typo3.org/33768
Reviewed-by: Stefan Froemken <froemken@gmail.com>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Benjamin Mack <benni@typo3.org>
39 files changed:
typo3/sysext/cms/layout/db_layout.php
typo3/sysext/cms/layout/db_new_content_el.php
typo3/sysext/core/Documentation/Changelog/master/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.rst [new file with mode: 0644]
typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php
typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
typo3/sysext/cshmanual/mod/index.php
typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
typo3/sysext/css_styled_content/Documentation/Configuration/Objects/Image/Index.rst
typo3/sysext/css_styled_content/Documentation/Configuration/Objects/Table/Index.rst
typo3/sysext/css_styled_content/Documentation/Configuration/Objects/Uploads/Index.rst
typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php [deleted file]
typo3/sysext/css_styled_content/static/v4.5/setup.txt
typo3/sysext/css_styled_content/static/v4.6/setup.txt
typo3/sysext/css_styled_content/static/v4.7/setup.txt
typo3/sysext/css_styled_content/static/v6.0/setup.txt
typo3/sysext/css_styled_content/static/v6.1/setup.txt
typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
typo3/sysext/filelist/Classes/FileList.php
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
typo3/sysext/frontend/Classes/ContentObject/FilesContentObject.php
typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
typo3/sysext/impexp/Classes/Controller/ImportExportController.php
typo3/sysext/impexp/Classes/Task/ImportExportTask.php
typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
typo3/sysext/install/Classes/SystemEnvironment/Check.php
typo3/sysext/lang/Classes/Command/LanguageCommandController.php
typo3/sysext/lang/Classes/LanguageService.php
typo3/sysext/lang/lang.php [deleted file]
typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
typo3/sysext/rsaauth/Resources/Public/JavaScript/rsaauth.js
typo3/sysext/rsaauth/Resources/Public/JavaScript/rsaauth_min.js
typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
typo3/sysext/rtehtmlarea/htmlarea/plugins/DynamicCSS/dynamiccss.css [deleted file]
typo3/sysext/scheduler/Classes/Task/FileIndexingTask.php [deleted file]
typo3/sysext/scheduler/Migrations/Code/ClassAliasMap.php
typo3/sysext/scheduler/ext_localconf.php
typo3/sysext/workspaces/Classes/Service/StagesService.php

index 079b7de..232e91b 100644 (file)
@@ -107,11 +107,6 @@ class ext_posMap extends \TYPO3\CMS\Backend\Tree\View\PagePositionMap {
 
 }
 
-/*
- * @deprecated since 6.0, the classname SC_db_layout and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/backend/Classes/Controller/PageLayoutController.php
- */
 require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('backend') . 'Classes/Controller/PageLayoutController.php';
 // Make instance:
 $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\PageLayoutController');
index 74c39ea..ac46379 100644 (file)
@@ -72,11 +72,6 @@ class ext_posMap extends \TYPO3\CMS\Backend\Tree\View\PagePositionMap {
 
 }
 
-/*
- * @deprecated since 6.0, the classname SC_db_new_content_el and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
- */
 require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('backend') . 'Classes/Controller/ContentElement/NewContentElementController.php';
 // Make instance:
 $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\ContentElement\\NewContentElementController');
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.rst
new file mode 100644 (file)
index 0000000..16b7ef8
--- /dev/null
@@ -0,0 +1,89 @@
+=================================================================
+Breaking: #62670 - Removal of deprecated code in multiple sysexts
+=================================================================
+
+Description
+===========
+
+DBAL DatabaseConnection
+-----------------------
+
+All connection parameters (host, username, password, db) for methods sql_connect() and sql_select_db() are removed.
+
+
+CSS Styled Content
+------------------
+
+The old frontend plugin file ``pi1/class.tx_cssstyledcontent_pi1.php`` is removed.
+Refer to ``Classes/Controller/CssStyledContentController.php`` instead.
+
+
+Install Tool
+------------
+
+The check for PHP's magic_quotes_gpc settings is removed, as the feature is disabled since PHP 5.4.
+
+
+Removed files
+-------------
+
+* lang/lang.php is removed. You don't need to include this file anymore, just use \TYPO3\CMS\Lang\LanguageService directly.
+* rtehtmlarea/htmlarea/plugins/DynamicCSS/dynamiccss.css is removed. The file is unused.
+
+
+Removed PHP classes
+-------------------
+
+* TYPO3\CMS\Scheduler\Task\FileIndexingTask is removed without replacement.
+
+
+Removed PHP class members
+-------------------------
+
+* TypoScriptFrontendController::$absRefPrefix_force is removed without replacement.
+
+
+Removed PHP methods
+-------------------
+
+* LanguageService::JScharCode is removed, use GeneralUtility::quoteJSvalue instead.
+* ContentObjectRenderer::joinTSarrays is removed without replacement.
+* TypoScriptFrontendController::tidyHTML is removed without replacement. You may use the tidy extension from TER.
+* ElementBrowser::isWebFolder is removed without replacement.
+* ElementBrowser::checkFolder is removed without replacement.
+* AbstractDatabaseRecordList::getTreeObject is removed without replacement.
+* FileList::dirData is removed without replacement.
+* FilesContentObject::stdWrapValue is removed, use ContentObjectRenderer::stdWrapValue instead.
+* ImportExportController::userTempFolder is removed, use getDefaultImportExportFolder instead.
+* ImportExportController::userSaveFolder is removed, use getDefaultImportExportFolder instead.
+* CrawlerHook::loadIndexerClass is removed without replacement.
+* DatabaseIntegrityView::func_filesearch is removed without replacement.
+* DatabaseIntegrityView::findFile is removed without replacement.
+* RteHtmlAreaBase::buildStyleSheet is removed without replacement.
+* RteHtmlAreaBase::loremIpsumInsert is removed without replacement.
+* StagesService::checkCustomStagingForWS is removed without replacement.
+
+
+Removed JS functions
+--------------------
+
+* tx_rsaauth_encrypt is removed without replacement.
+* tx_rsaauth_feencrypt is removed without replacement.
+
+
+Impact
+======
+
+A call to any of the aforementioned methods by third party code will result in a fatal PHP error.
+
+
+Affected installations
+======================
+
+Any installation which contains third party code still using these deprecated methods.
+
+
+Migration
+=========
+
+Replace the calls with the suggestions outlined above.
index 9bae085..614856a 100644 (file)
@@ -4686,11 +4686,6 @@ class tx_scheduler_CachingFrameworkGarbageCollection extends \TYPO3\CMS\Schedule
 /**
  * @deprecated since 6.0 will be removed in 7.0
  */
-class tx_scheduler_FileIndexing extends \TYPO3\CMS\Scheduler\Task\FileIndexingTask {}
-
-/**
- * @deprecated since 6.0 will be removed in 7.0
- */
 class tx_scheduler_RecyclerGarbageCollection_AdditionalFieldProvider extends \TYPO3\CMS\Scheduler\Task\RecyclerGarbageCollectionAdditionalFieldProvider {}
 
 /**
index eaa416b..edc8273 100644 (file)
@@ -468,7 +468,7 @@ class FunctionalTestCaseBootstrapUtility {
                        );
                }
                $database->setDatabaseName($this->databaseName);
-               $database->sql_select_db($this->databaseName);
+               $database->sql_select_db();
        }
 
        /**
@@ -491,7 +491,7 @@ class FunctionalTestCaseBootstrapUtility {
                }
                $this->databaseName = $GLOBALS['TYPO3_CONF_VARS']['DB']['database'];
                $database->setDatabaseName($this->databaseName);
-               $database->sql_select_db($this->databaseName);
+               $database->sql_select_db();
                foreach ($database->admin_get_tables() as $table) {
                        $database->admin_query('TRUNCATE ' . $table['Name'] . ';');
                }
index c5912af..da050be 100644 (file)
@@ -34,11 +34,6 @@ class local_t3lib_parsehtml extends \TYPO3\CMS\Core\Html\HtmlParser {
 
 }
 
-/*
- * @deprecated since 6.0, the classname SC_view_help and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
- */
 $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Cshmanual\\Controller\\HelpModuleController');
 $SOBE->init();
 $SOBE->main();
index 2d1cb70..bb2723b 100644 (file)
@@ -37,7 +37,7 @@ class CssStyledContentController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlug
         *
         * @var string
         */
-       public $scriptRelPath = 'pi1/class.tx_cssstyledcontent_pi1.php';
+       public $scriptRelPath = 'Classes/Controller/CssStyledContentController.php';
 
        /**
         * The extension key
index b54d9d0..aa30acb 100644 (file)
@@ -19,7 +19,7 @@ CSS Styled Content, as can be seen in the TypoScript setup::
        tt_content.image.10 = < lib.stdheader
        tt_content.image.20 = USER
        tt_content.image.20 {
-               userFunc = tx_cssstyledcontent_pi1->render_textpic
+               userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_textpic
                ...
        }
 
index 6862216..c712d1b 100644 (file)
@@ -20,7 +20,7 @@ CSS Styled Content, as can be seen in the TypoScript setup::
                10 = < lib.stdheader
 
                20 = USER
-               20.userFunc = tx_cssstyledcontent_pi1->render_table
+               20.userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_table
                20.field = bodytext
                ...
        }
index 5b06e61..8549500 100644 (file)
@@ -28,7 +28,7 @@ CSS Styled Content, as can be seen in the TypoScript setup::
                10 = < lib.stdheader
 
                20 = USER
-               20.userFunc = tx_cssstyledcontent_pi1->render_uploads
+               20.userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_uploads
                ...
        }
 
diff --git a/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php b/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
deleted file mode 100644 (file)
index 2ef0c84..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_cssstyledcontent_pi1 and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('css_styled_content') . 'Classes/Controller/CssStyledContentController.php';
index 82cf2f5..5b6a7ff 100644 (file)
@@ -229,12 +229,6 @@ lib.stdheader {
 
 
 
-#******************************************************
-# Including library for processing of some elements:
-#******************************************************
-includeLibs.tx_cssstyledcontent_pi1 = EXT:css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
-
-
 #**********************************
 # tt_content is started
 #**********************************
@@ -474,7 +468,7 @@ tt_content.image = COA
 tt_content.image.10 = < lib.stdheader
 tt_content.image.20 = USER
 tt_content.image.20 {
-       userFunc = tx_cssstyledcontent_pi1->render_textpic
+       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_textpic
 
        # Image source
        imgList.field = image
@@ -792,13 +786,13 @@ tt_content.bullets {
 # *****************
 # CType: table
 # *****************
-# Rendered by a PHP function specifically written to handle CE tables. See css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
+# Rendered by a PHP function specifically written to handle CE tables. See css_styled_content/Classes/Controller/CssStyledContentController.php
 tt_content.table = COA
 tt_content.table {
        10 = < lib.stdheader
 
        20 = USER
-       20.userFunc = tx_cssstyledcontent_pi1->render_table
+       20.userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_table
        20.field = bodytext
 
        20.color {
@@ -842,13 +836,13 @@ tt_content.table {
 # *****************
 # CType: uploads
 # *****************
-# Rendered by a PHP function specifically written to handle CE filelists. See css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
+# Rendered by a PHP function specifically written to handle CE filelists. See css_styled_content/Classes/Controller/CssStyledContentController.php
 tt_content.uploads = COA
 tt_content.uploads {
        10 = < lib.stdheader
 
        20 = USER
-       20.userFunc = tx_cssstyledcontent_pi1->render_uploads
+       20.userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_uploads
        20.field = media
        20.filePath.field = select_key
 
index 790a61e..dfc6a9f 100644 (file)
@@ -232,13 +232,6 @@ lib.stdheader {
 
 
 
-
-#******************************************************
-# Including library for processing of some elements:
-#******************************************************
-includeLibs.tx_cssstyledcontent_pi1 = EXT:css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
-
-
 #**********************************
 # tt_content is started
 #**********************************
@@ -478,7 +471,7 @@ tt_content.image = COA
 tt_content.image.10 = < lib.stdheader
 tt_content.image.20 = USER
 tt_content.image.20 {
-       userFunc = tx_cssstyledcontent_pi1->render_textpic
+       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_textpic
 
        # Image source
        imgList.field = image
@@ -796,13 +789,13 @@ tt_content.bullets {
 # *****************
 # CType: table
 # *****************
-# Rendered by a PHP function specifically written to handle CE tables. See css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
+# Rendered by a PHP function specifically written to handle CE tables. See css_styled_content/Classes/Controller/CssStyledContentController.php
 tt_content.table = COA
 tt_content.table {
        10 = < lib.stdheader
 
        20 = USER
-       20.userFunc = tx_cssstyledcontent_pi1->render_table
+       20.userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_table
        20.field = bodytext
 
        20.color {
@@ -846,13 +839,13 @@ tt_content.table {
 # *****************
 # CType: uploads
 # *****************
-# Rendered by a PHP function specifically written to handle CE filelists. See css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
+# Rendered by a PHP function specifically written to handle CE filelists. See css_styled_content/Classes/Controller/CssStyledContentController.php
 tt_content.uploads = COA
 tt_content.uploads {
        10 = < lib.stdheader
 
        20 = USER
-       20.userFunc = tx_cssstyledcontent_pi1->render_uploads
+       20.userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_uploads
        20.field = media
        20.filePath.field = select_key
 
index eee3571..b61b42c 100644 (file)
@@ -397,12 +397,6 @@ lib.stdheader {
 
 
 
-#******************************************************
-# Including library for processing of some elements:
-#******************************************************
-includeLibs.tx_cssstyledcontent_pi1 = EXT:css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
-
-
 #**********************************
 # tt_content is started
 #**********************************
@@ -458,7 +452,7 @@ tt_content.stdWrap {
                                # Create class for space before content
                                20 = USER
                                20 {
-                                       userFunc = tx_cssstyledcontent_pi1->renderSpace
+                                       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->renderSpace
                                        space = before
                                        constant = {$content.spaceBefore}
                                        stdWrap {
@@ -468,7 +462,7 @@ tt_content.stdWrap {
                                # Create class for space after content
                                30 = USER
                                30 {
-                                       userFunc = tx_cssstyledcontent_pi1->renderSpace
+                                       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->renderSpace
                                        space = after
                                        constant = {$content.spaceAfter}
                                        stdWrap {
@@ -543,7 +537,7 @@ tt_content.stdWrap {
                        20 {
                                10 = USER
                                10 {
-                                       userFunc = tx_cssstyledcontent_pi1->renderSpace
+                                       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->renderSpace
                                        space = before
                                        constant = {$content.spaceBefore}
                                        stdWrap {
@@ -662,7 +656,7 @@ tt_content.image = COA
 tt_content.image.10 = < lib.stdheader
 tt_content.image.20 = USER
 tt_content.image.20 {
-       userFunc = tx_cssstyledcontent_pi1->render_textpic
+       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_textpic
 
        # Image source
        imgList.field = image
@@ -1180,13 +1174,13 @@ tt_content.bullets {
 # *****************
 # CType: table
 # *****************
-# Rendered by a PHP function specifically written to handle CE tables. See css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
+# Rendered by a PHP function specifically written to handle CE tables. See css_styled_content/Classes/Controller/CssStyledContentController.php
 tt_content.table = COA
 tt_content.table {
        10 = < lib.stdheader
 
        20 = USER
-       20.userFunc = tx_cssstyledcontent_pi1->render_table
+       20.userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_table
        20.field = bodytext
 
        20.color {
@@ -1236,14 +1230,14 @@ tt_content.table {
 # *****************
 # CType: uploads
 # *****************
-# Rendered by a PHP function specifically written to handle CE filelists. See css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
+# Rendered by a PHP function specifically written to handle CE filelists. See css_styled_content/Classes/Controller/CssStyledContentController.php
 tt_content.uploads = COA
 tt_content.uploads {
        10 = < lib.stdheader
 
        20 = USER
        20 {
-               userFunc = tx_cssstyledcontent_pi1->render_uploads
+               userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_uploads
                field = media
                filePath.field = select_key
 
index 672d063..d664798 100644 (file)
@@ -394,15 +394,6 @@ lib.stdheader {
 
 
 
-
-
-
-#******************************************************
-# Including library for processing of some elements:
-#******************************************************
-includeLibs.tx_cssstyledcontent_pi1 = EXT:css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
-
-
 #**********************************
 # tt_content is started
 #**********************************
@@ -458,7 +449,7 @@ tt_content.stdWrap {
                                # Create class for space before content
                                20 = USER
                                20 {
-                                       userFunc = tx_cssstyledcontent_pi1->renderSpace
+                                       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->renderSpace
                                        space = before
                                        constant = {$content.spaceBefore}
                                        classStdWrap {
@@ -468,7 +459,7 @@ tt_content.stdWrap {
                                # Create class for space after content
                                30 = USER
                                30 {
-                                       userFunc = tx_cssstyledcontent_pi1->renderSpace
+                                       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->renderSpace
                                        space = after
                                        constant = {$content.spaceAfter}
                                        classStdWrap {
@@ -543,7 +534,7 @@ tt_content.stdWrap {
                        20 {
                                10 = USER
                                10 {
-                                       userFunc = tx_cssstyledcontent_pi1->renderSpace
+                                       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->renderSpace
                                        space = before
                                        constant = {$content.spaceBefore}
                                        stdWrap {
@@ -662,7 +653,7 @@ tt_content.image = COA
 tt_content.image.10 = < lib.stdheader
 tt_content.image.20 = USER
 tt_content.image.20 {
-       userFunc = tx_cssstyledcontent_pi1->render_textpic
+       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_textpic
 
        # Image source
        imgList.field = image
@@ -1329,13 +1320,13 @@ tt_content.uploads {
 # *****************
 # CType: table
 # *****************
-# Rendered by a PHP function specifically written to handle CE tables. See css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
+# Rendered by a PHP function specifically written to handle CE tables. See css_styled_content/Classes/Controller/CssStyledContentController.php
 tt_content.table = COA
 tt_content.table {
        10 = < lib.stdheader
 
        20 = USER
-       20.userFunc = tx_cssstyledcontent_pi1->render_table
+       20.userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_table
        20.field = bodytext
 
        20.color {
index 66cd20f..3b2b7da 100644 (file)
@@ -395,14 +395,6 @@ lib.stdheader {
 
 
 
-
-
-#******************************************************
-# Including library for processing of some elements:
-#******************************************************
-includeLibs.tx_cssstyledcontent_pi1 = EXT:css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
-
-
 #**********************************
 # tt_content is started
 #**********************************
@@ -458,7 +450,7 @@ tt_content.stdWrap {
                                # Create class for space before content
                                20 = USER
                                20 {
-                                       userFunc = tx_cssstyledcontent_pi1->renderSpace
+                                       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->renderSpace
                                        space = before
                                        constant = {$content.spaceBefore}
                                        classStdWrap {
@@ -468,7 +460,7 @@ tt_content.stdWrap {
                                # Create class for space after content
                                30 = USER
                                30 {
-                                       userFunc = tx_cssstyledcontent_pi1->renderSpace
+                                       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->renderSpace
                                        space = after
                                        constant = {$content.spaceAfter}
                                        classStdWrap {
@@ -543,7 +535,7 @@ tt_content.stdWrap {
                        20 {
                                10 = USER
                                10 {
-                                       userFunc = tx_cssstyledcontent_pi1->renderSpace
+                                       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->renderSpace
                                        space = before
                                        constant = {$content.spaceBefore}
                                        stdWrap {
@@ -662,7 +654,7 @@ tt_content.image = COA
 tt_content.image.10 = < lib.stdheader
 tt_content.image.20 = USER
 tt_content.image.20 {
-       userFunc = tx_cssstyledcontent_pi1->render_textpic
+       userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_textpic
 
        # Image source
        imgList.field = image
@@ -1330,13 +1322,13 @@ tt_content.uploads {
 # *****************
 # CType: table
 # *****************
-# Rendered by a PHP function specifically written to handle CE tables. See css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
+# Rendered by a PHP function specifically written to handle CE tables. See css_styled_content/Classes/Controller/CssStyledContentController.php
 tt_content.table = COA
 tt_content.table {
        10 = < lib.stdheader
 
        20 = USER
-       20.userFunc = tx_cssstyledcontent_pi1->render_table
+       20.userFunc = \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController->render_table
        20.field = bodytext
 
        20.color {
index 043a474..69d2ddd 100644 (file)
@@ -2505,39 +2505,26 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
        /**
         * Open a (persistent) connection to a MySQL server
         *
-        * @param string $host Deprecated since 6.1, will be removed in two versions. Database host IP/domain[:port]
-        * @param string $username Deprecated since 6.1, will be removed in two versions. Username to connect with.
-        * @param string $password Deprecated since 6.1, will be removed in two versions. Password to connect with.
         * @return bool|void
-        * @throws \RuntimeException
         */
-       public function sql_pconnect($host = NULL, $username = NULL, $password = NULL) {
-               if ($host || $username || $password) {
-                       $this->handleDeprecatedConnectArguments($host, $username, $password);
-               }
-
-               // Initializing and output value:
-               $sqlResult = $this->handler_init('_DEFAULT');
-               return $sqlResult;
+       public function sql_pconnect() {
+               return $this->handler_init('_DEFAULT');
        }
 
        /**
         * Select a SQL database
         *
-        * @param string $TYPO3_db Deprecated since 6.1, will be removed in two versions. Database to connect to.
         * @return bool Returns TRUE on success or FALSE on failure.
         */
-       public function sql_select_db($TYPO3_db = NULL) {
-               if (!$TYPO3_db) {
-                       $TYPO3_db = $this->handlerCfg[$this->lastHandlerKey]['config']['database'];
-               }
+       public function sql_select_db() {
+               $databaseName = $this->handlerCfg[$this->lastHandlerKey]['config']['database'];
                $ret = TRUE;
                if ((string)$this->handlerCfg[$this->lastHandlerKey]['type'] === 'native') {
-                       $ret = $this->handlerInstance[$this->lastHandlerKey]['link']->select_db($TYPO3_db);
+                       $ret = $this->handlerInstance[$this->lastHandlerKey]['link']->select_db($databaseName);
                }
                if (!$ret) {
                        GeneralUtility::sysLog(
-                               'Could not select MySQL database ' . $TYPO3_db . ': ' . $this->sql_error(),
+                               'Could not select MySQL database ' . $databaseName . ': ' . $this->sql_error(),
                                'Core',
                                GeneralUtility::SYSLOG_SEVERITY_FATAL
                        );
@@ -2567,11 +2554,14 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
                        case 'native':
                                /** @var \mysqli_result $db_list */
                                $db_list = $this->query("SELECT SCHEMA_NAME FROM information_schema.SCHEMATA");
+                               $oldDb = $this->handlerCfg[$this->lastHandlerKey]['config']['database'];
                                while ($row = $db_list->fetch_object()) {
-                                       if ($this->sql_select_db($row->SCHEMA_NAME)) {
+                                       $this->handlerCfg[$this->lastHandlerKey]['config']['database'] = $row->SCHEMA_NAME;
+                                       if ($this->sql_select_db()) {
                                                $dbArr[] = $row->SCHEMA_NAME;
                                        }
                                }
+                               $this->handlerCfg[$this->lastHandlerKey]['config']['database'] = $oldDb;
                                $db_list->free();
                                break;
                        case 'adodb':
index b6e4557..e1bd30a 100644 (file)
@@ -502,29 +502,6 @@ class FileList extends \TYPO3\CMS\Backend\RecordList\AbstractRecordList {
        }
 
        /**
-        * Returns some data specific for the directories...
-        *
-        * @param \TYPO3\CMS\Core\Resource\Folder $folderObject File information array
-        * @return array (title, icon, path)
-        * @deprecated since 6.2 - will be removed two versions later without replacement
-        */
-       public function dirData(\TYPO3\CMS\Core\Resource\Folder $folderObject) {
-               GeneralUtility::logDeprecatedFunction();
-
-               $title = htmlspecialchars($folderObject->getName());
-               $icon = 'apps-filetree-folder-default';
-               $role = $folderObject->getRole();
-               if ($role === FolderInterface::ROLE_TEMPORARY) {
-                       $title = '<strong>' . $GLOBALS['LANG']->getLL('temp', TRUE) . '</strong>';
-                       $icon = 'apps-filetree-folder-temp';
-               } elseif ($role === FolderInterface::ROLE_RECYCLER) {
-                       $icon = 'apps-filetree-folder-recycler';
-                       $title = '<strong>' . $GLOBALS['LANG']->getLL('recycler', TRUE) . '</strong>';
-               }
-               return array($title, $icon, $folderObject->getIdentifier());
-       }
-
-       /**
         * This returns tablerows for the files in the array $items['sorting'].
         *
         * @param \TYPO3\CMS\Core\Resource\File[] $files File items
index 1535087..06c417e 100644 (file)
@@ -6911,20 +6911,6 @@ class ContentObjectRenderer {
        }
 
        /**
-        * Merges two TypoScript propery array, overlaing the $old_conf onto the $conf array
-        *
-        * @param array $conf TypoScript property array, the "base
-        * @param array $old_conf TypoScript property array, the "overlay
-        * @return array The resulting array
-        * @see mergeTSRef(), tx_tstemplatestyler_modfunc1::joinTSarrays()
-        * @deprecated since 6.2, will be removed in two versions, use array_replace_recursive() instead
-        */
-       public function joinTSarrays($conf, $old_conf) {
-               GeneralUtility::logDeprecatedFunction();
-               return array_replace_recursive($conf, $old_conf);
-       }
-
-       /**
         * This function creates a number of TEXT-objects in a Gifbuilder configuration in order to create a text-field like thing.
         *
         * @param array $gifbuilderConf TypoScript properties for Gifbuilder - TEXT GIFBUILDER objects are added to this array and returned.
index 17dfd1b..f151fd4 100644 (file)
@@ -334,19 +334,6 @@ class FilesContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractConte
        }
 
        /**
-        * Gets a configuration value by passing them through stdWrap first and taking a default value if stdWrap doesn't yield a result.
-        *
-        * @param string $key The config variable key (from TS array).
-        * @param array $config The TypoScript array.
-        * @param string $defaultValue Optional default value.
-        * @return string Value of the config variable
-        * @deprecated since TYPO3 CMS 6.2, use ContentObjectRenderer::stdWrapValue() instead. Will be removed two versions later.
-        */
-       protected function stdWrapValue($key, array $config, $defaultValue = '') {
-               return $this->cObj->stdWrapValue($key, $config, $defaultValue);
-       }
-
-       /**
         * @return \TYPO3\CMS\Frontend\Page\PageRepository
         */
        protected function getPageRepository() {
index 909f8bc..d2c95a0 100644 (file)
@@ -486,16 +486,6 @@ class TypoScriptFrontendController {
        public $absRefPrefix = '';
 
        /**
-        * Absolute Reference prefix force flag. This is set, if the type and id is
-        * retrieve from PATH_INFO and thus we NEED to prefix urls with at least '/'
-        * UNUSED in Core
-        *
-        * @var bool
-        * @deprecated since 6.2; will be removed two versions later
-        */
-       public $absRefPrefix_force = FALSE;
-
-       /**
         * Factor for form-field widths compensation
         * @var string
         */
@@ -4078,7 +4068,6 @@ class TypoScriptFrontendController {
         * Logs access to deprecated TypoScript objects and properties.
         *
         * Dumps message to the TypoScript message log (admin panel) and the TYPO3 deprecation log.
-        * Note: The second parameter was introduced in TYPO3 4.5 and is not available in older versions
         *
         * @param string $typoScriptProperty Deprecated object or property
         * @param string $explanation Message or additional information
@@ -4102,45 +4091,6 @@ class TypoScriptFrontendController {
        }
 
        /**
-        * Pass the content through tidy - a little program that cleans up HTML-code.
-        * Requires $this->TYPO3_CONF_VARS['FE']['tidy'] to be TRUE and $this->TYPO3_CONF_VARS['FE']['tidy_path'] to
-        * contain the filename/path of tidy including clean-up arguments for tidy. See default value in
-        * TYPO3_CONF_VARS in ext:core/Configuration/DefaultConfiguration.php
-        *
-        * @param string $content The page content to clean up. Will be written to a temporary file which "tidy" is then asked to clean up. File content is read back and returned.
-        * @return string Returns the
-        * @deprecated tidy and its options were deprecated with TYPO3 CMS 6.2, this function will be removed two versions later. If you need tidy, use the extension "tidy" from TER.
-        */
-       public function tidyHTML($content) {
-               GeneralUtility::logDeprecatedFunction();
-               if ($this->TYPO3_CONF_VARS['FE']['tidy'] && $this->TYPO3_CONF_VARS['FE']['tidy_path']) {
-                       $oldContent = $content;
-                       // Create temporary name
-                       $fname = GeneralUtility::tempnam('typo3_tidydoc_');
-                       // Delete if exists, just to be safe.
-                       @unlink($fname);
-                       // Open for writing
-                       $fp = fopen($fname, 'wb');
-                       // Put $content
-                       fputs($fp, $content);
-                       // Close
-                       @fclose($fp);
-                       // run the $content through 'tidy', which formats the HTML to nice code.
-                       exec($this->TYPO3_CONF_VARS['FE']['tidy_path'] . ' ' . $fname, $output);
-                       // Delete the tempfile again
-                       @unlink($fname);
-                       $content = implode(LF, $output);
-                       if (!trim($content)) {
-                               // Restore old content due empty return value.
-                               $content = $oldContent;
-                               $GLOBALS['TT']->setTSlogMessage('"tidy" returned an empty value!', 2);
-                       }
-                       $GLOBALS['TT']->setTSlogMessage('"tidy" content length: ' . strlen($content), 0);
-               }
-               return $content;
-       }
-
-       /**
         * Substitutes all occurencies of <a href="#"... in $this->content with <a href="[path-to-url]#"...
         *
         * @return void Works directly on $this->content
index 98b13cf..0d55652 100644 (file)
@@ -1253,30 +1253,6 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
         ****************************/
 
        /**
-        * Gets the default folder path for temporary uploads,
-        * e.g. 'fileadmin/user_uploads/_temp_/importexport/'
-        *
-        * @return bool|string Path or FALSE otherwise
-        * @deprecated since TYPO3 CMS 6.2, will be removed two versions later - use getDefaultImportExportFolder() instead
-        */
-       public function userTempFolder() {
-               GeneralUtility::logDeprecatedFunction();
-               return $this->getDefaultImportExportFolder()->getPublicUrl();
-       }
-
-       /**
-        * Gets the default folder path for temporary uploads,
-        * e.g. 'fileadmin/user_uploads/_temp_/importexport/'
-        *
-        * @return string Absolute path to folder where export files can be saved.
-        * @deprecated since TYPO3 CMS 6.2, will be removed two versions later - use getDefaultImportExportFolder() instead
-        */
-       public function userSaveFolder() {
-               GeneralUtility::logDeprecatedFunction();
-               return $this->getDefaultImportExportFolder()->getPublicUrl();
-       }
-
-       /**
         * Returns a \TYPO3\CMS\Core\Resource\Folder object for saving export files
         * to the server and is also used for uploading import files.
         *
index 4bd3f71..322f86b 100644 (file)
@@ -80,7 +80,7 @@ class ImportExportTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
                        $content .= $this->taskObject->description($GLOBALS['LANG']->getLL('.alttitle'), $GLOBALS['LANG']->getLL('.description'));
                        $thumbnails = ($lines = array());
                        // Thumbnail folder and files:
-                       $tempDir = $this->userTempFolder();
+                       $tempDir = $this->getDefaultImportExportFolder()->getPublicUrl();
                        if ($tempDir) {
                                $thumbnails = \TYPO3\CMS\Core\Utility\GeneralUtility::getFilesInDir($tempDir, 'png,gif,jpg', 1);
                        }
@@ -166,13 +166,37 @@ class ImportExportTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
        }
 
        /**
-        * Returns first temporary folder of the user account
+        * Returns a \TYPO3\CMS\Core\Resource\Folder object for saving export files
+        * to the server and is also used for uploading import files.
         *
-        * @return string Absolute path to first "_temp_" folder of the current user, otherwise blank.
+        * @throws \InvalidArgumentException
+        * @return NULL|\TYPO3\CMS\Core\Resource\Folder
         */
-       protected function userTempFolder() {
-               // @TODO: This is broken since move to FAL
-               return '';
+       protected function getDefaultImportExportFolder() {
+               $defaultImportExportFolder = NULL;
+
+               $defaultTemporaryFolder = $this->getBackendUser()->getDefaultUploadTemporaryFolder();
+               if ($defaultTemporaryFolder !== NULL) {
+
+                       $importExportFolderName = 'importexport';
+                       $createFolder = !$defaultTemporaryFolder->hasFolder($importExportFolderName);
+                       if ($createFolder === TRUE) {
+                               try {
+                                       $defaultImportExportFolder = $defaultTemporaryFolder->createFolder($importExportFolderName);
+                               } catch (\TYPO3\CMS\Core\Resource\Exception $folderAccessException) {}
+                       } else {
+                               $defaultImportExportFolder = $defaultTemporaryFolder->getSubfolder($importExportFolderName);
+                       }
+               }
+
+               return $defaultImportExportFolder;
+       }
+
+       /**
+        * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+        */
+       protected function getBackendUser() {
+               return $GLOBALS['BE_USER'];
        }
 
 }
index ba420c5..82d9859 100644 (file)
@@ -541,16 +541,6 @@ class CrawlerHook {
        }
 
        /**
-        * Include indexer class.
-        *
-        * @return void
-        * @deprecated since 6.2 will be removed two version later. Rely on autoloading of the indexer class.
-        */
-       public function loadIndexerClass() {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-       }
-
-       /**
         * Get rootline for closest TypoScript template root.
         * Algorithm same as used in Web > Template, Object browser
         *
index dd1c782..cec8c89 100644 (file)
@@ -112,7 +112,6 @@ class Check {
                $statusArray[] = $this->checkGdLibJpgSupport();
                $statusArray[] = $this->checkGdLibPngSupport();
                $statusArray[] = $this->checkGdLibFreeTypeSupport();
-               $statusArray[] = $this->checkPhpMagicQuotes();
                $statusArray[] = $this->checkRegisterGlobals();
                $statusArray[] = $this->checkLibXmlBug();
                $statusArray[] = $this->isTrueTypeFontDpiStandard();
@@ -1299,29 +1298,6 @@ class Check {
        }
 
        /**
-        * Check php magic quotes
-        *
-        * @return Status\StatusInterface
-        */
-       protected function checkPhpMagicQuotes() {
-               $magicQuotesGpc = get_magic_quotes_gpc();
-               if ($magicQuotesGpc) {
-                       $status = new Status\WarningStatus();
-                       $status->setTitle('PHP magic quotes on');
-                       $status->setMessage(
-                               'magic_quotes_gpc=' . $magicQuotesGpc . LF .
-                               'Setting magic_quotes_gpc is deprecated since PHP 5.3.' .
-                               ' You are advised to disable it until it is completely removed:' . LF .
-                               'magic_quotes_gpc=Off'
-                       );
-               } else {
-                       $status = new Status\OkStatus();
-                       $status->setTitle('PHP magic quotes off');
-               }
-               return $status;
-       }
-
-       /**
         * Check register globals
         *
         * @return Status\StatusInterface
index e420157..7743b95 100644 (file)
@@ -13,6 +13,8 @@ namespace TYPO3\CMS\Lang\Command;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Core\Package\PackageInterface;
+use TYPO3\CMS\Core\Package\PackageManager;
 
 /**
  * Language command controller updates translation packages
@@ -20,12 +22,6 @@ namespace TYPO3\CMS\Lang\Command;
 class LanguageCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\CommandController {
 
        /**
-        * @var \TYPO3\CMS\Core\Package\PackageManager
-        * @inject
-        */
-       protected $packageManager;
-
-       /**
         * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher
         * @inject
         */
@@ -36,7 +32,6 @@ class LanguageCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\Comman
         *
         * @param string $localesToUpdate Comma separated list of locales that needs to be updated
         * @return void
-        * @deprecated Use LanguageCommandController (language:update) instead. will be removed two versions after 6.2
         */
        public function updateCommand($localesToUpdate = '') {
                /** @var $updateTranslationService \TYPO3\CMS\Lang\Service\UpdateTranslationService */
@@ -54,9 +49,11 @@ class LanguageCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\Comman
                                $locales[] = $language->getLocale();
                        }
                }
-               $this->packageManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Package\\PackageManager');
+               /** @var PackageManager $packageManager */
+               $packageManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Package\\PackageManager');
                $this->emitPackagesMayHaveChangedSignal();
-               foreach ($this->packageManager->getAvailablePackages() as $package) {
+               /** @var PackageInterface $package */
+               foreach ($packageManager->getAvailablePackages() as $package) {
                        $updateTranslationService->updateTranslation($package->getPackageKey(), $locales);
                }
        }
index 9b3e9c0..462aa01 100644 (file)
@@ -111,8 +111,7 @@ class LanguageService {
        /**
         * Initializes the backend language.
         * This is for example done in \TYPO3\CMS\Backend\Template\DocumentTemplate with lines like these:
-        * require (PATH_typo3 . 'sysext/lang/lang.php');
-        * $LANG = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('language');
+        * $LANG = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Lang\\LanguageService');
         * $LANG->init($GLOBALS['BE_USER']->uc['lang']);
         *
         * @throws \RuntimeException
@@ -193,26 +192,6 @@ class LanguageService {
        }
 
        /**
-        * Converts the input string to a JavaScript function returning the same string, but charset-safe.
-        * Used for confirm and alert boxes where we must make sure that any string content
-        * does not break the script AND want to make sure the charset is preserved.
-        * Originally I used the JS function unescape() in combination with PHP function
-        * rawurlencode() in order to pass strings in a safe way. This could still be done
-        * for iso-8859-1 charsets but now I have applied the same method here for all charsets.
-        *
-        * @param string $str Input string, encoded with UTF-8
-        * @return string Output string, a JavaScript function: "String.fromCharCode(......)
-        * @depreacted since 6.2 - will be removed two versions later; use GeneralUtility::quoteJSvalue() instead
-        */
-       public function JScharCode($str) {
-               GeneralUtility::logDeprecatedFunction();
-
-               // Convert the UTF-8 string into a array of char numbers:
-               $nArr = $this->csConvObj->utf8_to_numberarray($str);
-               return 'String.fromCharCode(' . implode(',', $nArr) . ')';
-       }
-
-       /**
         * Debugs localization key.
         *
         * @param string $value value to debug
diff --git a/typo3/sysext/lang/lang.php b/typo3/sysext/lang/lang.php
deleted file mode 100644 (file)
index 5b3e271..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname language and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/lang/Classes/LanguageService.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('lang') . 'Classes/LanguageService.php';
index 4b9359c..6252094 100644 (file)
@@ -491,29 +491,4 @@ class DatabaseIntegrityView {
                $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('select_db'), $admin->testDBRefs($admin->checkSelectDBRefs), TRUE, TRUE);
                $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('group_db'), $admin->testDBRefs($admin->checkGroupDBRefs), TRUE, TRUE);
        }
-
-       /**
-        * Searching for files with a specific pattern
-        *
-        * @deprecated since 6.2 will be removed two versions later
-        * @return void
-        */
-       public function func_filesearch() {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-       }
-
-       /**
-        * Searching for filename pattern recursively in the specified dir.
-        *
-        * @param string $basedir Base directory
-        * @param string $pattern Match pattern
-        * @param array $matching_files Array of matching files, passed by reference
-        * @param int $depth Depth to recurse
-        * @deprecated since 6.2 will be removed two versions later
-        * @return array Array with various information about the search result
-        */
-       public function findFile($basedir, $pattern, &$matching_files, $depth) {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-       }
-
 }
index c89f149..21ef6df 100644 (file)
@@ -2247,30 +2247,6 @@ class ElementBrowser {
         * Miscellaneous functions
         *
         ******************************************************************/
-       /**
-        * Verifies that a path is a web-folder:
-        *
-        * @param string $folder Absolute filepath
-        * @return bool If the input path is found in PATH_site then it returns TRUE.
-        * @deprecated since 6.2 - will be removed two versions later without replacement
-        */
-       public function isWebFolder($folder) {
-               GeneralUtility::logDeprecatedFunction();
-               $folder = rtrim($folder, '/') . '/';
-               return GeneralUtility::isFirstPartOfStr($folder, PATH_site) ? TRUE : FALSE;
-       }
-
-       /**
-        * Checks, if a path is within the mountpoints of the backend user
-        *
-        * @param string $folder Absolute filepath
-        * @return bool If the input path is found in the backend users filemounts, then return TRUE.
-        * @deprecated since 6.2 - will be removed two versions later without replacement
-        */
-       public function checkFolder($folder) {
-               GeneralUtility::logDeprecatedFunction();
-               return $this->fileProcessor->checkPathAgainstMounts(rtrim($folder, '/') . '/') ? TRUE : FALSE;
-       }
 
        /**
         * Prints a 'header' where string is in a tablecell
index 8577f84..1cd9899 100644 (file)
@@ -775,29 +775,6 @@ class AbstractDatabaseRecordList extends \TYPO3\CMS\Backend\RecordList\AbstractR
        }
 
        /**
-        * Creates an instance of \TYPO3\CMS\Backend\Tree\View\PageTreeView which will select a page
-        * tree to $depth and return the object. In that object we will find the ids of the tree.
-        *
-        * @param int $id Page id.
-        * @param int $depth Depth to go down.
-        * @param string $perms_clause Select clause
-        * @return \TYPO3\CMS\Backend\Tree\View\PageTreeView instance with created list of ids.
-        * @deprecated Deprecated since 6.2, will be removed 2 versions later
-        */
-       public function getTreeObject($id, $depth, $perms_clause) {
-               GeneralUtility::logDeprecatedFunction();
-               $tree = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\View\\PageTreeView');
-               $tree->init('AND ' . $perms_clause);
-               $tree->makeHTML = 0;
-               $tree->fieldArray = array('uid', 'php_tree_stop');
-               if ($depth) {
-                       $tree->getTree($id, $depth, '');
-               }
-               $tree->ids[] = $id;
-               return $tree;
-       }
-
-       /**
         * Get all allowed mount pages to be searched in.
         *
         * @param int $id Page id
index ec2c1e7..6300b90 100644 (file)
@@ -1,47 +1,3 @@
-// Deprecated since 6.2 will be removed 2 versions later
-function tx_rsaauth_encrypt() {
-       var rsa = new RSAKey();
-       rsa.setPublic(document.loginform.n.value, document.loginform.e.value);
-
-       var username = document.loginform.username.value;
-       var password = document.loginform.p_field.value;
-
-       var res = rsa.encrypt(password);
-
-       // Remove all plaintext-data
-       document.loginform.p_field.value = "";
-       document.loginform.e.value = "";
-       document.loginform.n.value = "";
-
-       if (res) {
-               document.loginform.userident.value = 'rsa:' + hex2b64(res);
-       }
-}
-
-// Deprecated since 6.2 will be removed 2 versions later
-function tx_rsaauth_feencrypt(form) {
-       // check if the form was already sent (see #40085)
-       if (form.pass.value.match(/^rsa:/) || form.n.value == '' || form.e.value == '') {
-               return;
-       }
-       var rsa = new RSAKey();
-       rsa.setPublic(form.n.value, form.e.value);
-
-       var username = form.user.value;
-       var password = form.pass.value;
-
-       var res = rsa.encrypt(password);
-
-       // Remove all plaintext-data. This will also prevent plain text authentication.
-       form.pass.value = "";
-       form.e.value = "";
-       form.n.value = "";
-
-       if (res) {
-               form.pass.value = 'rsa:' + hex2b64(res);
-       }
-}
-
 function tx_rsaauth_encryptUserSetup() {
 
        var rsa = new RSAKey();
@@ -57,5 +13,6 @@ function tx_rsaauth_encryptUserSetup() {
                        document.getElementById('field_password').value = 'rsa:' + hex2b64(res);
                        document.getElementById('field_password2').value = 'rsa:' + hex2b64(res2);
                }
-       }       return false;
+       }
+       return false;
 }
index ac038a6..d8d21de 100644 (file)
@@ -1,2 +1 @@
-// Deprecated since 6.2 will be removed 2 versions later
-function tx_rsaauth_encrypt(){var rsa=new RSAKey();rsa.setPublic(document.loginform.n.value,document.loginform.e.value);var username=document.loginform.username.value;var password=document.loginform.p_field.value;var res=rsa.encrypt(password);document.loginform.p_field.value="";document.loginform.e.value="";document.loginform.n.value="";if(res){document.loginform.userident.value="rsa:"+hex2b64(res)}}function tx_rsaauth_feencrypt(form){if(form.pass.value.match(/^rsa:/)||form.n.value==""||form.e.value==""){return}var rsa=new RSAKey();rsa.setPublic(form.n.value,form.e.value);var username=form.user.value;var password=form.pass.value;var res=rsa.encrypt(password);form.pass.value="";form.e.value="";form.n.value="";if(res){form.pass.value="rsa:"+hex2b64(res)}}function tx_rsaauth_encryptUserSetup(){var rsa=new RSAKey();rsa.setPublic(document.usersetup.n.value,document.usersetup.e.value);var password=document.getElementById("field_password").value;var password2=document.getElementById("field_password2").value;if(password||password2){var res=rsa.encrypt(password);var res2=rsa.encrypt(password2);if(res&&res2){document.getElementById("field_password").value="rsa:"+hex2b64(res);document.getElementById("field_password2").value="rsa:"+hex2b64(res2)}}return false};
+function tx_rsaauth_encryptUserSetup(){var rsa=new RSAKey();rsa.setPublic(document.usersetup.n.value,document.usersetup.e.value);var password=document.getElementById("field_password").value;var password2=document.getElementById("field_password2").value;if(password||password2){var res=rsa.encrypt(password);var res2=rsa.encrypt(password2);if(res&&res2){document.getElementById("field_password").value="rsa:"+hex2b64(res);document.getElementById("field_password2").value="rsa:"+hex2b64(res2)}}return false};
index 5b394b2..7fa8d51 100644 (file)
@@ -1027,17 +1027,6 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
        }
 
        /**
-        * Build the default content style sheet
-        *
-        * @return string Style sheet
-        * @deprecated since TYPO3 6.0, will be removed in TYPO3 6.2
-        */
-       public function buildStyleSheet() {
-               $stylesheet = '/* mainStyleOverride and inlineStyle properties ignored. */';
-               return $stylesheet;
-       }
-
-       /**
         * Return Javascript configuration of classes
         *
         * @param int $RTEcounter: The index number of the current RTE editing area within the form.
@@ -1045,7 +1034,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
         */
        public function buildJSClassesConfig($RTEcounter) {
                // Include JS arrays of configured classes
-               $configureRTEInJavascriptString .= '
+               $configureRTEInJavascriptString = '
                        RTEarea[editornumber].classesUrl = "' . ($this->is_FE() && $GLOBALS['TSFE']->absRefPrefix ? $GLOBALS['TSFE']->absRefPrefix : '') . $this->writeTemporaryFile('', ('classes_' . $this->language), 'js', $this->buildJSClassesArray(), TRUE) . '";';
                return $configureRTEInJavascriptString;
        }
@@ -1542,16 +1531,4 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
                }
                return implode('; ', $nStyle);
        }
-
-       // Hook on lorem_ipsum extension to insert text into the RTE in wysiwyg mode
-       /**
-        * @deprecated since 6.2 - will be removed two versions later without replacement
-        */
-       public function loremIpsumInsert($params) {
-               GeneralUtility::logDeprecatedFunction();
-               return '
-                               if (typeof(lorem_ipsum) == \'function\' && ' . $params['element'] . '.tagName.toLowerCase() == \'textarea\' ) lorem_ipsum(' . $params['element'] . ', lipsum_temp_strings[lipsum_temp_pointer]);
-                               ';
-       }
-
 }
diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/DynamicCSS/dynamiccss.css b/typo3/sysext/rtehtmlarea/htmlarea/plugins/DynamicCSS/dynamiccss.css
deleted file mode 100644 (file)
index 178475a..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************************************
-# This file is DEPRECATED.
-#
-# The default css file for content edited with htmlArea RTE is now: EXT:rtehtmlarea/res/contentcss/default.css
-# ***************************************************************************************/
-
-/* Left, center and right alignment of text in paragraphs and cells.*/
-p.align-left, h1.align-left, h2.align-left, h3.align-left, h4.align-left, h5.align-left, h6.align-left, td.align-left { text-align: left; }
-p.align-center, h1.align-center, h2.align-center, h3.align-center, h4.align-center, h5.align-center, h6.align-center, td.align-center { text-align: center; }
-p.align-right, h1.align-right, h2.align-right, h3.align-right, h4.align-right, h5.align-right, h6.align-right, td.align-right { text-align: right; }
-
-/* Two frame examples taken from the example CSS file of CSS Styled Content extension and applied to p and table block elements.*/
-p.csc-frame-frame1, table.csc-frame-frame1 { background-color: #EDEBF1; padding: 2px 4px 2px 4px; border: 1px solid #333333; }
-p.csc-frame-frame2, table.csc-frame-frame2 { background-color: #F5FFAA; padding: 2px 4px 2px 4px; border: 1px solid #333333; }
-
-/* Bullet styles for unordered lists.*/
-ul.component-items { color: #186900; list-style-type: circle; }
-ul.action-items { color: #8A0020; list-style-image: url(img/red_arrow_bullet.gif); }
-
-/* Numbering styles for ordered lists.*/
-ol.component-items-ordered { color: #10007B; list-style-type: lower-roman; }
-ol.action-items-ordered { color: #8A0020; list-style-type: lower-greek; }
-
-/* Three inline text colors taken from the color scheme of CSS Styled Content extension.*/
-span.important { color: #8A0020; }
-span.name-of-person { color: #10007B; }
-span.detail { color: #186900; }
-
-/* Selectors for the default configuration of the link accessibity feature.*/
-a.external-link {}
-a.external-link-new-window {}
-a.internal-link {}
-a.internal-link-new-window {}
-a.download {}
-a.mail {}
diff --git a/typo3/sysext/scheduler/Classes/Task/FileIndexingTask.php b/typo3/sysext/scheduler/Classes/Task/FileIndexingTask.php
deleted file mode 100644 (file)
index 3945a8d..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-namespace TYPO3\CMS\Scheduler\Task;
-
-/**
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * This class provides Scheduler plugin implementation
- *
- * @author Lorenz Ulrich <lorenz.ulrich@visol.ch>
- * @deprecated since TYPO3 CMS 6.2 LTS - will be removed 2 versions later
- */
-class FileIndexingTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
-
-       /**
-        * @var string
-        */
-       protected $indexingConfiguration;
-
-       /**
-        * @var string
-        */
-       protected $paths;
-
-       /**
-        * Get the value of the protected property indexingConfiguration
-        *
-        * @return string UID of indexing configuration used for the job
-        */
-       public function getIndexingConfiguration() {
-               return $this->indexingConfiguration;
-       }
-
-       /**
-        * Set the value of the private property indexingConfiguration
-        *
-        * @param string $indexingConfiguration UID of indexing configuration used for the job
-        * @return void
-        */
-       public function setIndexingConfiguration($indexingConfiguration) {
-               $this->indexingConfiguration = $indexingConfiguration;
-       }
-
-       /**
-        * Get the value of the protected property paths
-        *
-        * @return string path information for scheduler job (JSON encoded array)
-        */
-       public function getPaths() {
-               return $this->paths;
-       }
-
-       /**
-        * Set the value of the private property paths
-        *
-        * @param array $paths path information for scheduler job (JSON encoded array)
-        * @return void
-        */
-       public function setPaths($paths) {
-               $this->paths = $paths;
-       }
-
-       /**
-        * Hardcode disabled state
-        *
-        * @return bool TRUE if task is disabled, FALSE otherwise
-        */
-       public function isDisabled() {
-               return TRUE;
-       }
-
-       /**
-        * Function execute from the Scheduler
-        *
-        * @return bool TRUE on successful execution, FALSE on error
-        */
-       public function execute() {
-               return FALSE;
-       }
-
-}
index f26e2a8..c8bed02 100644 (file)
@@ -13,7 +13,6 @@ return array(
        'tx_scheduler_Task' => 'TYPO3\\CMS\\Scheduler\\Task\\AbstractTask',
        'tx_scheduler_CachingFrameworkGarbageCollection_AdditionalFieldProvider' => 'TYPO3\\CMS\\Scheduler\\Task\\CachingFrameworkGarbageCollectionAdditionalFieldProvider',
        'tx_scheduler_CachingFrameworkGarbageCollection' => 'TYPO3\\CMS\\Scheduler\\Task\\CachingFrameworkGarbageCollectionTask',
-       'tx_scheduler_FileIndexing' => 'TYPO3\\CMS\\Scheduler\\Task\\FileIndexingTask',
        'tx_scheduler_RecyclerGarbageCollection_AdditionalFieldProvider' => 'TYPO3\\CMS\\Scheduler\\Task\\RecyclerGarbageCollectionAdditionalFieldProvider',
        'tx_scheduler_RecyclerGarbageCollection' => 'TYPO3\\CMS\\Scheduler\\Task\\RecyclerGarbageCollectionTask',
        'tx_scheduler_TableGarbageCollection_AdditionalFieldProvider' => 'TYPO3\\CMS\\Scheduler\\Task\\TableGarbageCollectionAdditionalFieldProvider',
index 797c1e4..9c917d7 100644 (file)
@@ -33,13 +33,6 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Sch
        'additionalFields' => 'TYPO3\\CMS\\Scheduler\\Task\\CachingFrameworkGarbageCollectionAdditionalFieldProvider'
 );
 
-// Add file indexing task
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Scheduler\\Task\\FileIndexingTask'] = array(
-       'extension' => $_EXTKEY,
-       'title' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang.xlf:fileIndexing.name',
-       'description' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang.xlf:fileIndexing.description'
-);
-
 // Add task to index file in a storage
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Scheduler\\Task\\FileStorageIndexingTask'] = array(
        'extension' => $_EXTKEY,
@@ -98,4 +91,4 @@ if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['T
                'dateField' => 'tstamp',
                'expirePeriod' => 30
        );
-}
\ No newline at end of file
+}
index 391aff6..b025dd6 100644 (file)
@@ -253,18 +253,6 @@ class StagesService {
        }
 
        /**
-        * Check if given workspace has custom staging activated
-        *
-        * @return bool
-        * @deprecated since TYPO3 6.2, will be removed two versions later
-        * not used anymore in the TYPO3 CMS Core
-        */
-       public function checkCustomStagingForWS() {
-               $workspaceRec = BackendUtility::getRecord('sys_workspace', $this->getWorkspaceId());
-               return $workspaceRec['custom_stages'] > 0;
-       }
-
-       /**
         * Gets the title of a stage.
         *
         * @param int $ver_stage