[TASK] Remove deprecated parts marked for removal
authorXavier Perseguers <typo3@perseguers.ch>
Fri, 15 Jul 2011 11:13:02 +0000 (13:13 +0200)
committerXavier Perseguers <typo3@perseguers.ch>
Thu, 21 Jul 2011 19:13:00 +0000 (21:13 +0200)
Parts of Core are marked as deprecated and should be removed in
TYPO3 4.6. This patch does this clean-up.

Change-Id: Ib33c649d1b1f31ebbfb0fe6e825bb81b47b185a1
Resolves: #27983
Releases: 4.6
Reviewed-on: http://review.typo3.org/3351
Reviewed-by: Markus Klein
Reviewed-by: Philipp Gampe
Reviewed-by: Georg Ringer
Reviewed-by: Steffen Gebert
Tested-by: Steffen Gebert
Reviewed-by: Xavier Perseguers
Tested-by: Xavier Perseguers
31 files changed:
t3lib/class.t3lib_iconworks.php
t3lib/class.t3lib_page.php
t3lib/class.t3lib_recordlist.php
t3lib/class.t3lib_rteapi.php
t3lib/class.t3lib_spritemanager.php
t3lib/class.t3lib_stdgraphic.php
t3lib/class.t3lib_tceforms.php
t3lib/class.t3lib_tceforms_inline.php
t3lib/class.t3lib_tcemain.php
t3lib/config_default.php
t3lib/stddb/tables.php
t3lib/stddb/tbl_pages.php
t3lib/utility/class.t3lib_utility_client.php
t3lib/utility/class.t3lib_utility_mail.php
tests/t3lib/class.t3lib_pageselectTest.php
typo3/class.db_list_extra.inc
typo3/class.webpagetree.php
typo3/js/clickmenu.js
typo3/js/tree.js
typo3/jsfunc.tbe_editor.js
typo3/sysext/cms/tbl_cms.php
typo3/sysext/cms/tslib/class.tslib_adminpanel.php
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/class.tslib_fe.php
typo3/sysext/cms/tslib/class.tslib_fetce.php
typo3/sysext/cms/tslib/class.tslib_menu.php
typo3/sysext/cms/tslib/class.tslib_pagegen.php
typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc
typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
typo3/sysext/statictemplates/media/scripts/wapversionLib.inc
typo3/template.php

