D3Public/GoogleServices
8
0
Fork 0
Code Pull Requests Releases Activity

reformat code

Browse Source
This commit is contained in:
Daniel Seifert 2012-12-21 10:20:32 +00:00
parent dd07e5a0dc
commit 5ca7526da8
11 changed files with 130 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -260,6 +260,7 @@ copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_
copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_licence.php -text
copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_list.php -text
copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_main.php -text
copy_this/modules/d3/d3GoogleAnalytics/d3_googleanalytics_stub.php -text
copy_this/modules/d3/d3GoogleAnalytics/menu.xml -text
copy_this/modules/d3/d3GoogleAnalytics/modules/components/d3_oxcmp_utils_googleanalytics.php -text
copy_this/modules/d3/d3GoogleAnalytics/modules/models/d3_oxorder_googleanalytics.php -text

19
changed_full/470-/modules/d3/d3GoogleAnalytics/metadata.php
View File

@ -1,4 +1,23 @@
<?php
/**
* This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This module is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* For further informations, see <http://www.gnu.org/licenses/>.
*
* @link http://www.oxidmodule.com
* @link http://www.shopmodule.com
* @copyright (C) D3 Data Development
*/
/**
* Metadata version
*/

4
copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics.php
View File

@ -20,7 +20,9 @@
class d3_cfg_googleanalytics extends d3_cfg_mod_
{
/**
* @return string
*/
public function render()
{
$this->_aViewData['sListClass'] = 'd3_cfg_googleanalytics_list';

3
copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php
View File

@ -24,6 +24,9 @@ class d3_cfg_googleanalytics_campaigns extends d3_cfg_mod_main
protected $_sModId = 'd3_googleanalytics';
/**
* @return bool
*/
public function checkD3Log()
{
// there are no reasons to log anything

3
copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_list.php
View File

@ -22,6 +22,9 @@ class d3_cfg_googleanalytics_list extends d3_cfg_mod_list
{
protected $_blD3ShowLangSwitch = TRUE;
/**
* @return null|string
*/
public function render()
{
parent::render();

3
copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_main.php
View File

@ -23,6 +23,9 @@ class d3_cfg_googleanalytics_main extends d3_cfg_mod_main
protected $_sThisTemplate = 'd3_cfg_googleanalytics_main.tpl';
protected $_sModId = 'd3_googleanalytics';
/**
* @return bool
*/
public function checkD3Log()
{
// there are no reasons to log anything

23
copy_this/modules/d3/d3GoogleAnalytics/d3_googleanalytics_stub.php Normal file
View File

@ -0,0 +1,23 @@
<?php
/**
* This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This module is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* For further informations, see <http://www.gnu.org/licenses/>.
*
* @link http://www.oxidmodule.com
* @link http://www.shopmodule.com
* @copyright (C) D3 Data Development
*/
class d3_oxcmp_utils_googleAnalytics_parent extends oxcmp_utils {}
/** */
class d3_oxorder_googleanalytics_parent extends oxOrder {}

27
copy_this/modules/d3/d3GoogleAnalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
View File

@ -1,11 +1,32 @@
<?php
/**
* This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This module is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* For further informations, see <http://www.gnu.org/licenses/>.
*
* @link http://www.oxidmodule.com
* @link http://www.shopmodule.com
* @copyright (C) D3 Data Development
*/
class d3_oxcmp_utils_googleAnalytics extends d3_oxcmp_utils_googleAnalytics_parent
{
private $_sModId = 'd3_googleanalytics';
private $_oSet;
/**
* @return null
*/
public function render()
{
$ret = parent::render();
@ -13,8 +34,10 @@ class d3_oxcmp_utils_googleAnalytics extends d3_oxcmp_utils_googleAnalytics_pare
// load module config
$this->_oSet = d3_cfg_mod::get($this->_sModId);
$this->getParent()->addTplParam('blD3GoogleAnalyticsActive', $this->_oSet->getFieldData('oxactive'));
$this->getParent()->addTplParam('oD3GASettings', $this->_oSet);
/** @var $oParentView oxView */
$oParentView = $this->getParent();
$oParentView->addTplParam('blD3GoogleAnalyticsActive', $this->_oSet->getFieldData('oxactive'));
$oParentView->addTplParam('oD3GASettings', $this->_oSet);
return $ret;
}

6
copy_this/modules/d3/d3GoogleAnalytics/modules/models/d3_oxorder_googleanalytics.php
View File

@ -20,6 +20,9 @@
class d3_oxorder_googleanalytics extends d3_oxorder_googleanalytics_parent
{
/**
* @return oxUserPayment
*/
public function getPayment()
{
if (!$this->_oPayment)
@ -31,6 +34,9 @@ class d3_oxorder_googleanalytics extends d3_oxorder_googleanalytics_parent
return parent::getPayment();
}
/**
* @return array
*/
public function d3getVoucherSerieList()
{
$sSelect =

26
copy_this/modules/d3/d3GoogleAnalytics/views/admin/de/d3_googleanalytics_lang.php
View File

@ -1,5 +1,23 @@
<?php
/**
* This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This module is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* For further informations, see <http://www.gnu.org/licenses/>.
*
* @link http://www.oxidmodule.com
* @link http://www.shopmodule.com
* @copyright (C) D3 Data Development
*/
$sLangName = "Deutsch";
// -------------------------------
@ -43,11 +61,11 @@ $aLang = array(
'D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATHCOPY_DESC' => 'Ein Eintrag hier sollte so aussehen: /myCart/<br><br>Weitere Informationen finden Sie <a href="http://code.google.com/apis/analytics/docs/tracking/gaTrackingSite.html" target="gahelp">hier</a>.',
'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten',
'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => '<b>Deaktiviert</b> die Erkennung von Browserdaten (z.B. Name und Version)',
'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => '<span style="font-weight: bold;">Deaktiviert</span> die Erkennung von Browserdaten (z.B. Name und Version)',
'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie <a href="http://code.google.com/intl/de/apis/analytics/docs/gaJS/gaJSApiWebClient.html#_gat.GA_Tracker_._setClientInfo" target="gahelp">hier</a>.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => '<b>Unterbindet</b> die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => '<span style="font-weight: bold;">Unterbindet</span> die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie <a href="http://code.google.com/intl/de/apis/analytics/docs/gaJS/gaJSApiWebClient.html#_gat.GA_Tracker_._setDetectFlash" target="gahelp">hier</a>.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => '<b>Verhindert</b> die Erkennung des Seitentitels.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => '<span style="font-weight: bold;">Verhindert</span> die Erkennung des Seitentitels.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE_DESC' => 'Weitere Informationen finden Sie <a href="http://code.google.com/intl/de/apis/analytics/docs/gaJS/gaJSApiWebClient.html#_gat.GA_Tracker_._setDetectTitle" target="gahelp">hier</a>.',
'D3_GOOGLEANALYTICS_CUSTOMVARS' => 'individuelle Daten',
@ -58,7 +76,7 @@ $aLang = array(
// TODO: add content to package
'D3_GOOGLEANALYTICS_ADWORDSGENERAL' => 'Kampagnen Grundeinstellungen',
'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK' => 'Kampagnendaten <b>nicht</b> übertragen',
'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK' => 'Kampagnendaten <span style="font-weight: bold;">nicht</span> übertragen',
'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK_DESC' => 'Das Kampagnentracking ist im Standard aktiviert. Setzen Sie diesen Haken, um die Kampagnenübertragung zu deaktivieren.',
'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY' => 'Kampagnendaten nur in Bestellabschlussseite verwenden',
'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY_DESC' => 'Ist dieser Haken nicht gesetzt, wird der Kampagnencode shopweit eingefügt. Das AdWords-Conversion Tracking erwartet die Daten jedoch nur bei Bestellabschluss. Ob diese Einstellung notwendig ist, erfahren Sie bei Ihrem Conversion Tracking Anbieter.',

26
copy_this/modules/d3/d3GoogleAnalytics/views/admin/en/d3_googleanalytics_lang.php
View File

@ -1,5 +1,23 @@
<?php
/**
* This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This module is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* For further informations, see <http://www.gnu.org/licenses/>.
*
* @link http://www.oxidmodule.com
* @link http://www.shopmodule.com
* @copyright (C) D3 Data Development
*/
$sLangName = "English";
// -------------------------------
@ -43,11 +61,11 @@ $aLang = array(
'D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATHCOPY_DESC' => 'Ein Eintrag hier sollte so aussehen: /myCart/<br><br>Weitere Informationen finden Sie <a href="http://code.google.com/apis/analytics/docs/tracking/gaTrackingSite.html" target="gahelp">hier</a>.',
'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten',
'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => '<b>Deaktiviert</b> die Erkennung von Browserdaten (z.B. Name und Version)',
'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => '<span style="font-weight: bold;">Deaktiviert</span> die Erkennung von Browserdaten (z.B. Name und Version)',
'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie <a href="http://code.google.com/intl/de/apis/analytics/docs/gaJS/gaJSApiWebClient.html#_gat.GA_Tracker_._setClientInfo" target="gahelp">hier</a>.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => '<b>Unterbindet</b> die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => '<span style="font-weight: bold;">Unterbindet</span> die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie <a href="http://code.google.com/intl/de/apis/analytics/docs/gaJS/gaJSApiWebClient.html#_gat.GA_Tracker_._setDetectFlash" target="gahelp">hier</a>.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => '<b>Verhindert</b> die Erkennung des Seitentitels.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => '<span style="font-weight: bold;">Verhindert</span> die Erkennung des Seitentitels.',
'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE_DESC' => 'Weitere Informationen finden Sie <a href="http://code.google.com/intl/de/apis/analytics/docs/gaJS/gaJSApiWebClient.html#_gat.GA_Tracker_._setDetectTitle" target="gahelp">hier</a>.',
'D3_GOOGLEANALYTICS_CUSTOMVARS' => 'individuelle Daten',
@ -58,7 +76,7 @@ $aLang = array(
// TODO: add content to package
'D3_GOOGLEANALYTICS_ADWORDSGENERAL' => 'Kampagnen Main Settings',
'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK' => 'Kampagnendaten <b>nicht</b> übertragen',
'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK' => 'Kampagnendaten <span style="font-weight: bold;">nicht</span> übertragen',
'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK_DESC' => 'Das Kampagnentracking ist im Standard aktiviert. Setzen Sie diesen Haken, um die Kampagnenübertragung zu deaktivieren.',
'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY' => 'Kampagnendaten nur in Bestellabschlussseite verwenden',
'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY_DESC' => 'Ist dieser Haken nicht gesetzt, wird der Kampagnencode shopweit eingefügt. Das AdWords-Conversion Tracking erwartet die Daten jedoch nur bei Bestellabschluss. Ob diese Einstellung notwendig ist, erfahren Sie bei Ihrem Conversion Tracking Anbieter.',