[TASK] update eID scripts for TYPO3 7.0
authorAlex Kellner <alexander.kellner@in2code.de>
Wed, 25 Feb 2015 15:39:28 +0000 (16:39 +0100)
committerAlex Kellner <alexander.kellner@in2code.de>
Wed, 25 Feb 2015 15:39:28 +0000 (16:39 +0100)
Also updated ext_emconf.php with new version number

Classes/Utility/Eid/ClearSessionEid.php
Classes/Utility/Eid/DeRequiredFieldEid.php
Classes/Utility/Eid/DeRequiredFieldsEid.php
Classes/Utility/Eid/DebugSessionEid.php
Classes/Utility/Eid/GetFieldlistEid.php
Classes/Utility/Eid/ReadSessionEid.php
Classes/Utility/Eid/RequiredFieldEid.php
Classes/Utility/Eid/RequiredFieldsEid.php
Classes/Utility/Eid/SaveInSessionEid.php
ext_emconf.php

index cccb67f..5d52d03 100644 (file)
@@ -1,7 +1,9 @@
 <?php
 namespace In2code\PowermailCond\Utility\Eid;
 
-use \TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Frontend\Utility\EidUtility;
+use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 /***************************************************************
  *  Copyright notice
@@ -61,7 +63,7 @@ class ClearSessionEid {
         * @return void
         */
        public function main() {
-               $GLOBALS['TSFE']->sesData = \TYPO3\CMS\Frontend\Utility\EidUtility::initFeUser();
+               $GLOBALS['TSFE']->sesData = EidUtility::initFeUser();
                $piVars = GeneralUtility::_GP($this->prefixId);
                $form = intval($piVars['form']);
                $this->div->cleanfullSession($form, 'fieldSession');
@@ -70,27 +72,27 @@ class ClearSessionEid {
 
        /**
         * Initialize eID
+        *
+        * @param array $typo3ConfigurationVariables
         */
-       public function __construct($TYPO3_CONF_VARS) {
-               $userObj = \TYPO3\CMS\Frontend\Utility\EidUtility::initFeUser();
+       public function __construct($typo3ConfigurationVariables) {
                $GLOBALS['TSFE'] = GeneralUtility::makeInstance(
                        '\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController',
-                       $TYPO3_CONF_VARS,
+                       $typo3ConfigurationVariables,
                        32,
                        0,
                        TRUE
                );
                $GLOBALS['TSFE']->connectToDB();
-               $GLOBALS['TSFE']->fe_user = $userObj;
+               $GLOBALS['TSFE']->fe_user = EidUtility::initFeUser();
                $GLOBALS['TSFE']->id = GeneralUtility::_GET('id');
                $GLOBALS['TSFE']->determineId();
-               $GLOBALS['TSFE']->getCompressedTCarray();
                $GLOBALS['TSFE']->initTemplate();
                $GLOBALS['TSFE']->getConfigArray();
-               $GLOBALS['TSFE']->includeTCA();
 
                $this->div = GeneralUtility::makeInstance('\In2code\PowermailCond\Utility\Div');
        }
 }
+/** @var \In2code\PowermailCond\Utility\Eid\ClearSessionEid $eid */
 $eid = GeneralUtility::makeInstance('In2code\PowermailCond\Utility\Eid\ClearSessionEid', $GLOBALS['TYPO3_CONF_VARS']);
-echo $eid->main();
\ No newline at end of file
+$eid->main();
\ No newline at end of file
index deebcc6..c7a23c2 100644 (file)
@@ -87,10 +87,8 @@ class DeRequiredFieldEid {
                $GLOBALS['TSFE']->fe_user = $userObj;
                $GLOBALS['TSFE']->id = GeneralUtility::_GET('id');
                $GLOBALS['TSFE']->determineId();
-               $GLOBALS['TSFE']->getCompressedTCarray();
                $GLOBALS['TSFE']->initTemplate();
                $GLOBALS['TSFE']->getConfigArray();
-               $GLOBALS['TSFE']->includeTCA();
 
                $this->div = GeneralUtility::makeInstance('\In2code\PowermailCond\Utility\Div');
        }
index cd95d04..0d46ac4 100644 (file)
@@ -88,10 +88,8 @@ class DeRequiredFieldsEid {
                $GLOBALS['TSFE']->fe_user = $userObj;
                $GLOBALS['TSFE']->id = GeneralUtility::_GET('id');
                $GLOBALS['TSFE']->determineId();
-               $GLOBALS['TSFE']->getCompressedTCarray();
                $GLOBALS['TSFE']->initTemplate();
                $GLOBALS['TSFE']->getConfigArray();
-               $GLOBALS['TSFE']->includeTCA();
 
                $this->div = GeneralUtility::makeInstance('\In2code\PowermailCond\Utility\Div');
        }
index fe05dd7..706c44b 100644 (file)
@@ -77,10 +77,8 @@ class DebugSessionEid {
                $GLOBALS['TSFE']->fe_user = $userObj;
                $GLOBALS['TSFE']->id = GeneralUtility::_GET('id');
                $GLOBALS['TSFE']->determineId();
-               $GLOBALS['TSFE']->getCompressedTCarray();
                $GLOBALS['TSFE']->initTemplate();
                $GLOBALS['TSFE']->getConfigArray();
-               $GLOBALS['TSFE']->includeTCA();
                $GLOBALS['BE_USER'] = GeneralUtility::makeInstance('\TYPO3\CMS\Core\Authentication\BackendUserAuthentication');
                $GLOBALS['BE_USER']->start();
                $GLOBALS['BE_USER']->backendCheckLogin();
index 5c2c2bf..3b4a608 100644 (file)
@@ -304,10 +304,8 @@ class GetFieldlistEid {
                $GLOBALS['TSFE']->fe_user = $userObj;
                $GLOBALS['TSFE']->id = GeneralUtility::_GET('id');
                $GLOBALS['TSFE']->determineId();
-               $GLOBALS['TSFE']->getCompressedTCarray();
                $GLOBALS['TSFE']->initTemplate();
                $GLOBALS['TSFE']->getConfigArray();
-               $GLOBALS['TSFE']->includeTCA();
 
                $this->piVars = GeneralUtility::_GET($this->prefixId);
                $this->div = GeneralUtility::makeInstance('In2code\PowermailCond\Utility\Div');
index 8a7eeb1..62b370e 100644 (file)
@@ -87,10 +87,8 @@ class ReadSessionEid {
                $GLOBALS['TSFE']->fe_user = $userObj;
                $GLOBALS['TSFE']->id = GeneralUtility::_GET('id');
                $GLOBALS['TSFE']->determineId();
-               $GLOBALS['TSFE']->getCompressedTCarray();
                $GLOBALS['TSFE']->initTemplate();
                $GLOBALS['TSFE']->getConfigArray();
-               $GLOBALS['TSFE']->includeTCA();
 
                $this->div = GeneralUtility::makeInstance('\In2code\PowermailCond\Utility\Div');
        }
index a1e34a2..36484e3 100644 (file)
@@ -84,10 +84,8 @@ class RequiredFieldEid {
                $GLOBALS['TSFE']->fe_user = $userObj;
                $GLOBALS['TSFE']->id = GeneralUtility::_GET('id');
                $GLOBALS['TSFE']->determineId();
-               $GLOBALS['TSFE']->getCompressedTCarray();
                $GLOBALS['TSFE']->initTemplate();
                $GLOBALS['TSFE']->getConfigArray();
-               $GLOBALS['TSFE']->includeTCA();
 
                $this->div = GeneralUtility::makeInstance('\In2code\PowermailCond\Utility\Div');
        }
index 6f61bfc..118f7b2 100644 (file)
@@ -81,10 +81,8 @@ class RequiredFieldsEid {
                $GLOBALS['TSFE']->fe_user = $userObj;
                $GLOBALS['TSFE']->id = GeneralUtility::_GET('id');
                $GLOBALS['TSFE']->determineId();
-               $GLOBALS['TSFE']->getCompressedTCarray();
                $GLOBALS['TSFE']->initTemplate();
                $GLOBALS['TSFE']->getConfigArray();
-               $GLOBALS['TSFE']->includeTCA();
 
                $this->div = GeneralUtility::makeInstance('\In2code\PowermailCond\Utility\Div');
        }
index 84d28a1..bd607ca 100644 (file)
@@ -94,10 +94,8 @@ class SaveInSessionEid {
                $GLOBALS['TSFE']->fe_user = $userObj;
                $GLOBALS['TSFE']->id = GeneralUtility::_GET('id');
                $GLOBALS['TSFE']->determineId();
-               $GLOBALS['TSFE']->getCompressedTCarray();
                $GLOBALS['TSFE']->initTemplate();
                $GLOBALS['TSFE']->getConfigArray();
-               $GLOBALS['TSFE']->includeTCA();
 
                $this->div = GeneralUtility::makeInstance('\In2code\PowermailCond\Utility\Div');
        }
index 937c311..49258da 100644 (file)
@@ -34,10 +34,10 @@ $EM_CONF[$_EXTKEY] = array(
        'CGLcompliance_note' => '',
        'constraints' => array(
                'depends' => array(
-                       'powermail' => '2.1.0-2.1.99',
-                       'extbase' => '6.2.0-6.2.99',
-                       'fluid' => '6.2.0-6.2.99',
-                       'typo3' => '6.2.0-6.2.99',
+                       'powermail' => '2.1.0-2.2.99',
+                       'extbase' => '6.2.0-7.99.99',
+                       'fluid' => '6.2.0-7.99.99',
+                       'typo3' => '6.2.0-7.99.99',
                ),
                'conflicts' => array(
                ),