index 9bb9679..f98fe39 100644 (file)
@@ -180,11 +180,6 @@ final class t3lib_iconWorks {
 
                        // First, find the icon file name. This can depend on configuration in TCA, field values and more:
                if ($table == 'pages') {
-                               // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
-                       if ($row['nav_hide'] && ($row['doktype'] == t3lib_pageSelect::DOKTYPE_DEFAULT || $row['doktype'] == t3lib_pageSelect::DOKTYPE_ADVANCED)) {
-                               $row['doktype'] = t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU;
-                       } // Workaround to change the icon if "Hide in menu" was set
-
                        if (!$iconfile = $GLOBALS['PAGES_TYPES'][$row['doktype']]['icon']) {
                                $iconfile = $GLOBALS['PAGES_TYPES']['default']['icon'];
                        }
index 83794c0..d90e3a8 100644 (file)
@@ -71,10 +71,8 @@ class t3lib_pageSelect {
         * Named constants for "magic numbers" of the field doktype
         */
        const DOKTYPE_DEFAULT = 1;
-       const DOKTYPE_ADVANCED = 2; // @deprecated since TYPO3 4.2
        const DOKTYPE_LINK = 3;
        const DOKTYPE_SHORTCUT = 4;
-       const DOKTYPE_HIDE_IN_MENU = 5; // @deprecated since TYPO3 4.2
        const DOKTYPE_BE_USER_SECTION = 6;
        const DOKTYPE_MOUNTPOINT = 7;
        const DOKTYPE_SPACER = 199;
index 09a3002..bd2d1f2 100644 (file)
@@ -49,7 +49,6 @@ class t3lib_recordList {
        var $leftMargin = 0; // OBSOLETE - NOT USED ANYMORE. leftMargin
        var $showIcon = 1;
        var $no_noWrap = 0;
-       var $oddColumnsTDParams = ''; // Deprecated since TYPO3 4.2, remove in 4.4. If set this is <td>-params for odd columns in addElement. Used with db_layout / pages section
        var $oddColumnsCssClass = ''; // If set this is <td> CSS-classname for odd columns in addElement. Used with db_layout / pages section
        var $backPath = '';
        var $fieldArray = Array(); // Decides the columns shown. Filled with values that refers to the keys of the data-array. $this->fieldArray[0] is the title column.
index eeef97e..0ca2fa3 100644 (file)
@@ -166,14 +166,6 @@ class t3lib_rteapi {
        }
 }
 
-/**
- * @deprecated since TYPO3 4.4: Use XCLASS t3lib/class.t3lib_rteapi.php instead. Will be removed in TYPO3 4.6.
- */
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/rte/class.tx_rte_base.php'])) {
-       t3lib_div::deprecationLog('XCLASS "ext/rte/class.tx_rte_base.php" is deprecated since TYPO3 4.4 - use "t3lib/class.t3lib_rteapi.php" instead.');
-       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/rte/class.tx_rte_base.php']);
-}
-
 if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_rteapi.php'])) {
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_rteapi.php']);
 }
index def7e1f..fa2e83b 100644 (file)
@@ -147,9 +147,9 @@ class t3lib_SpriteManager {
 
        /**
         * Backwards compatibility methods, log usage to deprecation log.
-        * Will be removed in 4.7
         *
         * @return void
+        * @deprecated since TYPO3 4.4: Will be removed in 4.7
         */
        private function compatibilityCalls() {
                        // Fallback for $TYPE_ICONS "contains-module" icons
index af7c0c4..77708c5 100644 (file)
@@ -50,7 +50,6 @@ class t3lib_stdGraphic {
                // Internal configuration, set in init()
        var $combineScript = 'combine'; // The ImageMagick filename used for combining two images. This name changed during the versions.
        var $noFramePrepended = 0; // If set, there is no frame pointer prepended to the filenames.
-       var $GD2 = 1; // Set, if the GDlib used is version 2. @deprecated as of TYPO3 4.4, as this variables is now always set (GDlib2 always has this method, and PHP recommends to only use imagecreatetruecolor() over imagecreate())
        var $imagecopyresized_fix = 0; // If set, imagecopyresized will not be called directly. For GD2 (some PHP installs?)
        var $gifExtension = 'gif'; // This should be changed to 'png' if you want this class to read/make PNG-files instead!
        var $gdlibExtensions = ''; // File formats supported by gdlib. This variable get's filled in "init" method
index 605b70d..175a28d 100644 (file)
@@ -62,7 +62,6 @@ class t3lib_TCEforms {
        var $loadMD5_JS = 1;
        var $prevBorderStyle = '[nothing here...]'; // Something unique...
        var $allowUpload = 0; // If set direct upload fields will be shown
-       var $titleLen = 15; // @deprecated since TYPO3 4.1: $GLOBALS['BE_USER']->uc['titleLen'] but what is default??
        var $defaultLanguageData = array(); // Array where records in the default language is stored. (processed by transferdata)
        var $defaultLanguageData_diff = array(); // Array where records in the default language is stored (raw without any processing. used for making diff)
        var $additionalPreviewLanguageData = array();
@@ -257,7 +256,6 @@ class t3lib_TCEforms {
                $this->edit_showFieldHelp = $GLOBALS['BE_USER']->uc['edit_showFieldHelp'];
 
                $this->edit_docModuleUpload = $GLOBALS['BE_USER']->uc['edit_docModuleUpload'];
-               $this->titleLen = $GLOBALS['BE_USER']->uc['titleLen']; // @deprecated since TYPO3 4.1
 
                $this->inline->init($this);
                $this->suggest->init($this);
index 394fda2..30557ad 100644 (file)
@@ -1875,11 +1875,6 @@ class t3lib_TCEforms_inline {
                if (!isset($config['appearance']) || !is_array($config['appearance'])) {
                        $config['appearance'] = array();
                }
-                       // 'newRecordLinkPosition' is deprecated since TYPO3 4.2.0-beta1, this is for backward compatibility:
-               if (!isset($config['appearance']['levelLinksPosition']) && isset($config['appearance']['newRecordLinkPosition']) && $config['appearance']['newRecordLinkPosition']) {
-                       t3lib_div::deprecationLog('TCA contains a deprecated definition using "newRecordLinkPosition"');
-                       $config['appearance']['levelLinksPosition'] = $config['appearance']['newRecordLinkPosition'];
-               }
                        // Set the position/appearance of the "Create new record" link:
                if (isset($config['foreign_selector']) && $config['foreign_selector'] && (!isset($config['appearance']['useCombination']) || !$config['appearance']['useCombination'])) {
                        $config['appearance']['levelLinksPosition'] = 'none';
index 9beb7fd..d6a06a2 100644 (file)
@@ -3302,7 +3302,7 @@ class t3lib_TCEmain {
                                // In case the record to be moved turns out to be an offline version,
                                // we have to find the live version and work on that one (this case
                                // happens for pages with "branch" versioning type)
-                               // note: as "branch" versioning is deprecated since TYPO3 4.2, this
+                               // @deprecated note: as "branch" versioning is deprecated since TYPO3 4.2, this
                                // functionality will be removed in TYPO3 4.7 (note by benni: a hook could replace this)
                        if ($lookForLiveVersion = t3lib_BEfunc::getLiveVersionOfRecord($table, $uid, 'uid')) {
                                $uid = $lookForLiveVersion['uid'];
index c0110ba..c7d976a 100644 (file)
@@ -646,7 +646,7 @@ $TYPO3_CONF_VARS = array(
 $T3_VAR = array();     // Initialize.
 
        // TYPO3 version
-$TYPO_VERSION = '4.6-dev';     // deprecated: use the constants defined below
+$TYPO_VERSION = '4.6-dev';     // @deprecated: Will be removed in TYPO3 4.8. Use the constants defined below
 define('TYPO3_version', $TYPO_VERSION);
 define('TYPO3_branch', '4.6');
 define('TYPO3_copyright_year', '1998-2011');
index e181b59..e25a212 100644 (file)
  * Here you can set the icon and especially you can define which tables are allowed on a certain pagetype (doktype)
  * NOTE: The 'default' entry in the $PAGES_TYPES-array is the 'base' for all types, and for every type the entries simply overrides the entries in the 'default' type!
  *
- * NOTE: usage of 'icon' is deprecated since TYPO3 4.4, use t3lib_SpriteManager::addTcaTypeIcon() instead
  */
 $PAGES_TYPES = array(
        (string) t3lib_pageSelect::DOKTYPE_LINK => array(
        ),
        (string) t3lib_pageSelect::DOKTYPE_SHORTCUT => array(
        ),
-       (string) t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU => array(
-       ),
        (string) t3lib_pageSelect::DOKTYPE_BE_USER_SECTION => array(
                'type' => 'web',
                'allowedTables' => '*'
@@ -91,7 +88,7 @@ $PAGES_TYPES = array(
  * Each key is a value from the "module" field of page records and the value is an array with a key/value pair, eg. "icon" => "modules_shop.gif"
  *
  * @see t3lib_iconWorks::getIcon(), typo3/sysext/cms/ext_tables.php
- * @deprecated since TYPO3 4.4, use t3lib_SpriteManager::addTcaTypeIcon instead
+ * @deprecated since TYPO3 4.4, use t3lib_SpriteManager::addTcaTypeIcon instead, will be removed in TYPO3 4.7
  */
 $ICON_TYPES = array();
 
@@ -810,4 +807,4 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['spriteIconRecordOverlayNames'] = array(
        'protectedSection' => 'status-overlay-includes-subpages',
 );
 
-?>
\ No newline at end of file
+?>
index e037a84..e28cf72 100644 (file)
@@ -835,33 +835,6 @@ $TCA['pages'] = array(
                                        --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.config;config,
                                --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.extended,
                                '),
-               // not in menu
-               (string) t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU => array(
-                       'showitem' =>
-                       '--palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.standard;standard,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.title;title,
-                               --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.visibility;hiddenonly,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.access;access,
-                               --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.metadata,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.abstract;abstract,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.metatags;metatags,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.editorial;editorial,
-                               --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.layout;layout,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.module;module,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.replace;replace,
-                               --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.behaviour,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.links;links,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.caching;caching,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.language;language,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.miscellaneous;miscellaneous,
-                               --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.resources,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.media;media,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.storage;storage,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.config;config,
-                               --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.extended,
-               '),
                // mount page
                (string) t3lib_pageSelect::DOKTYPE_MOUNTPOINT => array(
                        'showitem' =>
@@ -1100,4 +1073,4 @@ if (!t3lib_div::compat_version('4.2')) {
        ');
 }
 
-?>
\ No newline at end of file
+?>
index b8cf47e..76053aa 100644 (file)
@@ -102,7 +102,7 @@ final class t3lib_utility_Client {
                }
 
                        // Microsoft Documentation about Platform tokens: http://msdn.microsoft.com/en-us/library/ms537503(VS.85).aspx
-                       // 'system' is deprecated, use 'all_systems' (array) in future!
+                       // @deprecated: 'system' is deprecated since TYPO3 4.6, use 'all_systems' (array) in future! Will be removed in TYPO3 4.8
                $browserInfo['system'] = '';
                $browserInfo['all_systems'] = array();
                if (strstr($userAgent, 'Win')) {
index 69bb034..fd64100 100644 (file)
@@ -78,7 +78,7 @@ final class t3lib_utility_Mail {
                                $hookSubscriberContainsArrow = strpos($hookSubscriber, '->');
 
                                if ($hookSubscriberContainsArrow !== FALSE) {
-                                               // deprecated, remove in TYPO3 4.7
+                                               // @deprecated: remove in TYPO3 4.7
                                        t3lib_div::deprecationLog(
                                                'The usage of user function notation for the substituteMailDelivery hook is deprecated,
                                                use the t3lib_mail_MailerAdapter interface instead.'
index cdd83f6..14ecea4 100644 (file)
@@ -121,16 +121,6 @@ class t3lib_pageselectTest extends tx_phpunit_testcase {
        /**
         * @test
         */
-       public function getExtUrlForDokType2ReturnsFalse() {
-               $this->assertEquals(
-                       FALSE,
-                       $this->pageSelectObject->getExtURL(array('doktype' => t3lib_pageSelect::DOKTYPE_ADVANCED))
-               );
-       }
-
-       /**
-        * @test
-        */
        public function getExtUrlForDokType3AndUrlType1AddsHttpSchemeToUrl() {
                $this->assertEquals(
                        'http://www.example.com',
index 0884080..7436836 100644 (file)
@@ -85,15 +85,6 @@ class localRecordList extends recordList {
        var $duplicateStack=array();                    // Used to track which elements has duplicates and how many
 
        /**
-        * references of the current record
-        *
-        * @var array
-        *
-        * @deprecated since 4.4: Use getReferenceCount instead
-        */
-       public $references;
-
-       /**
         * [$tablename][$uid] = number of references to this record
         *
         * @var array
@@ -1748,10 +1739,9 @@ class localRecordList extends recordList {
         * Adds selected columns of one table row as CSV line.
         *
         * @param       array           Record array, from which the values of fields found in $this->fieldArray will be listed in the CSV output.
-        * @param       string          Table name @deprecated since 4.4
         * @return      void
         */
-       protected function addToCSV(array $row = array(), $table = '') {
+       protected function addToCSV(array $row = array()) {
                $rowReducedByControlFields = self::removeControlFieldsFromFieldRow($row);
                $rowReducedToSelectedColumns = array_intersect_key($rowReducedByControlFields, array_flip($this->fieldArray));
                $this->setCsvRow($rowReducedToSelectedColumns);
index 970c9f0..abf4ddb 100644 (file)
@@ -435,9 +435,8 @@ class webPageTree extends t3lib_browseTree {
                        $crazyRecursionLimiter--;
 
                                // Not in menu:
-                               // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
                        if ($this->ext_separateNotinmenuPages &&
-                               ($row['doktype'] == t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU || $row['doktype'] == t3lib_pageSelect::DOKTYPE_BE_USER_SECTION ||
+                               ($row['doktype'] == t3lib_pageSelect::DOKTYPE_BE_USER_SECTION ||
                                        $row['doktype'] >= 200 || $row['nav_hide'])) {
                                $outOfMenuPages[] = $row;
                                $outOfMenuPagesTextIndex[] = ($row['doktype']>=200 ? 'zzz'.$row['doktype'].'_' : '').$row['title'];
@@ -534,4 +533,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/class.webpagetree.php']);
 }
 
-?>
\ No newline at end of file
+?>
index f8964d0..ed4844e 100644 (file)
@@ -222,11 +222,15 @@ var Clickmenu = {
 Event.observe(document, 'mousemove', Clickmenu.calcMousePosEvent.bindAsEventListener(Clickmenu), true);
 
 
-// deprecated functions since 4.2, here for compatibility, remove in 4.4
+// @deprecated: Deprecated functions since 4.2, here for compatibility, remove in 4.4+
+// ## BEGIN ##
+
+// Still used in Core: typo3/template.php::wrapClickMenuOnIcon()
 function showClickmenu(table, uid, listFr, enDisItems, backPath, addParams)    {
        Clickmenu.show(table, uid, listFr, enDisItems, backPath, addParams);
 }
 
+// Still used in Core: typo3/alt_clickmenu.php::linkItem()
 function showClickmenu_raw(url) {
        var parts = url.split('?');
        if (parts.length === 2) {
@@ -254,3 +258,4 @@ function hideSpecific(level) {
 function showHideSelectorBoxes(action) {
        toggleSelectorBoxes(action);
 }
+// ## END ##
index 71c4f36..510aac3 100644 (file)
@@ -307,6 +307,7 @@ function refresh_nav() {
 // Deprecated since 4.1.
 // Another JS function, for highlighting rows in the page tree, kept alive for backwards
 // compatibility. Please use the function in the "Tree" object for future implementations.
+// Still used in Core file_list.inc::linkWrapDir()
 function hilight_row(frameSetModule, highLightID) {
        Tree.highlightActiveItem(frameSetModule, highLightID);
 }
index f906a31..f3357bb 100644 (file)
@@ -341,13 +341,6 @@ var TBE_EDITOR = {
                        return true;
                }
        },
-       /**
-        * This function is not used by core and will be removed in version 4.6
-        * @deprecated
-        */
-       setHiddenContent: function(RTEcontent,theField) {
-               document[TBE_EDITOR.formname][theField].value = RTEcontent;
-       },
        fieldChanged_fName: function(fName,el) {
                var idx=2+TBE_EDITOR.prependFormFieldNamesCnt;
                var table = TBE_EDITOR.split(fName, "[", idx);
index 10dc1c9..974b222 100755 (executable)
@@ -760,22 +760,6 @@ $TCA['pages_language_overlay'] = array(
                                        --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.media;media,
                                --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.extended,
                                '),
-               // not in menu
-               (string) t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU => array(
-                       'showitem' =>
-                       '--palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.standard;standard,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.title;title,
-                               --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.visibility;hiddenonly,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.access;access,
-                               --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.metadata,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.abstract;abstract,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.metatags;metatags,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.editorial;editorial,
-                               --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.resources,
-                                       --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.media;media,
-                               --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.extended,
-               '),
                // mount page
                (string) t3lib_pageSelect::DOKTYPE_MOUNTPOINT => array(
                        'showitem' =>
@@ -1203,4 +1187,4 @@ $TCA['backend_layout'] = array(
 );
 
 
-?>
\ No newline at end of file
+?>
index 7d8e834..f37efbf 100644 (file)
@@ -173,16 +173,6 @@ class tslib_AdminPanel {
                if ($this->extGetFeAdminValue('cache', 'noCache')) {
                        $GLOBALS['TSFE']->set_no_cache();
                }
-
-                       // Hook for post processing the frontend admin configuration. Added with TYPO3 4.2, so naming is now incorrect but preserves compatibility.
-                       // @deprecated  since TYPO3 4.3
-               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extSaveFeAdminConfig-postProc'])) {
-                       t3lib_div::deprecationLog('Frontend admin post processing hook extSaveFeAdminConfig-postProc is deprecated since TYPO3 4.3.');
-                       $_params = array('input' => &$input, 'pObj' => &$this);
-                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extSaveFeAdminConfig-postProc'] as $_funcRef) {
-                               t3lib_div::callUserFunction($_funcRef, $_params, $this);
-                       }
-               }
        }
 
        /**
@@ -221,16 +211,6 @@ class tslib_AdminPanel {
                        if ($this->isAdminModuleOpen($sectionName)) {   // See if the menu is expanded!
                                return $retVal;
                        }
-
-                               // Hook for post processing the frontend admin configuration. Added with TYPO3 4.2, so naming is now incorrect but preserves compatibility.
-                               // @deprecated  since TYPO3 4.3
-                       if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extEditAction-postProc'])) {
-                               t3lib_div::deprecationLog('Frontend admin post processing hook extEditAction-postProc is deprecated since TYPO3 4.3.');
-                               $params = array('cmd' => &$cmd, 'tce' => &$this->tce, 'pObj' => &$this);
-                               foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extEditAction-postProc'] as $funcRef) {
-                                       t3lib_div::callUserFunction($funcRef, $params, $this);
-                               }
-                       }
                }
        }
 
index 0c2e7a8..f06824c 100644 (file)
@@ -5061,9 +5061,6 @@ class tslib_cObj {
                        if ((string) $key != '') {
                                $type = strtolower(trim($parts[0]));
                                switch ($type) {
-                                       case 'gpvar' :
-                                               t3lib_div::deprecationLog('Using gpvar in TypoScript getText is deprecated since TYPO3 4.3 - Use gp instead of gpvar.');
-                                               // Fall Through
                                        case 'gp' :
                                                        // Merge GET and POST and get $key out of the merged array
                                                $retVal = $this->getGlobal($key, t3lib_div::array_merge_recursive_overrule(t3lib_div::_GET(), t3lib_div::_POST()));
index 6715aca..f572060 100644 (file)
                'onload' => array(),
                'onunload' => array(),
        );
-       /**
-        * Adds JavaScript code
-        *
-        * @var string
-        * @deprecated since TYPO3 3.5 - use additionalJavaScript instead.
-        */
-       var $JSCode='';
        var $JSImgCode='';                                      // Used to accumulate JavaScript loaded images (by menus)
        var $divSection='';                                     // Used to accumulate DHTML-layers.
        var $defaultBodyTag='<body>';           // Default bodytag, if nothing else is set. This can be overridden by applications like TemplaVoila.
        var $uniqueString='';
        var $indexedDocTitle='';                        // This value will be used as the title for the page in the indexer (if indexing happens)
        var $altPageTitle='';                           // Alternative page title (normally the title of the page record). Can be set from applications you make.
-       /**
-        * An array that holds parameter names (keys) of GET parameters which MAY be MD5/base64 encoded with simulate_static_documents method.
-        * @var array
-        * @deprecated since TYPO3 4.3, remove in TYPO3 4.5
-        */
-       var $pEncAllowedParamNames=array();
        var $baseUrl='';                                        // The base URL set for the page header.
        var $anchorPrefix='';                           // The proper anchor prefix needed when using speaking urls. (only set if baseUrl is set)
 
         */
        function INTincScript() {
                        // Deprecated stuff:
+                       // @deprecated: annotation added TYPO3 4.6
                $this->additionalHeaderData = is_array($this->config['INTincScript_ext']['additionalHeaderData']) ? $this->config['INTincScript_ext']['additionalHeaderData'] : array();
                $this->additionalJavaScript = $this->config['INTincScript_ext']['additionalJavaScript'];
                $this->additionalCSS = $this->config['INTincScript_ext']['additionalCSS'];
-               $this->JSCode = $this->additionalHeaderData['JSCode'];
                $this->JSImgCode = $this->additionalHeaderData['JSImgCode'];
                $this->divSection='';
 
@@ -3188,17 +3175,6 @@ if (version == "n3") {
        /*]]>*/
 </script>';
                }
-               if ($this->JSCode || count($this->additionalJavaScript))        {       // Add javascript
-                       $this->additionalHeaderData['JSCode']='
-<script type="text/javascript">
-       /*<![CDATA[*/
-<!--
-'.implode(LF,$this->additionalJavaScript).'
-'.trim($this->JSCode).'
-// -->
-       /*]]>*/
-</script>';
-               }
                if (count($this->additionalCSS))        {       // Add javascript
                        $this->additionalHeaderData['_CSS']='
 <style type="text/css">
index 12d9be1..4024089 100644 (file)
@@ -58,7 +58,7 @@
  * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage tslib
- * @deprecated since TYPO3 3.6
+ * @deprecated since TYPO3 3.6, will be removed in TYPO3 4.8
  */
 class tslib_feTCE      {
 
@@ -67,6 +67,10 @@ class tslib_feTCE    {
        var $newData=array();
        var $extraList = 'pid';
 
+       public function __construct() {
+               t3lib_div::logDeprecatedFunction();
+       }
+
        /**
         * Starting the processing of user input.
         * Traverses the input data and fills in the array, $this->extScripts with references to files which are then included by includeScripts() (called AFTER start() in tslib_fe)
index 69dc973..31efddb 100644 (file)
@@ -76,8 +76,7 @@ class tslib_menu {
        var $menuNumber = 1;                            // tells you which menu-number this is. This is important when getting data from the setup
        var $entryLevel = 0;                            // 0 = rootFolder
        var $spacerIDList = '199';                      // The doktype-number that defines a spacer
-               // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
-       var $doktypeExcludeList = '5,6';                        // doktypes that define which should not be included in a menu
+       var $doktypeExcludeList = '6';                  // doktypes that define which should not be included in a menu
        var $alwaysActivePIDlist=array();
        var $imgNamePrefix = 'img';
        var $imgNameNotRandom=0;
@@ -175,12 +174,6 @@ class tslib_menu {
                        if($this->conf['excludeDoktypes']) {
                                $this->doktypeExcludeList = $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['excludeDoktypes']);
                        }
-                       if($this->conf['includeNotInMenu']) {
-                               $exclDoktypeArr = t3lib_div::trimExplode(',',$this->doktypeExcludeList,1);
-                                       // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
-                               $exclDoktypeArr = t3lib_div::removeArrayEntryByValue($exclDoktypeArr,'5');
-                               $this->doktypeExcludeList = implode(',',$exclDoktypeArr);
-                       }
                                // EntryLevel
                        $this->entryLevel = tslib_cObj::getKey (
                                isset($conf['entryLevel.'])
index d6fb076..001c894 100644 (file)
@@ -95,7 +95,7 @@ class TSpagegen {
                        // Base url:
                if ($GLOBALS['TSFE']->config['config']['baseURL'])      {
                        if ($GLOBALS['TSFE']->config['config']['baseURL']==='1')        {
-                                       // Deprecated property, going to be dropped in TYPO3 4.7.
+                                       // @deprecated: Deprecated property, going to be dropped in TYPO3 4.7.
                                $error = 'Unsupported TypoScript property was found in this template: "config.baseURL="1"
 
 This setting has been deprecated in TYPO 3.8.1 due to security concerns.
index 66fe964..55971bf 100755 (executable)
@@ -359,16 +359,17 @@ class user_wapversion {
        }
 
        /**
-        * Cleaning up the menu array returned from sys_page->getMenu(). Removing page types with doktype "5" (not in menu)
+        * Cleaning up the menu array returned from sys_page->getMenu().
+        * Removing pages having "not in menu" set.
         *
         * @param       array           Menu item array
-        * @return      array           New menu item array with doktype-5 elements removed.
+        * @return      array           New menu item array with "not in menu" elements removed.
         */
        function cleanMenuArray($menu)  {
                reset($menu);
                $newMenu=array();
                while(list(,$data)=each($menu)) {
-                       if ($data['doktype'] != t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU && !$data['nav_hide']) {
+                       if (!$data['nav_hide']) {
                                $newMenu[]=$data;
                        }
                }
index d09a0f0..b99463a 100755 (executable)
@@ -276,14 +276,12 @@ class tx_indexedsearch extends tslib_pibase {
                if ($this->conf['show.']['L1sections']) {
                        $firstLevelMenu = $this->getMenu($this->wholeSiteIdList);
                        foreach ($firstLevelMenu as $kk => $mR) {
-                                       // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
-                               if ($mR['doktype'] != t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU && !$mR['nav_hide']) {
+                               if (!$mR['nav_hide']) {
                                        $this->optValues['sections']['rl1_'.$mR['uid']] = trim($this->pi_getLL('opt_RL1').' '.$mR['title']);
                                        if ($this->conf['show.']['L2sections']) {
                                                $secondLevelMenu = $this->getMenu($mR['uid']);
                                                foreach ($secondLevelMenu as $kk2 => $mR2) {
-                                                               // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
-                                                       if ($mR2['doktype'] != t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU && !$mR2['nav_hide']) {
+                                                       if (!$mR2['nav_hide']) {
                                                                $this->optValues['sections']['rl2_'.$mR2['uid']] = trim($this->pi_getLL('opt_RL2').' '.$mR2['title']);
                                                        } else unset($secondLevelMenu[$kk2]);
                                                }
index f4910d9..bd6b160 100644 (file)
@@ -367,7 +367,7 @@ class user_wapversion {
        function cleanMenuArray($menu)  {
                $newMenu=array();
                foreach ($menu as $data) {
-                       if ($data['doktype'] != t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU && !$data['nav_hide']) {
+                       if (!$data['nav_hide']) {
                                $newMenu[]=$data;
                        }
                }
index c3e0f25..c43e3f1 100644 (file)
@@ -1498,9 +1498,6 @@ $str.=$this->docBodyTagBegin().
               $this->JScodeArray['clickmenu'] = '
                               Clickmenu.clickURL = "'.$this->backPath.'alt_clickmenu.php";
                               Clickmenu.ajax     = '.($this->isCMLayers() ? 'true' : 'false' ).';';
-
-                      // return array deprecated since 4.2
-              return array('','','');
        }
 
        /**
@@ -1521,9 +1518,6 @@ $str.=$this->docBodyTagBegin().
                        DragDrop.backPath  = "'.t3lib_div::shortMD5(''.'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']).'";
                        DragDrop.table     = "'.$table.'";
                ';
-
-                      // return array deprecated since 4.2
-              return array('','','');
        }
 
         /**