[TASK] RTE: Remove directories pi1, pi2 and pi3 27/33727/2
authorStanislas Rolland <typo3@sjbr.ca>
Sun, 2 Nov 2014 21:47:35 +0000 (16:47 -0500)
committerStanislas Rolland <typo3@sjbr.ca>
Mon, 3 Nov 2014 13:25:33 +0000 (14:25 +0100)
Remove directories pi1, pi2 and pi3 and adapt configuration of spell
checker, frontend RTE and click enlarge features accordingly.

Releases: master
Resolves: #62632
Change-Id: Idc9954d4eb3e03aba5f1b042f1dbc2f0dabc2d88
Reviewed-on: http://review.typo3.org/33727
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Stanislas Rolland <typo3@sjbr.ca>
Tested-by: Stanislas Rolland <typo3@sjbr.ca>
typo3/sysext/rtehtmlarea/Resources/Private/PHP/SpellCheckerEid.php [new file with mode: 0644]
typo3/sysext/rtehtmlarea/ext_autoload.php
typo3/sysext/rtehtmlarea/ext_localconf.php
typo3/sysext/rtehtmlarea/pi1/class.tx_rtehtmlarea_pi1.php [deleted file]
typo3/sysext/rtehtmlarea/pi1/locallang.xlf [deleted file]
typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php [deleted file]
typo3/sysext/rtehtmlarea/pi2/locallang.xlf [deleted file]
typo3/sysext/rtehtmlarea/pi3/class.tx_rtehtmlarea_pi3.php [deleted file]
typo3/sysext/rtehtmlarea/static/clickenlarge/setup.txt

diff --git a/typo3/sysext/rtehtmlarea/Resources/Private/PHP/SpellCheckerEid.php b/typo3/sysext/rtehtmlarea/Resources/Private/PHP/SpellCheckerEid.php
new file mode 100644 (file)
index 0000000..e6019e6
--- /dev/null
@@ -0,0 +1,19 @@
+<?php
+namespace TYPO3\CMS\Rtehtmlarea\Controller;
+
+/**
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+if (TYPO3_MODE === 'FE') {
+       $spellChecker = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Rtehtmlarea\\Controller\\SpellCheckingController');
+       $spellChecker->main();
+}
\ No newline at end of file
index 35aa6fe..291192e 100644 (file)
@@ -4,8 +4,5 @@
  */
 $rtehtmlareaExtensionPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('rtehtmlarea');
 return array(
-       'tx_rtehtmlarea_pi1' => $rtehtmlareaExtensionPath . 'pi1/class.tx_rtehtmlarea_pi1.php',
-       'tx_rtehtmlarea_pi2' => $rtehtmlareaExtensionPath . 'pi2/class.tx_rtehtmlarea_pi2.php',
-       'tx_rtehtmlarea_pi3' => $rtehtmlareaExtensionPath . 'pi3/class.tx_rtehtmlarea_pi3.php',
        'AccessibilityLinkController' => $rtehtmlareaExtensionPath . 'Classes/Controller/AccessibilityLinkController.php',
 );
index 33172f3..189ad25 100644 (file)
@@ -169,7 +169,7 @@ $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['Language']['addIconsToSkin'] =
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['Language']['disableInFE'] = 0;
 
 // Spell checking configuration
-$TYPO3_CONF_VARS['FE']['eID_include']['rtehtmlarea_spellchecker'] = 'EXT:' . $_EXTKEY . '/pi1/class.tx_rtehtmlarea_pi1.php';
+$TYPO3_CONF_VARS['FE']['eID_include']['rtehtmlarea_spellchecker'] = 'EXT:' . $_EXTKEY . '/Resources/Private/PHP/SpellCheckerEid.php';
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerAjaxHandler('rtehtmlarea::spellchecker', 'TYPO3\\CMS\\Rtehtmlarea\\Controller\\SpellCheckingController->main');
 
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['SpellChecker'] = array();
diff --git a/typo3/sysext/rtehtmlarea/pi1/class.tx_rtehtmlarea_pi1.php b/typo3/sysext/rtehtmlarea/pi1/class.tx_rtehtmlarea_pi1.php
deleted file mode 100644 (file)
index f324288..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_rtehtmlarea_pi1 and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('rtehtmlarea') . 'Classes/Controller/SpellCheckingController.php';
-if (TYPO3_MODE == 'FE') {
-       $spellChecker = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Rtehtmlarea\\Controller\\SpellCheckingController');
-       $spellChecker->main();
-}
diff --git a/typo3/sysext/rtehtmlarea/pi1/locallang.xlf b/typo3/sysext/rtehtmlarea/pi1/locallang.xlf
deleted file mode 100644 (file)
index 3706939..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0">
-       <file source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:36Z" product-name="rtehtmlarea">
-               <header/>
-               <body>
-                       <trans-unit id="tx_srspellcheck_pi1.list_type" xml:space="preserve">
-                               <source>Spell Checking for HTMLArea RTE</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php b/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
deleted file mode 100644 (file)
index 75695eb..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_rtehtmlarea_pi2 and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/rtehtmlarea/Classes/Controller/FrontendRteController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('rtehtmlarea') . 'Classes/Controller/FrontendRteController.php';
diff --git a/typo3/sysext/rtehtmlarea/pi2/locallang.xlf b/typo3/sysext/rtehtmlarea/pi2/locallang.xlf
deleted file mode 100644 (file)
index b67d5dc..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0">
-       <file source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:36Z" product-name="rtehtmlarea">
-               <header/>
-               <body>
-                       <trans-unit id="tx_rtepbhtmlarea_pi2.list_type" xml:space="preserve">
-                               <source>Front End HTMLArea RTE</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/rtehtmlarea/pi3/class.tx_rtehtmlarea_pi3.php b/typo3/sysext/rtehtmlarea/pi3/class.tx_rtehtmlarea_pi3.php
deleted file mode 100644 (file)
index 9625e77..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_rtehtmlarea_pi3 and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/rtehtmlarea/Classes/Controller/CustomAttributeController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('rtehtmlarea') . 'Classes/Controller/CustomAttributeController.php';
index 3a05242..7e18f12 100644 (file)
@@ -1,13 +1,11 @@
 #******************************************************
 # Including library for processing of custom tag "clickenlarge"
 #******************************************************
-includeLibs.tx_rtehtmlarea_pi3 = EXT:rtehtmlarea/pi3/class.tx_rtehtmlarea_pi3.php
-
 lib.parseFunc_RTE {
        tags.img = TEXT
        tags.img {
                current = 1
-               postUserFunc = tx_rtehtmlarea_pi3->render_clickenlarge
+               postUserFunc = TYPO3\CMS\Rtehtmlarea\Controller\CustomAttributeController->render_clickenlarge
                postUserFunc.imageLinkWrap < tt_content.image.20.1.imageLinkWrap
                postUserFunc.imageLinkWrap {
                        JSwindow.altUrl >