finished release preparations
This commit is contained in:
parent
68c2b56af2
commit
df5459a97b
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -168,13 +168,13 @@ changed_full/480-/application/views/azure/tpl/page/checkout/payment.tpl -text
|
|||||||
changed_full/480-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl -text
|
changed_full/480-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl -text
|
||||||
changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl -text
|
changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl -text
|
||||||
copy_this/.noencode -text
|
copy_this/.noencode -text
|
||||||
|
copy_this/modules/d3/d3_googleanalytics/IntelliSenseHelper.php -text
|
||||||
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics.php -text
|
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics.php -text
|
||||||
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php -text
|
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php -text
|
||||||
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php -text
|
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php -text
|
||||||
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_list.php -text
|
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_list.php -text
|
||||||
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php -text
|
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php -text
|
||||||
copy_this/modules/d3/d3_googleanalytics/core/smarty/plugins/function.d3getArticleFromOrderArticle.php -text
|
copy_this/modules/d3/d3_googleanalytics/core/smarty/plugins/function.d3getArticleFromOrderArticle.php -text
|
||||||
copy_this/modules/d3/d3_googleanalytics/d3_googleanalytics_stub.php -text
|
|
||||||
copy_this/modules/d3/d3_googleanalytics/menu.xml -text
|
copy_this/modules/d3/d3_googleanalytics/menu.xml -text
|
||||||
copy_this/modules/d3/d3_googleanalytics/metadata.php -text
|
copy_this/modules/d3/d3_googleanalytics/metadata.php -text
|
||||||
copy_this/modules/d3/d3_googleanalytics/models/d3_googleanalytics_update.php -text
|
copy_this/modules/d3/d3_googleanalytics/models/d3_googleanalytics_update.php -text
|
||||||
|
Binary file not shown.
@ -1,4 +1,7 @@
|
|||||||
|
3.0.0.3
|
||||||
|
- Update der precheck.php
|
||||||
|
|
||||||
-- 2012-12-19 -- SK --
|
-- 2012-12-19 -- SK --
|
||||||
- anpassen der Verzeichnisse + Dateien an PE/CE 4.7.x bzw. EE 5.0.x
|
- anpassen der Verzeichnisse + Dateien an PE/CE 4.7.x bzw. EE 5.0.x
|
||||||
- "alten" Trunk auslagern unter branches/trunk_bis_4.6.x
|
- "alten" Trunk auslagern unter branches/trunk_bis_4.6.x
|
||||||
- "alte" Versionen unter Tags verschieben in neuse Verzeichnis unter tags/versionen_bis_4.6.x
|
- "alte" Versionen unter Tags verschieben in neuse Verzeichnis unter tags/versionen_bis_4.6.x
|
||||||
|
@ -37,7 +37,7 @@ $aModule = array(
|
|||||||
'en' => 'Provides a quick and easy integration with your Google Analytics account to your shop.',
|
'en' => 'Provides a quick and easy integration with your Google Analytics account to your shop.',
|
||||||
),
|
),
|
||||||
'thumbnail' => 'picture.png',
|
'thumbnail' => 'picture.png',
|
||||||
'version' => '3.0.0.2',
|
'version' => '3.0.0.3',
|
||||||
'author' => 'D³ Data Development (Inh. Thomas Dartsch)',
|
'author' => 'D³ Data Development (Inh. Thomas Dartsch)',
|
||||||
'email' => 'support@shopmodule.com',
|
'email' => 'support@shopmodule.com',
|
||||||
'url' => 'http://www.oxidmodule.com/',
|
'url' => 'http://www.oxidmodule.com/',
|
||||||
@ -69,4 +69,4 @@ $aModule = array(
|
|||||||
'block'=>'head_css',
|
'block'=>'head_css',
|
||||||
'file'=>'/views/blocks/layout/d3_base_googleanalytics.tpl'),
|
'file'=>'/views/blocks/layout/d3_base_googleanalytics.tpl'),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
@ -11,32 +11,47 @@
|
|||||||
* http://www.shopmodule.com
|
* http://www.shopmodule.com
|
||||||
*
|
*
|
||||||
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
* @author D3 Data Development - Daniel Seifert <ds@shopmodule.com>
|
* @author D3 Data Development - Daniel Seifert <ds@shopmodule.com>
|
||||||
* @link http://www.oxidmodule.com
|
* @link http://www.oxidmodule.com
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class d3_googleanalytics_update extends d3install_updatebase
|
class d3_googleanalytics_update extends d3install_updatebase
|
||||||
{
|
{
|
||||||
public $sModKey = 'd3_googleanalytics';
|
public $sModKey = 'd3_googleanalytics';
|
||||||
|
|
||||||
public $sModName = 'Google Analytics Schnittstelle';
|
public $sModName = 'Google Analytics Schnittstelle';
|
||||||
public $sModVersion = '3.0.0.2';
|
|
||||||
public $sModRevision = '99';
|
public $sModVersion = '3.0.0.3';
|
||||||
public $sBaseConf = 'WxUSlVXQ0ZjeG44Z3RyZWN3TlhqTFdlNVdJcWFVaDgwOTYwcUdOdHVycnFCRnJDQjBpTDhRMHhqRCt0U
|
|
||||||
jQrcldHdzArR0xMaGtNdTM2MFdRcTRNZ0tOQnFZWDJPckR1T3FTcmY5U0l6MjBrSmpMa0VkS2t0MXFGT
|
public $sModRevision = '100';
|
||||||
lVPdFVIMGpNSTNpcjV5ejBLR1hpVktaTHNtbnVZVzNqT3diUEFNRXpJUjNZTDg0SmZHYjlYYW5ZaXZPY
|
|
||||||
XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V
|
public $sBaseConf = <<<KEY
|
||||||
0tmeFpBS2hpZVFjc29qdFRiSm9UZEVkTnFsUXB3M292anJyVG5wUkd6bG5MVzR4NThFRE9TYjJYaStuR
|
--------------------------------------------------------------------------------
|
||||||
3M9';
|
84MbWtQLzZnbGNvWkw4d3BEUy82OTdmQmhZNEw5OWNYSXpuNGRMbE02bnJ0VlF6MlcwM252R1UvdTVkd
|
||||||
|
09zOWs0SnF3T0U2L3RBUEN6MDkwdmFQeStMcWRHRGY1blJGUk9waTZSSlZLRlB0UHNnU2ZiS2pqWVJ6e
|
||||||
|
VcxK3lPOW9TQWM3QkZmb3dTMjlwVkNBVitWck5sWUE2dlRLNWZjNGJRZG9uMEVlR2dTL3pxaGpPL2lvZ
|
||||||
|
nYrbFovbmhIb1o3Q0RFSkl4S2RhNTdaaHUvbXU4L0VFK0QxMUVVdmo3b0N5enVaS01yRE9DZGVud1dEd
|
||||||
|
DNLOWgybGkycTNnRnBMU256aVY5Um5RdTVPaFl6ckIyRWRJSWg1T1ZMVU1nbDBNSUFwdHh6OThRK01wV
|
||||||
|
0k9
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
KEY;
|
||||||
|
|
||||||
public $sRequirements = '';
|
public $sRequirements = '';
|
||||||
|
|
||||||
public $sBaseValue = '';
|
public $sBaseValue = '';
|
||||||
|
|
||||||
protected $_aUpdateMethods = array(
|
protected $_aUpdateMethods = array(
|
||||||
array('check' => 'checkModCfgItemExist',
|
array(
|
||||||
'do' => 'updateModCfgItemExist'),
|
'check' => 'checkModCfgItemExist',
|
||||||
array('check' => 'checkContentGANoticeItemExist',
|
'do' => 'updateModCfgItemExist'
|
||||||
'do' => 'updateContentGANoticeItemExist'),
|
),
|
||||||
array('check' => 'checkModCfgSameRevision',
|
array(
|
||||||
'do' => 'updateModCfgSameRevision'),
|
'check' => 'checkContentGANoticeItemExist',
|
||||||
|
'do' => 'updateContentGANoticeItemExist'
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'check' => 'checkModCfgSameRevision',
|
||||||
|
'do' => 'updateModCfgSameRevision'
|
||||||
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
protected $_aRefreshMetaModuleIds = array('d3_googleanalytics');
|
protected $_aRefreshMetaModuleIds = array('d3_googleanalytics');
|
||||||
@ -46,9 +61,8 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V
|
|||||||
*/
|
*/
|
||||||
public function checkModCfgItemExist()
|
public function checkModCfgItemExist()
|
||||||
{
|
{
|
||||||
$blRet = FALSE;
|
$blRet = false;
|
||||||
foreach ($this->_getShopList() as $oShop)
|
foreach ($this->_getShopList() as $oShop) {
|
||||||
{
|
|
||||||
/** @var $oShop oxshop */
|
/** @var $oShop oxshop */
|
||||||
$aWhere = array(
|
$aWhere = array(
|
||||||
'oxmodid' => $this->sModKey,
|
'oxmodid' => $this->sModKey,
|
||||||
@ -58,8 +72,7 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V
|
|||||||
|
|
||||||
$blRet = $this->_checkTableItemNotExist('d3_cfg_mod', $aWhere);
|
$blRet = $this->_checkTableItemNotExist('d3_cfg_mod', $aWhere);
|
||||||
|
|
||||||
if ($blRet)
|
if ($blRet) {
|
||||||
{
|
|
||||||
return $blRet;
|
return $blRet;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -72,12 +85,10 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V
|
|||||||
*/
|
*/
|
||||||
public function updateModCfgItemExist()
|
public function updateModCfgItemExist()
|
||||||
{
|
{
|
||||||
$blRet = FALSE;
|
$blRet = false;
|
||||||
|
|
||||||
if ($this->checkModCfgItemExist())
|
if ($this->checkModCfgItemExist()) {
|
||||||
{
|
foreach ($this->_getShopList() as $oShop) {
|
||||||
foreach ($this->_getShopList() as $oShop)
|
|
||||||
{
|
|
||||||
/** @var $oShop oxshop */
|
/** @var $oShop oxshop */
|
||||||
$aWhere = array(
|
$aWhere = array(
|
||||||
'oxmodid' => $this->sModKey,
|
'oxmodid' => $this->sModKey,
|
||||||
@ -85,68 +96,66 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V
|
|||||||
'oxnewrevision' => $this->sModRevision,
|
'oxnewrevision' => $this->sModRevision,
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($this->_checkTableItemNotExist('d3_cfg_mod', $aWhere))
|
if ($this->_checkTableItemNotExist('d3_cfg_mod', $aWhere)) {
|
||||||
{
|
|
||||||
// update don't use this property
|
// update don't use this property
|
||||||
unset($aWhere['oxnewrevision']);
|
unset($aWhere['oxnewrevision']);
|
||||||
|
|
||||||
$aInsertFields = array(
|
$aInsertFields = array(
|
||||||
'OXID' => array(
|
'OXID' => array(
|
||||||
'content' => "md5('" . $this->sModKey . " " . $oShop->getId() . "')",
|
'content' => "md5('" . $this->sModKey . " " . $oShop->getId() . "')",
|
||||||
'force_update' => false,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXSHOPID' => array(
|
'OXSHOPID' => array(
|
||||||
'content' => "'" . $oShop->getId() . "'",
|
'content' => "'" . $oShop->getId() . "'",
|
||||||
'force_update' => false,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXMODID' => array(
|
'OXMODID' => array(
|
||||||
'content' => "'" . $this->sModKey . "'",
|
'content' => "'" . $this->sModKey . "'",
|
||||||
'force_update' => TRUE,
|
'force_update' => true,
|
||||||
),
|
),
|
||||||
'OXNAME' => array(
|
'OXNAME' => array(
|
||||||
'content' => "'" . $this->sModName . "'",
|
'content' => "'" . $this->sModName . "'",
|
||||||
'force_update' => TRUE,
|
'force_update' => true,
|
||||||
),
|
),
|
||||||
'OXACTIVE' => array(
|
'OXACTIVE' => array(
|
||||||
'content' => "0",
|
'content' => "0",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXBASECONFIG' => array(
|
'OXBASECONFIG' => array(
|
||||||
'content' => "'" . $this->sBaseConf . "'",
|
'content' => "'" . $this->sBaseConf . "'",
|
||||||
'force_update' => TRUE,
|
'force_update' => true,
|
||||||
),
|
),
|
||||||
'OXINSTALLDATE' => array(
|
'OXINSTALLDATE' => array(
|
||||||
'content' => "NOW()",
|
'content' => "NOW()",
|
||||||
'force_update' => TRUE,
|
'force_update' => true,
|
||||||
),
|
),
|
||||||
'OXVERSION' => array(
|
'OXVERSION' => array(
|
||||||
'content' => "'" . $this->sModVersion . "'",
|
'content' => "'" . $this->sModVersion . "'",
|
||||||
'force_update' => TRUE,
|
'force_update' => true,
|
||||||
),
|
),
|
||||||
'OXSHOPVERSION' => array(
|
'OXSHOPVERSION' => array(
|
||||||
'content' => "'" . oxRegistry::getConfig()->getEdition() . "'",
|
'content' => "'" . oxRegistry::getConfig()->getEdition() . "'",
|
||||||
'force_update' => TRUE,
|
'force_update' => true,
|
||||||
),
|
),
|
||||||
'OXREQUIREMENTS' => array(
|
'OXREQUIREMENTS' => array(
|
||||||
'content' => "'" . $this->sRequirements . "'",
|
'content' => "'" . $this->sRequirements . "'",
|
||||||
'force_update' => TRUE,
|
'force_update' => true,
|
||||||
),
|
),
|
||||||
'OXVALUE' => array(
|
'OXVALUE' => array(
|
||||||
'content' => "'" . $this->sBaseValue . "'",
|
'content' => "'" . $this->sBaseValue . "'",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXNEWREVISION' => array(
|
'OXNEWREVISION' => array(
|
||||||
'content' => "'" . $this->sModRevision . "'",
|
'content' => "'" . $this->sModRevision . "'",
|
||||||
'force_update' => TRUE,
|
'force_update' => true,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
$aRet = $this->_updateTableItem('d3_cfg_mod', $aInsertFields, $aWhere);
|
$aRet = $this->_updateTableItem('d3_cfg_mod', $aInsertFields, $aWhere);
|
||||||
$blRet = $aRet['blRet'];
|
$blRet = $aRet['blRet'];
|
||||||
$this->_setActionLog('SQL', $aRet['sql'], __METHOD__);
|
$this->_setActionLog('SQL', $aRet['sql'], __METHOD__);
|
||||||
$this->_setUpdateBreak(FALSE);
|
$this->_setUpdateBreak(false);
|
||||||
|
|
||||||
if ($this->getStepByStepMode())
|
if ($this->getStepByStepMode()) {
|
||||||
{
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -161,9 +170,8 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V
|
|||||||
*/
|
*/
|
||||||
public function checkContentGANoticeItemExist()
|
public function checkContentGANoticeItemExist()
|
||||||
{
|
{
|
||||||
$blRet = FALSE;
|
$blRet = false;
|
||||||
foreach ($this->_getShopList() as $oShop)
|
foreach ($this->_getShopList() as $oShop) {
|
||||||
{
|
|
||||||
/** @var $oShop oxshop */
|
/** @var $oShop oxshop */
|
||||||
$aWhere = array(
|
$aWhere = array(
|
||||||
'oxloadid' => 'Analytics_Security_Informations',
|
'oxloadid' => 'Analytics_Security_Informations',
|
||||||
@ -172,8 +180,7 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V
|
|||||||
|
|
||||||
$blRet = $this->_checkTableItemNotExist('oxcontents', $aWhere);
|
$blRet = $this->_checkTableItemNotExist('oxcontents', $aWhere);
|
||||||
|
|
||||||
if ($blRet)
|
if ($blRet) {
|
||||||
{
|
|
||||||
return $blRet;
|
return $blRet;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -186,83 +193,80 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V
|
|||||||
*/
|
*/
|
||||||
public function updateContentGANoticeItemExist()
|
public function updateContentGANoticeItemExist()
|
||||||
{
|
{
|
||||||
$blRet = FALSE;
|
$blRet = false;
|
||||||
|
|
||||||
if ($this->checkContentGANoticeItemExist())
|
if ($this->checkContentGANoticeItemExist()) {
|
||||||
{
|
foreach ($this->_getShopList() as $oShop) {
|
||||||
foreach ($this->_getShopList() as $oShop)
|
|
||||||
{
|
|
||||||
/** @var $oShop oxshop */
|
/** @var $oShop oxshop */
|
||||||
$aWhere = array(
|
$aWhere = array(
|
||||||
'oxloadid' => 'Analytics_Security_Informations',
|
'oxloadid' => 'Analytics_Security_Informations',
|
||||||
'oxshopid' => $oShop->getId(),
|
'oxshopid' => $oShop->getId(),
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($this->_checkTableItemNotExist('oxcontents', $aWhere))
|
if ($this->_checkTableItemNotExist('oxcontents', $aWhere)) {
|
||||||
{
|
|
||||||
$aInsertFields = array(
|
$aInsertFields = array(
|
||||||
'OXID' => array(
|
'OXID' => array(
|
||||||
'content' => "md5(RAND())",
|
'content' => "md5(RAND())",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXLOADID' => array(
|
'OXLOADID' => array(
|
||||||
'content' => "'Analytics_Security_Informations'",
|
'content' => "'Analytics_Security_Informations'",
|
||||||
'force_update' => TRUE,
|
'force_update' => true,
|
||||||
),
|
),
|
||||||
'OXSHOPID' => array(
|
'OXSHOPID' => array(
|
||||||
'content' => "'" . $oShop->getId() . "'",
|
'content' => "'" . $oShop->getId() . "'",
|
||||||
'force_update' => TRUE,
|
'force_update' => true,
|
||||||
),
|
),
|
||||||
'OXSNIPPET' => array(
|
'OXSNIPPET' => array(
|
||||||
'content' => "'1'",
|
'content' => "'1'",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXTYPE' => array(
|
'OXTYPE' => array(
|
||||||
'content' => "'0'",
|
'content' => "'0'",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXACTIVE' => array(
|
'OXACTIVE' => array(
|
||||||
'content' => "'1'",
|
'content' => "'1'",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXACTIVE_1' => array(
|
'OXACTIVE_1' => array(
|
||||||
'content' => "'1'",
|
'content' => "'1'",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXPOSITION' => array(
|
'OXPOSITION' => array(
|
||||||
'content' => "''",
|
'content' => "''",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXTITLE' => array(
|
'OXTITLE' => array(
|
||||||
'content' => "'Analytics Datenschutz Information'",
|
'content' => "'Analytics Datenschutz Information'",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXCONTENT' => array(
|
'OXCONTENT' => array(
|
||||||
'content' => "'<p>Diese Website benutzt Google Analytics, einen Webanalysedienst der Google\r\n\r\nInc. ("Google"). Google Analytics verwendet sog. "Cookies", 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>'",
|
'content' => "'<p>Diese Website benutzt Google Analytics, einen Webanalysedienst der Google\r\n\r\nInc. ("Google"). Google Analytics verwendet sog. "Cookies", 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>'",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXCATID' => array(
|
'OXCATID' => array(
|
||||||
'content' => "''",
|
'content' => "''",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
'OXFOLDER' => array(
|
'OXFOLDER' => array(
|
||||||
'content' => "'CMSFOLDER_USERINFO'",
|
'content' => "'CMSFOLDER_USERINFO'",
|
||||||
'force_update' => FALSE,
|
'force_update' => false,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
$aRet = $this->_updateTableItem('oxcontents', $aInsertFields, $aWhere);
|
$aRet = $this->_updateTableItem('oxcontents', $aInsertFields, $aWhere);
|
||||||
$blRet = $aRet['blRet'];
|
$blRet = $aRet['blRet'];
|
||||||
|
|
||||||
$this->_setActionLog('SQL', $aRet['sql'], __METHOD__);
|
$this->_setActionLog('SQL', $aRet['sql'], __METHOD__);
|
||||||
$this->_setUpdateBreak(FALSE);
|
$this->_setUpdateBreak(false);
|
||||||
|
|
||||||
if ($this->getStepByStepMode())
|
if ($this->getStepByStepMode()) {
|
||||||
{
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $blRet;
|
return $blRet;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -279,17 +283,16 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V
|
|||||||
*/
|
*/
|
||||||
public function updateModCfgSameRevision()
|
public function updateModCfgSameRevision()
|
||||||
{
|
{
|
||||||
$blRet = FALSE;
|
$blRet = false;
|
||||||
|
|
||||||
if ($this->checkModCfgSameRevision($this->sModKey))
|
if ($this->checkModCfgSameRevision($this->sModKey)) {
|
||||||
{
|
|
||||||
$aRet = $this->_updateModCfgSameRevision($this->sModKey);
|
$aRet = $this->_updateModCfgSameRevision($this->sModKey);
|
||||||
|
|
||||||
$this->_setActionLog('SQL', $aRet['sql'], __METHOD__);
|
$this->_setActionLog('SQL', $aRet['sql'], __METHOD__);
|
||||||
$this->_setUpdateBreak(FALSE);
|
$this->_setUpdateBreak(false);
|
||||||
$blRet = $aRet['blRet'];
|
$blRet = $aRet['blRet'];
|
||||||
}
|
}
|
||||||
|
|
||||||
return $blRet;
|
return $blRet;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
=== 3.0.0.2 => 3.0.0.3 ===
|
||||||
|
- Umstellung auf teilautomatische Installation
|
||||||
|
|
||||||
=== 3.0.0.0 => 3.1.0.0 ===
|
=== 3.0.0.0 => 3.1.0.0 ===
|
||||||
- Umstellung auf teilautomatische Installation
|
- Umstellung auf teilautomatische Installation
|
||||||
- Übergabe der Steuer
|
- Übergabe der Steuer
|
||||||
@ -39,4 +42,4 @@
|
|||||||
- Preise werden in Shophauptwährung übertragen
|
- Preise werden in Shophauptwährung übertragen
|
||||||
- Templates für OXID 4.5.1 kompatibel
|
- Templates für OXID 4.5.1 kompatibel
|
||||||
|
|
||||||
...
|
...
|
||||||
|
Loading…
Reference in New Issue
Block a user