TYPO3 8.x release

tollwerk · Dec 21, 2016 · cade903 · cade903
1 parent 7f93771
commit cade903
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 85 deletions.
diff --git a/Configuration/TCA/Email.php b/Configuration/TCA/Email.php
@@ -4,7 +4,22 @@
 }
 
 $GLOBALS['TCA']['tx_twantibot_domain_model_email'] = array(
-    'ctrl' => $GLOBALS['TCA']['tx_twantibot_domain_model_email']['ctrl'],
+    'ctrl' => array(
+        'title' => 'LLL:EXT:tw_antibot/Resources/Private/Language/locallang_db.xlf:tx_twantibot_domain_model_email',
+        'label' => 'email',
+        'tstamp' => 'tstamp',
+        'crdate' => 'crdate',
+        'cruser_id' => 'cruser_id',
+        'dividers2tabs' => true,
+
+        'enablecolumns' => array(
+            'disabled' => 'hidden',
+            'endtime' => 'endtime',
+        ),
+        'searchFields' => 'email,',
+        'dynamicConfigFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('tw_antibot').'Configuration/TCA/Email.php',
+        'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('tw_antibot').'Resources/Public/Icons/tx_twantibot_domain_model_email.png'
+    ),
     'interface' => array(
         'showRecordFieldList' => 'hidden, email, submission',
     ),

diff --git a/Configuration/TCA/Ip.php b/Configuration/TCA/Ip.php
@@ -4,7 +4,22 @@
 }
 
 $GLOBALS['TCA']['tx_twantibot_domain_model_ip'] = array(
-    'ctrl' => $GLOBALS['TCA']['tx_twantibot_domain_model_ip']['ctrl'],
+    'ctrl' => array(
+        'title' => 'LLL:EXT:tw_antibot/Resources/Private/Language/locallang_db.xlf:tx_twantibot_domain_model_ip',
+        'label' => 'ip',
+        'tstamp' => 'tstamp',
+        'crdate' => 'crdate',
+        'cruser_id' => 'cruser_id',
+        'dividers2tabs' => true,
+
+        'enablecolumns' => array(
+            'disabled' => 'hidden',
+            'endtime' => 'endtime',
+        ),
+        'searchFields' => 'ip,',
+        'dynamicConfigFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('tw_antibot').'Configuration/TCA/Ip.php',
+        'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('tw_antibot').'Resources/Public/Icons/tx_twantibot_domain_model_ip.png'
+    ),
     'interface' => array(
         'showRecordFieldList' => 'hidden, ip, endtime',
     ),

diff --git a/Configuration/TCA/Submission.php b/Configuration/TCA/Submission.php
@@ -4,7 +4,21 @@
 }
 
 $GLOBALS['TCA']['tx_twantibot_domain_model_submission'] = array(
-    'ctrl' => $GLOBALS['TCA']['tx_twantibot_domain_model_submission']['ctrl'],
+    'ctrl' => array(
+        'title' => 'LLL:EXT:tw_antibot/Resources/Private/Language/locallang_db.xlf:tx_twantibot_domain_model_submission',
+        'label' => 'reason',
+        'label_alt' => 'ip,crdate',
+        'label_alt_force' => true,
+        'tstamp' => 'tstamp',
+        'crdate' => 'crdate',
+        'cruser_id' => 'cruser_id',
+        'dividers2tabs' => true,
+
+        'enablecolumns' => array(),
+        'searchFields' => 'reason,ip',
+        'dynamicConfigFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('tw_antibot').'Configuration/TCA/Submission.php',
+        'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('tw_antibot').'Resources/Public/Icons/tx_twantibot_domain_model_submission.png'
+    ),
     'interface' => array(
         'showRecordFieldList' => 'ip, reason, ip, settings, data, fields',
     ),

diff --git a/README.md b/README.md
@@ -9,21 +9,16 @@ The extension was heavily inspired by [Karl Groves](http://www.karlgroves.com/)'
 Installation
 ============
 
-Right now the extension is not yet released to the TYPO3 extension directory (TER), but you may install it from GitHub:
+Install the extension into your composer mode TYPO3 installation:
 
 ```bash
-cd typo3conf/ext
-git clone [email protected]:tollwerk/TYPO3-ext-tw_antibot.git tw_antibot
+cd /path/to/site/root
+composer require tollwerk/tw-antibot
 ``` 
 
 Simply add *Antibot*'s static TypoScript to your main template then and start configuring the desired options.
 
-*Antibot* supports [ChromePhp](https://github.com/ccampbell/chromephp) for logging to your Chrome console. If you want to use it, please pull in ChromePhp via Composer:
-
-```bash
-cd typo3conf/ext/tw_antibot/Resources/Private
-composer install
-``` 
+*Antibot* supports [ChromePhp](https://github.com/ccampbell/chromephp) for logging to your Chrome console. During installation, composer will pull in ChromePhp automatically.
 
 
 Configuration

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
   "homepage": "https://github.com/tollwerk/TYPO3-ext-tw_antibot",
   "license": "GPL-2.0+",
   "require": {
-    "typo3/cms": "*",
+    "typo3/cms": "8.x",
     "ccampbell/chromephp": "*"
   },
   "autoload": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -21,11 +21,11 @@
 	'uploadfolder' => '0',
 	'createDirs' => '',
 	'clearCacheOnLoad' => 0,
-	'version' => '0.2.0',
+	'version' => '1.0.0',
 	'constraints' => array(
 		'depends' => array(
-			'typo3' => '6.1.0-',
-			'extbase' => '6.1.0-',
+			'typo3' => '8.0.0-',
+			'extbase' => '8.0.0-',
 		),
 		'conflicts' => array(
 		),

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -1,14 +1,8 @@
 <?php
+
 if (!defined ('TYPO3_MODE')) {
 	die ('Access denied.');
 }
 
-// Registering and including classes and namespaces from external libraries (chromephp etc.).
-$composerAutoloader = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY, 'Resources/Private/Libraries/autoload.php');
-if (@file_exists($composerAutoloader)) {
-	require_once ($composerAutoloader);
-}
-unset($composerAutoloader);
-
 // Command controller registration
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'][] = 'Tollwerk\\TwAntibot\\Command\\AntibotCommandController';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'][] = 'Tollwerk\\TwAntibot\\Command\\AntibotCommandController';
diff --git a/ext_tables.php b/ext_tables.php
@@ -1,76 +1,16 @@
 <?php
+
 if (!defined('TYPO3_MODE')) {
 	die('Access denied.');
 }
 
-// Registering and including classes and namespaces from external libraries (chromephp etc.).
-$composerAutoloader = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY, 'Resources/Private/Libraries/autoload.php');
-if (@file_exists($composerAutoloader)) {
-	require_once ($composerAutoloader);
-}
-unset($composerAutoloader);
-
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'Configuration/TypoScript', 'tollwerk Anti-Spambot tools');
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('tx_twantibot_domain_model_ip', 'EXT:tw_antibot/Resources/Private/Language/locallang_csh_tx_twantibot_domain_model_ip.xlf');
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_twantibot_domain_model_ip');
-$GLOBALS['TCA']['tx_twantibot_domain_model_ip'] = array(
-	'ctrl' => array(
-		'title'	=> 'LLL:EXT:tw_antibot/Resources/Private/Language/locallang_db.xlf:tx_twantibot_domain_model_ip',
-		'label' => 'ip',
-		'tstamp' => 'tstamp',
-		'crdate' => 'crdate',
-		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
-
-		'enablecolumns' => array(
-			'disabled' => 'hidden',
-			'endtime' => 'endtime',
-		),
-		'searchFields' => 'ip,',
-		'dynamicConfigFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Configuration/TCA/Ip.php',
-		'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/tx_twantibot_domain_model_ip.png'
-	),
-);
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('tx_twantibot_domain_model_email', 'EXT:tw_antibot/Resources/Private/Language/locallang_csh_tx_twantibot_domain_model_email.xlf');
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_twantibot_domain_model_email');
-$GLOBALS['TCA']['tx_twantibot_domain_model_email'] = array(
-	'ctrl' => array(
-		'title'	=> 'LLL:EXT:tw_antibot/Resources/Private/Language/locallang_db.xlf:tx_twantibot_domain_model_email',
-		'label' => 'email',
-		'tstamp' => 'tstamp',
-		'crdate' => 'crdate',
-		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
-
-		'enablecolumns' => array(
-			'disabled' => 'hidden',
-			'endtime' => 'endtime',
-		),
-		'searchFields' => 'email,',
-		'dynamicConfigFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Configuration/TCA/Email.php',
-		'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/tx_twantibot_domain_model_email.png'
-	),
-);
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('tx_twantibot_domain_model_submission', 'EXT:tw_antibot/Resources/Private/Language/locallang_csh_tx_twantibot_domain_model_submission.xlf');
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_twantibot_domain_model_submission');
-$GLOBALS['TCA']['tx_twantibot_domain_model_submission'] = array(
-	'ctrl' => array(
-		'title'	=> 'LLL:EXT:tw_antibot/Resources/Private/Language/locallang_db.xlf:tx_twantibot_domain_model_submission',
-		'label' => 'reason',
-		'label_alt' => 'ip,crdate',
-		'label_alt_force' => true,
-		'tstamp' => 'tstamp',
-		'crdate' => 'crdate',
-		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
-
-		'enablecolumns' => array(
-		),
-		'searchFields' => 'reason,ip',
-		'dynamicConfigFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Configuration/TCA/Submission.php',
-		'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/tx_twantibot_domain_model_submission.png'
-	),
-);