From 16918787fd4304b4ffbde5a818a76b964da920c0 Mon Sep 17 00:00:00 2001
From: DanielSeifert <ds@shopmodule.com>
Date: Mon, 13 Oct 2014 11:38:48 +0000
Subject: [PATCH] changed duplicated varname for "submit campaign code" (other
 campaigns and AdWords) #3098

---
 .../views/tpl/widget/d3_googleanalytics.tpl   | 16 +++++++--------
 .../tpl/widget/inc/d3ga_universal_adwords.tpl | 20 ++++++++++++-------
 .../tpl/d3_cfg_googleanalytics_adwords.tpl    |  6 +++---
 3 files changed, 24 insertions(+), 18 deletions(-)

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 0a05411..93870dd 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
@@ -58,37 +58,37 @@
                     _gaq.push(['_setDetectTitle', true]);
                 [{/if}]
 
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack')}]
+                [{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')}]
                     _gaq.push(['_setCampaignTrack', true]);
                 [{else}]
                     _gaq.push(['_setCampaignTrack', false]);
                 [{/if}]
 
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]
+                [{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]
                     _gaq.push(['_setCampaignCookieTimeout', '[{$oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]']);
                 [{/if}]
 
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampNameKey')}]
+                [{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampNameKey')}]
                     _gaq.push(['_setCampNameKey', '[{$oD3GASettings->getValue('sD3GASetCampNameKey')}]']);
                 [{/if}]
 
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
+                [{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
                     _gaq.push(['_setCampMediumKey', '[{$oD3GASettings->getValue('sD3GASetCampMediumKey')}]']);
                 [{/if}]
 
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
+                [{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
                     _gaq.push(['_setCampSourceKey', '[{$oD3GASettings->getValue('sD3GASetCampSourceKey')}]']);
                 [{/if}]
 
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampTermKey')}]
+                [{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampTermKey')}]
                     _gaq.push(['_setCampTermKey', '[{$oD3GASettings->getValue('sD3GASetCampTermKey')}]']);
                 [{/if}]
 
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
+                [{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
                     _gaq.push(['_setCampContentKey', '[{$oD3GASettings->getValue('sD3GASetCampContentKey')}]']);
                 [{/if}]
 
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
+                [{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
                     _gaq.push(['_setCampNOKey', 'ga_nooverride']);
                 [{/if}]
 
diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl
index 84aa938..f62dd15 100644
--- a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl
+++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl
@@ -1,26 +1,32 @@
 [{strip}]
-    [{if false == $oD3GASettings->getValue('blD3GASetCampaignTrack')}]
-        [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampNameKey')}]
+    [{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')}]
+        [{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
+        && $oD3GASettings->getValue('sD3GASetCampNameKey')}]
             ga('set', 'campaignName', '[{$oD3GASettings->getValue('sD3GASetCampNameKey')}]');
         [{/if}]
 
-        [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
+        [{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
+        && $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
             ga('set', 'campaignMedium', '[{$oD3GASettings->getValue('sD3GASetCampMediumKey')}]');
         [{/if}]
 
-        [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
+        [{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
+        && $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
             ga('set', 'campaignSource', '[{$oD3GASettings->getValue('sD3GASetCampSourceKey')}]');
         [{/if}]
 
-        [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampTermKey')}]
+        [{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
+        && $oD3GASettings->getValue('sD3GASetCampTermKey')}]
             ga('set', 'campaignKeyword', '[{$oD3GASettings->getValue('sD3GASetCampTermKey')}]');
         [{/if}]
 
-        [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
+        [{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
+        && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
             ga('set', 'campaignContent', '[{$oD3GASettings->getValue('sD3GASetCampContentKey')}]');
         [{/if}]
 
-        [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampIdKey')}]
+        [{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
+        && $oD3GASettings->getValue('sD3GASetCampIdKey')}]
             ga('set', 'campaignId', '[{$oD3GASettings->getValue('sD3GASetCampIdKey')}]');
         [{/if}]
     [{else}]
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl
index b05873e..bd41b87 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl
@@ -121,12 +121,12 @@ function _groupExp(el) {
                         </a>
                         <dl>
                             <dt>
-                                <label for="blD3GASetCampaignTrack">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK"}]</label>
+                                <label for="blD3GASetAdWordsCampaignTrack">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK"}]</label>
                                 [{*  _gaq.push(['_setCampaignTrack', false]);  *}]
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[blD3GASetCampaignTrack]" value="0">
-                                <input id="blD3GASetCampaignTrack" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GASetCampaignTrack')}]checked[{/if}] name="value[blD3GASetCampaignTrack]">
+                                <input type="hidden" name="value[blD3GASetAdWordsCampaignTrack]" value="0">
+                                <input id="blD3GASetAdWordsCampaignTrack" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GASetAdWordsCampaignTrack')}]checked[{/if}] name="value[blD3GASetAdWordsCampaignTrack]">
                                 [{oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK_DESC"}]
                             </dd>
                         </dl>