[TASK] Remove deprecated functions from TypoScriptFrontendController 27/28327/2
authorWouter Wolters <typo3@wouterwolters.nl>
Wed, 12 Mar 2014 20:04:11 +0000 (21:04 +0100)
committerGeorg Ringer <georg.ringer@gmail.com>
Thu, 13 Mar 2014 05:41:18 +0000 (06:41 +0100)
fe_tce
isEXTincScript
getLogIPAddress
getLogHostName
getLogUserName

Resolves: #56849
Releases: 6.2
Change-Id: Ib740ebfbb29734f41e4024746132dd306f4fdd2c
Reviewed-on: https://review.typo3.org/28327
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php

index 2fea2c6..1ebe3b6 100644 (file)
@@ -2692,18 +2692,6 @@ class TypoScriptFrontendController {
                return $ret;
        }
 
-       /**
-        * Processes submitted user data (obsolete "Frontend TCE")
-        *
-        * @return void
-        * @see tslib_feTCE
-        * @deprecated since 6.0, will be removed two versions later
-        * @todo Define visibility
-        */
-       public function fe_tce() {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-       }
-
        /**
         * Checks if a formmail submission can be sent as email
         *
@@ -3784,19 +3772,6 @@ if (version == "n3") {
                }
        }
 
-       /**
-        * Determines if any EXTincScripts should be included
-        *
-        * @return boolean TRUE, if external php scripts should be included (set by PHP_SCRIPT_EXT cObjects)
-        * @see \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::PHP_SCRIPT
-        * @deprecated since 6.0, will be removed two versions later
-        * @todo Define visibility
-        */
-       public function isEXTincScript() {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-               return FALSE;
-       }
-
        /**
         * Stores session data for the front end user
         *
@@ -3823,62 +3798,6 @@ if (version == "n3") {
                $this->scriptParseTime = $GLOBALS['TT']->getMilliseconds($microtime_end) - $GLOBALS['TT']->getMilliseconds($microtime_start) - ($GLOBALS['TT']->getMilliseconds($microtime_BE_USER_end) - $GLOBALS['TT']->getMilliseconds($microtime_BE_USER_start));
        }
 
-       /**
-        * Get the (partially) anonymized IP address for the log file
-        * Configure: set set config.stat_IP_anonymize=1
-        *
-        * @return string the IP to log
-        * @deprecated since 6.0, will be removed with 6.2
-        */
-       public function getLogIPAddress() {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-               $result = GeneralUtility::getIndpEnv('REMOTE_ADDR');
-               if ($this->config['config']['stat_IP_anonymize']) {
-                       if (strpos($result, ':')) {
-                               $result = $this->stripIPv6($result);
-                       } else {
-                               $result = $this->stripIPv4($result);
-                       }
-               }
-               return $result;
-       }
-
-       /**
-        * Get the (possibly) anonymized host name for the log file
-        * Configure: set config.stat_IP_anonymize=1
-        *
-        * @return the host name to log
-        * @deprecated since 6.0, will be removed with 6.2
-        */
-       public function getLogHostName() {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-               if ($this->config['config']['stat_IP_anonymize']) {
-                       // Ignore hostname if IP anonymized
-                       $hostName = '<anonymized>';
-               } else {
-                       $hostName = GeneralUtility::getIndpEnv('REMOTE_HOST');
-               }
-               return $hostName;
-       }
-
-       /**
-        * Get the (possibly) anonymized username or user id for the log file
-        * Configure: set config.stat_IP_anonymize=1
-        *
-        * @return string The user name /uid to log
-        * @deprecated since 6.0, will be removed with 6.2
-        */
-       public function getLogUserName() {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-               $logUser = isset($this->config['config']['stat_logUser']) ? $this->config['config']['stat_logUser'] : TRUE;
-               if ($this->loginUser && $logUser) {
-                       $userName = $this->fe_user->user['username'];
-               } else {
-                       $userName = '-';
-               }
-               return $userName;
-       }
-
        /**
         * Outputs preview info.
         *