[TASK] Remove deprecated code for 6.0
authorChristian Kuhn <lolli@schwarzbu.ch>
Thu, 12 Apr 2012 10:03:46 +0000 (12:03 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 13 Apr 2012 09:05:23 +0000 (11:05 +0200)
Removes all deprecated methods and files that are unused in core and scheduled
for deletion in 4.8 / 6.0. Some more complicated parts are left out for now.

Change-Id: I03e236cedfbfa666d9b6f83848b11bb0977cdff0
Resolves: #35923
Releases: 6.0
Reviewed-on: http://review.typo3.org/10361
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
48 files changed:
t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php
t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php
t3lib/class.t3lib_cache.php
t3lib/class.t3lib_cli.php
t3lib/class.t3lib_cs.php
t3lib/class.t3lib_div.php
t3lib/class.t3lib_foldertree.php
t3lib/class.t3lib_install.php
t3lib/class.t3lib_tceforms.php
t3lib/class.t3lib_xml.php
t3lib/config_default.php
t3lib/utility/class.t3lib_utility_client.php
tests/t3lib/class.t3lib_divTest.php
tests/t3lib/utility/class.t3lib_utility_clientTest.php
typo3/alt_intro.php [deleted file]
typo3/alt_topmenu_dummy.php [deleted file]
typo3/class.browse_links.php
typo3/class.filelistfoldertree.php
typo3/class.webpagetree.php
typo3/db_list.php [deleted file]
typo3/file_list.php [deleted file]
typo3/sysext/beuser/mod/index.php
typo3/sysext/cms/layout/class.tx_cms_layout.php
typo3/sysext/cms/tslib/class.tslib_adminpanel.php
typo3/sysext/cms/tslib/class.tslib_fe.php
typo3/sysext/cms/tslib/class.tslib_pibase.php
typo3/sysext/cms/tslib/class.tslib_search.php
typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectsoap.php
typo3/sysext/impexp/app/index.php
typo3/sysext/indexed_search/class.indexer.php
typo3/sysext/indexed_search/class.lexer.php
typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
typo3/sysext/install/mod/class.tx_install.php
typo3/sysext/lang/lang.php
typo3/sysext/lowlevel/class.tx_lowlevel_admin_core.php
typo3/sysext/lowlevel/class.tx_lowlevel_cleaner_core.php
typo3/sysext/lowlevel/clmods/class.cleanflexform.php
typo3/sysext/lowlevel/clmods/class.deleted.php
typo3/sysext/lowlevel/clmods/class.double_files.php
typo3/sysext/lowlevel/clmods/class.lost_files.php
typo3/sysext/lowlevel/clmods/class.missing_files.php
typo3/sysext/lowlevel/clmods/class.missing_relations.php
typo3/sysext/lowlevel/clmods/class.orphan_records.php
typo3/sysext/lowlevel/clmods/class.rte_images.php
typo3/sysext/lowlevel/clmods/class.syslog.php
typo3/sysext/lowlevel/clmods/class.versions.php
typo3/sysext/setup/mod/index.php
typo3/template.php

index 2eef8c4..cc151dd 100644 (file)
@@ -369,17 +369,6 @@ class t3lib_cache_backend_DbBackend extends t3lib_cache_backend_AbstractBackend
        }
 
        /**
-        * Sets the table where the cache entries are stored.
-        *
-        * @deprecated since TYPO3 4.6: The backend calculates the table name internally, this method does nothing anymore
-        * @param string $cacheTable Table name
-        * @return void
-        */
-       public function setCacheTable($cacheTable) {
-               t3lib_div::logDeprecatedFunction();
-       }
-
-       /**
         * Returns the table where the cache entries are stored.
         *
         * @return      string  The cache table.
@@ -391,17 +380,6 @@ class t3lib_cache_backend_DbBackend extends t3lib_cache_backend_AbstractBackend
        }
 
        /**
-        * Sets the table where cache tags are stored.
-        *
-        * @deprecated since TYPO3 4.6: The backend calculates the table name internally, this method does nothing anymore
-        * @param string $tagsTable: Tags table name
-        * @return void
-        */
-       public function setTagsTable($tagsTable) {
-               t3lib_div::logDeprecatedFunction();
-       }
-
-       /**
         * Gets the table where cache tags are stored.
         *
         * @return      string          Name of the table storing tags
index 3e29156..be574c8 100644 (file)
@@ -154,21 +154,6 @@ abstract class t3lib_cache_frontend_AbstractFrontend implements t3lib_cache_fron
        }
 
        /**
-        * Removes all cache entries of this cache which are tagged by
-        * one of the specified tags.
-        * @param array $tags Array of tags to search for
-        * @return void
-        * @deprecated since 4.6, will be removed in 4.8
-        * @api
-        */
-       public function flushByTags(array $tags) {
-               t3lib_div::deprecationLog('flushByTags is deprecated since 4.6 and will be removed in 4.8');
-               foreach ($tags as $tag) {
-                       $this->backend->flushByTag($tag);
-               }
-       }
-
-       /**
         * Does garbage collection
         *
         * @return void
@@ -179,22 +164,6 @@ abstract class t3lib_cache_frontend_AbstractFrontend implements t3lib_cache_fron
        }
 
        /**
-        * Renders a tag which can be used to mark a cache entry as "depends on this class".
-        * Whenever the specified class is modified, all cache entries tagged with the
-        * class are flushed.
-        *
-        * If an empty string is specified as class name, the returned tag means "depends on any class".
-        *
-        * @param string $className The class name
-        * @return string Class Tag
-        * @api
-        * @deprecated since TYPO3 4.6 - Use t3lib_cache_Manager::getClassTag() instead
-        */
-       public function getClassTag($className = '') {
-               return t3lib_cache_Manager::getClassTag($className);
-       }
-
-       /**
         * Checks the validity of an entry identifier. Returns TRUE if it's valid.
         *
         * @param string $identifier An identifier to be checked for validity
index ae5ab76..c478775 100644 (file)
@@ -52,39 +52,6 @@ class t3lib_cache {
        }
 
        /**
-        * initializes the cache_pages cache
-        *
-        * @return      void
-        * @author      Ingo Renner <ingo@typo3.org>
-        * @deprecated since TYPO3 4.6, will be removed in 4.8 - cacheManager->getCache() now initializes caches automatically
-        */
-       public static function initPageCache() {
-               t3lib_div::logDeprecatedFunction();
-       }
-
-       /**
-        * initializes the cache_pagesection cache
-        *
-        * @return      void
-        * @author      Ingo Renner <ingo@typo3.org>
-        * @deprecated since TYPO3 4.6, will be removed in 4.8 - cacheManager->getCache() now initializes caches automatically
-        */
-       public static function initPageSectionCache() {
-               t3lib_div::logDeprecatedFunction();
-       }
-
-       /**
-        * initializes the cache_hash cache
-        *
-        * @return      void
-        * @author      Ingo Renner <ingo@typo3.org>
-        * @deprecated since TYPO3 4.6, will be removed in 4.8 - cacheManager->getCache() now initializes caches automatically
-        */
-       public static function initContentHashCache() {
-               t3lib_div::logDeprecatedFunction();
-       }
-
-       /**
         * Determines whether the caching framework is initialized.
         * The caching framework could be disabled for the core but used by an extension.
         *
@@ -102,18 +69,6 @@ class t3lib_cache {
        }
 
        /**
-        * Enables the caching framework for the core caches like cache_pages, cache_pagesection and cache_hash.
-        * This method can be called by extensions in their ext_localconf.php. Calling it later would not work,
-        * since rendering is already started using the defined caches.
-        *
-        * @deprecated since 4.6, will be removed in 4.8: The caching framework is enabled by default
-        * @return void
-        */
-       public static function enableCachingFramework() {
-               t3lib_div::logDeprecatedFunction();
-       }
-
-       /**
         * Helper method for install tool and extension manager to determine
         * required table structure of all caches that depend on it
         *
index 6f7bad8..f6c6d1c 100644 (file)
@@ -70,19 +70,6 @@ class t3lib_cli {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function t3lib_cli() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               t3lib_cli::__construct();
-       }
-
-       /**
         * Finds the arg token (like "-s") in argv and returns the rest of argv from that point on.
         * This should only be used in special cases since this->cli_args should already be prepared with an index of values!
         *
index 712c500..408f691 100644 (file)
@@ -483,29 +483,6 @@ class t3lib_cs {
                'zh' => 'big5',
        );
 
-               // TYPO3 specific: Array with the iso names used for each system language in TYPO3:
-               // Missing keys means: same as TYPO3
-               // @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8 - use t3lib_l10n_Locales::getIsoMapping()
-       var $isoArray = array(
-               'ba' => 'bs',
-               'br' => 'pt_BR',
-               'ch' => 'zh_CN',
-               'cz' => 'cs',
-               'dk' => 'da',
-               'si' => 'sl',
-               'se' => 'sv',
-               'gl' => 'kl',
-               'gr' => 'el',
-               'hk' => 'zh_HK',
-               'kr' => 'ko',
-               'ua' => 'uk',
-               'jp' => 'ja',
-               'qc' => 'fr_CA',
-               'vn' => 'vi',
-               'ge' => 'ka',
-               'ga' => 'gl',
-       );
-
        /**
         * Default constructor.
         */
@@ -2352,4 +2329,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_cs.php']);
 }
 
