Umstellung auf static method

Fixed some issues in dca config

composer.json

@@ -0,0 +1,48 @@
+{
+	"name":"cgo-it/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.git",
+		"forum":"https://community.contao.org/de/showthread.php?31684-Advanced-eMail-Obfuscation"
+	},
+	"require":{
+		"php": ">=7.0.0",
+		"contao/core-bundle": "~4.5"
+	},
+	"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": {
+		"contao-manager-plugin": "cgoIT\\aeo\\ContaoManagerPlugin"
+	}
+}

config/autoload.ini

@@ -1,7 +0,0 @@
-
-;;
-; Configure what you want the autoload creator to register
-;;
-register_namespaces = true
-register_classes    = true
-register_templates  = true

config/autoload.php

@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Contao Open Source CMS
- * 
- * Copyright (C) 2005-2013 Leo Feyer
- * 
- * @package Zaeo
- * @link    http://contao.org
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
- */
-
-
-/**
- * Register the namespaces
- */
-ClassLoader::addNamespaces(array
-(
-	'cgoIT',
-));
-
-
-/**
- * Register the classes
- */
-ClassLoader::addClasses(array
-(
-	'cgoIT\aeo\AeoJavaScript'   => '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',
-));

config/database.sql

@@ -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;

public/.htaccess

@@ -1,7 +0,0 @@
-<IfModule !mod_authz_core.c>
-  Order allow,deny
-  Allow from all
-</IfModule>
-<IfModule mod_authz_core.c>
-  Require all granted
-</IfModule>

src/CgoITAeoBundle.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace cgoIT\aeo;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+/**
+ * Configures the Contao aeo bundle.
+ *
+ * @author Carsten Götzinger
+ */
+class CgoITAeoBundle extends Bundle
+{
+}

src/ContaoManagerPlugin.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace cgoIT\aeo;
+
+use Contao\CoreBundle\ContaoCoreBundle;
+use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
+use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
+use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
+
+/**
+ * Plugin for the Contao Manager.
+ *
+ * @author Carsten Götzinger
+ */
+class ContaoManagerPlugin implements BundlePluginInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getBundles(ParserInterface $parser)
+    {
+        return [
+            BundleConfig::create(CgoITAeoBundle::class)
+                ->setLoadAfter([ContaoCoreBundle::class])
+                ->setReplace(['aeo']),
+        ];
+    }
+}

src/Resources/contao/classes/AeoJavaScript.php

