diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl
index 112976b..91a2d95 100644
--- a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl
+++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl
@@ -1,186 +1,194 @@
 [{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}]
+    [{if $oViewConf->getActiveClassName() == 'thankyou'}]
+        [{assign var="order" value=$oView->getOrder()}]
+        [{assign var="oPayment" value=$order->getPayment()}]
+        [{assign var="oDelSet" value=$order->getDelSet()}]
+        [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}]
+        [{assign var="oUser" value=$oView->getUser()}]
+    [{/if}]
 
-[{if $oViewConf->getActiveClassName() == 'thankyou'}]
-    [{assign var="order" value=$oView->getOrder()}]
-    [{assign var="oPayment" value=$order->getPayment()}]
-    [{assign var="oDelSet" value=$order->getDelSet()}]
-    [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}]
-    [{assign var="oUser" value=$oView->getUser()}]
-[{/if}]
+    [{capture name="d3GATrackCode"}]
+            [{strip}]
+            <script type="text/javascript">
+                var _gaq = _gaq || [];
+                _gaq.push(['_setAccount', '[{ $oD3GASettings->getValue('sD3GAId') }]']);
 
-    [{strip}]
-        <script type="text/javascript">
-            var _gaq = _gaq || [];
-            _gaq.push(['_setAccount', '[{ $oD3GASettings->getValue('sD3GAId') }]']);
-
-            [{if $oD3GASettings->getValue('blD3GAAnonymizeIP')}]
-                _gaq.push(['_gat._anonymizeIp']);
-            [{/if}]
-
-            [{if $oD3GASettings->getValue('sD3GASetDomainName')}]
-                _gaq.push(['_setDomainName', '[{$oD3GASettings->getValue('sD3GASetDomainName')}]']);
-                _gaq.push(['_setAllowHash', false]);
-            [{else}]
-                _gaq.push(['_setDomainName', 'none']);
-            [{/if}]
-
-            [{if $oD3GASettings->getValue('sD3GASetCookiePath')}]
-                _gaq.push(['_setCookiePath', '[{$oD3GASettings->getValue('sD3GASetCookiePath')}]']);
-            [{/if}]
-
-            [{if $oD3GASettings->getValue('blD3GAAllowDomainLinker')}]
-                _gaq.push(['_setAllowLinker', true]);
-            [{/if}]
-
-            [{if $oD3GASettings->getValue('blD3GASetClientInfo')}]
-                _gaq.push(['_setClientInfo', false]);
-            [{else}]
-                _gaq.push(['_setClientInfo', true]);
-            [{/if}]
-
-            [{if $oD3GASettings->getValue('blD3GASetDetectFlash')}]
-                _gaq.push(['_setDetectFlash', false]);
-            [{else}]
-                _gaq.push(['_setDetectFlash', true]);
-            [{/if}]
-
-            [{if $oD3GASettings->getValue('blD3GASetDetectTitle')}]
-                _gaq.push(['_setDetectTitle', false]);
-            [{else}]
-                _gaq.push(['_setDetectTitle', true]);
-            [{/if}]
-
-            [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack')}]
-                _gaq.push(['_setCampaignTrack', true]);
-            [{else}]
-                _gaq.push(['_setCampaignTrack', false]);
-            [{/if}]
-
-            [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]
-                _gaq.push(['_setCampaignCookieTimeout', '[{$oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]']);
-            [{/if}]
-
-            [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampNameKey')}]
-                _gaq.push(['_setCampNameKey', '[{$oD3GASettings->getValue('sD3GASetCampNameKey')}]']);
-            [{/if}]
-
-            [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
-                _gaq.push(['_setCampMediumKey', '[{$oD3GASettings->getValue('sD3GASetCampMediumKey')}]']);
-            [{/if}]
-
-            [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
-                _gaq.push(['_setCampSourceKey', '[{$oD3GASettings->getValue('sD3GASetCampSourceKey')}]']);
-            [{/if}]
-
-            [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampTermKey')}]
-                _gaq.push(['_setCampTermKey', '[{$oD3GASettings->getValue('sD3GASetCampTermKey')}]']);
-            [{/if}]
-
-            [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
-                _gaq.push(['_setCampContentKey', '[{$oD3GASettings->getValue('sD3GASetCampContentKey')}]']);
-            [{/if}]
-
-            [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
-                _gaq.push(['_setCampNOKey', 'ga_nooverride']);
-            [{/if}]
-
-            [{if $oD3GASettings->getValue('blD3GAUseCustomVars')}]
-[{* /*** add custom variables here ***/ *}]
-                [{if $oxcmp_user}]
-                    _gaq.push(['_setCustomVar',
-                        1,           [{*// This custom var is set to slot #1.  Required parameter.*}]
-                        'Geschlecht',    [{*// The name of the custom variable.  Required parameter.*}]
-                        [{if $oxcmp_user->oxuser__oxsal->value == 'MR'}]'male'[{elseif $oxcmp_user->oxuser__oxsal->value == 'MRS'}]'female'[{/if}],
-                                     [{*// The value of the custom variable.  Required parameter.*}]
-                        1            [{*// Sets the scope to visitor-level.  Optional parameter.*}]
-                    ]);
+                [{if $oD3GASettings->getValue('blD3GAAnonymizeIP')}]
+                    _gaq.push(['_gat._anonymizeIp']);
                 [{/if}]
-                [{if $oViewConf->getActiveClassName() == 'thankyou' && $oPayment}]
-                    _gaq.push(['_setCustomVar',2,'Zahlungsart', '[{$oPayment->getFieldData('oxdesc')}]' , 3]);
+
+                [{if $oD3GASettings->getValue('sD3GASetDomainName')}]
+                    _gaq.push(['_setDomainName', '[{$oD3GASettings->getValue('sD3GASetDomainName')}]']);
+                    _gaq.push(['_setAllowHash', false]);
+                [{else}]
+                    _gaq.push(['_setDomainName', 'none']);
                 [{/if}]
-                [{if $oViewConf->getActiveClassName() == 'thankyou' && $oDelSet}]
-                    _gaq.push(['_setCustomVar',3,'Versandart', '[{$oDelSet->getFieldData('oxtitle')}]' , 3]);
+
+                [{if $oD3GASettings->getValue('sD3GASetCookiePath')}]
+                    _gaq.push(['_setCookiePath', '[{$oD3GASettings->getValue('sD3GASetCookiePath')}]']);
                 [{/if}]
-                [{if $oViewConf->getActiveClassName() == 'thankyou' && $aVoucherSerieList}]
-                    [{foreach from=$aVoucherSerieList item="oVoucherSerie"}]
-                        _gaq.push(['_setCustomVar',4,'Gutschein', '[{$oVoucherSerie->getFieldData('oxserienr')}]', 3]);
-                    [{/foreach}]
+
+                [{if $oD3GASettings->getValue('blD3GAAllowDomainLinker')}]
+                    _gaq.push(['_setAllowLinker', true]);
                 [{/if}]
-                [{if $oViewConf->getActiveClassName() == 'thankyou' && $order}]
-                    _gaq.push(['_setCustomVar',5,'Waehrung', '[{$order->getFieldData('oxcurrency')}]' , 3]);
+
+                [{if $oD3GASettings->getValue('blD3GASetClientInfo')}]
+                    _gaq.push(['_setClientInfo', false]);
+                [{else}]
+                    _gaq.push(['_setClientInfo', true]);
                 [{/if}]
-                [{if $oViewConf->getActiveClassName() == 'thankyou'}]
-                    _gaq.push(['_setCustomVar',5,'Neukunde', '[{$oView->isNewCustomer()}]',3]);
+
+                [{if $oD3GASettings->getValue('blD3GASetDetectFlash')}]
+                    _gaq.push(['_setDetectFlash', false]);
+                [{else}]
+                    _gaq.push(['_setDetectFlash', true]);
                 [{/if}]
-            [{/if}]
 
-            _gaq.push(['_trackPageview']);
+                [{if $oD3GASettings->getValue('blD3GASetDetectTitle')}]
+                    _gaq.push(['_setDetectTitle', false]);
+                [{else}]
+                    _gaq.push(['_setDetectTitle', true]);
+                [{/if}]
 
-            [{if $oD3GASettings->getValue('blD3GATrackPageLoadTime')}]
-                _gaq.push(['_trackPageLoadTime']);
-            [{/if}]
+                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack')}]
+                    _gaq.push(['_setCampaignTrack', true]);
+                [{else}]
+                    _gaq.push(['_setCampaignTrack', false]);
+                [{/if}]
 
-            [{if $oD3GASettings->getValue('sD3GACookiePathCopy')}]
-                _gaq.push(['_cookiePathCopy', '[{$oD3GASettings->getValue('sD3GACookiePathCopy')}]']);
-            [{/if}]
+                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]
+                    _gaq.push(['_setCampaignCookieTimeout', '[{$oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]']);
+                [{/if}]
 
-            [{if $oD3GASettings->getValue('blD3GASendECommerce') && $oViewConf->getActiveClassName() == 'thankyou'}]
+                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampNameKey')}]
+                    _gaq.push(['_setCampNameKey', '[{$oD3GASettings->getValue('sD3GASetCampNameKey')}]']);
+                [{/if}]
 
-                [{assign var="currate" value=$order->oxorder__oxcurrate->value}]
+                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
+                    _gaq.push(['_setCampMediumKey', '[{$oD3GASettings->getValue('sD3GASetCampMediumKey')}]']);
+                [{/if}]
 
-                _gaq.push(['_addTrans',
-                    '[{ $order->oxorder__oxordernr->value }]',          [{* // order ID - required *}]
-                    '[{ $oxcmp_shop->oxshops__oxname->value}]',         [{* // affiliation or store name *}]
-                    [{if $oD3GASettings->getValue('blD3GAUseNetto') }]
-                        [{*'[{math equation="s / r" s=$order->getOrderNetSum() r=$currate format="%.2f"}]',                // total - required - has to be gross sum *}]
+                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
+                    _gaq.push(['_setCampSourceKey', '[{$oD3GASettings->getValue('sD3GASetCampSourceKey')}]']);
+                [{/if}]
 
-                         '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]',               [{* // total - required *}]
-                    [{else}]
-                        '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]',             [{* // total - required *}]
+                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampTermKey')}]
+                    _gaq.push(['_setCampTermKey', '[{$oD3GASettings->getValue('sD3GASetCampTermKey')}]']);
+                [{/if}]
+
+                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
+                    _gaq.push(['_setCampContentKey', '[{$oD3GASettings->getValue('sD3GASetCampContentKey')}]']);
+                [{/if}]
+
+                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
+                    _gaq.push(['_setCampNOKey', 'ga_nooverride']);
+                [{/if}]
+
+                [{if $oD3GASettings->getValue('blD3GAUseCustomVars')}]
+    [{* /*** add custom variables here ***/ *}]
+                    [{if $oxcmp_user}]
+                        _gaq.push(['_setCustomVar',
+                            1,           [{*// This custom var is set to slot #1.  Required parameter.*}]
+                            'Geschlecht',    [{*// The name of the custom variable.  Required parameter.*}]
+                            [{if $oxcmp_user->oxuser__oxsal->value == 'MR'}]'male'[{elseif $oxcmp_user->oxuser__oxsal->value == 'MRS'}]'female'[{/if}],
+                                         [{*// The value of the custom variable.  Required parameter.*}]
+                            1            [{*// Sets the scope to visitor-level.  Optional parameter.*}]
+                        ]);
                     [{/if}]
-                    '',                                                 [{* // tax *}]
-                    '[{math equation="s / r" s=$order->oxorder__oxdelcost->value r=$currate format="%.2f"}]',          [{* // shipping *}]
-                    '[{ $order->oxorder__oxbillcity->value }]',         [{* // city *}]
-                    '[{ $order->oxorder__oxbillstate->value }]',        [{* // state or province *}]
-                    '[{ $order->oxorder__oxbillcountry->value }]'       [{* // country *}]
-                ]);
+                    [{if $oViewConf->getActiveClassName() == 'thankyou' && $oPayment}]
+                        _gaq.push(['_setCustomVar',2,'Zahlungsart', '[{$oPayment->getFieldData('oxdesc')}]' , 3]);
+                    [{/if}]
+                    [{if $oViewConf->getActiveClassName() == 'thankyou' && $oDelSet}]
+                        _gaq.push(['_setCustomVar',3,'Versandart', '[{$oDelSet->getFieldData('oxtitle')}]' , 3]);
+                    [{/if}]
+                    [{if $oViewConf->getActiveClassName() == 'thankyou' && $aVoucherSerieList}]
+                        [{foreach from=$aVoucherSerieList item="oVoucherSerie"}]
+                            _gaq.push(['_setCustomVar',4,'Gutschein', '[{$oVoucherSerie->getFieldData('oxserienr')}]', 3]);
+                        [{/foreach}]
+                    [{/if}]
+                    [{if $oViewConf->getActiveClassName() == 'thankyou' && $order}]
+                        _gaq.push(['_setCustomVar',5,'Waehrung', '[{$order->getFieldData('oxcurrency')}]' , 3]);
+                    [{/if}]
+                    [{if $oViewConf->getActiveClassName() == 'thankyou'}]
+                        _gaq.push(['_setCustomVar',5,'Neukunde', '[{$oView->isNewCustomer()}]',3]);
+                    [{/if}]
+                [{/if}]
 
-                [{foreach from=$order->getOrderArticles() item=oOrderArticle}]
-                    _gaq.push(['_addItem',
-                        '[{ $order->oxorder__oxordernr->value }]',                      [{* // order ID - required *}]
-                        '[{ $oOrderArticle->oxorderarticles__oxartnum->value }]',       [{* // SKU/code *}]
-                        '[{ $oOrderArticle->oxorderarticles__oxtitle->value }]',        [{* // product name *}]
-                        '[{ $oOrderArticle->oxorderarticles__oxselvariant->value }]',   [{* // category or variation *}]
+                _gaq.push(['_trackPageview']);
+
+                [{if $oD3GASettings->getValue('blD3GATrackPageLoadTime')}]
+                    _gaq.push(['_trackPageLoadTime']);
+                [{/if}]
+
+                [{if $oD3GASettings->getValue('sD3GACookiePathCopy')}]
+                    _gaq.push(['_cookiePathCopy', '[{$oD3GASettings->getValue('sD3GACookiePathCopy')}]']);
+                [{/if}]
+
+                [{if $oD3GASettings->getValue('blD3GASendECommerce') && $oViewConf->getActiveClassName() == 'thankyou'}]
+
+                    [{assign var="currate" value=$order->oxorder__oxcurrate->value}]
+
+                    _gaq.push(['_addTrans',
+                        '[{ $order->oxorder__oxordernr->value }]',          [{* // order ID - required *}]
+                        '[{ $oxcmp_shop->oxshops__oxname->value}]',         [{* // affiliation or store name *}]
                         [{if $oD3GASettings->getValue('blD3GAUseNetto') }]
-                            [{assign var="oPrice" value=$oOrderArticle->getPrice()}]
-                            '[{math equation="s / r" s=$oPrice->getNettoPrice() r=$currate format="%.2f"}]',                           [{* // unit price - required *}]
+                            [{*'[{math equation="s / r" s=$order->getOrderNetSum() r=$currate format="%.2f"}]',                // total - required - has to be gross sum *}]
+
+                             '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]',               [{* // total - required *}]
                         [{else}]
-                            '[{ $oOrderArticle->oxorderarticles__oxprice->value }]',    [{* // unit price - required - is not currency depended *}]
+                            '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]',             [{* // total - required *}]
                         [{/if}]
-                        '[{ $oOrderArticle->oxorderarticles__oxamount->value }]'        [{* // quantity - required *}]
+                        '',                                                 [{* // tax *}]
+                        '[{math equation="s / r" s=$order->oxorder__oxdelcost->value r=$currate format="%.2f"}]',          [{* // shipping *}]
+                        '[{ $order->oxorder__oxbillcity->value }]',         [{* // city *}]
+                        '[{ $order->oxorder__oxbillstate->value }]',        [{* // state or province *}]
+                        '[{ $order->oxorder__oxbillcountry->value }]'       [{* // country *}]
                     ]);
-                [{/foreach}]
 
-                _gaq.push(['_trackTrans']);
+                    [{foreach from=$order->getOrderArticles() item=oOrderArticle}]
+                        _gaq.push(['_addItem',
+                            '[{ $order->oxorder__oxordernr->value }]',                      [{* // order ID - required *}]
+                            '[{ $oOrderArticle->oxorderarticles__oxartnum->value }]',       [{* // SKU/code *}]
+                            '[{ $oOrderArticle->oxorderarticles__oxtitle->value }]',        [{* // product name *}]
+                            '[{ $oOrderArticle->oxorderarticles__oxselvariant->value }]',   [{* // category or variation *}]
+                            [{if $oD3GASettings->getValue('blD3GAUseNetto') }]
+                                [{assign var="oPrice" value=$oOrderArticle->getPrice()}]
+                                '[{math equation="s / r" s=$oPrice->getNettoPrice() r=$currate format="%.2f"}]',                           [{* // unit price - required *}]
+                            [{else}]
+                                '[{ $oOrderArticle->oxorderarticles__oxprice->value }]',    [{* // unit price - required - is not currency depended *}]
+                            [{/if}]
+                            '[{ $oOrderArticle->oxorderarticles__oxamount->value }]'        [{* // quantity - required *}]
+                        ]);
+                    [{/foreach}]
 
+                    _gaq.push(['_trackTrans']);
+
+                [{/if}]
+
+                (function() {
+                    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+
+                    [{if $oD3GASettings->getValue('blD3GAUseRemarketing')}]
+                        ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
+                    [{else}]
+                        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                    [{/if}]
+
+                    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+                })();
+            </script>
+
+            [{if (!$oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou') &&
+                  !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode')}]
+                [{$oD3GASettings->getValue('sD3GACampaignCode')}]
             [{/if}]
+        [{/strip}]
+    [{/capture}]
 
-            (function() {
-                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-                
-                [{if $oD3GASettings->getValue('blD3GAUseRemarketing')}]
-                	ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
-                [{else}]	
-                    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-                [{/if}]	
-                
-                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-            })();
-        </script>
+    [{if $oViewConf->getActiveClassName() == 'thankyou'}]
+        [{$oView->logCode($smarty.capture.d3GATrackCode)}]
+    [{/if}]
+
+    [{$smarty.capture.d3GATrackCode}]
 
-        [{if (!$oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou') &&
-              !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode')}]
-            [{$oD3GASettings->getValue('sD3GACampaignCode')}]
-        [{/if}]
-    [{/strip}]
 [{/if}]
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php
index 0b43731..1540c6e 100644
--- a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php
+++ b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php
@@ -23,13 +23,4 @@ class d3_cfg_googleanalytics_campaigns extends d3_cfg_mod_main
     protected $_sThisTemplate = 'd3_cfg_googleanalytics_campaigns.tpl';
 
     protected $_sModId = 'd3_googleanalytics';
-
-    /**
-     * @return bool
-     */
-    public function checkD3Log()
-    {
-        // there are no reasons to log anything
-        return FALSE;
-    }
 }
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php
index b0f45d9..acaf608 100644
--- a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php
+++ b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php
@@ -22,13 +22,4 @@ class d3_cfg_googleanalytics_main extends d3_cfg_mod_main
 {
     protected $_sThisTemplate = 'd3_cfg_googleanalytics_main.tpl';
     protected $_sModId = 'd3_googleanalytics';
-
-    /**
-     * @return bool
-     */
-    public function checkD3Log()
-    {
-        // there are no reasons to log anything
-        return FALSE;
-    }
 }
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3_googleanalytics/modules/controllers/d3_thankyou_googleanalytics.php b/copy_this/modules/d3/d3_googleanalytics/modules/controllers/d3_thankyou_googleanalytics.php
index a2440ca..64063fe 100644
--- a/copy_this/modules/d3/d3_googleanalytics/modules/controllers/d3_thankyou_googleanalytics.php
+++ b/copy_this/modules/d3/d3_googleanalytics/modules/controllers/d3_thankyou_googleanalytics.php
@@ -21,6 +21,8 @@
 
 class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
 {
+    private $_sModCfgId = 'd3_googleanalytics';
+
     /**
      * @return int
      */
@@ -31,4 +33,14 @@ class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
 
         return $iIsNewCustomer;
     }
+
+    /**
+     * @param $sGACode
+     */
+    public function logCode($sGACode)
+    {
+        d3_cfg_mod::get($this->_sModCfgId)->getLog()->log(
+            d3log::NOTICE, __CLASS__, __FUNCTION__, __LINE__, 'GA TrackingCode', $sGACode
+        );
+    }
 }
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
index d212d0c..6a0640c 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
@@ -118,7 +118,9 @@
             [{assign var="incpath" value=$oViewConf->getModulePath('d3modcfg_lib')|cat:"views/admin/tpl/inc/d3_cfg_mod_active.tpl"}]
             [{include file=$incpath}]
 
-            [{if $oView->getValueStatus() == 'error'}]
+            [{if $edit->getErrorMessage()}]
+
+            [{elseif $oView->getValueStatus() == 'error'}]
                     <hr>
                     <b>[{oxmultilang ident="D3_CFG_MOD_GENERAL_NOCONFIG_DESC"}]</b>
                     <br>
diff --git a/setup+doku/EE/install.sql b/setup+doku/EE/install.sql
index 8535655..ceb502c 100644
--- a/setup+doku/EE/install.sql
+++ b/setup+doku/EE/install.sql
@@ -1,37 +1,37 @@
 REPLACE INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXBASECONFIG`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXNEWREVISION`) VALUES
 (md5('d3_googleanalytics EE1 de'), '1', 'd3_googleanalytics', 'Google Analytics', 1, 
-'--------------------------------------------------------------------------------
+'---
 vUrWmloMytUSWhDL3c4eit4MmRUMHFlQU8xODV6QThqaitaajdRTUhyL08yZStjcU01TThTOWV3YnNNd
 UwzRUd6RCtrZ0dHTFZEbmlMZ3pPbkhubysxVndaUkNVUDFLSmZDdUM3a0wycS9NdzVzM0lzQnJTaXJlW
 UNpeVQ0akwyZVpDdFlSUEV2UkloR29zMFowZlRVdXhjc0I0bGpkbXVPWXFJc2tXODcrcDRWd2ZicVlzd
 0srdlM1Zk1XN2JvTFJNTHpsTHpsTnRPR0haaFd4MXJ5NXd0YjRwekxYbDV4dTBWL2diMENQL2VNNVE4M
 XVrbndtcEZQL2pCVlUwRHZrZzEwSmpZZFZDWnZKZ0RaNlhuTGZiS3dRQ0xua1JUdUV6eVJRcXZ1TVlEb
 jQ9
---------------------------------------------------------------------------------', '', NOW(), '3.0.0.0', 'EE', 0, '', '', 60);
+---', '', NOW(), '3.0.0.0', 'EE', 0, '', '', 60);
 
 REPLACE INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXBASECONFIG`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXNEWREVISION`) VALUES
 (md5('d3_googleanalytics EE2 de'), '2', 'd3_googleanalytics', 'Google Analytics', 1, 
-'--------------------------------------------------------------------------------
+'---
 vUrWmloMytUSWhDL3c4eit4MmRUMHFlQU8xODV6QThqaitaajdRTUhyL08yZStjcU01TThTOWV3YnNNd
 UwzRUd6RCtrZ0dHTFZEbmlMZ3pPbkhubysxVndaUkNVUDFLSmZDdUM3a0wycS9NdzVzM0lzQnJTaXJlW
 UNpeVQ0akwyZVpDdFlSUEV2UkloR29zMFowZlRVdXhjc0I0bGpkbXVPWXFJc2tXODcrcDRWd2ZicVlzd
 0srdlM1Zk1XN2JvTFJNTHpsTHpsTnRPR0haaFd4MXJ5NXd0YjRwekxYbDV4dTBWL2diMENQL2VNNVE4M
 XVrbndtcEZQL2pCVlUwRHZrZzEwSmpZZFZDWnZKZ0RaNlhuTGZiS3dRQ0xua1JUdUV6eVJRcXZ1TVlEb
 jQ9
---------------------------------------------------------------------------------', '', NOW(), '3.0.0.0', 'EE', 0, '', '',  60);
+---', '', NOW(), '3.0.0.0', 'EE', 0, '', '',  60);
 
 REPLACE INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXBASECONFIG`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXNEWREVISION`) VALUES
 (md5('d3_googleanalytics EE3 de'), '3', 'd3_googleanalytics', 'Google Analytics', 1, 
-'--------------------------------------------------------------------------------
+'---
 vUrWmloMytUSWhDL3c4eit4MmRUMHFlQU8xODV6QThqaitaajdRTUhyL08yZStjcU01TThTOWV3YnNNd
 UwzRUd6RCtrZ0dHTFZEbmlMZ3pPbkhubysxVndaUkNVUDFLSmZDdUM3a0wycS9NdzVzM0lzQnJTaXJlW
 UNpeVQ0akwyZVpDdFlSUEV2UkloR29zMFowZlRVdXhjc0I0bGpkbXVPWXFJc2tXODcrcDRWd2ZicVlzd
 0srdlM1Zk1XN2JvTFJNTHpsTHpsTnRPR0haaFd4MXJ5NXd0YjRwekxYbDV4dTBWL2diMENQL2VNNVE4M
 XVrbndtcEZQL2pCVlUwRHZrZzEwSmpZZFZDWnZKZ0RaNlhuTGZiS3dRQ0xua1JUdUV6eVJRcXZ1TVlEb
 jQ9
---------------------------------------------------------------------------------', '', NOW(), '3.0.0.0', 'EE', 0, '', '',  60);
+---', '', NOW(), '3.0.0.0', 'EE', 0, '', '',  60);
 
 REPLACE INTO `oxcontents` (`OXID`, `OXLOADID`, `OXSHOPID`, `OXSNIPPET`, `OXTYPE`, `OXACTIVE`, `OXACTIVE_1`, `OXTITLE`, `OXCONTENT`, `OXTITLE_1`, `OXCONTENT_1`, `OXACTIVE_2`, `OXTITLE_2`, `OXCONTENT_2`, `OXACTIVE_3`, `OXTITLE_3`, `OXCONTENT_3`, `OXCATID`, `OXFOLDER`) VALUES
-(md5('d3_googleanalytics EE de'), 'Analytics_Security_Informations', 'oxbaseshop', 1, 0, 1, 1, 'Analytics Datenschutz Information', '<p>Diese Website benutzt Google Analytics, einen Webanalysedienst der Google\r\n\r\nInc. (&quot;Google&quot;). Google Analytics verwendet sog. &quot;Cookies&quot;, Textdateien, die auf\r\n\r\nIhrem Computer gespeichert werden und die eine Analyse der Benutzung der Website\r\n\r\ndurch Sie ermöglichen. Die durch den Cookie erzeugten Informationen über Ihre\r\n\r\nBenutzung dieser Website (einschließlich Ihrer IP-Adresse<span style="color: #800000">, die jedoch mit der Methode _anonymizeIp() anonymisiert wird, so dass Sie nicht mehr einem Anschluss\r\n\r\nzugeordnet werden kann</span>) wird an einen Server von Google in den USA\r\n\r\nübertragen und dort gespeichert. Google wird diese Informationen benutzen, um\r\n\r\nIhre Nutzung der Website auszuwerten, um Reports über die Websiteaktivitäten für\r\n\r\ndie Websitebetreiber zusammenzustellen und um weitere mit der Websitenutzung und\r\n\r\nder Internetnutzung verbundene Dienstleistungen zu erbringen. Auch wird Google\r\n\r\ndiese Informationen gegebenenfalls an Dritte übertragen, sofern dies gesetzlich\r\n\r\nvorgeschrieben oder soweit Dritte diese Daten im Auftrag von Google verarbeiten.\r\n\r\nGoogle wird in keinem Fall Ihre IP-Adresse mit anderen Daten von Google in\r\n\r\nVerbindung bringen. Sie können die Installation der Cookies durch eine\r\n\r\nentsprechende Einstellung Ihrer Browser Software verhindern; wir weisen Sie\r\n\r\njedoch darauf hin, dass Sie in diesem Fall gegebenenfalls nicht sämtliche\r\n\r\nFunktionen dieser Website vollumfänglich nutzen können. Durch die Nutzung dieser\r\n\r\nWebsite erklären Sie sich mit der Bearbeitung der über Sie erhobenen Daten durch\r\n\r\nGoogle in der zuvor beschriebenen Art und Weise und zu dem zuvor benannten Zweck\r\n\r\neinverstanden.</p>\r\n<p><span style="color: #800000">Sie können der Erhebung der\r\n\r\nDaten durch Google-Analytics mit Wirkung für die Zukunft widersprechen, indem\r\n\r\nsie ein Deaktivierungs-Add-on (<a href="http://tools.google.com/dlpage/gaoptout?hl=de" title="">http://tools.google.com/dlpage/gaoptout?hl=de</a>)\r\n\r\nfür Ihren Browser installieren.</span></p>', '', '', 1, '', '', 1, '', '', '943a9ba3050e78b443c16e043ae60ef3', 'CMSFOLDER_USERINFO');
+(md5('d3_googleanalytics EE de'), 'Analytics_Security_Informations', 1, 1, 0, 1, 1, 'Analytics Datenschutz Information', '<p>Diese Website benutzt Google Analytics, einen Webanalysedienst der Google\r\n\r\nInc. (&quot;Google&quot;). Google Analytics verwendet sog. &quot;Cookies&quot;, Textdateien, die auf\r\n\r\nIhrem Computer gespeichert werden und die eine Analyse der Benutzung der Website\r\n\r\ndurch Sie ermöglichen. Die durch den Cookie erzeugten Informationen über Ihre\r\n\r\nBenutzung dieser Website (einschließlich Ihrer IP-Adresse<span style="color: #800000">, die jedoch mit der Methode _anonymizeIp() anonymisiert wird, so dass Sie nicht mehr einem Anschluss\r\n\r\nzugeordnet werden kann</span>) wird an einen Server von Google in den USA\r\n\r\nübertragen und dort gespeichert. Google wird diese Informationen benutzen, um\r\n\r\nIhre Nutzung der Website auszuwerten, um Reports über die Websiteaktivitäten für\r\n\r\ndie Websitebetreiber zusammenzustellen und um weitere mit der Websitenutzung und\r\n\r\nder Internetnutzung verbundene Dienstleistungen zu erbringen. Auch wird Google\r\n\r\ndiese Informationen gegebenenfalls an Dritte übertragen, sofern dies gesetzlich\r\n\r\nvorgeschrieben oder soweit Dritte diese Daten im Auftrag von Google verarbeiten.\r\n\r\nGoogle wird in keinem Fall Ihre IP-Adresse mit anderen Daten von Google in\r\n\r\nVerbindung bringen. Sie können die Installation der Cookies durch eine\r\n\r\nentsprechende Einstellung Ihrer Browser Software verhindern; wir weisen Sie\r\n\r\njedoch darauf hin, dass Sie in diesem Fall gegebenenfalls nicht sämtliche\r\n\r\nFunktionen dieser Website vollumfänglich nutzen können. Durch die Nutzung dieser\r\n\r\nWebsite erklären Sie sich mit der Bearbeitung der über Sie erhobenen Daten durch\r\n\r\nGoogle in der zuvor beschriebenen Art und Weise und zu dem zuvor benannten Zweck\r\n\r\neinverstanden.</p>\r\n<p><span style="color: #800000">Sie können der Erhebung der\r\n\r\nDaten durch Google-Analytics mit Wirkung für die Zukunft widersprechen, indem\r\n\r\nsie ein Deaktivierungs-Add-on (<a href="http://tools.google.com/dlpage/gaoptout?hl=de" title="">http://tools.google.com/dlpage/gaoptout?hl=de</a>)\r\n\r\nfür Ihren Browser installieren.</span></p>', '', '', 1, '', '', 1, '', '', '943a9ba3050e78b443c16e043ae60ef3', 'CMSFOLDER_USERINFO');
 
 UPDATE `d3_cfg_mod` SET `OXREVISION` = `OXNEWREVISION` WHERE `OXMODID` = 'd3_googleanalytics';
\ No newline at end of file