From 452f49f020c8569f3648433298792fffc95818e9 Mon Sep 17 00:00:00 2001
From: DanielSeifert <ds@shopmodule.com>
Date: Mon, 5 May 2014 14:49:37 +0000
Subject: [PATCH] fix update instructions, add sampleRate configuration

---
 .../models/d3_googleanalytics_update.php      | 20 +++++++++----------
 .../d3_oxcmp_utils_googleanalytics.php        |  6 +++++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/copy_this/modules/d3/d3_googleanalytics/models/d3_googleanalytics_update.php b/copy_this/modules/d3/d3_googleanalytics/models/d3_googleanalytics_update.php
index 2cdb5e1..ab77969 100644
--- a/copy_this/modules/d3/d3_googleanalytics/models/d3_googleanalytics_update.php
+++ b/copy_this/modules/d3/d3_googleanalytics/models/d3_googleanalytics_update.php
@@ -25,16 +25,16 @@ class d3_googleanalytics_update extends d3install_updatebase
 
     public $sModRevision = '100';
 
-    public $sBaseConf = <<<KEY
---------------------------------------------------------------------------------
-84MbWtQLzZnbGNvWkw4d3BEUy82OTdmQmhZNEw5OWNYSXpuNGRMbE02bnJ0VlF6MlcwM252R1UvdTVkd
-09zOWs0SnF3T0U2L3RBUEN6MDkwdmFQeStMcWRHRGY1blJGUk9waTZSSlZLRlB0UHNnU2ZiS2pqWVJ6e
-VcxK3lPOW9TQWM3QkZmb3dTMjlwVkNBVitWck5sWUE2dlRLNWZjNGJRZG9uMEVlR2dTL3pxaGpPL2lvZ
-nYrbFovbmhIb1o3Q0RFSkl4S2RhNTdaaHUvbXU4L0VFK0QxMUVVdmo3b0N5enVaS01yRE9DZGVud1dEd
-DNLOWgybGkycTNnRnBMU256aVY5Um5RdTVPaFl6ckIyRWRJSWg1T1ZMVU1nbDBNSUFwdHh6OThRK01wV
-0k9
---------------------------------------------------------------------------------
-KEY;
+    // heredoc syntax using for class members is available from PHP 5.3 up
+    public $sBaseConf =
+    "--------------------------------------------------------------------------------
+    84MbWtQLzZnbGNvWkw4d3BEUy82OTdmQmhZNEw5OWNYSXpuNGRMbE02bnJ0VlF6MlcwM252R1UvdTVkd
+    09zOWs0SnF3T0U2L3RBUEN6MDkwdmFQeStMcWRHRGY1blJGUk9waTZSSlZLRlB0UHNnU2ZiS2pqWVJ6e
+    VcxK3lPOW9TQWM3QkZmb3dTMjlwVkNBVitWck5sWUE2dlRLNWZjNGJRZG9uMEVlR2dTL3pxaGpPL2lvZ
+    nYrbFovbmhIb1o3Q0RFSkl4S2RhNTdaaHUvbXU4L0VFK0QxMUVVdmo3b0N5enVaS01yRE9DZGVud1dEd
+    DNLOWgybGkycTNnRnBMU256aVY5Um5RdTVPaFl6ckIyRWRJSWg1T1ZMVU1nbDBNSUFwdHh6OThRK01wV
+    0k9
+    --------------------------------------------------------------------------------";
 
     public $sRequirements = '';
 
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 04a219d..60e4172 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
@@ -80,7 +80,11 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
             $aParameter[] = "'allowLinker': true";
         }
         if (d3_cfg_mod::get($this->_sModId)->getValue('iD3GASiteSpeedSampleRate')) {
-            $aParameter[] = "'siteSpeedSampleRate': ".d3_cfg_mod::get($this->_sModId)->getValue('iD3GASiteSpeedSampleRate');
+            $aParameter[] = "'siteSpeedSampleRate': ".
+                d3_cfg_mod::get($this->_sModId)->getValue('iD3GASiteSpeedSampleRate');
+        }
+        if (d3_cfg_mod::get($this->_sModId)->getValue('iD3GASampleRate')) {
+            $aParameter[] = "'sampleRate': ".d3_cfg_mod::get($this->_sModId)->getValue('iD3GASampleRate');
         }
 
         if (count($aParameter)) {