contao/aeo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kompatibel mit Erweiterung i18nl10n

Browse Source
This commit is contained in:
Carsten Götzinger 2015-10-09 09:27:49 +02:00
parent 81ae92763e
commit 51d20d5d2d
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dca/tl_content.php
View File

@ -59,7 +59,7 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['aeo_show_info'] = array
( (
'label' => &$GLOBALS['TL_LANG']['tl_content']['aeo_show_info'], 'label' => &$GLOBALS['TL_LANG']['tl_content']['aeo_show_info'],
'exclude' => true, 'exclude' => true,
'filter' => true, 'filter' => false,
'search' => false, 'search' => false,
'inputType' => 'checkbox', 'inputType' => 'checkbox',
'eval' => array('tl_class'=>'w50') 'eval' => array('tl_class'=>'w50')
@ -69,8 +69,8 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['aeo_info_text'] = array
( (
'label' => &$GLOBALS['TL_LANG']['tl_content']['aeo_info_text'], 'label' => &$GLOBALS['TL_LANG']['tl_content']['aeo_info_text'],
'exclude' => true, 'exclude' => true,
'filter' => true, 'filter' => false,
'search' => true, 'search' => false,
'inputType' => 'textarea', 'inputType' => 'textarea',
'eval' => array('rte'=>'tinyMCE', 'tl_class'=>'clr') 'eval' => array('rte'=>'tinyMCE', 'tl_class'=>'clr')
); );

8
dca/tl_module.php
View File

@ -64,7 +64,7 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_show_info'] = array
( (
'label' => &$GLOBALS['TL_LANG']['tl_module']['aeo_show_info'], 'label' => &$GLOBALS['TL_LANG']['tl_module']['aeo_show_info'],
'exclude' => true, 'exclude' => true,
'filter' => true, 'filter' => false,
'search' => false, 'search' => false,
'inputType' => 'checkbox', 'inputType' => 'checkbox',
'eval' => array('tl_class'=>'w50') 'eval' => array('tl_class'=>'w50')
@ -74,8 +74,8 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_info_text'] = array
( (
'label' => &$GLOBALS['TL_LANG']['tl_module']['aeo_info_text'], 'label' => &$GLOBALS['TL_LANG']['tl_module']['aeo_info_text'],
'exclude' => true, 'exclude' => true,
'filter' => true, 'filter' => false,
'search' => true, 'search' => false,
'inputType' => 'textarea', 'inputType' => 'textarea',
'eval' => array('rte'=>'tinyMCE', 'tl_class'=>'clr') 'eval' => array('rte'=>'tinyMCE', 'tl_class'=>'clr')
); );
@ -85,7 +85,7 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_disable'] = array
'label' => &$GLOBALS['TL_LANG']['tl_module']['aeo_disable'], 'label' => &$GLOBALS['TL_LANG']['tl_module']['aeo_disable'],
'default' => '', 'default' => '',
'exclude' => true, 'exclude' => true,
'filter' => true, 'filter' => false,
'search' => false, 'search' => false,
'inputType' => 'checkbox', 'inputType' => 'checkbox',
'eval' => array('tl_class'=>'long') 'eval' => array('tl_class'=>'long')

2
dca/tl_settings.php
View File

@ -144,7 +144,7 @@ class tl_settings_aeo extends \Backend
} }
if (in_array('i18nl10n', $this->Config->getActiveModules())) { if (in_array('i18nl10n', $this->Config->getActiveModules())) {
$languages = deserialize($GLOBALS['TL_CONFIG']['i18nl10n_languages']); $languages = \I18nl10n\Classes\I18nl10n::getInstance()->getAvailableLanguages(true, true);
foreach ($languages as $language) { foreach ($languages as $language) {
array_push($arrLanguages, strtolower($language)); array_push($arrLanguages, strtolower($language));
} }

4
util/AeoFrontendUtil.php
View File

@ -104,7 +104,7 @@ class AeoFrontendUtil extends \Frontend {
} }
if (in_array('i18nl10n', $this->Config->getActiveModules())) { if (in_array('i18nl10n', $this->Config->getActiveModules())) {
$this->AeoUtil->fixupCurrentLanguage(); $this->AeoUtil->fixupCurrentLanguage();
if ($GLOBALS['TL_CONFIG']['i18nl10n_addLanguageToUrl']) { if ($GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'url') {
$folder .= $GLOBALS['TL_LANGUAGE'] . '/'; $folder .= $GLOBALS['TL_LANGUAGE'] . '/';
} }
$folder .= $this->virtual_path.'/'.$GLOBALS['TL_LANGUAGE']; $folder .= $this->virtual_path.'/'.$GLOBALS['TL_LANGUAGE'];
@ -122,7 +122,7 @@ class AeoFrontendUtil extends \Frontend {
$urlSuffix = ''; $urlSuffix = '';
if (strlen($GLOBALS['TL_CONFIG']['urlSuffix']) > 0) { if (strlen($GLOBALS['TL_CONFIG']['urlSuffix']) > 0) {
if (in_array('i18nl10n', $this->Config->getActiveModules()) && if (in_array('i18nl10n', $this->Config->getActiveModules()) &&
$GLOBALS['TL_CONFIG']['i18nl10n_alias_suffix']) { $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'alias') {
$this->AeoUtil->fixupCurrentLanguage(); $this->AeoUtil->fixupCurrentLanguage();
$urlSuffix .= '.'.$GLOBALS['TL_LANGUAGE']; $urlSuffix .= '.'.$GLOBALS['TL_LANGUAGE'];
} }

12
util/AeoRedirectUtil.php
View File

@ -83,7 +83,7 @@ class AeoRedirectUtil extends \Frontend {
} }
$i18nl10nLanguage = ''; $i18nl10nLanguage = '';
if (in_array('i18nl10n', $this->Config->getActiveModules())) { if (in_array('i18nl10n', $this->Config->getActiveModules())) {
if ($GLOBALS['TL_CONFIG']['i18nl10n_addLanguageToUrl']) { if ($GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'url') {
$i18nl10nLanguage = $arrFragments[count($arrFragments) - 1]; $i18nl10nLanguage = $arrFragments[count($arrFragments) - 1];
} }
} }
@ -128,11 +128,11 @@ class AeoRedirectUtil extends \Frontend {
$strObfuscatedValues = $arrFragments[3]; $strObfuscatedValues = $arrFragments[3];
if (in_array('i18nl10n', $this->Config->getActiveModules()) && if (in_array('i18nl10n', $this->Config->getActiveModules()) &&
$GLOBALS['TL_CONFIG']['i18nl10n_alias_suffix']) { $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'alias') {
$this->AeoUtil->fixupCurrentLanguage(); $this->AeoUtil->fixupCurrentLanguage();
$strObfuscatedValues = str_replace('.'.$GLOBALS['TL_LANGUAGE'], '', $strObfuscatedValues); $strObfuscatedValues = str_replace('.'.$GLOBALS['TL_LANGUAGE'], '', $strObfuscatedValues);
} }
$arrObfuscatedValues = explode('+', $strObfuscatedValues, 5); $arrObfuscatedValues = explode(' ', $strObfuscatedValues, 5);
$arrFragments[$i++] = 'n'; $arrFragments[$i++] = 'n';
$arrFragments[$i++] = $arrObfuscatedValues[0]; $arrFragments[$i++] = $arrObfuscatedValues[0];
@ -160,7 +160,7 @@ class AeoRedirectUtil extends \Frontend {
} }
if (in_array('i18nl10n', $this->Config->getActiveModules()) && if (in_array('i18nl10n', $this->Config->getActiveModules()) &&
$GLOBALS['TL_CONFIG']['i18nl10n_addLanguageToUrl'] && $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'url' &&
strlen($i18nl10nLanguage)) { strlen($i18nl10nLanguage)) {
$arrFragments[$i++] = 'language'; $arrFragments[$i++] = 'language';
$arrFragments[$i++] = $i18nl10nLanguage; $arrFragments[$i++] = $i18nl10nLanguage;
@ -181,7 +181,7 @@ class AeoRedirectUtil extends \Frontend {
$url = $this->removeUrlPrefix($url); $url = $this->removeUrlPrefix($url);
if ($GLOBALS['TL_CONFIG']['addLanguageToUrl'] || if ($GLOBALS['TL_CONFIG']['addLanguageToUrl'] ||
(in_array('i18nl10n', $this->Config->getActiveModules()) && (in_array('i18nl10n', $this->Config->getActiveModules()) &&
$GLOBALS['TL_CONFIG']['i18nl10n_addLanguageToUrl'])) { $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'url')) {
$arrUrlFragments = explode('/', $url); $arrUrlFragments = explode('/', $url);
$url = $arrUrlFragments[1]; $url = $arrUrlFragments[1];
} }
@ -218,7 +218,7 @@ class AeoRedirectUtil extends \Frontend {
} }
} }
if (in_array('i18nl10n', $this->Config->getActiveModules()) && if (in_array('i18nl10n', $this->Config->getActiveModules()) &&
$GLOBALS['TL_CONFIG']['i18nl10n_alias_suffix']) { $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'alias') {
$this->AeoUtil->fixupCurrentLanguage(); $this->AeoUtil->fixupCurrentLanguage();
$strUrl = str_replace('.'.$GLOBALS['TL_LANGUAGE'], '', $strUrl); $strUrl = str_replace('.'.$GLOBALS['TL_LANGUAGE'], '', $strUrl);
} }

2
util/AeoUtil.php
View File

@ -97,7 +97,7 @@ class AeoUtil extends \Controller {
if( if(
($selected_language) && ($selected_language) &&
in_array($selected_language, in_array($selected_language,
deserialize($GLOBALS['TL_CONFIG']['i18nl10n_languages'])) \I18nl10n\Classes\I18nl10n::getInstance()->getAvailableLanguages(true, true))
) { ) {
$_SESSION['TL_LANGUAGE'] = $GLOBALS['TL_LANGUAGE'] = $selected_language; $_SESSION['TL_LANGUAGE'] = $GLOBALS['TL_LANGUAGE'] = $selected_language;
} elseif(isset($_SESSION['TL_LANGUAGE'])) { } elseif(isset($_SESSION['TL_LANGUAGE'])) {