-?>
+?>
\ No newline at end of file
index 60107e5..fb3f694 100644 (file)
@@ -380,20 +380,6 @@ final class t3lib_div {
        }
 
        /**
-        * Breaks up a single line of text for emails
-        *
-        * @param string $str The string to break up
-        * @param string $newlineChar The string to implode the broken lines with (default/typically \n)
-        * @param integer $lineWidth The line width
-        * @return string reformatted text
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8 - Use t3lib_utility_Mail::breakLinesForEmail()
-        */
-       public static function breakLinesForEmail($str, $newlineChar = LF, $lineWidth = 76) {
-               self::logDeprecatedFunction();
-               return t3lib_utility_Mail::breakLinesForEmail($str, $newlineChar, $lineWidth);
-       }
-
-       /**
         * Match IP number with list of numbers with wildcard
         * Dispatcher method for switching into specialised IPv4 and IPv6 methods.
         *
@@ -864,18 +850,6 @@ final class t3lib_div {
        }
 
        /**
-        * Returns the $integer if greater than zero, otherwise returns zero.
-        *
-        * @param integer $theInt Integer string to process
-        * @return integer
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8 - Use t3lib_utility_Math::convertToPositiveInteger() instead
-        */
-       public static function intval_positive($theInt) {
-               self::logDeprecatedFunction();
-               return t3lib_utility_Math::convertToPositiveInteger($theInt);
-       }
-
-       /**
         * Returns an integer from a three part version number, eg '4.12.3' -> 4012003
         *
         * @param string $verNumberStr Version number on format x.x.x
@@ -1067,19 +1041,6 @@ final class t3lib_div {
        }
 
        /**
-        * Tests if the input can be interpreted as integer.
-        *
-        * @param mixed $var Any input variable to test
-        * @return boolean Returns TRUE if string is an integer
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8 - Use t3lib_utility_Math::canBeInterpretedAsInteger() instead
-        */
-       public static function testInt($var) {
-               self::logDeprecatedFunction();
-
-               return t3lib_utility_Math::canBeInterpretedAsInteger($var);
-       }
-
-       /**
         * Returns TRUE if the first part of $str matches the string $partStr
         *
         * @param string $str Full string to check
@@ -1159,34 +1120,6 @@ final class t3lib_div {
        }
 
        /**
-        * Calculates the input by +,-,*,/,%,^ with priority to + and -
-        *
-        * @param string $string Input string, eg "123 + 456 / 789 - 4"
-        * @return integer Calculated value. Or error string.
-        * @see calcParenthesis()
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8 - Use t3lib_utility_Math::calculateWithPriorityToAdditionAndSubtraction() instead
-        */
-       public static function calcPriority($string) {
-               self::logDeprecatedFunction();
-
-               return t3lib_utility_Math::calculateWithPriorityToAdditionAndSubtraction($string);
-       }
-
-       /**
-        * Calculates the input with parenthesis levels
-        *
-        * @param string $string Input string, eg "(123 + 456) / 789 - 4"
-        * @return integer Calculated value. Or error string.
-        * @see calcPriority(), tslib_cObj::stdWrap()
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8 - Use t3lib_utility_Math::calculateWithParentheses() instead
-        */
-       public static function calcParenthesis($string) {
-               self::logDeprecatedFunction();
-
-               return t3lib_utility_Math::calculateWithParentheses($string);
-       }
-
-       /**
         * Inverse version of htmlspecialchars()
         *
         * @param string $value Value where &gt;, &lt;, &quot; and &amp; should be converted to regular chars.
@@ -4168,260 +4101,6 @@ final class t3lib_div {
        }
 
        /**
-        * Includes a locallang-php file and returns the $LOCAL_LANG array
-        * Works only when the frontend or backend has been initialized with a charset conversion object. See first code lines.
-        *
-        * @param string $fileRef Absolute reference to locallang-PHP file
-        * @param string $langKey TYPO3 language key, eg. "dk" or "de" or "default"
-        * @param string $charset Character set (optional)
-        * @return array LOCAL_LANG array in return.
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8 - use t3lib_l10n_parser_Llphp::getParsedData() from now on
-        */
-       public static function readLLPHPfile($fileRef, $langKey, $charset = '') {
-               t3lib_div::logDeprecatedFunction();
-
-               if (is_object($GLOBALS['LANG'])) {
-                       $csConvObj = $GLOBALS['LANG']->csConvObj;
-               } elseif (is_object($GLOBALS['TSFE'])) {
-                       $csConvObj = $GLOBALS['TSFE']->csConvObj;
-               } else {
-                       $csConvObj = self::makeInstance('t3lib_cs');
-               }
-
-               if (@is_file($fileRef) && $langKey) {
-
-                               // Set charsets:
-                       $sourceCharset = $csConvObj->parse_charset($csConvObj->charSetArray[$langKey] ? $csConvObj->charSetArray[$langKey] : 'utf-8');
-                       if ($charset) {
-                               $targetCharset = $csConvObj->parse_charset($charset);
-                       } else {
-                               $targetCharset = 'utf-8';
-                       }
-
-                               // Cache file name:
-                       $hashSource = substr($fileRef, strlen(PATH_site)) . '|' . date('d-m-Y H:i:s', filemtime($fileRef)) . '|version=2.3';
-                       $cacheFileName = PATH_site . 'typo3temp/llxml/' .
-                                       substr(basename($fileRef), 10, 15) .
-                                       '_' . self::shortMD5($hashSource) . '.' . $langKey . '.' . $targetCharset . '.cache';
-                               // Check if cache file exists...
-                       if (!@is_file($cacheFileName)) { // ... if it doesn't, create content and write it:
-                               $LOCAL_LANG = NULL;
-                                       // Get PHP data
-                               include($fileRef);
-                               if (!is_array($LOCAL_LANG)) {
-                                       $fileName = substr($fileRef, strlen(PATH_site));
-                                       throw new RuntimeException(
-                                               'TYPO3 Fatal Error: "' . $fileName . '" is no TYPO3 language file!',
-                                               1270853900
-                                       );
-                               }
-
-                                       // converting the default language (English)
-                                       // this needs to be done for a few accented loan words and extension names
-                               if (is_array($LOCAL_LANG['default']) && $targetCharset != 'utf-8') {
-                                       foreach ($LOCAL_LANG['default'] as &$labelValue) {
-                                               $labelValue = $csConvObj->conv($labelValue, 'utf-8', $targetCharset);
-                                       }
-                                       unset($labelValue);
-                               }
-
-                               if ($langKey != 'default' && is_array($LOCAL_LANG[$langKey]) && $sourceCharset != $targetCharset) {
-                                       foreach ($LOCAL_LANG[$langKey] as &$labelValue) {
-                                               $labelValue = $csConvObj->conv($labelValue, $sourceCharset, $targetCharset);
-                                       }
-                                       unset($labelValue);
-                               }
-
-                                       // Cache the content now:
-                               $serContent = array('origFile' => $hashSource, 'LOCAL_LANG' => array('default' => $LOCAL_LANG['default'], $langKey => $LOCAL_LANG[$langKey]));
-                               $res = self::writeFileToTypo3tempDir($cacheFileName, serialize($serContent));
-                               if ($res) {
-                                       throw new RuntimeException(
-                                               'TYPO3 Fatal Error: "' . $res,
-                                               1270853901
-                                       );
-                               }
-                       } else {
-                                       // Get content from cache:
-                               $serContent = unserialize(self::getUrl($cacheFileName));
-                               $LOCAL_LANG = $serContent['LOCAL_LANG'];
-                       }
-
-                       return $LOCAL_LANG;
-               }
-       }
-
-       /**
-        * Includes a locallang-xml file and returns the $LOCAL_LANG array
-        * Works only when the frontend or backend has been initialized with a charset conversion object. See first code lines.
-        *
-        * @param string $fileRef Absolute reference to locallang-XML file
-        * @param string $langKey TYPO3 language key, eg. "dk" or "de" or "default"
-        * @param string $charset Character set (optional)
-        * @return array LOCAL_LANG array in return.
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8 - use t3lib_l10n_parser_Llxml::getParsedData() from now on
-        */
-       public static function readLLXMLfile($fileRef, $langKey, $charset = '') {
-               t3lib_div::logDeprecatedFunction();
-
-               if (is_object($GLOBALS['LANG'])) {
-                       $csConvObj = $GLOBALS['LANG']->csConvObj;
-               } elseif (is_object($GLOBALS['TSFE'])) {
-                       $csConvObj = $GLOBALS['TSFE']->csConvObj;
-               } else {
-                       $csConvObj = self::makeInstance('t3lib_cs');
-               }
-
-               $LOCAL_LANG = NULL;
-               if (@is_file($fileRef) && $langKey) {
-
-                               // Set charset:
-                       if ($charset) {
-                               $targetCharset = $csConvObj->parse_charset($charset);
-                       } else {
-                               $targetCharset = 'utf-8';
-                       }
-
-                               // Cache file name:
-                       $hashSource = substr($fileRef, strlen(PATH_site)) . '|' . date('d-m-Y H:i:s', filemtime($fileRef)) . '|version=2.3';
-                       $cacheFileName = PATH_site . 'typo3temp/llxml/' .
-                                       substr(basename($fileRef), 10, 15) .
-                                       '_' . self::shortMD5($hashSource) . '.' . $langKey . '.' . $targetCharset . '.cache';
-
-                               // Check if cache file exists...
-                       if (!@is_file($cacheFileName)) { // ... if it doesn't, create content and write it:
-
-                                       // Read XML, parse it.
-                               $xmlString = self::getUrl($fileRef);
-                               $xmlContent = self::xml2array($xmlString);
-                               if (!is_array($xmlContent)) {
-                                       $fileName = substr($fileRef, strlen(PATH_site));
-                                       throw new RuntimeException(
-                                               'TYPO3 Fatal Error: The file "' . $fileName . '" is no TYPO3 language file!',
-                                               1270853902
-                                       );
-                               }
-
-                                       // Set default LOCAL_LANG array content:
-                               $LOCAL_LANG = array();
-                               $LOCAL_LANG['default'] = $xmlContent['data']['default'];
-
-                                       // converting the default language (English)
-                                       // this needs to be done for a few accented loan words and extension names
-                                       // NOTE: no conversion is done when in UTF-8 mode!
-                               if (is_array($LOCAL_LANG['default']) && $targetCharset != 'utf-8') {
-                                       foreach ($LOCAL_LANG['default'] as &$labelValue) {
-                                               $labelValue = $csConvObj->utf8_decode($labelValue, $targetCharset);
-                                       }
-                                       unset($labelValue);
-                               }
-
-                                       // converting other languages to their "native" charsets
-                                       // NOTE: no conversion is done when in UTF-8 mode!
-                               if ($langKey != 'default') {
-
-                                               // If no entry is found for the language key, then force a value depending on meta-data setting. By default an automated filename will be used:
-                                       $LOCAL_LANG[$langKey] = self::llXmlAutoFileName($fileRef, $langKey);
-                                       $localized_file = self::getFileAbsFileName($LOCAL_LANG[$langKey]);
-                                       if (!@is_file($localized_file) && isset($xmlContent['data'][$langKey])) {
-                                               $LOCAL_LANG[$langKey] = $xmlContent['data'][$langKey];
-                                       }
-
-                                               // Checking if charset should be converted.
-                                       if (is_array($LOCAL_LANG[$langKey]) && $targetCharset != 'utf-8') {
-                                               foreach ($LOCAL_LANG[$langKey] as &$labelValue) {
-                                                       $labelValue = $csConvObj->utf8_decode($labelValue, $targetCharset);
-                                               }
-                                               unset($labelValue);
-                                       }
-                               }
-
-                                       // Cache the content now:
-                               $serContent = array('origFile' => $hashSource, 'LOCAL_LANG' => array('default' => $LOCAL_LANG['default'], $langKey => $LOCAL_LANG[$langKey]));
-                               $res = self::writeFileToTypo3tempDir($cacheFileName, serialize($serContent));
-                               if ($res) {
-                                       throw new RuntimeException(
-                                               'TYPO3 Fatal Error: ' . $res,
-                                               1270853903
-                                       );
-                               }
-                       } else {
-                                       // Get content from cache:
-                               $serContent = unserialize(self::getUrl($cacheFileName));
-                               $LOCAL_LANG = $serContent['LOCAL_LANG'];
-                       }
-
-                               // Checking for EXTERNAL file for non-default language:
-                       if ($langKey != 'default' && is_string($LOCAL_LANG[$langKey]) && strlen($LOCAL_LANG[$langKey])) {
-
-                                       // Look for localized file:
-                               $localized_file = self::getFileAbsFileName($LOCAL_LANG[$langKey]);
-                               if ($localized_file && @is_file($localized_file)) {
-
-                                               // Cache file name:
-                                       $hashSource = substr($localized_file, strlen(PATH_site)) . '|' . date('d-m-Y H:i:s', filemtime($localized_file)) . '|version=2.3';
-                                       $cacheFileName = PATH_site . 'typo3temp/llxml/EXT_' .
-                                                       substr(basename($localized_file), 10, 15) .
-                                                       '_' . self::shortMD5($hashSource) . '.' . $langKey . '.' . $targetCharset . '.cache';
-
-                                               // Check if cache file exists...
-                                       if (!@is_file($cacheFileName)) { // ... if it doesn't, create content and write it:
-
-                                                       // Read and parse XML content:
-                                               $local_xmlString = self::getUrl($localized_file);
-                                               $local_xmlContent = self::xml2array($local_xmlString);
-                                               if (!is_array($local_xmlContent)) {
-                                                       $fileName = substr($localized_file, strlen(PATH_site));
-                                                       throw new RuntimeException(
-                                                               'TYPO3 Fatal Error: The file "' . $fileName . '" is no TYPO3 language file!',
-                                                               1270853904
-                                                       );
-                                               }
-                                               $LOCAL_LANG[$langKey] = is_array($local_xmlContent['data'][$langKey]) ? $local_xmlContent['data'][$langKey] : array();
-
-                                                       // Checking if charset should be converted.
-                                               if (is_array($LOCAL_LANG[$langKey]) && $targetCharset != 'utf-8') {
-                                                       foreach ($LOCAL_LANG[$langKey] as &$labelValue) {
-                                                               $labelValue = $csConvObj->utf8_decode($labelValue, $targetCharset);
-                                                       }
-                                                       unset($labelValue);
-                                               }
-
-                                                       // Cache the content now:
-                                               $serContent = array('extlang' => $langKey, 'origFile' => $hashSource, 'EXT_DATA' => $LOCAL_LANG[$langKey]);
-                                               $res = self::writeFileToTypo3tempDir($cacheFileName, serialize($serContent));
-                                               if ($res) {
-                                                       throw new RuntimeException(
-                                                               'TYPO3 Fatal Error: ' . $res,
-                                                               1270853905
-                                                       );
-                                               }
-                                       } else {
-                                                       // Get content from cache:
-                                               $serContent = unserialize(self::getUrl($cacheFileName));
-                                               $LOCAL_LANG[$langKey] = $serContent['EXT_DATA'];
-                                       }
-                               } else {
-                                       $LOCAL_LANG[$langKey] = array();
-                               }
-                       }
-
-                               // Convert the $LOCAL_LANG array to XLIFF structure
-                       foreach ($LOCAL_LANG as &$keysLabels) {
-                               foreach ($keysLabels as &$label) {
-                                       $label = array(0 => array(
-                                               'target' => $label,
-                                       ));
-                               }
-                               unset($label);
-                       }
-                       unset($keysLabels);
-
-                       return $LOCAL_LANG;
-               }
-       }
-
-       /**
         * Returns auto-filename for locallang-XML localizations.
         *
         * @param string $fileRef Absolute file reference to locallang-XML file. Must be inside system/global/local extension
@@ -5727,4 +5406,4 @@ final class t3lib_div {
        }
 }
 
-?>
+?>
\ No newline at end of file
index 664ed4b..009460b 100644 (file)
@@ -61,19 +61,6 @@ class t3lib_folderTree extends t3lib_treeView {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function t3lib_folderTree() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               t3lib_folderTree::__construct();
-       }
-
-       /**
         * Wrapping the folder icon
         *
         * @param       string          The image tag for the icon
index 1526821..9883ac7 100644 (file)
@@ -67,20 +67,6 @@ class t3lib_install {
                $this->sqlHandler = t3lib_div::makeInstance('t3lib_install_Sql');
        }
 
-       /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function t3lib_install() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               t3lib_install::__construct();
-       }
-
-
        /**************************************
         *
         * Writing to localconf.php
@@ -424,168 +410,6 @@ class t3lib_install {
        }
 
 
-       /*************************************
-        *
-        * SQL
-        *
-        *************************************/
-
-       /**
-        * Reads the field definitions for the input SQL-file string
-        *
-        * @param $fileContent string Should be a string read from an SQL-file made with 'mysqldump [database_name] -d'
-        * @return array Array with information about table.
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8, use method from t3lib_install_Sql instead
-        */
-       function getFieldDefinitions_fileContent($fileContent) {
-               t3lib_div::logDeprecatedFunction();
-               return $this->sqlHandler->getFieldDefinitions_fileContent($fileContent);
-       }
-
-       /**
-        * Multiplies varchars/tinytext fields in size according to $this->multiplySize
-        * Useful if you want to use UTF-8 in the database and needs to extend the field sizes in the database so UTF-8 chars are not discarded. For most charsets available as single byte sets, multiplication with 2 should be enough. For chinese, use 3.
-        *
-        * @param array $total Total array (from getFieldDefinitions_fileContent())
-        * @return      void
-        * @access private
-        * @see getFieldDefinitions_fileContent()
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8
-        */
-       function getFieldDefinitions_sqlContent_parseTypes(&$total) {
-                       // This method is protected in t3lib_install_Sql
-               t3lib_div::logDeprecatedFunction();
-       }
-
-       /**
-        * Look up the default collation for specified character set based on "SHOW CHARACTER SET" output
-        *
-        * @param string $charset Character set
-        * @return string Corresponding default collation
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8, use method from t3lib_install_Sql instead
-        */
-       function getCollationForCharset($charset) {
-               t3lib_div::logDeprecatedFunction();
-               return $this->sqlHandler->getCollationForCharset($charset);
-       }
-
-       /**
-        * Reads the field definitions for the current database
-        *
-        * @return      array Array with information about table.
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8, use method from t3lib_install_Sql instead
-        */
-       function getFieldDefinitions_database() {
-               t3lib_div::logDeprecatedFunction();
-               return $this->sqlHandler->getFieldDefinitions_database();
-       }
-
-       /**
-        * Compares two arrays with field information and returns information about fields that are MISSING and fields that have CHANGED.
-        * FDsrc and FDcomp can be switched if you want the list of stuff to remove rather than update.
-        *
-        * @param array $FDsrc Field definitions, source (from getFieldDefinitions_fileContent())
-        * @param array $FDcomp Field definitions, comparison. (from getFieldDefinitions_database())
-        * @param string $onlyTableList Table names (in list) which is the ONLY one observed.
-        * @param boolean $ignoreNotNullWhenComparing If set, this function ignores NOT NULL statements of the SQL file field definition when comparing current field definition from database with field definition from SQL file. This way, NOT NULL statements will be executed when the field is initially created, but the SQL parser will never complain about missing NOT NULL statements afterwards.
-        * @return array Returns an array with 1) all elements from $FDsrc that is not in $FDcomp (in key 'extra') and 2) all elements from $FDsrc that is different from the ones in $FDcomp
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8, use method from t3lib_install_Sql instead
-        */
-       function getDatabaseExtra($FDsrc, $FDcomp, $onlyTableList = '', $ignoreNotNullWhenComparing = TRUE) {
-               t3lib_div::logDeprecatedFunction();
-               return $this->sqlHandler->getDatabaseExtra($FDsrc, $FDcomp, $onlyTableList, $ignoreNotNullWhenComparing);
-       }
-
-       /**
-        * Returns an array with SQL-statements that is needed to update according to the diff-array
-        *
-        * @param array $diffArr Array with differences of current and needed DB settings. (from getDatabaseExtra())
-        * @param string $keyList List of fields in diff array to take notice of.
-        * @return array Array of SQL statements (organized in keys depending on type)
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8, use method from t3lib_install_Sql instead
-        */
-       function getUpdateSuggestions($diffArr, $keyList = 'extra,diff') {
-               t3lib_div::logDeprecatedFunction();
-               return $this->sqlHandler->getUpdateSuggestions($diffArr, $keyList);
-       }
-
-       /**
-        * Converts a result row with field information into the SQL field definition string
-        *
-        * @param array $row MySQL result row
-        * @return string Field definition
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8, use method from t3lib_install_Sql instead
-        */
-       function assembleFieldDefinition($row) {
-               t3lib_div::logDeprecatedFunction();
-               return $this->sqlHandler->assembleFieldDefinition($row);
-       }
-
-       /**
-        * Returns an array where every entry is a single SQL-statement. Input must be formatted like an ordinary MySQL-dump files.
-        *
-        * @param string $sqlcode The SQL-file content. Provided that 1) every query in the input is ended with ';' and that a line in the file contains only one query or a part of a query.
-        * @param boolean $removeNonSQL If set, non-SQL content (like comments and blank lines) is not included in the final output
-        * @param string $query_regex Regex to filter SQL lines to include
-        * @return array Array of SQL statements
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8, use method from t3lib_install_Sql instead
-        */
-       function getStatementArray($sqlcode, $removeNonSQL = FALSE, $query_regex = '') {
-               t3lib_div::logDeprecatedFunction();
-               return $this->sqlHandler->getStatementArray($sqlcode, $removeNonSQL, $query_regex);
-       }
-
-       /**
-        * Returns tables to create and how many records in each
-        *
-        * @param array $statements Array of SQL statements to analyse.
-        * @param boolean $insertCountFlag If set, will count number of INSERT INTO statements following that table definition
-        * @return array Array with table definitions in index 0 and count in index 1
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8, use method from t3lib_install_Sql instead
-        */
-       function getCreateTables($statements, $insertCountFlag = FALSE) {
-               t3lib_div::logDeprecatedFunction();
-               return $this->sqlHandler->getCreateTables($statements, $insertCountFlag);
-       }
-
-       /**
-        * Extracts all insert statements from $statement array where content is inserted into $table
-        *
-        * @param array $statements Array of SQL statements
-        * @param string $table Table name
-        * @return array Array of INSERT INTO statements where table match $table
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8, use method from t3lib_install_Sql instead
-        */
-       function getTableInsertStatements($statements, $table) {
-               t3lib_div::logDeprecatedFunction();
-               $this->sqlHandler->getTableInsertStatements($statements, $table);
-       }
-
-       /**
-        * Performs the queries passed from the input array.
-        *
-        * @param array $arr Array of SQL queries to execute.
-        * @param array $keyArr Array with keys that must match keys in $arr. Only where a key in this array is set and TRUE will the query be executed (meant to be passed from a form checkbox)
-        * @return mixed Array with error message from database if any occured. Otherwise TRUE if everything was executed successfully.
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8, use method from t3lib_install_Sql instead
-        */
-       function performUpdateQueries($arr, $keyArr) {
-               t3lib_div::logDeprecatedFunction();
-               $this->sqlHandler->performUpdateQueries($arr, $keyArr);
-       }
-
-       /**
-        * Returns list of tables in the database
-        *
-        * @return      array           List of tables.
-        * @see t3lib_db::admin_get_tables()
-        * @deprecated Since TYPO3 4.6, will be removed in 4.8, use method from t3lib_install_Sql instead
-        */
-       function getListOfTables() {
-               t3lib_div::logDeprecatedFunction();
-               $this->sqlHandler->getListOfTables();
-       }
-
        /**
         * Creates a table which checkboxes for updating database.
         *
index c46ef0c..32d6dbd 100644 (file)
@@ -231,19 +231,6 @@ class t3lib_TCEforms {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function t3lib_TCEforms() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behaviour (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               t3lib_TCEforms::__construct();
-       }
-
-       /**
         * Initialize various internal variables.
         *
         * @return      void
@@ -6610,4 +6597,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tceforms.php']);
 }
 
-?>
+?>
\ No newline at end of file
index 84ed452..feeba91 100644 (file)
@@ -64,20 +64,6 @@ class t3lib_xml {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @param string Top Level Name
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function t3lib_xml($topLevelName) {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               t3lib_xml::__construct($topLevelName);
-       }
-
-       /**
         * When outputting a input record in XML only fields listed in $this->XML_recFields for the current table will be rendered.
         *
         * @param       string          Table name
index 70b9e3b..20395a5 100644 (file)
@@ -105,7 +105,6 @@ $TYPO3_CONF_VARS = array(
                't3lib_cs_convMethod' => '',                    // String (values: "iconv", "recode", "mbstring", default is homemade PHP-code). Defines which of these PHP-features to use for various charset conversion functions in t3lib_cs. Will speed up charset conversion radically.
                't3lib_cs_utils' => '',                                 // String (values: "iconv", "mbstring", default is homemade PHP-code). Defines which of these PHP-features to use for various charset processing functions in t3lib_cs. Will speed up charset functions radically.
                'no_pconnect' => TRUE,                                  // Boolean: If TRUE, "connect" is used to connect to the database. If FALSE, a persistent connection using "pconnect" will be established!
-               'multiplyDBfieldSize' => 1,                             // Double: 1-5: Amount used to multiply the DB field size when the install tool is evaluating the database size (eg. "2.5"). This is only useful e.g. if your database is ISO-8859-1 encoded but you want to use UTF-8 for your site. For Western European sites using UTF-8 the need should not be for more than twice the normal single-byte size (2) and for Chinese / Asian languages 3 should suffice. NOTICE: It is recommended to change the native database charset instead! (see <a href="http://wiki.typo3.org/index.php/UTF-8_support" target="_blank">TYPO3 wiki: UTF-8 support</a> for more information). NOTICE: This option is deprecated since TYPO3 4.5, and will not be used anymore in 4.7+. Please use proper tools to set your installation to native UTF-8.
                'dbClientCompress' => FALSE,                    // Boolean: if TRUE, data exchange between TYPO3 and database server will be compressed. This may improve performance if (1) database serever is on the different server and (2) network connection speed to database server is 100mbps or less. CPU usage will be higher if this option is used but database operations will be executed faster due to much less (up to 3 times) database network traffic. This option has no effect if MySQL server is localhost.
                'setMemoryLimit' => 0,                                  // Integer: memory_limit in MB: If more than 16, TYPO3 will try to use ini_set() to set the memory limit of PHP to the value. This works only if the function ini_set() is not disabled by your sysadmin.
                'serverTimeZone' => 1,                                  // Integer: GMT offset of servers time (from time()). Default is "1" which is "GMT+1" (central european time). This value can be used in extensions that are GMT aware and wants to convert times to/from other timezones.
@@ -854,18 +853,6 @@ if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['useCachingFramework'] !== -1) {
        t3lib_div::deprecationLog('Setting $GLOBALS[\'TYPO3_CONF_VARS\'][\'SYS\'][\'useCachingFramework\'] is obsolete since TYPO3 4.6 and should be removed from localconf.php.');
 }
 
-if (isset($GLOBALS['TYPO3_CONF_VARS']['FE']['userFuncClassPrefix'])) {
-       if(is_string($GLOBALS['TYPO3_CONF_VARS']['FE']['userFuncClassPrefix'])) {
-               if(is_null($GLOBALS['TYPO3_CONF_VARS']['SYS']['additionalAllowedClassPrefixes'])) {
-                       $GLOBALS['TYPO3_CONF_VARS']['SYS']['additionalAllowedClassPrefixes'] = $GLOBALS['TYPO3_CONF_VARS']['FE']['userFuncClassPrefix'];
-               } elseif (is_string($GLOBALS['TYPO3_CONF_VARS']['SYS']['additionalAllowedClassPrefixes'])) {
-                       $GLOBALS['TYPO3_CONF_VARS']['SYS']['additionalAllowedClassPrefixes'] .= ',' . $GLOBALS['TYPO3_CONF_VARS']['FE']['userFuncClassPrefix'];
-               }
-       }
-               // Deprecation log since 4.6, can be removed in 4.8
-       t3lib_div::deprecationLog('$GLOBALS[\'TYPO3_CONF_VARS\'][\'FE\'][\'userFuncClassPrefix\'] is deprecated, use $GLOBALS[\'TYPO3_CONF_VARS\'][\'SYS\'][\'additionalAllowedClassPrefixes\'] instead');
-}
-
        // Force enabled caching framework
        // @deprecated, constant can be removed in 4.8
 define('TYPO3_UseCachingFramework', TRUE);
@@ -1096,11 +1083,6 @@ $GLOBALS['typo3CacheManager']->setCacheConfigurations($GLOBALS['TYPO3_CONF_VARS'
 
 require_once(t3lib_extMgm::extPath('lang') . 'lang.php');
 
-       // Deprecation log since 4.6, can be removed in 4.8. Checks if obsolete pageCacheToExternalFiles is set
-if (isset($GLOBALS['TYPO3_CONF_VARS']['FE']['pageCacheToExternalFiles'])) {
-       t3lib_div::deprecationLog('Setting $GLOBALS[\'TYPO3_CONF_VARS\'][\'FE\'][\'pageCacheToExternalFiles\'] is deprecated since TYPO3 4.6 and should be removed.');
-}
-
        // Define "TYPO3_DLOG" constant
 define('TYPO3_DLOG', $GLOBALS['TYPO3_CONF_VARS']['SYS']['enable_DLOG']);
 
@@ -1133,4 +1115,4 @@ $SIM_EXEC_TIME = $EXEC_TIME;                      // $SIM_EXEC_TIME is set to $EXEC_TIME but can be
 $ACCESS_TIME = $EXEC_TIME - ($EXEC_TIME % 60);         // $ACCESS_TIME is a common time in minutes for access control
 $SIM_ACCESS_TIME = $ACCESS_TIME;               // if $SIM_EXEC_TIME is changed this value must be set accordingly
 
-?>
\ No newline at end of file
+?>
index 76053aa..9989c31 100644 (file)
@@ -101,72 +101,52 @@ final class t3lib_utility_Client {
                        }
                }
 
-                       // Microsoft Documentation about Platform tokens: http://msdn.microsoft.com/en-us/library/ms537503(VS.85).aspx
-                       // @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')) {
                                // windows
                        if (strstr($userAgent, 'Windows NT 6.1')) {
-                               $browserInfo['system'] = 'winNT'; // backwards compatible
                                $browserInfo['all_systems'][] = 'win7';
                                $browserInfo['all_systems'][] = 'winNT';
                        } elseif (strstr($userAgent, 'Windows NT 6.0')) {
-                               $browserInfo['system'] = 'winNT'; // backwards compatible
                                $browserInfo['all_systems'][] = 'winVista';
                                $browserInfo['all_systems'][] = 'winNT';
                        } elseif (strstr($userAgent, 'Windows NT 5.1')) {
-                               $browserInfo['system'] = 'winNT'; // backwards compatible
                                $browserInfo['all_systems'][] = 'winXP';
                                $browserInfo['all_systems'][] = 'winNT';
                        } elseif (strstr($userAgent, 'Windows NT 5.0')) {
-                               $browserInfo['system'] = 'winNT'; // backwards compatible
                                $browserInfo['all_systems'][] = 'win2k';
                                $browserInfo['all_systems'][] = 'winNT';
                        } elseif (strstr($userAgent, 'Win98') || strstr($userAgent, 'Windows 98')) {
-                               $browserInfo['system'] = 'win98';
                                $browserInfo['all_systems'][] = 'win98';
                        } elseif (strstr($userAgent, 'Win95') || strstr($userAgent, 'Windows 95')) {
-                               $browserInfo['system'] = 'win95';
                                $browserInfo['all_systems'][] = 'win95';
                        } elseif (strstr($userAgent, 'WinNT') || strstr($userAgent, 'Windows NT')) {
-                               $browserInfo['system'] = 'winNT';
                                $browserInfo['all_systems'][] = 'winNT';
                        } elseif (strstr($userAgent, 'Win16') || strstr($userAgent, 'Windows 311')) {
-                               $browserInfo['system'] = 'win311';
                                $browserInfo['all_systems'][] = 'win311';
                        }
                } elseif (strstr($userAgent, 'Mac')) {
                        if (strstr($userAgent, 'iPad') || strstr($userAgent, 'iPhone') || strstr($userAgent, 'iPod')) {
-                               $browserInfo['system'] = 'mac'; // backwards compatible
                                $browserInfo['all_systems'][] = 'iOS';
                                $browserInfo['all_systems'][] = 'mac';
                        } else {
-                               $browserInfo['system'] = 'mac';
                                $browserInfo['all_systems'][] = 'mac';
                        }
                                // unixes
                } elseif (strstr($userAgent, 'Android')) {
-                       $browserInfo['system'] = 'linux'; // backwards compatible
                        $browserInfo['all_systems'][] = 'android';
                        $browserInfo['all_systems'][] = 'linux';
                } elseif (strstr($userAgent, 'Linux')) {
-                       $browserInfo['system'] = 'linux';
                        $browserInfo['all_systems'][] = 'linux';
                } elseif (strstr($userAgent, 'BSD')) {
-                       $browserInfo['system'] = 'unix_bsd';
                        $browserInfo['all_systems'][] = 'unix_bsd';
                } elseif (strstr($userAgent, 'SGI') && strstr($userAgent, ' IRIX ')) {
-                       $browserInfo['system'] = 'unix_sgi';
                        $browserInfo['all_systems'][] = 'unix_sgi';
                } elseif (strstr($userAgent, ' SunOS ')) {
-                       $browserInfo['system'] = 'unix_sun';
                        $browserInfo['all_systems'][] = 'unix_sun';
                } elseif (strstr($userAgent, ' HP-UX ')) {
-                       $browserInfo['system'] = 'unix_hp';
                        $browserInfo['all_systems'][] = 'unix_hp';
                } elseif (strstr($userAgent, 'CrOS')) {
-                       $browserInfo['system'] = 'linux';
                        $browserInfo['all_systems'][] = 'chrome';
                        $browserInfo['all_systems'][] = 'linux';
                }
index f31e9d8..8e1111c 100644 (file)
@@ -491,73 +491,6 @@ class t3lib_divTest extends tx_phpunit_testcase {
 
 
        ///////////////////////////////
-       // Tests concerning testInt
-       ///////////////////////////////
-
-       /**
-        * Data provider for testIntReturnsTrue
-        *
-        * @return array Data sets
-        */
-       public function functionTestIntValidDataProvider() {
-               return array(
-                       'int' => array(32425),
-                       'negative int' => array(-32425),
-                       'largest int' => array(PHP_INT_MAX),
-                       'int as string' => array('32425'),
-                       'negative int as string' => array('-32425'),
-                       'zero' => array(0),
-                       'zero as string' => array('0'),
-               );
-       }
-
-       /**
-        * @test
-        * @dataProvider functionTestIntValidDataProvider
-        */
-       public function testIntReturnsTrue($int) {
-               $this->assertTrue(t3lib_utility_Math::canBeInterpretedAsInteger($int));
-       }
-
-       /**
-        * Data provider for testIntReturnsFalse
-        *
-        * @return array Data sets
-        */
-       public function functionTestIntInvalidDataProvider() {
-               return array(
-                       'int as string with leading zero' => array('01234'),
-                       'positive int as string with plus modifier' => array('+1234'),
-                       'negative int as string with leading zero' => array('-01234'),
-                       'largest int plus one' => array(PHP_INT_MAX + 1),
-                       'string' => array('testInt'),
-                       'empty string' => array(''),
-                       'int in string' => array('5 times of testInt'),
-                       'int as string with space after' => array('5 '),
-                       'int as string with space before' => array(' 5'),
-                       'int as string with many spaces before' => array('     5'),
-                       'float' => array(3.14159),
-                       'float as string' => array('3.14159'),
-                       'float as string only a dot' => array('10.'),
-                       'float as string trailing zero would evaluate to int 10' => array('10.0'),
-                       'float as string trailing zeros  would evaluate to int 10' => array('10.00'),
-                       'null' => array(NULL),
-                       'empty array' => array(array()),
-                       'int in array' => array(array(32425)),
-                       'int as string in array' => array(array('32425')),
-               );
-       }
-
-       /**
-        * @test
-        * @dataProvider functionTestIntInvalidDataProvider
-        */
-       public function testIntReturnsFalse($int) {
-               $this->assertFalse(t3lib_utility_Math::canBeInterpretedAsInteger($int));
-       }
-
-
-       ///////////////////////////////
        // Tests concerning isFirstPartOfStr
        ///////////////////////////////
 
