diff --git a/copy_this/modules/d3/d3_googleanalytics/metadata.php b/copy_this/modules/d3/d3_googleanalytics/metadata.php index d7ca587..946421b 100644 --- a/copy_this/modules/d3/d3_googleanalytics/metadata.php +++ b/copy_this/modules/d3/d3_googleanalytics/metadata.php @@ -40,7 +40,7 @@ $aModule = array( 'Trusted Shops account to your shop.', ), 'thumbnail' => 'picture.png', - 'version' => '3.3.1.0', + 'version' => '3.3.2.0', 'author' => 'D³ Data Development (Inh. Thomas Dartsch)', 'email' => 'support@shopmodule.com', 'url' => 'http://www.oxidmodule.com/', diff --git a/copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php b/copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php index f09df8f..644b04b 100644 --- a/copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php +++ b/copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php @@ -21,18 +21,18 @@ class d3_googleanalytics_update extends d3install_updatebase public $sModName = 'Google Services Schnittstelle'; - public $sModVersion = '3.3.1.0'; + public $sModVersion = '3.3.2.0'; - public $sModRevision = '214'; + public $sModRevision = '228'; // heredoc syntax using for class members is available from PHP 5.3 up public $sBaseConf = - "U88cS9acWI1SStIK2FRa1hienV0TW43N1djMUFrQTBmdEpsKzF4U2t3M3h6Wk1KcnI4bjFFZ3pUWFgxY -XNCc2VDSHIzSTFDN2xURkIxSUZuMG12cnQ3ajJKWEozRmNoZ2Y3TVRkK2hsSFFCU3BXcEh1ekdQcnR2V -S9yL3QzT0NuZm1LNHQ2R3RCOHlzekIrTjFJTjhucm0rY29WeTEzeFgzc3Y5MkFUYlh3ZkFuc3ByRkZYT -2ZSWVYvaHpJY3A5Ky85cDJnYTkrc3l6MXgzK0NTcmY2MTZDV0hIMmFuRmJ1MzFHSnNJUEFDLzUvSGxWT -DRNWEFybDE3SGJXdjJNS1R1a0lPejFqZFVMN3JzMWYrRElYY2t0RTdQUmN6bnJmdDNaNnR1SndaSjcza -kk9"; + "9I7SjYrOVJJbDRCZTBFTjhiOVI5VElTamJwNDQ3Qk9FeWdLQjVXaHBaRFBHemxYV0NZYVJ2ZWN2SmMrS +m1taGh4OHk3Z0NXbUFDWUJaWjZXYVJicEM3a3AwTTFYWlVOZXlhYitWa2ptTDBLSVh0R1ArbkRYT3Jub +jE0cm1sSVgxOWpIMGQ1NjJ3TklEVTE1YW5YR1VueW4zcUNqZHNQK0NKRW1WOFpENGdISms4QTlDdS8xQ +kYzUldpVkJiNXVkUVZFK0dyd2hTcXRRb0tjN0ZCdHJ3VGJyVzZSbFdyc01yeXp4WVM3Sk9DblhqR0ZIY +lZWa0h3WGF3b0NYWlloT0dsU0dPYkJpWjR6M3dWdllFVFE0eVhiQWM0cHdLdmQ4cHhYR1kySWZ3T2EzW +DQ9"; public $sRequirements = ''; @@ -78,7 +78,7 @@ kk9"; public function checkModCfgItemExist() { $blRet = false; - foreach ($this->_getShopList() as $oShop) { + foreach ($this->getShopList() as $oShop) { /** @var $oShop oxshop */ $aWhere = array( 'oxmodid' => $this->sModKey, @@ -104,7 +104,7 @@ kk9"; $blRet = false; if ($this->checkModCfgItemExist()) { - foreach ($this->_getShopList() as $oShop) { + foreach ($this->getShopList() as $oShop) { /** @var $oShop oxshop */ $aWhere = array( 'oxmodid' => $this->sModKey, @@ -178,10 +178,10 @@ kk9"; 'use_quote' => true, ), ); - $aRet = $this->_updateTableItem('d3_cfg_mod', $aInsertFields, $aWhere); + $aRet = $this->_updateTableItem2('d3_cfg_mod', $aInsertFields, $aWhere); $blRet = $aRet['blRet']; - $this->_setActionLog('SQL', $aRet['sql'], __METHOD__); - $this->_setUpdateBreak(false); + $this->setActionLog('SQL', $aRet['sql'], __METHOD__); + $this->setUpdateBreak(false); if ($this->getStepByStepMode()) { break; @@ -199,7 +199,7 @@ kk9"; public function checkContentGANoticeItemExist() { $blRet = false; - foreach ($this->_getShopList() as $oShop) { + foreach ($this->getShopList() as $oShop) { /** @var $oShop oxshop */ $aWhere = array( 'oxloadid' => 'Analytics_Security_Informations', @@ -224,7 +224,7 @@ kk9"; $blRet = false; if ($this->checkContentGANoticeItemExist()) { - foreach ($this->_getShopList() as $oShop) { + foreach ($this->getShopList() as $oShop) { /** @var $oShop oxshop */ $aWhere = array( 'oxloadid' => 'Analytics_Security_Informations', @@ -282,11 +282,11 @@ kk9"; 'force_update' => false, ), ); - $aRet = $this->_updateTableItem('oxcontents', $aInsertFields, $aWhere); + $aRet = $this->_updateTableItem2('oxcontents', $aInsertFields, $aWhere); $blRet = $aRet['blRet']; - $this->_setActionLog('SQL', $aRet['sql'], __METHOD__); - $this->_setUpdateBreak(false); + $this->setActionLog('SQL', $aRet['sql'], __METHOD__); + $this->setUpdateBreak(false); if ($this->getStepByStepMode()) { break; @@ -316,8 +316,8 @@ kk9"; if ($this->checkModCfgSameRevision($this->sModKey)) { $aRet = $this->_updateModCfgSameRevision($this->sModKey); - $this->_setActionLog('SQL', $aRet['sql'], __METHOD__); - $this->_setUpdateBreak(false); + $this->setActionLog('SQL', $aRet['sql'], __METHOD__); + $this->setUpdateBreak(false); $blRet = $aRet['blRet']; } diff --git a/setup+doku/Precheck/d3precheck.php b/setup+doku/Precheck/d3precheck.php index b67116a..bcf0636 100644 --- a/setup+doku/Precheck/d3precheck.php +++ b/setup+doku/Precheck/d3precheck.php @@ -41,9 +41,9 @@ class requConfig { public $sModName = 'D³ Google Services'; - public $sModId = 'd3_googleanalytics'; + public $sModId = 'd3_googleanalytics'; - public $sModVersion = '3.3.1.0'; + public $sModVersion = '3.3.2.0'; /********************** check configuration section ************************/ @@ -113,9 +113,9 @@ class requConfig 'hasMaxShopVersion' => array( 'blExec' => 1, 'aParams' => array( - 'PE' => '4.9.0', - 'CE' => '4.9.0', - 'EE' => '5.2.0' + 'PE' => '4.9.4', + 'CE' => '4.9.4', + 'EE' => '5.2.4' ), ), @@ -143,7 +143,7 @@ class requConfig 'aParams' => array( 'id' => 'd3modcfg_lib', 'name' => 'Modul-Connector', - 'version' => '4.0.0.0', + 'version' => '4.3.3.0', ), ), ), diff --git a/setup+doku/changelog.txt b/setup+doku/changelog.txt index 83aeb9d..2b8667d 100644 --- a/setup+doku/changelog.txt +++ b/setup+doku/changelog.txt @@ -7,6 +7,7 @@ - fix: Kampagnencode wurde nicht übertragen - Link "Hilfe starten" korrigieren - Aktualisierung der Modulinstallationsanleitung / Vorabprüfung (d3precheck) +- freigegeben bis PHP 5.6 => 3.3.1.0 - Lieferzeitangabe kann nun für lagernde und nicht lagernde Artikel getrennt angegeben werden