[BUGFIX] Migrate from mcrypt to openssl 73/55173/2
authorStanislas Rolland <typo3@sjbr.ca>
Wed, 20 Dec 2017 02:34:16 +0000 (21:34 -0500)
committerStanislas Rolland <typo3@sjbr.ca>
Wed, 20 Dec 2017 02:35:56 +0000 (03:35 +0100)
Follow-up: Remove reference to PHP mcrypt extension

Resolves: #82716
Change-Id: Icfeb2740449d621f3495e8fdc40fe9e0f234da9d
Reviewed-on: https://review.typo3.org/55173
Reviewed-by: Stanislas Rolland <typo3@sjbr.ca>
Tested-by: Stanislas Rolland <typo3@sjbr.ca>
ChangeLog
Classes/ViewHelpers/AudioViewHelper.php

index da98e6f..a4f3731 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2017-12-19  Stanislas Rolland  <typo(arobas)sjbr.ca>
        * Resolves #80906: Unknown Exception thrown when domain model with validator is used in backend context
+       * Resolves #82716: Migrate from mcrypt to openssl (follow-up)
 
 2017-10-16  Stanislas Rolland  <typo(arobas)sjbr.ca>
        * Resolves #82716: Migrate from mcrypt to openssl
index 00775c4..789a0c3 100644 (file)
@@ -79,10 +79,10 @@ class AudioViewHelper extends AbstractTagBasedViewHelper
                $translator = GeneralUtility::makeInstance(TranslateViewHelper::class);
                $translator->injectConfigurationManager($this->configurationManager);
                // Get browser info: in IE 8, we will use a simple link, as dynamic insertion of object element gives unpredictable results
-                $browserInfo = ClientUtility::getBrowserInfo(GeneralUtility::getIndpEnv('HTTP_USER_AGENT'));
-                $browerIsIE8 = $browserInfo['browser'] == 'msie' && $browserInfo['version'] == '8';
+        $browserInfo = ClientUtility::getBrowserInfo(GeneralUtility::getIndpEnv('HTTP_USER_AGENT'));
+        $browerIsIE8 = $browserInfo['browser'] == 'msie' && $browserInfo['version'] == '8';
                // Generate the icon
-               if ($settings['accessibleOutput'] && in_array('mcrypt', get_loaded_extensions()) && intval($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem'])) {
+               if ($settings['accessibleOutput'] && (int)$GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
                        $fakeId = GeneralUtility::shortMD5(uniqid (rand()),5);
                        $siteURL = GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
                        $urlParams = array(
@@ -95,7 +95,7 @@ class AudioViewHelper extends AbstractTagBasedViewHelper
                                'actionName' => 'play',
                                'formatName' => $browerIsIE8 ? 'mp3' : 'wav',
                        );
-                       $L = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('L');
+                       $L = GeneralUtility::_GP('L');
                        if (isset($L)) {
                                $urlParams['L'] = htmlspecialchars($L);
                        }