@@ -655,69 +588,7 @@ class t3lib_divTest extends tx_phpunit_testcase {
 
 
        //////////////////////////////////
-       // Tests concerning calcPriority
-       //////////////////////////////////
-
-       /**
-        * Data provider for calcPriority
-        *
-        * @return array expected values, arithmetic expression
-        */
-       public function calcPriorityDataProvider() {
-               return array(
-                       'add' => array(9, '6 + 3'),
-                       'substract with positive result' => array(3, '6 - 3'),
-                       'substract with negative result' => array(-3, '3 - 6'),
-                       'multiply' => array(6, '2 * 3'),
-                       'divide' => array(2.5, '5 / 2'),
-                       'modulus' => array(1, '5 % 2'),
-                       'power' => array(8, '2 ^ 3'),
-                       'three operands with non integer result' => array(6.5, '5 + 3 / 2'),
-                       'three operands with power' => array(14, '5 + 3 ^ 2'),
-                       'three operads with modulus' => array(4, '5 % 2 + 3'),
-                       'four operands' => array(3, '2 + 6 / 2 - 2'),
-                       'division by zero when dividing' => array('ERROR: dividing by zero', '2 / 0'),
-                       'division by zero with modulus' => array('ERROR: dividing by zero', '2 % 0')
-               );
-       }
-
-       /**
-        * @test
-        * @dataProvider calcPriorityDataProvider
-        */
-       public function calcPriorityCorrectlyCalculatesExpression($expected, $expression) {
-               $this->assertEquals($expected, t3lib_div::calcPriority($expression));
-       }
-
-       //////////////////////////////////
-       // Tests concerning calcParenthesis
-       //////////////////////////////////
-
-       /**
-        * Data provider for calcParenthesis
-        *
-        * @return array expected values, arithmetic expression
-        */
-       public function calcParenthesisDataProvider() {
-               return array(
-                       'starts with parenthesis' => array(18, '(6 + 3) * 2'),
-                       'ends with parenthesis' => array(6, '2 * (6 - 3)'),
-                       'multiple parentheses' => array(-6, '(3 - 6) * (4 - 2)'),
-                       'nested parentheses' => array(22, '2 * (3 + 2 + (3 * 2))'),
-                       'parenthesis with division' => array(15, '5 / 2 * (3 * 2)'),
-               );
-       }
-
-       /**
-        * @test
-        * @dataProvider calcParenthesisDataProvider
-        */
-       public function calcParenthesisCorrectlyCalculatesExpression($expected, $expression) {
-               $this->assertEquals($expected, t3lib_div::calcParenthesis($expression));
-       }
-
-       //////////////////////////////////
-       // Tests concerning calcPriority
+       // Tests concerning validEmail
        //////////////////////////////////
 
        /**
@@ -846,23 +717,6 @@ class t3lib_divTest extends tx_phpunit_testcase {
        }
 
        //////////////////////////////////
-       // Tests concerning intval_positive
-       //////////////////////////////////
-       /**
-        * @test
-        */
-       public function intvalPositiveReturnsZeroForNegativeValues() {
-               $this->assertEquals(0, t3lib_div::intval_positive(-123));
-       }
-
-       /**
-        * @test
-        */
-       public function intvalPositiveReturnsTheInputValueForPositiveValues() {
-               $this->assertEquals(123, t3lib_div::intval_positive(123));
-       }
-
-       //////////////////////////////////
        // Tests concerning int_from_ver
        //////////////////////////////////
        /**
@@ -3721,4 +3575,4 @@ class t3lib_divTest extends tx_phpunit_testcase {
                $this->assertEquals($expected, $result);
        }
 }
-?>
+?>
\ No newline at end of file
index 9863068..c424417 100644 (file)
@@ -274,22 +274,9 @@ class t3lib_utility_clientTest extends tx_phpunit_testcase {
                $userAgentString = 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 4.0)';
                $infoArray = t3lib_utility_Client::getBrowserInfo($userAgentString);
 
-               $this->assertSame(
-                       'winNT',
-                       $infoArray['system']
-               );
-       }
-
-       /**
-        * @test
-        */
-       public function getBrowserInfoReturnsCorrectSystemValueForUserAgentStringContainingNtAsFallback() {
-               $userAgentString = 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT)';
-               $infoArray = t3lib_utility_Client::getBrowserInfo($userAgentString);
-
-               $this->assertSame(
+               $this->assertContains(
                        'winNT',
-                       $infoArray['system']
+                       $infoArray['all_systems']
                );
        }
 
@@ -339,9 +326,9 @@ class t3lib_utility_clientTest extends tx_phpunit_testcase {
                $userAgentString = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_5; en-us) AppleWebKit/534.15+ (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4';
                $infoArray = t3lib_utility_Client::getBrowserInfo($userAgentString);
 
-               $this->assertSame(
+               $this->assertContains(
                        'mac',
-                       $infoArray['system']
+                       $infoArray['all_systems']
                );
        }
 
@@ -352,9 +339,9 @@ class t3lib_utility_clientTest extends tx_phpunit_testcase {
                $userAgentString = 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.8) Gecko/20100723 Ubuntu/10.04 (lucid) Firefox/3.6.8';
                $infoArray = t3lib_utility_Client::getBrowserInfo($userAgentString);
 
-               $this->assertSame(
+               $this->assertContains(
                        'linux',
-                       $infoArray['system']
+                       $infoArray['all_systems']
                );
        }
 
@@ -365,9 +352,9 @@ class t3lib_utility_clientTest extends tx_phpunit_testcase {
                $userAgentString = 'Mozilla/5.0 (X11; U; SunOS i86pc; en-US; rv:1.9.1.9) Gecko/20100525 Firefox/3.5.9';
                $infoArray = t3lib_utility_Client::getBrowserInfo($userAgentString);
 
-               $this->assertSame(
+               $this->assertContains(
                        'unix_sun',
-                       $infoArray['system']
+                       $infoArray['all_systems']
                );
        }
 
diff --git a/typo3/alt_intro.php b/typo3/alt_intro.php
deleted file mode 100644 (file)
index bbc41b0..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 1999-2011 Kasper Skårhøj (kasperYYYY@typo3.com)
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license
-*  from the author is found in LICENSE.txt distributed with these scripts.
-*
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-/**
- * 'About modules' script - the default start-up module.
- * Will display the list of main- and sub-modules available to the user.
- * Each module will be show with description and a link to the module.
- *
- * Revised for TYPO3 3.6 2/2003 by Kasper Skårhøj
- * XHTML compliant
- *
- * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
- * @deprecated since 4.6
- */
-
-
-require ('init.php');
-require ('template.php');
-
-t3lib_div::deprecationLog('This script is not in use anymore and will be removed in TYPO3 4.8, it is moved into "aboutmodules" extension.');
-
-include(t3lib_extMgm::extPath('aboutmodules', 'mod/index.php'));
-
-?>
\ No newline at end of file
diff --git a/typo3/alt_topmenu_dummy.php b/typo3/alt_topmenu_dummy.php
deleted file mode 100644 (file)
index ea3908c..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 1999-2011 Kasper Skårhøj (kasperYYYY@typo3.com)
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license
-*  from the author is found in LICENSE.txt distributed with these scripts.
-*
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-/**
- * Alternative top menu
- * Displays a horizontal menu with the same items as the default left vertical menu
- * in the backend frameset. Only the icons are displayed and linked.
- * Will appear as the default document in the top frame if configured to appear.
- * This is the default menu used during "condensed mode"
- *
- * Revised for TYPO3 3.6 2/2003 by Kasper Skårhøj
- * XHTML compliant content
- *
- * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
- * @deprecated since TYPO3 4.5, this file will be removed in TYPO3 4.7.
- *             The TYPO3 backend is using typo3/backend.php with less frames,
- *             which makes this file obsolete.
- */
-
-
-require ('init.php');
-require ('template.php');
-require_once ('class.alt_menu_functions.inc');
-
-
-t3lib_div::deprecationLog('alt_topmenu_dummy.php is deprecated since TYPO3 4.5, this file will be removed in TYPO3 4.7. The TYPO3 backend is using typo3/backend.php with less frames, which makes this file obsolete.');
-
-
-
-
-/**
- * Script Class for rendering the topframe dummy view.
- * In the case where TYPO3 backend is configured to show the menu in the top frame this class will render the horizontal line of module icons in the top frame.
- *
- * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
- */
-class SC_alt_topmenu_dummy {
-       var $content;
-
-       /**
-        * Main function - making the menu happen.
-        *
-        * @return      void
-        */
-       function main() {
-
-                       // Remember if noMenuMode is set to 'icons' or not because the hook will be ignored in this case.
-               if (!strcmp($GLOBALS['BE_USER']->uc['noMenuMode'],'icons'))     { $iconMenuMode = TRUE; }
-
-               $contentArray=array();
-
-                       // Hook for adding content to the topmenu. Only works if noMenuMode is not set to "icons" in the users setup!
-               if (!$iconMenuMode && is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/alt_topmenu_dummy.php']['fetchContentTopmenu']))       {
-                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/alt_topmenu_dummy.php']['fetchContentTopmenu'] as $classRef)  {
-                               $hookObj = t3lib_div::getUserObj($classRef);
-                               if (method_exists($hookObj,'fetchContentTopmenu_processContent'))       {
-                                       $tempContent = $hookObj->fetchContentTopmenu_processContent($this);
-
-                                               // Placement priority handling.
-                                       if (is_int($hookObj->priority) && ($hookObj->priority>=1 && $hookObj->priority<=9)) {
-                                               $priority = $hookObj->priority;
-                                       } else $priority = 5;
-
-                                       $overrulestyle = isset($hookObj->overrulestyle) ? $hookObj->overrulestyle : 'padding-top: 4px;';
-                                       $contentArray[$priority][] = '<td class="c-menu" style="'.$overrulestyle.'">'.$tempContent.'</td>';
-                               }
-                       }
-                       ksort($contentArray);
-               }
-
-                       // If noMenuMode is set to 'icons' or if a hook was found, display menu instead of nothingness
-               if ($iconMenuMode || count($contentArray))      {
-
-                               // Loading the modules for this backend user:
-                       $loadModules = t3lib_div::makeInstance('t3lib_loadModules');
-                       $loadModules->observeWorkspaces = TRUE;
-                       $loadModules->load($GLOBALS['TBE_MODULES']);
-
-                               // Creating menu object:
-                       $alt_menuObj = t3lib_div::makeInstance('alt_menu_functions');
-
-                               // Start page
-                       $GLOBALS['TBE_TEMPLATE']->bodyTagId.= '-iconmenu';
-                       $GLOBALS['TBE_TEMPLATE']->JScodeArray[] = $alt_menuObj->generateMenuJScode($loadModules->modules);
-
-                       $this->content .= $GLOBALS['TBE_TEMPLATE']->startPage('Top frame icon menu');
-
-                       if ($iconMenuMode)      {
-                               $contentArray[0][] = '<td class="c-menu">'.$alt_menuObj->topMenu($loadModules->modules,0,'',3).'</td>';
-                               if ($GLOBALS['BE_USER']->isAdmin())     {
-                                       $contentArray[1][] = '<td class="c-admin">'.$alt_menuObj->adminButtons().'</td>';
-                               }
-                               $contentArray[2][] = '<td class="c-logout">'.$alt_menuObj->topButtons().'</td>';
-                       }
-
-                               // Make menu and add it:
-                       $this->content.='
-
-                               <!--
-                                 Alternative module menu made of icons, displayed in top frame:
-                               -->
-                               <table border="0" cellpadding="0" cellspacing="0" id="typo3-topMenu">
-                                       <tr>';
-
-                       foreach ($contentArray as $key=>$menucontent)   {
-                               $this->content .= implode(LF, $menucontent);
-                       }
-
-                       $this->content.='
-                                       </tr>
-                               </table>';
-
-                               // End page:
-                       $this->content .= $GLOBALS['TBE_TEMPLATE']->endPage();
-               } else {
-                               // Make dummy content:
-                       $this->dummyContent();
-               }
-       }
-
-       /**
-        * Creates the dummy content of the top frame if no menu - which is a blank page.
-        *
-        * @return      void
-        */
-       function dummyContent() {
-                       // Start page
-               $this->content.=$GLOBALS['TBE_TEMPLATE']->startPage('Top frame dummy display');
-
-                       // End page:
-               $this->content.=$GLOBALS['TBE_TEMPLATE']->endPage();
-       }
-
-       /**
-        * Outputting the accumulated content to screen
-        *
-        * @return      void
-        */
-       function printContent() {
-               echo $this->content;
-       }
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/alt_topmenu_dummy.php'])) {
-       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/alt_topmenu_dummy.php']);
-}
-
-
-
-// Make instance:
-$SOBE = t3lib_div::makeInstance('SC_alt_topmenu_dummy');
-$SOBE->main();
-$SOBE->printContent();
-
-?>
\ No newline at end of file
index a6c43a7..1019f51 100644 (file)
@@ -64,19 +64,6 @@ class TBE_browser_recordList extends localRecordList {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function TBE_browser_recordList() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               TBE_browser_recordList::__construct();
-       }
-
-       /**
         * Creates the URL for links
         *
         * @param       mixed           If not blank string, this is used instead of $this->id as the id value.
@@ -189,19 +176,6 @@ class localPageTree extends t3lib_browseTree {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function localPageTree() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               localPageTree::__construct();
-       }
-
-       /**
         * Wrapping the title in a link, if applicable.
         *
         * @param       string          Title, (must be ready for output, that means it must be htmlspecialchars()'ed).
@@ -407,19 +381,6 @@ class localFolderTree extends t3lib_folderTree {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function localFolderTree() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               localFolderTree::__construct();
-       }
-
-       /**
         * Wrapping the title in a link, if applicable.
         *
         * @param       string          Title, ready for output.
@@ -2895,4 +2856,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/class.browse_links.php']);
 }
 
-?>
+?>
\ No newline at end of file
index 06d29c1..b3492e1 100644 (file)
@@ -72,19 +72,6 @@ class filelistFolderTree extends t3lib_folderTree {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function filelistFolderTree() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               filelistFolderTree::__construct();
-       }
-
-       /**
         * Wrapping icon in browse tree
         *
         * @param       string          Icon IMG code
index aa9a124..4f0b2a2 100644 (file)
@@ -84,19 +84,6 @@ class webPageTree extends t3lib_browseTree {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function webPageTree() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               webPageTree::__construct();
-       }
-
-       /**
         * Wrapping icon in browse tree
         *
         * @param       string          Icon IMG code
@@ -530,4 +517,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
diff --git a/typo3/db_list.php b/typo3/db_list.php
deleted file mode 100644 (file)
index 81c36d3..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 2010-2011 Steffen Kamper (steffen@typo3.com)
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license
-*  from the author is found in LICENSE.txt distributed with these scripts.
-*
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-/**
- * This is a wrapper file for direct calls to list module.
- * It's deprecated since 4.5, use proper link generation.
- *
- * @author     Steffen Kamper <steffen@typo3.com>
- * @deprecated since 4.5 will be removed in 4.8.
- *
- */
-
-
-require ('init.php');
-
-$query = t3lib_div::getIndpEnv('QUERY_STRING');
-t3lib_div::deprecationLog('db_list.php is deprecated since TYPO3 4.5, this file will be removed in TYPO3 4.8. The list module is a system extension now, do not link to this file.' .
-       LF .
-       'Referer: ' . t3lib_div::getIndpEnv('HTTP_REFERER')
-);
-if (t3lib_extMgm::isLoaded('recordlist')) {
-       t3lib_utility_Http::redirect(t3lib_BEfunc::getModuleUrl('web_list', array(), '', TRUE) . '&' . $query);
-} else {
-       $title = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:extension.not.installed'), 'list');
-       $message = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:link.to.dblist.correctly');
-       throw new RuntimeException($title . ': ' . $message, 1294586840);
-}
-
-?>
\ No newline at end of file
diff --git a/typo3/file_list.php b/typo3/file_list.php
deleted file mode 100644 (file)
index d3a5b6a..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 2010-2011 Steffen Kamper (steffen@typo3.com)
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license
-*  from the author is found in LICENSE.txt distributed with these scripts.
-*
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-/**
- * This is a wrapper file for direct calls to filelist module.
- * It's deprecated since 4.5, use proper link generation.
- *
- * @author     Steffen Kamper <steffen@typo3.com>
- * @deprecated since 4.5, will be removed in 4.8.
- *
- */
-
-require ('init.php');
-
-$query = t3lib_div::getIndpEnv('QUERY_STRING');
-t3lib_div::deprecationLog('file_list.php is deprecated since TYPO3 4.5, this file will be removed in TYPO3 4.8. The filelist module is a system extension now, do not link to this file.' .
-       LF .
-       'Referer: ' . t3lib_div::getIndpEnv('HTTP_REFERER')
-);
-if (t3lib_extMgm::isLoaded('filelist')) {
-       t3lib_utility_Http::redirect(t3lib_extMgm::extRelPath('filelist') . 'mod1/file_list.php?' . $query);
-} else {
-       $title = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:extension.not.installed'), 'list');
-       $message = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:link.to.filelist.correctly');
-       throw new RuntimeException($title . ': ' . $message, 1294586842);
-}
-?>
\ No newline at end of file
index fc0ea65..8ee9d5c 100755 (executable)
@@ -74,21 +74,6 @@ $BE_USER->modAccess($MCONF,1);
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @param object Local backend user (not the GLOBALS[] backend user!!)
-        * @param array Webmounts for the backend user
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function localPageTree($BE_USER, $WEBMOUNTS = '') {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               localPageTree::__construct($BE_USER, $WEBMOUNTS);
-       }
-
-       /**
         * Return select permissions.
         *
         * @return      string          WHERE query part.
@@ -344,21 +329,6 @@ class printAllPageTree_perms extends printAllPageTree {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @param object Local backend user (not the GLOBALS[] backend user!!)
-        * @param array Filemounts for the backend user
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function localFolderTree($BE_USER, $FILEMOUNTS = '') {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               localFolderTree::__construct($BE_USER, $FILEMOUNTS);
-       }
-
-       /**
         * Wraps the title.
         *
         * @param       string          [See parent]
@@ -1600,4 +1570,4 @@ $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
 
-?>
+?>
\ No newline at end of file
index da85814..0ff9544 100755 (executable)
@@ -811,397 +811,6 @@ class tx_cms_layout extends recordList {
                return $out;
        }
 
-       /**
-        * Renders Frontend Users from the fe_users table from page id
-        *
-        * @param       integer         Page id
-        * @return      string          HTML for the listing
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-        */
-       function getTable_fe_users($id) {
-               t3lib_div::logDeprecatedFunction();
-
-               $this->addElement_tdParams = array(
-                       'username' => ' nowrap="nowrap"',
-                       'usergroup' => ' nowrap="nowrap"',
-                       'name' => ' nowrap="nowrap"',
-                       'address' => ' nowrap="nowrap"',
-                       'zip' => ' nowrap="nowrap"',
-                       'city' => ' nowrap="nowrap"',
-                       'email' => ' nowrap="nowrap"',
-                       'telephone' => ' nowrap="nowrap"'
-               );
-               $fList = 'username,usergroup,name,email,telephone,address,zip,city';
-               $out = $this->makeOrdinaryList('fe_users', $id, $fList, 1);
-               $this->addElement_tdParams = array();
-               return $out;
-       }
-
-       /**
-        * Renders records from the sys_notes table from page id
-        * NOTICE: Requires the sys_note extension to be loaded.
-        *
-        * @param       integer         Page id
-        * @return      string          HTML for the listing
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-        */
-       function getTable_sys_note($id) {
-               t3lib_div::logDeprecatedFunction();
-
-               if (!t3lib_extMgm::isLoaded('sys_note')) {
-                       return '';
-               }
-
-               // INIT:
-               $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
-               $tree = $this->getTreeObject($id, intval($GLOBALS['SOBE']->MOD_SETTINGS['pages_levels']), $perms_clause);
-
-               $this->itemLabels = array();
-               foreach ($GLOBALS['TCA']['sys_note']['columns'] as $name => $val) {
-                       $this->itemLabels[$name] = $GLOBALS['LANG']->sL($val['label']);
-               }
-
-               // If page ids were found, select all sys_notes from the page ids:
-               $out = '';
-               if (count($tree->ids)) {
-                       $delClause = t3lib_BEfunc::deleteClause('sys_note') . t3lib_BEfunc::versioningPlaceholderClause('sys_note');
-                       $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_note', 'pid IN (' . implode(',', $tree->ids) . ') AND (personal=0 OR cruser=' . intval($GLOBALS['BE_USER']->user['uid']) . ')' . $delClause);
-                       $dbCount = $GLOBALS['TYPO3_DB']->sql_num_rows($result);
-
-                       // If sys_notes were found, render them:
-                       if ($dbCount) {
-                               $this->fieldArray = explode(',', '__cmds__,info,note');
-
-                               // header line is drawn
-                               $theData = Array();
-                               $theData['__cmds__'] = '';
-                               $theData['info'] = '<strong>Info</strong><br /><img src="clear.gif" height="1" width="220" alt="" />';
-                               $theData['note'] = '<strong>Note</strong>';
-                               $out .= $this->addelement(1, '', $theData, ' class="t3-row-header"', 20);
-
-                               // half line is drawn
-                               $theData = Array();
-                               $theData['info'] = $this->widthGif;
-                               $out .= $this->addelement(0, '', $theData);
-
-                               $this->no_noWrap = 1;
-
-                               // Items
-                               $this->eCounter = $this->firstElementNumber;
-                               while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
-                                       t3lib_BEfunc::workspaceOL('sys_note', $row);
-
-                                       if (is_array($row)) {
-                                               list($flag, $code) = $this->fwd_rwd_nav();
-                                               $out .= $code;
-                                               if ($flag) {
-                                                       $color = Array(
-                                                               0 => '', // No category
-                                                               1 => ' class="bgColor4"', // Instructions
-                                                               2 => ' class="bgColor2"', // Template
-                                                               3 => '', // Notes
-                                                               4 => ' class="bgColor5"' // To-do
-                                                       );
-                                                       $tdparams = $color[$row['category']];
-                                                       $info = Array();
-                                                       ;
-                                                       $theData = Array();
-                                                       $this->getProcessedValue('sys_note', 'subject,category,author,email,personal', $row, $info);
-                                                       $cont = implode('<br />', $info);
-                                                       $head = '<strong>Page:</strong> ' . t3lib_BEfunc::getRecordPath($row['pid'], $perms_clause, 10) . '<br />';
-
-                                                       $theData['__cmds__'] = $this->getIcon('sys_note', $row);
-                                                       $theData['info'] = $head . $cont;
-                                                       $theData['note'] = nl2br(htmlspecialchars($row['message']));
-
-                                                       $out .= $this->addelement(1, '', $theData, $tdparams, 20);
-
-
-                                                       // half line is drawn
-                                                       $theData = Array();
-                                                       $theData['info'] = $this->widthGif;
-                                                       $out .= $this->addelement(0, '', $theData);
-                                               }
-                                               $this->eCounter++;
-                                       }
-                               }
-
-                               // Wrap it all in a table:
-                               $out = '
-                                       <table border="0" cellpadding="1" cellspacing="2" width="480" class="typo3-page-sysnote">
-                                               ' . $out . '
-                                       </table>';
-                       }
-               }
-               return $out;
-       }
-
-       /**
-        * Renders records from the tt_board table from page id
-        * NOTICE: Requires the tt_board extension to be loaded.
-        *
-        * @param       integer         Page id
-        * @return      string          HTML for the listing
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-
-        */
-       function getTable_tt_board($id) {
-               t3lib_div::logDeprecatedFunction();
-
-               // Initialize:
-               $delClause = t3lib_BEfunc::deleteClause('tt_board') . t3lib_BEfunc::versioningPlaceholderClause('tt_board');
-               $queryParts = $this->makeQueryArray('tt_board', $id, 'AND parent=0');
-               $this->setTotalItems($queryParts);
-               $dbCount = 0;
-
-               // If items were selected, make query:
-               if ($this->totalItems) {
-                       $result = $GLOBALS['TYPO3_DB']->exec_SELECT_queryArray($queryParts);
-                       $dbCount = $GLOBALS['TYPO3_DB']->sql_num_rows($result);
-               }
-
-               // If results came out of that, render the list:
-               $out = '';
-               if ($dbCount) {
-
-                       // Setting fields to display first:
-                       if ($GLOBALS['SOBE']->MOD_SETTINGS['tt_board'] == 'expand') {
-                               $this->fieldArray = explode(',', 'subject,author,date,age');
-                       } else {
-                               $this->fieldArray = explode(',', 'subject,author,date,age,replys');
-                       }
-
-                       // Header line is drawn
-                       $theData = Array();
-                       $theData['subject'] = '<strong>' . $GLOBALS['LANG']->getLL('tt_board_subject', 1) . '</strong>';
-                       $theData['author'] = '<strong>' . $GLOBALS['LANG']->getLL('tt_board_author', 1) . '</strong>';
-                       $theData['date'] = '<strong>' . $GLOBALS['LANG']->getLL('tt_board_date', 1) . '</strong>';
-                       $theData['age'] = '<strong>' . $GLOBALS['LANG']->getLL('tt_board_age', 1) . '</strong>';
-                       if ($GLOBALS['SOBE']->MOD_SETTINGS['tt_board'] != 'expand') {
-                               $theData['replys'] = '<strong>' . $GLOBALS['LANG']->getLL('tt_board_RE', 1) . '</strong>';
-                       }
-                       $out .= $this->addelement(1, '', $theData, ' class="t3-row-header"', 20);
-
-                       // half line is drawn
-                       $theData = Array();
-                       $theData['subject'] = $this->widthGif;
-                       $out .= $this->addelement(0, '', $theData);
-
-                       // Items
-                       $this->eCounter = $this->firstElementNumber;
-                       while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
-                               t3lib_BEfunc::workspaceOL('tt_board', $row);
-
-                               if (is_array($row)) {
-                                       list($flag, $code) = $this->fwd_rwd_nav();
-                                       $out .= $code;
-
-                                       if ($flag) {
-
-                                               $theRows = Array();
-                                               $theRows = $this->tt_board_getTree($theRows, $row['uid'], $id, $delClause, '');
-                                               $out .= $this->tt_board_drawItem('tt_board', $row, count($theRows));
-
-                                               if ($GLOBALS['SOBE']->MOD_SETTINGS['tt_board'] == 'expand') {
-                                                       foreach ($theRows as $n => $sRow) {
-                                                               $out .= $this->tt_board_drawItem('tt_board', $sRow, 0);
-                                                       }
-                                               }
-                                       }
-                                       $this->eCounter++;
-                               }
-                       }
-
-                       // Wrap it all in a table:
-                       $out = '
-                               <table border="0" cellpadding="0" cellspacing="0" class="typo3-page-listTTboard">
-                                       ' . $out . '
-                               </table>';
-               }
-
-               return $out;
-       }
-
-       /**
-        * Renders address records from the tt_address table from page id
-        * NOTICE: Requires the tt_address extension to be loaded.
-        *
-        * @param       integer         Page id
-        * @return      string          HTML for the listing
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-        */
-       function getTable_tt_address($id) {
-               t3lib_div::logDeprecatedFunction();
-
-               // Define fieldlist to show:
-               switch ($GLOBALS['SOBE']->MOD_SETTINGS['tt_address']) {
-                       case 1:
-                               $icon = 0;
-                               $fList = 'name,address,zip,city,country';
-                               break;
-                       case 2:
-                               $icon = 1;
-                               $fList = 'name;title;email;company,image';
-                               break;
-                       default:
-                               $icon = 0;
-                               $fList = 'name,email,www,phone,fax,mobile';
-                               break;
-               }
-
-               // Create listing
-               $out = $this->makeOrdinaryList('tt_address', $id, $fList, $icon);
-               return $out;
-       }
-
-       /**
-        * Renders link records from the tt_links table from page id
-        * NOTICE: Requires the tt_links extension to be loaded.
-        *
-        * @param       integer         Page id
-        * @return      string          HTML for the listing
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-        */
-       function getTable_tt_links($id) {
-               t3lib_div::logDeprecatedFunction();
-
-               // Define fieldlist to show:
-               switch ($GLOBALS['SOBE']->MOD_SETTINGS['tt_links']) {
-                       case 1:
-                               $fList = 'title,hidden,url';
-                               break;
-                       case 2:
-                               $fList = 'title;url,note2';
-                               break;
-                       default:
-                               $fList = 'title;url,note';
-                               break;
-               }
-
-               $out = $this->makeOrdinaryList('tt_links', $id, $fList, 1);
-               return $out;
-       }
-
-       /**
-        * Renders link records from the tt_links table from page id
-        * NOTICE: Requires the tt_links extension to be loaded.
-        *
-        * @param       integer         Page id
-        * @return      string          HTML for the listing
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-        */
-       function getTable_tt_guest($id) {
-               t3lib_div::logDeprecatedFunction();
-
-               // Define fieldlist to show:
-               $fList = 'title;cr_name;cr_email,note';
-               $out = $this->makeOrdinaryList('tt_guest', $id, $fList, 1);
-               return $out;
-       }
-
-       /**
-        * Renders news items from the tt_news table from page id
-        * NOTICE: Requires the tt_news extension to be loaded.
-        *
-        * @param       integer         Page id
-        * @return      string          HTML for the listing
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-        */
-       function getTable_tt_news($id) {
-               t3lib_div::logDeprecatedFunction();
-
-               $this->addElement_tdParams = array(
-                       'title' => ' nowrap="nowrap"',
-                       'datetime' => ' nowrap="nowrap"',
-                       'starttime' => ' nowrap="nowrap"',
-                       'author' => ' nowrap="nowrap"'
-               );
-               $fList = 'title,author,author_email,datetime,starttime,category,image';
-               $out = $this->makeOrdinaryList('tt_news', $id, $fList, 1);
-               $this->addElement_tdParams = array();
-               return $out;
-       }
-
-       /**
-        * Renders calender elements link records from the tt_calender table from page id
-        * NOTICE: Requires the tt_calender extension to be loaded.
-        *
-        * @param       integer         Page id
-        * @return      string          HTML for the listing
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-        */
-       function getTable_tt_calender($id) {
-               t3lib_div::logDeprecatedFunction();
-
-               $type = $GLOBALS['SOBE']->MOD_SETTINGS['tt_calender'];
-               switch ($type) {
-                       case 'date':
-                               // Date default
-                               $fList = 'date,title';
-                               $icon = 0;
-                               $out = $this->makeOrdinaryList('tt_calender', $id, $fList, $icon, ' AND type=0');
-                               return $out;
-                               break;
-                       case 'date_ext':
-                               // Date extended
-                               $fList = 'title;date;time;datetext;link,note';
-                               $icon = 1;
-                               $out = $this->makeOrdinaryList('tt_calender', $id, $fList, $icon, ' AND type=0');
-                               return $out;
-                               break;
-                       case 'todo':
-                               // Todo default
-                               $fList = 'title,complete,priority,date';
-                               $icon = 0;
-                               $out = $this->makeOrdinaryList('tt_calender', $id, $fList, $icon, ' AND type=1');
-                               return $out;
-                               break;
-                       case 'todo_ext':
-                               // Todo extended
-                               $fList = 'title;complete;priority;date;workgroup;responsible;category,note';
-                               $icon = 1;
-                               $out = $this->makeOrdinaryList('tt_calender', $id, $fList, $icon, ' AND type=1');
-                               return $out;
-                               break;
-                       default:
-                               // Overview, both todo and calender
-                               $fList = 'title,date,time,week';
-                               $icon = 1;
-                               $out = $this->makeOrdinaryList('tt_calender', $id, $fList, $icon, ' AND type=0');
-                               $out .= $this->makeOrdinaryList('tt_calender', $id, $fList, $icon, ' AND type=1');
-                               return $out;
-                               break;
-               }
-       }
-
-       /**
-        * Renders shopping elements from the tt_products table from page id
-        * NOTICE: Requires the tt_products extension to be loaded.
-        *
-        * @param       integer         Page id
-        * @return      string          HTML for the listing
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-        */
-       function getTable_tt_products($id) {
-               t3lib_div::logDeprecatedFunction();
-
-               $type = $GLOBALS['SOBE']->MOD_SETTINGS['tt_products'];
-               switch ($type) {
-                       case 'ext':
-                               $fList = 'title;itemnumber;price;price2;inStock;category,image,note';
-                               $icon = 1;
-                               $out = $this->makeOrdinaryList('tt_products', $id, $fList, $icon);
-                               break;
-                       default:
-                               $fList = 'title,itemnumber,price,category,image';
-                               $icon = 1;
-                               $out = $this->makeOrdinaryList('tt_products', $id, $fList, $icon);
-                               break;
-               }
-
-               return $out;
-       }
-
 
        /**********************************
         *
@@ -2082,84 +1691,6 @@ class tx_cms_layout extends recordList {
        }
 
 
-       /**********************************
-        *
-        * Additional functions; Message board items (tt_board)
-        *
-        **********************************/
-
-       /**
-        * Traverses recursively a branch in a message board.
-        *
-        * @param       array           Array of rows (build up recursively)
-        * @param       integer         tt_content parent uid
-        * @param       integer         Page id
-        * @param       string          Additional query part.
-        * @param       string          HTML content to prefix items with (to draw the proper tree-graphics)
-        * @return      array           $theRows, but with added content
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-        */
-       function tt_board_getTree($theRows, $parent, $pid, $qWhere, $treeIcons) {
-               t3lib_div::logDeprecatedFunction();
-
-               // Select tt_board elements:
-               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'tt_board', 'pid=' . intval($pid) . ' AND parent=' . intval($parent) . $qWhere, '', 'crdate');
-
-               // Traverse the results:
-               $c = 0;
-               $rc = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
-               while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
-                       $c++;
-                       $row['treeIcons'] = $treeIcons . '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/ol/' . ($rc == $c ? 'joinbottom.gif' : 'join.gif'), 'width="18" height="16"') . ' alt="" />';
-                       $theRows[] = $row;
-
-                       // Get the branch
-                       $theRows = $this->tt_board_getTree(
-                               $theRows,
-                               $row['uid'],
-                               $row['pid'],
-                               $qWhere,
-                                       $treeIcons . '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/ol/' . ($rc == $c ? 'blank.gif' : 'line.gif'), 'width="18" height="16"') . ' alt="" />'
-                       );
-               }
-
-               // Return modified rows:
-               return $theRows;
-       }
-
-       /**
-        * Adds an element to the tt_board listing:
-        *
-        * @param       string          Table name
-        * @param       array           The record row
-        * @param       string          Reply count, if applicable.
-        * @return      string          Return content of element (table row)
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-        */
-       function tt_board_drawItem($table, $row, $re) {
-               t3lib_div::logDeprecatedFunction();
-
-               // Building data-arary with content:
-               $theData = Array();
-               $theData['subject'] = t3lib_div::fixed_lgd_cs(htmlspecialchars($row['subject']), 25) . '&nbsp; &nbsp;';
-               $theData['author'] = t3lib_div::fixed_lgd_cs(htmlspecialchars($row['author']), 15) . '&nbsp; &nbsp;';
-               $theData['date'] = t3lib_div::fixed_lgd_cs(t3lib_BEfunc::datetime($row['crdate']), 20) . '&nbsp; &nbsp;';
-               $theData['age'] = t3lib_BEfunc::calcAge($GLOBALS['EXEC_TIME'] - $row['crdate'], $this->agePrefixes) . '&nbsp; &nbsp;';
-               if ($re) {
-                       $theData['replys'] = $re;
-               }
-
-               // Subject is built:
-               $theData['subject'] =
-                               $row['treeIcons'] .
-                                               $this->getIcon($table, $row) .
-                                               $theData['subject'];
-
-               // Adding element:
-               return $this->addelement(1, '', $theData);
-       }
-
-
        /********************************
         *
         * Various helper functions
@@ -2659,4 +2190,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/cms/layout/class.tx_cms_layout.php']);
 }
 
-?>
+?>
\ No newline at end of file
index d33db94..47b660e 100644 (file)
@@ -224,16 +224,6 @@ class tslib_AdminPanel {
        }
 
        /**
-        * Returns the comma-separated list of page UIDs to be published.
-        *
-        * @return string
-        * @deprecated since 4.6, will be removed in 4.8
-        */
-       public function getExtPublishList() {
-               t3lib_div::logDeprecatedFunction();
-       }
-
-       /**
         * Returns TRUE if admin panel module is open
         *
         * @param       string          Module key
index a801ba8..ea12746 100644 (file)
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @param array The global $TYPO3_CONF_VARS array. Will be set internally in ->TYPO3_CONF_VARS
-        * @param mixed The value of t3lib_div::_GP('id')
-        * @param integer The value of t3lib_div::_GP('type')
-        * @param boolean The value of t3lib_div::_GP('no_cache'), evaluated to 1/0
-        * @param string The value of t3lib_div::_GP('cHash')
-        * @param string The value of t3lib_div::_GP('jumpurl')
-        * @param string The value of t3lib_div::_GP('MP')
-        * @param string The value of t3lib_div::_GP('RDCT')
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tslib_fe($TYPO3_CONF_VARS, $id, $type, $no_cache = '', $cHash = '', $jumpurl = '', $MP = '', $RDCT = '') {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tslib_fe::__construct($TYPO3_CONF_VARS, $id, $type, $no_cache, $cHash, $jumpurl, $MP, $RDCT);
-       }
-
-       /**
         * Connect to SQL database. May exit after outputting an error message
         * or some JavaScript redirecting to the install tool.
         *
                }
        }
 
-       /**
-        * Looking for a ADMCMD_prev code, looks it up if found and returns configuration data.
-        * Background: From the backend a request to the frontend to show a page, possibly with workspace preview can be "recorded" and associated with a keyword. When the frontend is requested with this keyword the associated request parameters are restored from the database AND the backend user is loaded - only for that request.
-        * The main point is that a special URL valid for a limited time, eg. http://localhost/typo3site/index.php?ADMCMD_prev=035d9bf938bd23cb657735f68a8cedbf will open up for a preview that doesn't require login. Thus it's useful for sending in an email to someone without backend account.
-        * This can also be used to generate previews of hidden pages, start/endtimes, usergroups and those other settings from the Admin Panel - just not implemented yet.
-        *
-        * @return      array           Preview configuration array from sys_preview record.
-        * @see t3lib_BEfunc::compilePreviewKeyword()
-        * @deprecated since TYPO3 4.6, should be removed in TYPO3 4.8, this is now in Tx_Version
-        */
-       function ADMCMD_preview() {
-               t3lib_div::logDeprecatedFunction();
-               $inputCode = t3lib_div::_GP('ADMCMD_prev');
-
-                       // If no inputcode and a cookie is set, load input code from cookie:
-               if (!$inputCode && $_COOKIE['ADMCMD_prev'])     {
-                       $inputCode = $_COOKIE['ADMCMD_prev'];
-               }
-
-                       // If inputcode now, look up the settings:
-               if ($inputCode) {
-
-                       if ($inputCode=='LOGOUT') {     // "log out":
-                               SetCookie('ADMCMD_prev', '', 0, t3lib_div::getIndpEnv('TYPO3_SITE_PATH'));
-                               if ($this->TYPO3_CONF_VARS['FE']['workspacePreviewLogoutTemplate'])     {
-                                       if (@is_file(PATH_site.$this->TYPO3_CONF_VARS['FE']['workspacePreviewLogoutTemplate'])) {
-                                               $message = t3lib_div::getUrl(PATH_site.$this->TYPO3_CONF_VARS['FE']['workspacePreviewLogoutTemplate']);
-                                       } else {
-                                               $message = '<strong>ERROR!</strong><br>Template File "'.$this->TYPO3_CONF_VARS['FE']['workspacePreviewLogoutTemplate'].'" configured with $TYPO3_CONF_VARS["FE"]["workspacePreviewLogoutTemplate"] not found. Please contact webmaster about this problem.';
-                                       }
-                               } else {
-                                       $message = 'You logged out from Workspace preview mode. Click this link to <a href="%1$s">go back to the website</a>';
-                               }
-
-                               $returnUrl = t3lib_div::sanitizeLocalUrl(t3lib_div::_GET('returnUrl'));
-                               die(sprintf($message,
-                                       htmlspecialchars(preg_replace('/\&?ADMCMD_prev=[[:alnum:]]+/', '', $returnUrl))
-                                       ));
-                       }
-
-                               // Look for keyword configuration record:
-                       $previewData = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
-                               '*',
-                               'sys_preview',
-                               'keyword='.$GLOBALS['TYPO3_DB']->fullQuoteStr($inputCode, 'sys_preview').
-                                       ' AND endtime>' . $GLOBALS['EXEC_TIME']
-                       );
-
-                               // Get: Backend login status, Frontend login status
-                               // - Make sure to remove fe/be cookies (temporarily); BE already done in ADMCMD_preview_postInit()
-                       if (is_array($previewData))     {
-                               if (!count(t3lib_div::_POST())) {
-                                               // Unserialize configuration:
-                                       $previewConfig = unserialize($previewData['config']);
-
-                                       if ($previewConfig['fullWorkspace']) {  // For full workspace preview we only ADD a get variable to set the preview of the workspace - so all other Get vars are accepted. Hope this is not a security problem. Still posting is not allowed and even if a backend user get initialized it shouldn't lead to situations where users can use those credentials.
-
-                                                       // Set the workspace preview value:
-                                               t3lib_div::_GETset($previewConfig['fullWorkspace'],'ADMCMD_previewWS');
-
-                                                       // If ADMCMD_prev is set the $inputCode value cannot come from a cookie and we set that cookie here. Next time it will be found from the cookie if ADMCMD_prev is not set again...
-                                               if (t3lib_div::_GP('ADMCMD_prev'))      {
-                                                       SetCookie('ADMCMD_prev', t3lib_div::_GP('ADMCMD_prev'), 0, t3lib_div::getIndpEnv('TYPO3_SITE_PATH'));   // Lifetime is 1 hour, does it matter much? Requires the user to click the link from their email again if it expires.
-                                               }
-                                               return $previewConfig;
-                                       } elseif (t3lib_div::getIndpEnv('TYPO3_SITE_URL').'index.php?ADMCMD_prev='.$inputCode === t3lib_div::getIndpEnv('TYPO3_REQUEST_URL'))   {
-
-                                                       // Set GET variables:
-                                               $GET_VARS = '';
-                                               parse_str($previewConfig['getVars'], $GET_VARS);
-                                               t3lib_div::_GETset($GET_VARS);
-
-                                                       // Return preview keyword configuration:
-                                               return $previewConfig;
-                                       } else throw new Exception(htmlspecialchars('Request URL did not match "' . t3lib_div::getIndpEnv('TYPO3_SITE_URL') . 'index.php?ADMCMD_prev=' . $inputCode . '"', 1294585190));        // This check is to prevent people from setting additional GET vars via realurl or other URL path based ways of passing parameters.
-                               } else throw new Exception('POST requests are incompatible with keyword preview.', 1294585191);
-                       } else throw new Exception('ADMCMD command could not be executed! (No keyword configuration found)', 1294585192);
-               }
-       }
-
-       /**
-        * Configuration after initialization of TSFE object.
-        * Basically this unsets the BE cookie if any and forces the BE user set according to the preview configuration.
-        *
-        * @param       array           Preview configuration, see ADMCMD_preview()
-        * @return      void
-        * @see ADMCMD_preview(), index_ts.php
-        * @deprecated since TYPO3 4.6, should be removed in TYPO3 4.8, this is now in Tx_Version
-        */
-       function ADMCMD_preview_postInit(array $previewConfig){
-                       // Clear cookies:
-               unset($_COOKIE[t3lib_beUserAuth::getCookieName()]);
-               $this->ADMCMD_preview_BEUSER_uid = $previewConfig['BEUSER_uid'];
-       }
-
-
 
 
 
                $this->pageCache->remove($this->newHash);
        }
 
