D3Public/GoogleServices
8
0
Fork 0
Code Pull Requests Releases Activity

#2782: _d3GetNonBaseLanguageUrls() liefert falsche URLs wenn die SSL-Verbindung über eine Subdomain läuft

Browse Source
This commit is contained in:
Daniel Seifert 2014-07-24 09:21:40 +00:00
parent 370734c123
commit 0166ff5ff5
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
View File

@ -123,26 +123,45 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
{ {
$myConfig = oxRegistry::getConfig(); $myConfig = oxRegistry::getConfig();
$aLanguageUrls = $myConfig->getConfigParam('aLanguageURLs'); $aLanguageUrls = $myConfig->getConfigParam('aLanguageURLs');
$aUrls = array(); $aSslLanguageUrls = $myConfig->getConfigParam('aLanguageSSLURLs');
/** @var oxUBase $oActView */
$oActView = $myConfig->getTopActiveView();
$aUrls = array();
if ($myConfig->getConfigParam('bl_perfLoadLanguages')) { if ($myConfig->getConfigParam('bl_perfLoadLanguages')) {
$aLanguages = oxRegistry::getLang()->getLanguageArray(null, true, true); $aLanguages = oxRegistry::getLang()->getLanguageArray(null, true, true);
reset($aLanguages); reset($aLanguages);
while ((list($sKey, $oVal) = each($aLanguages))) { foreach ($aLanguages as $oVal) {
$aLanguages[$sKey]->link = $oActView->getLink($oVal->id); $aUrls = $this->_d3AddLanguageUrlsToList($aLanguageUrls, $oVal, $aSslLanguageUrls, $aUrls);
$sUrl = str_replace('http://', '', $aLanguageUrls[$oVal->id]);
if ($aLanguageUrls[$oVal->id] != $aLanguageUrls[oxRegistry::getLang()->getBaseLanguage()]) {
$aUrls[] = "'".$sUrl."'";
}
} }
} }
return $aUrls; return $aUrls;
} }
/**
* @param $aLanguageUrls
* @param $oVal
* @param $aSslLanguageUrls
* @param $aUrls
*
* @return array
*/
protected function _d3AddLanguageUrlsToList($aLanguageUrls, $oVal, $aSslLanguageUrls, $aUrls)
{
$sUrl = str_replace('http://', '', $aLanguageUrls[$oVal->id]);
$sSslUrl = str_replace('https://', '', $aSslLanguageUrls[$oVal->id]);
if ($aLanguageUrls[$oVal->id] != $aLanguageUrls[oxRegistry::getLang()->getBaseLanguage()]) {
$aUrls[] = "'" . $sUrl . "'";
}
if ($aSslLanguageUrls[$oVal->id] != $aSslLanguageUrls[oxRegistry::getLang()->getBaseLanguage()]) {
$aUrls[] = "'" . $sSslUrl . "'";
return $aUrls;
}
return $aUrls;
}
/** /**
* @return string * @return string
*/ */