diff --git a/Sources/Google Analytics-Installation.docx b/Sources/Google Analytics-Installation.docx
index df28269..87f7eba 100644
Binary files a/Sources/Google Analytics-Installation.docx and b/Sources/Google Analytics-Installation.docx differ
diff --git a/copy_this/modules/d3/d3_googleanalytics/metadata.php b/copy_this/modules/d3/d3_googleanalytics/metadata.php
index 999948a..a07dae3 100644
--- a/copy_this/modules/d3/d3_googleanalytics/metadata.php
+++ b/copy_this/modules/d3/d3_googleanalytics/metadata.php
@@ -29,16 +29,18 @@ $sMetadataVersion = '1.1';
$aModule = array(
'id' => 'd3_googleanalytics',
'title' => (class_exists('d3utils')?d3utils::getInstance()->getD3Logo():'D³').
- ' Google Analytics Schnittstelle',
+ ' Google Services Schnittstelle',
'description' => array(
'de' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-'.
'Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die '.
'Besucherdaten und eCommerce-Daten zu Google übertragen. Ebenfalls übermittelt werden Daten '.
- 'der Website-Suche.',
- 'en' => 'Provides a quick and easy integration with your Google Analytics account to your shop.',
+ 'der Website-Suche. Weiterhin können über das Modul Shopdaten an Google Adwords und Google Trusted '.
+ 'Shops übertragen werden.',
+ 'en' => 'Provides a quick and easy integration with your Google Analytics, Google Adwords and Google '.
+ 'Trusted Shops account to your shop.',
),
'thumbnail' => 'picture.png',
- 'version' => '3.2.1.0',
+ 'version' => '3.3.0.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 ea53b37..e576cae 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
@@ -19,9 +19,9 @@ class d3_googleanalytics_update extends d3install_updatebase
{
public $sModKey = 'd3_googleanalytics';
- public $sModName = 'Google Analytics Schnittstelle';
+ public $sModName = 'Google Services Schnittstelle';
- public $sModVersion = '3.2.1.0';
+ public $sModVersion = '3.3.0.0';
public $sModRevision = '171';
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php b/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
index 2b09d28..134ab6f 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
@@ -27,7 +27,7 @@ $aLang = array(
//Navigation
'charset' => 'ISO-8859-15',
- 'd3mxgoogleanalytics' => 'Google Analytics',
+ 'd3mxgoogleanalytics' => 'Google Services',
'd3mxgoogleanalytics_settings' => 'Einstellungen',
'd3tbclgoogleanalytics_main' => 'Analytics',
'd3tbclgoogleanalytics_adwords' => 'AdWords',
@@ -332,7 +332,7 @@ $aLang = array(
'D3_GOOGLEANALYTICS_TS_SHOPPINGARTID_DESC' => 'Über welches Feld kann Google Shopping die '.
'dort hinterlegten Artikel identfizieren?',
- 'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle',
+ 'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Services Schnittstelle',
'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und '.
'unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden '.
'über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen. '.
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php b/copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php
index 6544efd..bd2292f 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php
@@ -27,13 +27,13 @@ $aLang = array(
//Navigation
'charset' => 'ISO-8859-15',
- 'd3mxgoogleanalytics' => 'Google Analytics',
+ 'd3mxgoogleanalytics' => 'Google Services',
'd3mxgoogleanalytics_settings' => 'Settings',
'd3tbclgoogleanalytics_main' => 'Analytics',
'd3tbclgoogleanalytics_adwords' => 'AdWords',
'd3tbclgoogleanalytics_trustedstore' => 'Trusted Store',
- 'D3_GOOGLEANALYTICS_CFG_TITLE' => 'Google Analytics Connector - Settings',
+ 'D3_GOOGLEANALYTICS_CFG_TITLE' => 'Google Services Connector - Settings',
'D3_GOOGLEANALYTICS_MAIN' => 'Main Settings',
'D3_GOOGLEANALYTICS_MAIN_DEBUG' => 'Aktivieren Sie mit dem Schalter den Debugmodus.'.
@@ -331,7 +331,7 @@ $aLang = array(
'D3_GOOGLEANALYTICS_TS_SHOPPINGARTID_DESC' => 'Über welches Feld kann Google Shopping die '.
'dort hinterlegten Artikel identfizieren?',
- 'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle',
+ 'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Services Schnittstelle',
'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und '.
'unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden '.
'über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen. '.
diff --git a/setup+doku/Google Analytics-Installation.pdf b/setup+doku/Google Analytics-Installation.pdf
index 6946197..22ba399 100644
Binary files a/setup+doku/Google Analytics-Installation.pdf and b/setup+doku/Google Analytics-Installation.pdf differ
diff --git a/setup+doku/Precheck/d3precheck.php b/setup+doku/Precheck/d3precheck.php
index bd00154..0a80a22 100644
--- a/setup+doku/Precheck/d3precheck.php
+++ b/setup+doku/Precheck/d3precheck.php
@@ -39,11 +39,11 @@
class requConfig
{
- public $sModName = 'D³ GoogleAnalytics';
+ public $sModName = 'D³ Google Services';
public $sModId = 'd3_googleanalytics';
- public $sModVersion = '3.2.1.0';
+ public $sModVersion = '3.3.0.0';
/********************** check configuration section ************************/
@@ -113,9 +113,9 @@ class requConfig
'hasMaxShopVersion' => array(
'blExec' => 1,
'aParams' => array(
- 'PE' => '4.8.6',
- 'CE' => '4.8.6',
- 'EE' => '5.1.6'
+ 'PE' => '4.8.7',
+ 'CE' => '4.8.7',
+ 'EE' => '5.1.7'
),
),
@@ -157,6 +157,17 @@ class requConfig
),
),
),
+
+ // benötigt neuen Lizenzschlüssel
+ 'requireNewLicence' => array(
+ array(
+ 'blExec' => 0,
+ 'aParams' => array(
+ 'checkVersion' => true, // soll Versionsnummer des installierten Moduls gegengeprüft werden?
+ 'remainingDigits' => 2, // zu prüfende Stellen für neue Lizenz
+ ),
+ ),
+ ),
);
}
@@ -169,7 +180,7 @@ date_default_timezone_set('Europe/Berlin');
*/
class requCheck
{
- public $sVersion = '4.2';
+ public $sVersion = '4.3';
protected $_db = false;
@@ -469,6 +480,30 @@ class requCheck
return !$aResult;
}
+ /**
+ * @param $aResult
+ *
+ * @return bool
+ */
+ protected function _hasNoticeInResult($aResult)
+ {
+ if (is_array($aResult)) {
+ foreach ($aResult as $blResult) {
+ if ($blResult === 'notice') {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ if ($aResult === 'notice') {
+ return true;
+ }
+
+ return false;
+ }
+
/********************** conversion function section ************************/
/**
@@ -521,17 +556,24 @@ class requCheck
return sprintf(
'%d%03d%03d%03d',
- intval($match[0] !== null ? $match[0] : $iUnsetPart),
- intval(
- $match[1] !== null ? $match[1] : $iUnsetPart
- ),
- intval($match[2] !== null ? $match[2] : $iUnsetPart),
- intval(
- $match[3] !== null ? $match[3] : $iUnsetPart
- )
+ $this->_getVersionDigit($match[0], $iUnsetPart),
+ $this->_getVersionDigit($match[1], $iUnsetPart),
+ $this->_getVersionDigit($match[2], $iUnsetPart),
+ $this->_getVersionDigit($match[3], $iUnsetPart)
);
}
+ /**
+ * @param $sMatch
+ * @param $iUnsetPart
+ *
+ * @return int
+ */
+ protected function _getVersionDigit($sMatch, $iUnsetPart)
+ {
+ return intval($sMatch !== null ? $sMatch : $iUnsetPart);
+ }
+
/********************** layout function section ************************/
public function deleteme()
@@ -585,22 +627,35 @@ class requCheck
$oTests = new requTests($this, $this->oConfig, $this->getDb(), $this->oRemote);
if (method_exists($oTests, $sGenCheckType)) {
- $aResult = $oTests->{$sGenCheckType}($aConfiguration);
- $sElementId = (md5($sGenCheckType . serialize($aConfiguration)));
-
- if ($this->_hasFalseInResult($aResult)) {
- $this->oLayout->getNoSuccessItem($aResult, $sElementId, $sCheckType, $aConfiguration);
- } elseif ($this->_hasNullInResult($aResult)) {
- $this->oLayout->getUnknownItem($aResult, $sElementId, $sCheckType, $aConfiguration);
- } else {
- $this->oLayout->getSuccessItem($aResult, $sElementId, $sCheckType, $aConfiguration);
- }
+ $this->_checkResult($oTests, $sGenCheckType, $sCheckType, $aConfiguration);
} else {
$this->oLayout->getUncheckableItem($sCheckType, $aConfiguration);
$this->blGlobalResult = false;
}
}
+ /**
+ * @param $oTests
+ * @param $sGenCheckType
+ * @param $sCheckType
+ * @param $aConfiguration
+ */
+ protected function _checkResult($oTests, $sGenCheckType, $sCheckType, $aConfiguration)
+ {
+ $aResult = $oTests->{$sGenCheckType}($aConfiguration);
+ $sElementId = (md5($sGenCheckType . serialize($aConfiguration)));
+
+ if ($this->_hasNoticeInResult($aResult)) {
+ $this->oLayout->getUnknownItem($aResult, $sElementId, $sCheckType, $aConfiguration);
+ } elseif ($this->_hasNullInResult($aResult)) {
+ $this->oLayout->getUnknownItem($aResult, $sElementId, $sCheckType, $aConfiguration);
+ } elseif ($this->_hasFalseInResult($aResult)) {
+ $this->oLayout->getNoSuccessItem($aResult, $sElementId, $sCheckType, $aConfiguration);
+ } else {
+ $this->oLayout->getSuccessItem($aResult, $sElementId, $sCheckType, $aConfiguration);
+ }
+ }
+
public function showinfo()
{
phpinfo();
@@ -641,21 +696,73 @@ class requLayout
- 
- 
+
+
+
+
+
+
+
+
+
EOT;
echo "" . $this->translate('RequCheck') . ' "' . $this->oConfig->sModName . ' ' . $sModVersion . '"
';
echo '' . $this->translate('ExecNotice') . '
' . PHP_EOL;
@@ -681,10 +788,15 @@ EOT;
$sTranslDependent
- $sTranslShopPhpInfo
+
+ $sTranslShopPhpInfo
+
-
+