-       /**
-        * Post processing page cache rows for both get and set.
-        *
-        * @param       array           Input "cache_pages" row, passed by reference!
-        * @param       string          Type of operation, either "get" or "set"
-        * @return      void
-        * @deprecated since 4.6, will be removed in 4.8
-        */
-       function pageCachePostProcess(&$row,$type)      {
-               t3lib_div::logDeprecatedFunction();
-       }
-
        /**
         * Clears cache content for a list of page ids
         *
@@ -4970,4 +4841,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['tslib/class.tslib_fe.php']);
 }
 
-?>
+?>
\ No newline at end of file
index 37da2e7..4b671c3 100644 (file)
@@ -162,19 +162,6 @@ class tslib_pibase {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tslib_pibase() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tslib_pibase::__construct();
-       }
-
-       /**
         * If internal TypoScript property "_DEFAULT_PI_VARS." is set then it will merge the current $this->piVars array onto these default values.
         *
         * @return      void
@@ -1323,4 +1310,4 @@ class tslib_pibase {
 
 // NO extension of class - does not make sense here.
 
-?>
+?>
\ No newline at end of file
index 4e856c8..d7dfccb 100644 (file)
@@ -234,22 +234,6 @@ class tslib_search {
        }
 
        /**
-        * Local version of quotemeta. This is the same as the PHP function
-        * but the vertical line, |, and minus, -, is also escaped with a slash.
-        *
-        * @deprecated This function is deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Please, use preg_quote() instead.
-        * @param       string          String to pass through quotemeta()
-        * @return      string          Return value
-        */
-       function quotemeta($str) {
-               t3lib_div::logDeprecatedFunction();
-
-               $str = str_replace('|','\|',quotemeta($str));
-               #$str = str_replace('-','\-',$str);             // Breaks "-" which should NOT have a slash before it inside of [ ] in a regex.
-               return $str;
-       }
-
-       /**
         * This creates the search-query.
         * In TypoScript this is used for searching only records not hidden, start/endtimed and fe_grouped! (enable-fields, see tt_content)
         * Sets $this->queryParts
index 8252190..f19d8e7 100644 (file)
@@ -68,42 +68,6 @@ class tx_em_Connection_ExtDirectSoap {
        }
 
        /**
-        * Login test with user credentials
-        *
-        * @deprecated since 4.6, will be removed in 4.8
-        * @return array
-        */
-       public function testUserLogin() {
-
-                       // There is a theory which states that if ever anybody discovers exactly what this method is for and why it is here,
-                       // it will instantly disappear and be replaced by something even more bizarre and inexplicable.
-                       // There is another theory which states that this has already happened.
-               t3lib_div::logDeprecatedFunction();
-
-               if (is_array($this->accountData)) {
-                       $login = FALSE;
-                       if ($login) {
-                               $data = array(
-                                       'success' => TRUE,
-                                       'id' => $login
-                               );
-                       } else {
-                               $data = array(
-                                       'success' => FALSE,
-                                       'error' => $GLOBALS['LANG']->sL('LLL:EXT:em/language/locallang.xml:msg_loginFailed')
-                               );
-                       }
-               } else {
-                       $data = array(
-                               'success' => FALSE,
-                               'error' => $GLOBALS['LANG']->sL('LLL:EXT:em/language/locallang.xml:msg_noUserLoginData')
-                       );
-               }
-
-               return $data;
-       }
-
-       /**
         * Show Info of extension record
         *
         * @param  array $record
index e275f5d..9584c88 100755 (executable)
@@ -93,19 +93,6 @@ class localPageTree extends t3lib_browseTree {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function localPageTree() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               localPageTree::__construct();
-       }
-
-       /**
         * Wrapping title from page tree.
         *
         * @param       string          Title to wrap
index 6879232..13f368f 100755 (executable)
@@ -2135,19 +2135,6 @@ class tx_indexedsearch_indexer {
                return $hash;
        }
 
-       /**
-        * Calculates md5 integer hash. This is kept for the compatibility with
-        * previous versions. Delegates actual call to tx_indexedsearch_util.
-        *
-        * @param string $stringToHash String to hash
-        * @return int Integer intepretation of the md5 hash of input string.
-        * @deprecated will be removed in 4.8.
-        */
-       function md5inthash($stringToHash) {
-               t3lib_div::logDeprecatedFunction();
-               return tx_indexedsearch_util::md5inthash($stringToHash);
-       }
-
        /*********************************
         *
         * Internal logging functions
@@ -2217,4 +2204,4 @@ class tx_indexedsearch_indexer {
 if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/indexed_search/class.indexer.php'])) {
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/indexed_search/class.indexer.php']);
 }
-?>
+?>
\ No newline at end of file
index 12746a8..b3cf936 100755 (executable)
@@ -92,19 +92,6 @@ class tx_indexedsearch_lexer {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_indexedsearch_lexer() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_indexedsearch_lexer::__construct();
-       }
-
-       /**
         * Splitting string into words.
         * Used for indexing, can also be used to find words in query.
         *
index a73c974..7ce1d90 100755 (executable)
@@ -1310,19 +1310,6 @@ class tx_indexedsearch extends tslib_pibase {
                }
        }
 
-       /**
-        * This function is deprecated.
-        *
-        * @param string $stringToHash
-        * @return int Integer intepretation of the md5 hash of input string.
-        * @deprecated will be removed in 4.8
-        * @see tx_indexedsearch_util::md5inthash
-        */
-       function md5inthash($stringToHash) {
-               t3lib_div::logDeprecatedFunction();
-               return tx_indexedsearch_util::md5inthash($stringToHash);
-       }
-
        /***********************************
         *
         * HTML output functions
index 3ea8740..2d938f3 100644 (file)
@@ -298,19 +298,6 @@ class tx_install extends t3lib_install {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_install() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_install::__construct();
-       }
-
-       /**
         * Returns TRUE if submitted password is ok.
         *
         * If password is ok, set session as "authorized".
index 8f3b08e..45248be 100755 (executable)
@@ -200,29 +200,6 @@ class language {
        }
 
        /**
-        * Will htmlspecialchar() the input string and before that any charset conversion
-        * will also have taken place if needed (see init())
-        * Used to pipe language labels through just before they are returned.
-        *
-        * @param  string $lStr The string to process
-        * @param  boolean $hsc If set, then the string is htmlspecialchars()'ed
-        * @return string               The processed string
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8 - Use htmlspecialchars() instead.
-        * @see    init()
-        * @access public
-        */
-       public function hscAndCharConv($lStr, $hsc) {
-               t3lib_div::logDeprecatedFunction();
-                       // labels returned from a locallang file used to be in the language of the charset.
-                       // Since TYPO3 4.1 they are always in the charset of the BE.
-               if ($hsc) {
-                       return htmlspecialchars($lStr);
-               } else {
-                       return $lStr;
-               }
-       }
-
-       /**
         * Will convert the input strings special chars (all above 127) to entities.
         * The string is expected to be encoded in UTF-8
         * This function is used to create strings that can be used in the Click Menu
@@ -572,4 +549,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/lang/lang.php']);
 }
 
-?>
+?>
\ No newline at end of file
index 3ca594b..0caa27f 100644 (file)
@@ -65,20 +65,6 @@ class tx_lowlevel_admin_core extends t3lib_cli {
                $this->cli_help['author'] = "Kasper Skaarhoej, (c) 2009";
        }
 
-       /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_admin_core() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_admin_core::__construct();
-       }
-
-
 
 
 
index 6c30f00..0a592e2 100644 (file)
@@ -85,20 +85,6 @@ class tx_lowlevel_cleaner_core extends t3lib_cli {
                $this->cli_help['author'] = "Kasper Skaarhoej, (c) 2006";
        }
 
-       /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_cleaner_core() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_cleaner_core::__construct();
-       }
-
-
 
 
 
index e8f1e1c..40d96c0 100644 (file)
@@ -66,19 +66,6 @@ Cleaning XML for FlexForm fields.
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_cleanflexform() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_cleanflexform::__construct();
-       }
-
-       /**
         * Find orphan records
         * VERY CPU and memory intensive since it will look up the whole page tree!
         *
index 451c02b..9793a04 100644 (file)
@@ -66,19 +66,6 @@ Although deleted records are not errors to be repaired, this tool allows you to
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_deleted() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_deleted::__construct();
-       }
-
-       /**
         * Find orphan records
         * VERY CPU and memory intensive since it will look up the whole page tree!
         *
index dd0b5d4..6674624 100644 (file)
@@ -73,19 +73,6 @@ This will check the system for double files relations.';
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_double_files() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_double_files::__construct();
-       }
-
-       /**
         * Find managed files which are referred to more than one time
         * Fix methods: API in t3lib_refindex that allows to change the value of a reference (we could copy the file) or remove reference
         *
index d0a044c..345fb63 100644 (file)
@@ -78,19 +78,6 @@ Will report lost files.';
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_lost_files() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_lost_files::__construct();
-       }
-
-       /**
         * Find lost files in uploads/ folder
         * FIX METHOD: Simply delete the file...
         *
index 8f8954e..c95b77d 100644 (file)
@@ -76,19 +76,6 @@ This will show you missing files in the TYPO3 system and only report back if err
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_missing_files() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_missing_files::__construct();
-       }
-
-       /**
         * Find file references that points to non-existing files in system
         * Fix methods: API in t3lib_refindex that allows to change the value of a reference (or remove it)
         *
index 0a147bc..c36abfb 100644 (file)
@@ -78,19 +78,6 @@ Reports missing relations';
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_missing_relations() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_missing_relations::__construct();
-       }
-
-       /**
         * Find relations pointing to non-existing records
         * Fix methods: API in t3lib_refindex that allows to change the value of a reference (or remove it) [Only for managed relations!]
         *
index 19b57ee..f87ab46 100644 (file)
@@ -74,19 +74,6 @@ Will report orphan uids from TCA tables.';
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_orphan_records() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_orphan_records::__construct();
-       }
-
-       /**
         * Find orphan records
         * VERY CPU and memory intensive since it will look up the whole page tree!
         *
index 4a5eb76..af3a052 100644 (file)
@@ -74,19 +74,6 @@ Reports problems with RTE images';
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_rte_images() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_rte_images::__construct();
-       }
-
-       /**
         * Analyse situation with RTE magic images. (still to define what the most useful output is).
         * Fix methods: API in t3lib_refindex that allows to change the value of a reference (we could copy the files) or remove reference
         *
index 93a4e29..ffb1653 100644 (file)
@@ -58,19 +58,6 @@ Showing last 25 hour entries from the syslog. More features pending. This is the
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_syslog() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_syslog::__construct();
-       }
-
-       /**
         * Find syslog
         *
         * @return      array
index 6317b1b..73e0fab 100644 (file)
@@ -71,19 +71,6 @@ Automatic Repair:
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function tx_lowlevel_versions() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               tx_lowlevel_versions::__construct();
-       }
-
-       /**
         * Find orphan records
         * VERY CPU and memory intensive since it will look up the whole page tree!
         *
index e2f9d5b..0ee6468 100755 (executable)
@@ -97,18 +97,6 @@ class SC_mod_user_setup_index {
        protected $settingsAreResetToDefault = FALSE;
 
        /**
-        * @var bool
-        * @deprecated since TYPO3 4.6 - will be removed with TYPO3 4.8
-        */
-       protected $installToolFileExists = FALSE;
-
-       /**
-        * @var bool
-        * @deprecated since TYPO3 4.6 - will be removed with TYPO3 4.8
-        */
-       protected $installToolFileKeep = FALSE;
-
-       /**
         * Form protection instance
         *
         * @var t3lib_formprotection_BackendFormProtection
@@ -284,13 +272,6 @@ class SC_mod_user_setup_index {
        function init() {
                $this->MCONF = $GLOBALS['MCONF'];
 
-                       // check Install Tool enable file
-                       // @deprecated since TYPO3 4.6 - will be removed with TYPO3 4.8
-               $this->installToolFileExists = is_file(PATH_typo3conf . 'ENABLE_INSTALL_TOOL');
-               if ($this->installToolFileExists) {
-                       $this->installToolFileKeep = (trim(file_get_contents(PATH_typo3conf . 'ENABLE_INSTALL_TOOL')) === 'KEEP_FILE');
-               }
-
                        // Returns the script user - that is the REAL logged in user! ($GLOBALS[BE_USER] might be another user due to simulation!)
                $scriptUser = $this->getRealScriptUserObj();
                        // ... and checking module access for the logged in user.
@@ -479,50 +460,6 @@ class SC_mod_user_setup_index {
        }
 
        /**
-        * Sets existance of Install Tool file
-        *
-        * @return void
-        * @deprecated since TYPO3 4.6 - will be removed with TYPO3 4.8 - use Tx_Install_Service_BasicService
-        */
-       public function setInstallToolFileExists() {
-               t3lib_div::logDeprecatedFunction();
-               $this->installToolFileExists = is_file(PATH_typo3conf . 'ENABLE_INSTALL_TOOL');
-       }
-
-       /**
-        * Sets property if Install Tool file contains "KEEP_FILE"
-        * @deprecated since TYPO3 4.6 - will be removed with TYPO3 4.8 - use Tx_Install_Service_BasicService
-        */
-       public function setInstallToolFileKeep() {
-               t3lib_div::logDeprecatedFunction();
-               if ($this->installToolFileExists) {
-                       $this->installToolFileKeep = (trim(file_get_contents(PATH_typo3conf . 'ENABLE_INSTALL_TOOL')) === 'KEEP_FILE');
-               }
-       }
-
-       /**
-        * Gets property installToolFileExists
-        *
-        * @return boolean $this->installToolFileExists
-        * @deprecated since TYPO3 4.6 - will be removed with TYPO3 4.8 - use Tx_Install_Service_BasicService
-        */
-       public function getInstallToolFileExists() {
-               t3lib_div::logDeprecatedFunction();
-               return $this->installToolFileExists;
-       }
-
-       /**
-        * Gets property installToolFileKeep
-        *
-        * @return boolean $this->installToolFileKeep
-        * @deprecated since TYPO3 4.6 - will be removed with TYPO3 4.8 - use Tx_Install_Service_BasicService
-        */
-       public function getInstallToolFileKeep() {
-               t3lib_div::logDeprecatedFunction();
-               return $this->installToolFileKeep;
-       }
-
-       /**
         * Prints the content / ends page
         *
         * @return      void
@@ -1020,4 +957,4 @@ $LANG->includeLLFile('EXT:setup/mod/locallang.xml');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
+?>
\ No newline at end of file
index cdc7504..cd4f4a1 100644 (file)
@@ -219,19 +219,6 @@ class template {
        }
 
        /**
-        * Compatibility constructor.
-        *
-        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
-        */
-       public function template() {
-               t3lib_div::logDeprecatedFunction();
-                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
-                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
-                       // statically called non-static method inherits $this from the caller's scope.
-               template::__construct();
-       }
-
-       /**
         * Gets instance of PageRenderer
         *
         * @return      t3lib_PageRenderer
@@ -1416,58 +1403,8 @@ $str.=$this->docBodyTagBegin().
                        </table>';
        }
 
-       /**
-        * Creates a selector box with clear-cache items.
-        * Rather specialized functions - at least don't use it with $addSaveOptions unless you know what you do...
-        *
-        * @param       integer         The page uid of the "current page" - the one that will be cleared as "clear cache for this page".
-        * @param       boolean         If $addSaveOptions is set, then also the array of save-options for TCE_FORMS will appear.
-        * @return      string          <select> tag with content - a selector box for clearing the cache
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8
-        */
-       function clearCacheMenu($id,$addSaveOptions=0)  {
-               t3lib_div::logDeprecatedFunction();
-               $opt=array();
-               if ($addSaveOptions)    {
-                       $opt[]='<option value="">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.menu',1).'</option>';
-                       $opt[]='<option value="TBE_EDITOR.checkAndDoSubmit(1);">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc',1).'</option>';
-                       $opt[]='<option value="document.editform.closeDoc.value=-2; TBE_EDITOR.checkAndDoSubmit(1);">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveCloseDoc',1).'</option>';
-                       if ($GLOBALS['BE_USER']->uc['allSaveFunctions']) {
-                               $opt[] = '<option value="document.editform.closeDoc.value=-3; TBE_EDITOR.checkAndDoSubmit(1);">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveCloseAllDocs', 1) . '</option>';
-                       }
-                       $opt[]='<option value="document.editform.closeDoc.value=2; document.editform.submit();">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc',1).'</option>';
-                       $opt[]='<option value="document.editform.closeDoc.value=3; document.editform.submit();">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeAllDocs',1).'</option>';
-                       $opt[]='<option value=""></option>';
-               }
-               $opt[]='<option value="">[ '.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.clearCache_clearCache',1).' ]</option>';
-               if ($id) $opt[]='<option value="'.$id.'">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.clearCache_thisPage',1).'</option>';
-               if ($GLOBALS['BE_USER']->isAdmin() || $GLOBALS['BE_USER']->getTSConfigVal('options.clearCache.pages')) {
-                       $opt[] = '<option value="pages">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.clearCache_pages', 1) . '</option>';
-               }
-               if ($GLOBALS['BE_USER']->isAdmin() || $GLOBALS['BE_USER']->getTSConfigVal('options.clearCache.all')) {
-                       $opt[] = '<option value="all">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.clearCache_all', 1) . '</option>';
-               }
-
-               $onChange = 'if (!this.options[this.selectedIndex].value) {
-                               this.selectedIndex=0;
-                       } else if (this.options[this.selectedIndex].value.indexOf(\';\')!=-1) {
-                               eval(this.options[this.selectedIndex].value);
-                       } else {
-                               window.location.href=\'' . $this->backPath .
-                                               'tce_db.php?vC=' . $GLOBALS['BE_USER']->veriCode() .
-                                               t3lib_BEfunc::getUrlToken('tceAction') .
-                                               '&redirect=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')) .
-                                               '&cacheCmd=\'+this.options[this.selectedIndex].value;
-                       }';
-               $af_content = '<select name="cacheCmd" onchange="'.htmlspecialchars($onChange).'">'.implode('',$opt).'</select>';
-
-               if (count($opt)>1)      {
-                       return $af_content;
-               }
-       }
-
 
-       /**
+       /**
         * Includes a javascript library that exists in the core /typo3/ directory. The
         * backpath is automatically applied
         *
@@ -2177,4 +2114,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
 $GLOBALS['TBE_TEMPLATE'] = t3lib_div::makeInstance('template');
 
 
-?>
+?>
\ No newline at end of file