From 5d9172850fdd790a424f3f54337e18e915f7a9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20G=C3=B6tzinger?= Date: Mon, 7 Aug 2017 07:33:08 +0200 Subject: [PATCH] Umstellung auf contao-bundle --- composer.json | 51 +++++++++++++++++++ config/autoload.ini | 7 --- config/autoload.php | 48 ----------------- config/database.sql | 29 ----------- public/.htaccess | 7 --- src/CgoITAeoBundle.php | 14 +++++ src/ContaoManager/Plugin.php | 28 ++++++++++ .../Resources/contao/classes/AeoCE.php | 0 .../Resources/contao/classes/AeoHybrid.php | 0 .../contao/classes/AeoJavaScript.php | 0 .../Resources/contao/classes/PageRoot_Aeo.php | 0 .../Resources/contao/config}/config.php | 25 ++++----- .../Resources/contao/dca}/tl_content.php | 26 ++++++---- .../Resources/contao/dca}/tl_module.php | 33 ++++++------ .../Resources/contao/dca}/tl_settings.php | 0 .../contao/languages}/de/default.php | 0 .../contao/languages}/de/modules.php | 0 .../contao/languages}/de/tl_content.php | 0 .../contao/languages}/de/tl_module.php | 0 .../contao/languages}/de/tl_settings.php | 0 .../contao/languages}/en/default.php | 0 .../contao/languages}/en/modules.php | 0 .../contao/languages}/en/tl_content.php | 0 .../contao/languages}/en/tl_module.php | 0 .../contao/languages}/en/tl_settings.php | 0 .../Resources/contao/modules/AeoModule.php | 0 .../contao/templates}/aeo_default_no_js.html5 | 0 .../contao/templates}/aeo_default_no_js.xhtml | 0 .../templates}/js_aeo_deobfuscate.html5 | 0 .../templates}/js_aeo_deobfuscate.xhtml | 0 .../contao/util}/AeoFrontendUtil.php | 0 .../contao/util}/AeoRedirectUtil.php | 0 .../Resources/contao/util}/AeoUtil.php | 0 {public => src/Resources/public}/js/aeo.js | 0 .../Resources/public}/js/aeo.min.js | 0 .../Resources/public}/js/onReadyAeo.js | 0 .../Resources/public}/js/onReadyAeo.min.js | 0 37 files changed, 133 insertions(+), 135 deletions(-) create mode 100644 composer.json delete mode 100644 config/autoload.ini delete mode 100644 config/autoload.php delete mode 100644 config/database.sql delete mode 100644 public/.htaccess create mode 100644 src/CgoITAeoBundle.php create mode 100644 src/ContaoManager/Plugin.php rename AeoCE.php => src/Resources/contao/classes/AeoCE.php (100%) rename AeoHybrid.php => src/Resources/contao/classes/AeoHybrid.php (100%) rename AeoJavaScript.php => src/Resources/contao/classes/AeoJavaScript.php (100%) rename PageRoot_Aeo.php => src/Resources/contao/classes/PageRoot_Aeo.php (100%) rename {config => src/Resources/contao/config}/config.php (56%) rename {dca => src/Resources/contao/dca}/tl_content.php (76%) rename {dca => src/Resources/contao/dca}/tl_module.php (75%) rename {dca => src/Resources/contao/dca}/tl_settings.php (100%) rename {languages => src/Resources/contao/languages}/de/default.php (100%) rename {languages => src/Resources/contao/languages}/de/modules.php (100%) rename {languages => src/Resources/contao/languages}/de/tl_content.php (100%) rename {languages => src/Resources/contao/languages}/de/tl_module.php (100%) rename {languages => src/Resources/contao/languages}/de/tl_settings.php (100%) rename {languages => src/Resources/contao/languages}/en/default.php (100%) rename {languages => src/Resources/contao/languages}/en/modules.php (100%) rename {languages => src/Resources/contao/languages}/en/tl_content.php (100%) rename {languages => src/Resources/contao/languages}/en/tl_module.php (100%) rename {languages => src/Resources/contao/languages}/en/tl_settings.php (100%) rename AeoModule.php => src/Resources/contao/modules/AeoModule.php (100%) rename {templates => src/Resources/contao/templates}/aeo_default_no_js.html5 (100%) rename {templates => src/Resources/contao/templates}/aeo_default_no_js.xhtml (100%) rename {templates => src/Resources/contao/templates}/js_aeo_deobfuscate.html5 (100%) rename {templates => src/Resources/contao/templates}/js_aeo_deobfuscate.xhtml (100%) rename {util => src/Resources/contao/util}/AeoFrontendUtil.php (100%) rename {util => src/Resources/contao/util}/AeoRedirectUtil.php (100%) rename {util => src/Resources/contao/util}/AeoUtil.php (100%) rename {public => src/Resources/public}/js/aeo.js (100%) rename {public => src/Resources/public}/js/aeo.min.js (100%) rename {public => src/Resources/public}/js/onReadyAeo.js (100%) rename {public => src/Resources/public}/js/onReadyAeo.min.js (100%) diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..b594fc5 --- /dev/null +++ b/composer.json @@ -0,0 +1,51 @@ +{ + "name":"cgoit/contao-aeo-bundle", + "description":"Contao 4 Advanced eMail Obfuscation Bundle", + "keywords":["contao","aeo","bundle"], + "type":"contao-bundle", + "homepage":"https://cgo-it.de", + "license":"LGPL-3.0+", + "authors":[ + { + "name":"Carsten Götzinger", + "homepage":"https://cgo-it.de", + "role":"Developer" + } + ], + "support":{ + "issues":"https://git.cgo-it.de/contao/aeo/issues", + "source":"https://git.cgo-it.de/contao/aeo", + "forum":"https://community.contao.org/de/showthread.php?31684-Advanced-eMail-Obfuscation" + }, + "require":{ + "php": ">=5.6.0", + "contao/core-bundle": "~4.3" + }, + "require-dev": { + "contao/manager-plugin": "^2.0" + }, + "conflict": { + "contao/manager-plugin": "<2.0 || >=3.0", + "symfony/symfony": "3.2.7" + }, + "autoload": { + "psr-4": { + "cgoIT\\aeo\\": "src/" + }, + "classmap": [ + "src/Resources/contao/" + ], + "exclude-from-classmap": [ + "src/Resources/contao/config/", + "src/Resources/contao/dca/", + "src/Resources/contao/languages/", + "src/Resources/contao/templates/" + ] + }, + "extra": { + "branch-alias": { + "dev-develop": "3.6.x-dev" + }, + "contao-manager-plugin": "cgoIT\\aeo\\ContaoManager\\Plugin" + } +} diff --git a/config/autoload.ini b/config/autoload.ini deleted file mode 100644 index 56a51b1..0000000 --- a/config/autoload.ini +++ /dev/null @@ -1,7 +0,0 @@ - -;; -; Configure what you want the autoload creator to register -;; -register_namespaces = true -register_classes = true -register_templates = true diff --git a/config/autoload.php b/config/autoload.php deleted file mode 100644 index cb78e0b..0000000 --- a/config/autoload.php +++ /dev/null @@ -1,48 +0,0 @@ - 'system/modules/zaeo/AeoJavaScript.php', - 'cgoIT\aeo\AeoHybrid' => 'system/modules/zaeo/AeoHybrid.php', - 'cgoIT\aeo\AeoCE' => 'system/modules/zaeo/AeoCE.php', - 'cgoIT\aeo\AeoModule' => 'system/modules/zaeo/AeoModule.php', - 'cgoIT\aeo\PageRoot_Aeo' => 'system/modules/zaeo/PageRoot_Aeo.php', - // Util - 'cgoIT\aeo\AeoFrontendUtil' => 'system/modules/zaeo/util/AeoFrontendUtil.php', - 'cgoIT\aeo\AeoRedirectUtil' => 'system/modules/zaeo/util/AeoRedirectUtil.php', - 'cgoIT\aeo\AeoUtil' => 'system/modules/zaeo/util/AeoUtil.php', - 'cgoIT\aeo\McwPageTree' => 'system/modules/zaeo/widgets/McwPageTree.php', -)); - - -/** - * Register the templates - */ -TemplateLoader::addFiles(array -( - 'aeo_default_no_js' => 'system/modules/zaeo/templates', - 'js_aeo_deobfuscate' => 'system/modules/zaeo/templates', -)); diff --git a/config/database.sql b/config/database.sql deleted file mode 100644 index 97c782a..0000000 --- a/config/database.sql +++ /dev/null @@ -1,29 +0,0 @@ --- ********************************************************** --- * * --- * IMPORTANT NOTE * --- * * --- * Do not import this file manually but use the TYPOlight * --- * install tool to create and maintain database tables! * --- * * --- ********************************************************** - - --- --- Table `tl_module` --- -CREATE TABLE `tl_module` ( - `aeo_custom_template` varchar(32) NOT NULL default '', - `aeo_show_info` char(1) NOT NULL default '', - `aeo_info_text` mediumtext NULL, - `aeo_disable` char(1) NOT NULL default '' -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- --- Table `tl_content` --- -CREATE TABLE `tl_content` ( - `aeo_custom_template` varchar(32) NOT NULL default '', - `aeo_show_info` char(1) NOT NULL default '', - `aeo_info_text` mediumtext NULL, - `aeo_disable` char(1) NOT NULL default '' -) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/public/.htaccess b/public/.htaccess deleted file mode 100644 index 28cc359..0000000 --- a/public/.htaccess +++ /dev/null @@ -1,7 +0,0 @@ - - Order allow,deny - Allow from all - - - Require all granted - \ No newline at end of file diff --git a/src/CgoITAeoBundle.php b/src/CgoITAeoBundle.php new file mode 100644 index 0000000..48ef692 --- /dev/null +++ b/src/CgoITAeoBundle.php @@ -0,0 +1,14 @@ +setLoadAfter(['Contao\CoreBundle\ContaoCoreBundle']) + ->setLoadAfter(['*']) + ->setReplace(['aeo']); + ]; + } +} diff --git a/AeoCE.php b/src/Resources/contao/classes/AeoCE.php similarity index 100% rename from AeoCE.php rename to src/Resources/contao/classes/AeoCE.php diff --git a/AeoHybrid.php b/src/Resources/contao/classes/AeoHybrid.php similarity index 100% rename from AeoHybrid.php rename to src/Resources/contao/classes/AeoHybrid.php diff --git a/AeoJavaScript.php b/src/Resources/contao/classes/AeoJavaScript.php similarity index 100% rename from AeoJavaScript.php rename to src/Resources/contao/classes/AeoJavaScript.php diff --git a/PageRoot_Aeo.php b/src/Resources/contao/classes/PageRoot_Aeo.php similarity index 100% rename from PageRoot_Aeo.php rename to src/Resources/contao/classes/PageRoot_Aeo.php diff --git a/config/config.php b/src/Resources/contao/config/config.php similarity index 56% rename from config/config.php rename to src/Resources/contao/config/config.php index 4caa057..082c9e0 100644 --- a/config/config.php +++ b/src/Resources/contao/config/config.php @@ -1,4 +1,4 @@ -. * * PHP version 5 - * @copyright cgo IT, 2012-2013 + * @copyright cgo IT, 2012-2017 * @author Carsten Götzinger (info@cgo-it.de) * @package aeo * @license GNU/LGPL * @filesource */ -// Backwards compatibility for Contao < 3.5.1 -if (!class_exists('StringUtil') && class_exists('String')) { - class_alias('String', 'StringUtil'); -} - /** * Hooks */ -$GLOBALS['TL_HOOKS']['getFrontendModule'][] = array('aeo\\AeoFrontendUtil', 'aeoGetFrontendModule'); -$GLOBALS['TL_HOOKS']['getContentElement'][] = array('aeo\\AeoFrontendUtil', 'aeoGetContentElement'); -$GLOBALS['TL_HOOKS']['outputFrontendTemplate'][] = array('aeo\\AeoFrontendUtil', 'obfuscateEmails'); -$GLOBALS['TL_HOOKS']['getPageIdFromUrl'][] = array('aeo\\AeoRedirectUtil', 'getRedirectPageAeo'); +$GLOBALS['TL_HOOKS']['getFrontendModule'][] = array('cgoIT\\aeo\\AeoFrontendUtil', 'aeoGetFrontendModule'); +$GLOBALS['TL_HOOKS']['getContentElement'][] = array('cgoIT\\aeo\\AeoFrontendUtil', 'aeoGetContentElement'); +$GLOBALS['TL_HOOKS']['outputFrontendTemplate'][] = array('cgoIT\\aeo\\AeoFrontendUtil', 'obfuscateEmails'); +$GLOBALS['TL_HOOKS']['getPageIdFromUrl'][] = array('cgoIT\\aeo\\AeoRedirectUtil', 'getRedirectPageAeo'); /** * frontend moduls */ -$GLOBALS['FE_MOD']['application']['aeo'] = 'aeo\\AeoModule'; +$GLOBALS['FE_MOD']['application']['aeo'] = 'cgoIT\\aeo\\AeoModule'; /** * content elements */ -$GLOBALS['TL_CTE']['includes']['aeo'] = 'aeo\\AeoCE'; +$GLOBALS['TL_CTE']['includes']['aeo'] = 'cgoIT\\aeo\\AeoCE'; /** * PageTypes */ -$GLOBALS['TL_PTY']['root'] = 'aeo\\PageRoot_Aeo'; - -?> +$GLOBALS['TL_PTY']['root'] = 'cgoIT\\aeo\\PageRoot_Aeo'; diff --git a/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php similarity index 76% rename from dca/tl_content.php rename to src/Resources/contao/dca/tl_content.php index 118faa6..befabb1 100644 --- a/dca/tl_content.php +++ b/src/Resources/contao/dca/tl_content.php @@ -47,12 +47,13 @@ foreach ($GLOBALS['TL_DCA']['tl_content']['palettes'] as $key => $palette) { */ $GLOBALS['TL_DCA']['tl_content']['fields']['aeo_custom_template'] = array ( - 'label' => &$GLOBALS['TL_LANG']['tl_content']['aeo_custom_template'], - 'default' => 'aeo_default_no_js', - 'exclude' => true, - 'inputType' => 'select', - 'options_callback' => array('tl_content_aeo', 'getAeoTemplates'), - 'eval' => array('tl_class'=>'w50') + 'label' => &$GLOBALS['TL_LANG']['tl_content']['aeo_custom_template'], + 'default' => 'aeo_default_no_js', + 'exclude' => true, + 'inputType' => 'select', + 'options_callback' => array('tl_content_aeo', 'getAeoTemplates'), + 'eval' => array('tl_class'=>'w50'), + 'sql' => "varchar(32) NOT NULL default ''" ); $GLOBALS['TL_DCA']['tl_content']['fields']['aeo_show_info'] = array @@ -62,7 +63,8 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['aeo_show_info'] = array 'filter' => false, 'search' => false, 'inputType' => 'checkbox', - 'eval' => array('tl_class'=>'w50') + 'eval' => array('tl_class'=>'w50'), + 'sql' => "char(1) NOT NULL default ''" ); $GLOBALS['TL_DCA']['tl_content']['fields']['aeo_info_text'] = array @@ -71,19 +73,21 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['aeo_info_text'] = array 'exclude' => true, 'filter' => false, 'search' => false, - 'inputType' => 'textarea', - 'eval' => array('rte'=>'tinyMCE', 'tl_class'=>'clr') + 'inputType' => 'textarea', + 'eval' => array('rte'=>'tinyMCE', 'tl_class'=>'clr'), + 'sql' => "mediumtext NULL" ); $GLOBALS['TL_DCA']['tl_content']['fields']['aeo_disable'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_content']['aeo_disable'], - 'default' => '', + 'default' => '', 'exclude' => true, 'filter' => true, 'search' => false, 'inputType' => 'checkbox', - 'eval' => array('tl_class'=>'long') + 'eval' => array('tl_class'=>'long'), + 'sql' => "char(1) NOT NULL default ''" ); /** diff --git a/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php similarity index 75% rename from dca/tl_module.php rename to src/Resources/contao/dca/tl_module.php index 6fe8b82..22960e3 100644 --- a/dca/tl_module.php +++ b/src/Resources/contao/dca/tl_module.php @@ -21,7 +21,7 @@ * Software Foundation website at . * * PHP version 5 - * @copyright cgo IT, 2012-2013 + * @copyright cgo IT, 2012-2017 * @author Carsten Götzinger (info@cgo-it.de) * @package aeo * @license GNU/LGPL @@ -41,23 +41,19 @@ foreach ($GLOBALS['TL_DCA']['tl_module']['palettes'] as $key => $palette) { $GLOBALS['TL_DCA']['tl_module']['palettes'][$key] = $palette.';{aeo_legend:hide},aeo_disable'; } } -//foreach ($GLOBALS['TL_DCA']['tl_module']['palettes'] as $key => $palette) { -// if (!is_array($palette)) { -// print "

