From 76fdad3d4474116d508e5b11600e4759bfd1ea89 Mon Sep 17 00:00:00 2001 From: DanielSeifert Date: Fri, 21 Dec 2012 10:17:54 +0000 Subject: [PATCH] basic refactoring --- .../admin/d3_cfg_googleanalytics_licence.php | 1 - .../admin/d3_cfg_googleanalytics_list.php | 3 +-- .../admin/d3_cfg_googleanalytics_main.php | 1 - .../d3_oxcmp_utils_googleanalytics.php | 13 +++++----- .../models/d3_oxorder_googleanalytics.php | 23 ++++++++++++++-- .../tpl/d3_cfg_googleanalytics_campaigns.tpl | 26 ++++++++++++------- .../admin/tpl/d3_cfg_googleanalytics_main.tpl | 5 +--- 7 files changed, 45 insertions(+), 27 deletions(-) diff --git a/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_licence.php b/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_licence.php index 1f7bb9f..66829d1 100644 --- a/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_licence.php +++ b/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_licence.php @@ -20,7 +20,6 @@ class d3_cfg_googleanalytics_licence extends d3_cfg_mod_licence { - protected $_sModId = 'd3_googleanalytics'; protected $_hasLicence = FALSE; diff --git a/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_list.php b/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_list.php index c5ef181..a5a0cfc 100644 --- a/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_list.php +++ b/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_list.php @@ -20,14 +20,13 @@ class d3_cfg_googleanalytics_list extends d3_cfg_mod_list { - protected $_blD3ShowLangSwitch = TRUE; public function render() { parent::render(); - $this->_aViewData["default_edit"] = "d3_cfg_googleanalytics_main"; + $this->addTplParam("default_edit", "d3_cfg_googleanalytics_main"); return $this->_sThisTemplate; } diff --git a/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_main.php b/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_main.php index 20d61a8..22a3f64 100644 --- a/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_main.php +++ b/copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_main.php @@ -21,7 +21,6 @@ class d3_cfg_googleanalytics_main extends d3_cfg_mod_main { protected $_sThisTemplate = 'd3_cfg_googleanalytics_main.tpl'; - protected $_sModId = 'd3_googleanalytics'; public function checkD3Log() diff --git a/copy_this/modules/d3/d3GoogleAnalytics/modules/components/d3_oxcmp_utils_googleanalytics.php b/copy_this/modules/d3/d3GoogleAnalytics/modules/components/d3_oxcmp_utils_googleanalytics.php index 0694ac7..6ee4bbe 100644 --- a/copy_this/modules/d3/d3GoogleAnalytics/modules/components/d3_oxcmp_utils_googleanalytics.php +++ b/copy_this/modules/d3/d3GoogleAnalytics/modules/components/d3_oxcmp_utils_googleanalytics.php @@ -3,19 +3,18 @@ class d3_oxcmp_utils_googleAnalytics extends d3_oxcmp_utils_googleAnalytics_parent { private $_sModId = 'd3_googleanalytics'; - + private $_oSet; - + public function render() { $ret = parent::render(); // load module config - $this->_oSet = oxNew('d3_cfg_mod'); - $this->_oSet->Load($this->_oSet->getModOxid($this->_sModId), true); - - $this->_oParent->addTplParam('blD3GoogleAnalyticsActive', $this->_oSet->getFieldData('oxactive')); - $this->_oParent->addTplParam('oD3GASettings', $this->_oSet); + $this->_oSet = d3_cfg_mod::get($this->_sModId); + + $this->getParent()->addTplParam('blD3GoogleAnalyticsActive', $this->_oSet->getFieldData('oxactive')); + $this->getParent()->addTplParam('oD3GASettings', $this->_oSet); return $ret; } diff --git a/copy_this/modules/d3/d3GoogleAnalytics/modules/models/d3_oxorder_googleanalytics.php b/copy_this/modules/d3/d3GoogleAnalytics/modules/models/d3_oxorder_googleanalytics.php index d060fa8..d80528b 100644 --- a/copy_this/modules/d3/d3GoogleAnalytics/modules/models/d3_oxorder_googleanalytics.php +++ b/copy_this/modules/d3/d3GoogleAnalytics/modules/models/d3_oxorder_googleanalytics.php @@ -1,5 +1,23 @@ . + * + * @link http://www.oxidmodule.com + * @link http://www.shopmodule.com + * @copyright (C) D3 Data Development + */ + class d3_oxorder_googleanalytics extends d3_oxorder_googleanalytics_parent { public function getPayment() @@ -15,8 +33,9 @@ class d3_oxorder_googleanalytics extends d3_oxorder_googleanalytics_parent public function d3getVoucherSerieList() { - $sSelect = "SELECT oxvoucherserieid FROM oxvouchers WHERE oxorderid = ".oxDb::getDb()->quote($this->getId()); - $aVoucherIds = oxDb::getDb()->getArray($sSelect); + $sSelect = + "SELECT oxvoucherserieid FROM oxvouchers WHERE oxorderid = " . oxDb::getDb()->quote($this->getId()); + $aVoucherIds = (array) oxDb::getDb()->getArray($sSelect); $aVoucherSerieList = array(); foreach ($aVoucherIds as $aVoucherId) diff --git a/copy_this/modules/d3/d3GoogleAnalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/copy_this/modules/d3/d3GoogleAnalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl index 4d0c3b4..58559fa 100644 --- a/copy_this/modules/d3/d3GoogleAnalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl +++ b/copy_this/modules/d3/d3GoogleAnalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl @@ -1,7 +1,5 @@ [{include file="headitem.tpl" title="D3_GOOGLEANALYTICS_CFG_TITLE"|oxmultilangassign}] - -