@@ -36,12 +36,6 @@ namespace cgoIT\aeo;
 class AeoJavaScript
 {
 
-	/**
-	 * Current object instance (Singleton)
-	 * @var Cache
-	 */
-	protected static $objInstance;
-	
 	/**
 	 * Template
 	 * @var string
@@ -59,7 +53,7 @@ class AeoJavaScript
 	 */
 	final private function __clone() {}
 	
-	public function getContent($folder, $rot13 = true) {
+	public static function getContent($folder, $rot13 = true) {
 		$Template = new \FrontendTemplate(self::$strTemplate);
 		$Template->rot13 = $rot13;
 		$Template->folder = $folder;
@@ -67,18 +61,6 @@ class AeoJavaScript
 		$Template->tooltip_js_off = $GLOBALS['TL_LANG']['aeo']['tooltip_no_js'];
 		return $Template->parse();
 	}
-
-	/**
-	 * Instantiate a new cache object and return it (Factory)
-	 * @return Cache
-	 */
-	public static function getInstance() {
-		if (!is_object(self::$objInstance)) {
-			self::$objInstance = new self();
-		}
-
-		return self::$objInstance;
-	}
 }
 
 ?>

src/Resources/contao/config/config.php

@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php 
 
 /**
  * Contao Open Source CMS
@@ -21,39 +21,32 @@
  * Software Foundation website at <http://www.gnu.org/licenses/>.
  *
  * 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';

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 ''"
 );
 
 /**

src/Resources/contao/dca/tl_module.php

@@ -21,7 +21,7 @@
  * Software Foundation website at <http://www.gnu.org/licenses/>.
  *
  * 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 "<h1>$key => $palette </h1>\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 ''"
 );
 
 /**

src/Resources/contao/dca/tl_settings.php

@@ -67,7 +67,7 @@ $GLOBALS['TL_DCA']['tl_settings']['fields']['aeo_virtual_path'] = array
       'default'                 => '',
       'exclude'                 => true,
       'inputType'               => 'text',
-      'eval'                    => array('decodeEntities'=>true, 'mandatory'=>true, 'tl_class'=>'w50', 'trailingSlash'=>false)
+      'eval'                    => array('decodeEntities'=>true, 'mandatory'=>true, 'tl_class'=>'w50', 'rgxp'=>'alias')
 );
 
 $GLOBALS['TL_DCA']['tl_settings']['fields']['aeo_obfuscation_method'] = array
@@ -100,14 +100,14 @@ $GLOBALS['TL_DCA']['tl_settings']['fields']['aeo_jump_to_no_js'] = array
                 'default'           => '',
                 'exclude'           => true,
                 'inputType'         => 'checkbox',
-                'eval'              => array(doNotCopy => true, multiple => false, 'tl_class' => 'm12', 'style' => 'width:50px; padding-bottom: 3px;', 'includeBlankOption' => true),
+                'eval'              => array('doNotCopy' => true, 'multiple' => false, 'tl_class' => 'm12', 'style' => 'width:50px; padding-bottom: 3px;', 'includeBlankOption' => true),
             ),
             'aeo_language' => array(
                 'label'             => &$GLOBALS['TL_LANG']['tl_settings']['aeo_language'],
                 'exclude'           => true,
                 'inputType'         => 'select',
                 'options_callback'  => array("tl_settings_aeo", "getAvailableLanguages"),
-                'eval'              => array(doNotCopy => true, 'mandatory' => true, 'tl_class' => 'm12', 'style' => 'width:210px; padding-bottom: 3px; margin-top: 3px;', 'includeBlankOption' => true),
+                'eval'              => array('doNotCopy' => true, 'mandatory' => true, 'tl_class' => 'm12', 'style' => 'width:210px; padding-bottom: 3px; margin-top: 3px;', 'includeBlankOption' => true),
             ),
             'aeo_redirecturl' => array(
                 'label'             => &$GLOBALS['TL_LANG']['tl_settings']['aeo_redirecturl'],
@@ -211,7 +211,6 @@ class tl_settings_aeo extends \Backend
      */
     public function checkForModuleOrCE($varVal, \DataContainer $dc) {
     	$this->import('\\Database', 'Database');
-    	$this->import('aeo\\AeoUtil', 'AeoUtil');
 
     	$arrValue = deserialize($varVal);
         foreach ($arrValue as $key => $value) {

src/Resources/contao/util/AeoFrontendUtil.php

@@ -30,6 +30,9 @@
 
 namespace cgoIT\aeo;
 
+use cgoIT\aeo\AeoUtil;
+use cgoIT\aeo\AeoJavaScript;
+
 /**
  * Class AeoFrontendUtil
  */
@@ -76,6 +79,8 @@ class AeoFrontendUtil extends \Frontend {
 	 */
 	protected $aeo;
 
+	protected $aeoUtil;
+
 	/**
 	 * Initialize the object
 	 * @param array
@@ -85,7 +90,7 @@ class AeoFrontendUtil extends \Frontend {
 
 		if (TL_MODE == 'FE') {
 			global $objPage;
-			$this->import('aeo\\AeoUtil', 'AeoUtil');
+			$this->aeoUtil = new AeoUtil();
 
 			if ($GLOBALS['TL_CONFIG']['aeo_replace_standard_obfuscation'] === true) {
 			  	$this->use_rot_13 = $GLOBALS['TL_CONFIG']['aeo_use_rot_13'];
@@ -103,7 +108,7 @@ class AeoFrontendUtil extends \Frontend {
 			  		$folder .= $objPage->rootLanguage.'/';
 			  	}
 			  	if (in_array('i18nl10n', $this->Config->getActiveModules())) {
-			  		$this->AeoUtil->fixupCurrentLanguage();
+			  		$this->aeoUtil->fixupCurrentLanguage();
 			  		if ($GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'url') {
 			  			$folder .= $GLOBALS['TL_LANGUAGE'] . '/';
 			  		}
@@ -123,7 +128,7 @@ class AeoFrontendUtil extends \Frontend {
 			  	if (strlen($GLOBALS['TL_CONFIG']['urlSuffix']) > 0) {
 			  		if (in_array('i18nl10n', $this->Config->getActiveModules()) &&
 			  		    $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'alias') {
-			  			$this->AeoUtil->fixupCurrentLanguage();
+			  			$this->aeoUtil->fixupCurrentLanguage();
 			  			$urlSuffix .= '.'.$GLOBALS['TL_LANGUAGE'];
 			  		}
 			  		$urlSuffix .= $GLOBALS['TL_CONFIG']['urlSuffix'];
@@ -186,7 +191,7 @@ class AeoFrontendUtil extends \Frontend {
 	{
 		global $objPage;
 		$objPage2 = $this->getPageDetails($objPage->id);
-		$redirectPageId = $this->AeoUtil->getRedirectPageForLanguage(deserialize($this->jump_to_no_js), $objPage2->rootLanguage);
+		$redirectPageId = $this->aeoUtil->getRedirectPageForLanguage(deserialize($this->jump_to_no_js), $objPage2->rootLanguage);
 		
 		if (TL_MODE == 'FE' && $this->replace_standard_obfuscation && $objPage2->id != $redirectPageId) {
 			$strContent = $this->aeoReplaceInsertTags($strContent);
@@ -236,8 +241,8 @@ class AeoFrontendUtil extends \Frontend {
 													->execute($objPage2->layout)
 													->fetchAssoc();
 	   
-	   $GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/zaeo/public/js/onReadyAeo.min.js|static';
-	   $GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/zaeo/public/js/aeo.min.js|static';
+	   $GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitaeo/js/onReadyAeo.min.js|static';
+	   $GLOBALS['TL_JAVASCRIPT'][] = 'bundles/cgoitaeo/js/aeo.min.js|static';
 	}
 	
 	/**
@@ -491,11 +496,8 @@ class Aeo extends \System {
 	}
 
 	function dropJS() {
-		$this->import('aeo\\AeoJavaScript', 'AeoJavaScript');
-		$strContentJs = $this->AeoJavaScript->getContent(str_replace("/", "\/", $this->folder), $this->rot13);
+		$strContentJs = AeoJavaScript::getContent(str_replace("/", "\/", $this->folder), $this->rot13);
 		$strContentJs = "\n<script type=\"text/javascript\">\n$strContentJs\n</script>\n";
-// 		$strContentJs .= "<script src=\"system/modules/zaeo/public/js/onReadyAeo.js\" type=\"text/javascript\"></script>";
-// 		$strContentJs .= "<script src=\"system/modules/zaeo/public/js/aeo.js\" type=\"text/javascript\"></script>";
 		return $strContentJs;
 	}
 

src/Resources/contao/util/AeoRedirectUtil.php

@@ -30,18 +30,22 @@
 
 namespace cgoIT\aeo;
 
+use cgoIT\aeo\AeoUtil;
+
 /**
  * Class AeoRedirectUtil
  */
 class AeoRedirectUtil extends \Frontend {
 	
+	protected $aeoUtil;
+	
 	/**
 	 * Initialize the object
 	 * @param array
 	 */
 	public function __construct($arrAttributes=false) {
 		parent::__construct($arrAttributes);
-		$this->import('aeo\\AeoUtil', 'AeoUtil');
+		$this->aeoUtil = new AeoUtil();
 	}
 	
 	/**
@@ -129,7 +133,7 @@ class AeoRedirectUtil extends \Frontend {
 				$strObfuscatedValues = $arrFragments[3];
 			    if (in_array('i18nl10n', $this->Config->getActiveModules()) &&
 				     $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'alias') {
-					$this->AeoUtil->fixupCurrentLanguage();
+					$this->aeoUtil->fixupCurrentLanguage();
 					$strObfuscatedValues = str_replace('.'.$GLOBALS['TL_LANGUAGE'], '', $strObfuscatedValues);
 				}
 				$arrObfuscatedValues = explode('+', $strObfuscatedValues, 5);
@@ -219,7 +223,7 @@ class AeoRedirectUtil extends \Frontend {
 		}
 		if (in_array('i18nl10n', $this->Config->getActiveModules()) &&
 		     $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'alias') {
-			$this->AeoUtil->fixupCurrentLanguage();
+			$this->aeoUtil->fixupCurrentLanguage();
 			$strUrl = str_replace('.'.$GLOBALS['TL_LANGUAGE'], '', $strUrl);
 		}
 		return $strUrl;