$key => $palette

\n"; -// } -//} /** * fields */ $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_custom_template'] = array ( - 'label' => &$GLOBALS['TL_LANG']['tl_module']['aeo_custom_template'], - 'default' => 'aeo_default_no_js', - 'exclude' => true, - 'inputType' => 'select', - 'options_callback' => array('tl_module_aeo', 'getAeoTemplates'), - 'eval' => array('tl_class'=>'w50') + 'label' => &$GLOBALS['TL_LANG']['tl_module']['aeo_custom_template'], + 'default' => 'aeo_default_no_js', + 'exclude' => true, + 'inputType' => 'select', + 'options_callback' => array('tl_module_aeo', 'getAeoTemplates'), + 'eval' => array('tl_class'=>'w50'), + 'sql' => "varchar(32) NOT NULL default ''" ); $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_show_info'] = array @@ -67,7 +63,8 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_show_info'] = array 'filter' => false, 'search' => false, 'inputType' => 'checkbox', - 'eval' => array('tl_class'=>'w50') + 'eval' => array('tl_class'=>'w50'), + 'sql' => "char(1) NOT NULL default ''" ); $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_info_text'] = array @@ -76,19 +73,21 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_info_text'] = array 'exclude' => true, 'filter' => false, 'search' => false, - 'inputType' => 'textarea', - 'eval' => array('rte'=>'tinyMCE', 'tl_class'=>'clr') + 'inputType' => 'textarea', + 'eval' => array('rte'=>'tinyMCE', 'tl_class'=>'clr'), + 'sql' => "mediumtext NULL" ); $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_disable'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_module']['aeo_disable'], - 'default' => '', + 'default' => '', 'exclude' => true, 'filter' => false, 'search' => false, 'inputType' => 'checkbox', - 'eval' => array('tl_class'=>'long') + 'eval' => array('tl_class'=>'long'), + 'sql' => "char(1) NOT NULL default ''" ); /** diff --git a/dca/tl_settings.php b/src/Resources/contao/dca/tl_settings.php similarity index 100% rename from dca/tl_settings.php rename to src/Resources/contao/dca/tl_settings.php diff --git a/languages/de/default.php b/src/Resources/contao/languages/de/default.php similarity index 100% rename from languages/de/default.php rename to src/Resources/contao/languages/de/default.php diff --git a/languages/de/modules.php b/src/Resources/contao/languages/de/modules.php similarity index 100% rename from languages/de/modules.php rename to src/Resources/contao/languages/de/modules.php diff --git a/languages/de/tl_content.php b/src/Resources/contao/languages/de/tl_content.php similarity index 100% rename from languages/de/tl_content.php rename to src/Resources/contao/languages/de/tl_content.php diff --git a/languages/de/tl_module.php b/src/Resources/contao/languages/de/tl_module.php similarity index 100% rename from languages/de/tl_module.php rename to src/Resources/contao/languages/de/tl_module.php diff --git a/languages/de/tl_settings.php b/src/Resources/contao/languages/de/tl_settings.php similarity index 100% rename from languages/de/tl_settings.php rename to src/Resources/contao/languages/de/tl_settings.php diff --git a/languages/en/default.php b/src/Resources/contao/languages/en/default.php similarity index 100% rename from languages/en/default.php rename to src/Resources/contao/languages/en/default.php diff --git a/languages/en/modules.php b/src/Resources/contao/languages/en/modules.php similarity index 100% rename from languages/en/modules.php rename to src/Resources/contao/languages/en/modules.php diff --git a/languages/en/tl_content.php b/src/Resources/contao/languages/en/tl_content.php similarity index 100% rename from languages/en/tl_content.php rename to src/Resources/contao/languages/en/tl_content.php diff --git a/languages/en/tl_module.php b/src/Resources/contao/languages/en/tl_module.php similarity index 100% rename from languages/en/tl_module.php rename to src/Resources/contao/languages/en/tl_module.php diff --git a/languages/en/tl_settings.php b/src/Resources/contao/languages/en/tl_settings.php similarity index 100% rename from languages/en/tl_settings.php rename to src/Resources/contao/languages/en/tl_settings.php diff --git a/AeoModule.php b/src/Resources/contao/modules/AeoModule.php similarity index 100% rename from AeoModule.php rename to src/Resources/contao/modules/AeoModule.php diff --git a/templates/aeo_default_no_js.html5 b/src/Resources/contao/templates/aeo_default_no_js.html5 similarity index 100% rename from templates/aeo_default_no_js.html5 rename to src/Resources/contao/templates/aeo_default_no_js.html5 diff --git a/templates/aeo_default_no_js.xhtml b/src/Resources/contao/templates/aeo_default_no_js.xhtml similarity index 100% rename from templates/aeo_default_no_js.xhtml rename to src/Resources/contao/templates/aeo_default_no_js.xhtml diff --git a/templates/js_aeo_deobfuscate.html5 b/src/Resources/contao/templates/js_aeo_deobfuscate.html5 similarity index 100% rename from templates/js_aeo_deobfuscate.html5 rename to src/Resources/contao/templates/js_aeo_deobfuscate.html5 diff --git a/templates/js_aeo_deobfuscate.xhtml b/src/Resources/contao/templates/js_aeo_deobfuscate.xhtml similarity index 100% rename from templates/js_aeo_deobfuscate.xhtml rename to src/Resources/contao/templates/js_aeo_deobfuscate.xhtml diff --git a/util/AeoFrontendUtil.php b/src/Resources/contao/util/AeoFrontendUtil.php similarity index 100% rename from util/AeoFrontendUtil.php rename to src/Resources/contao/util/AeoFrontendUtil.php diff --git a/util/AeoRedirectUtil.php b/src/Resources/contao/util/AeoRedirectUtil.php similarity index 100% rename from util/AeoRedirectUtil.php rename to src/Resources/contao/util/AeoRedirectUtil.php diff --git a/util/AeoUtil.php b/src/Resources/contao/util/AeoUtil.php similarity index 100% rename from util/AeoUtil.php rename to src/Resources/contao/util/AeoUtil.php diff --git a/public/js/aeo.js b/src/Resources/public/js/aeo.js similarity index 100% rename from public/js/aeo.js rename to src/Resources/public/js/aeo.js diff --git a/public/js/aeo.min.js b/src/Resources/public/js/aeo.min.js similarity index 100% rename from public/js/aeo.min.js rename to src/Resources/public/js/aeo.min.js diff --git a/public/js/onReadyAeo.js b/src/Resources/public/js/onReadyAeo.js similarity index 100% rename from public/js/onReadyAeo.js rename to src/Resources/public/js/onReadyAeo.js diff --git a/public/js/onReadyAeo.min.js b/src/Resources/public/js/onReadyAeo.min.js similarity index 100% rename from public/js/onReadyAeo.min.js rename to src/Resources/public/js/onReadyAeo.min.js