From 5b992ba9735de7445d3dc267407c4f0ffb1c279d Mon Sep 17 00:00:00 2001
From: DanielSeifert <ds@shopmodule.com>
Date: Thu, 24 Jul 2014 09:39:57 +0000
Subject: [PATCH] add opposite url to isSsl()-Url to AutoLinker list

---
 .../d3_oxcmp_utils_googleanalytics.php        | 24 ++++++++++++++-----
 setup+doku/changelog.txt                      |  1 +
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php b/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
index ad9898f..24d0dc5 100644
--- a/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
+++ b/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
@@ -147,21 +147,33 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
      */
     protected function _d3AddLanguageUrlsToList($aLanguageUrls, $oVal, $aSslLanguageUrls, $aUrls)
     {
-        $sUrl    = str_replace('http://', '', $aLanguageUrls[$oVal->id]);
-        $sSslUrl = str_replace('https://', '', $aSslLanguageUrls[$oVal->id]);
+        $blIsSsl = oxRegistry::getConfig()->isSsl();
 
-        if ($aLanguageUrls[$oVal->id] != $aLanguageUrls[oxRegistry::getLang()->getBaseLanguage()]) {
+        if ($this->_d3CheckLanguageUrlsToList($aLanguageUrls, $oVal, $blIsSsl)) {
+            $sUrl    = str_replace('http://', '', $aLanguageUrls[$oVal->id]);
             $aUrls[] = "'" . $sUrl . "'";
         }
-        if ($aSslLanguageUrls[$oVal->id] != $aSslLanguageUrls[oxRegistry::getLang()->getBaseLanguage()]) {
-            $aUrls[] = "'" . $sSslUrl . "'";
 
-            return $aUrls;
+        if ($this->_d3CheckLanguageUrlsToList($aSslLanguageUrls, $oVal, !$blIsSsl)) {
+            $sSslUrl = str_replace('https://', '', $aSslLanguageUrls[$oVal->id]);
+            $aUrls[] = "'" . $sSslUrl . "'";
         }
 
         return $aUrls;
     }
 
+    /**
+     * @param $aLanguageUrls
+     * @param $oVal
+     * @param $blIsSsl
+     *
+     * @return bool
+     */
+    protected function _d3CheckLanguageUrlsToList($aLanguageUrls, $oVal, $blIsSsl)
+    {
+        return $blIsSsl || $aLanguageUrls[$oVal->id] != $aLanguageUrls[oxRegistry::getLang()->getBaseLanguage()];
+    }
+
     /**
      * @return string
      */
diff --git a/setup+doku/changelog.txt b/setup+doku/changelog.txt
index 8a48ea3..24cddb7 100644
--- a/setup+doku/changelog.txt
+++ b/setup+doku/changelog.txt
@@ -1,6 +1,7 @@
 => 3.2.0.0
 - Tracking für gekaufte Artikel enthält Daten zur Kategorie / Seite, aus der die Artikel zuerst in den Warenkorb gelegt wurden
 - Bugfix: Artikeltitel werden escaped, sofern Quotes enthalten sind
+- AutoLinker-URL enthält auch abweichende SSL-URLs
 
 => 3.1.0.2
 - Bugfix: deaktiviertes Modul kann benötigtes Objekt nicht laden