Skip to content

PHP5.3 compatibility #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pquerner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PHP5.3 compatibility #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions copy_this/modules/bla/matomo/application/views/admin/de/matomo_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
$css = '<style type="text/css">
.groupExp dd > h3 { display: inline-block; margin: 0 15px; border: none; }
.groupExp a.rc b {font-size:medium;color:#ff3600;}.groupExp dt input.txt {width:430px !important} .groupExp dl {display:block !important;} input.confinput {position:fixed;top:20px;right:70px;background:#008B2D;padding:10px 25px;color:white;border:1px solid black;cursor:pointer;font-size:125%;} input.confinput:hover {outline:3px solid #ff3600;} .groupExp dt textarea.txtfield {width:430px;height:150px;}</style>';
$aLang = [
$aLang = array(
'charset' => 'UTF-8',
'SHOP_MODULE_GROUP_blaMatomo_Main' => $css . 'Matomo Konfiguration',
'SHOP_MODULE_blaMatomo_debug' => 'Debug Modus (zeigt für Shop-Admins Matomo Tracking Variablen im Template an)',
Expand Down Expand Up @@ -71,4 +71,4 @@
'SHOP_MODULE_GROUP_blaMatomo_Params' => 'Zusätzliches Parametermapping',
'SHOP_MODULE_blaMatomo_aParamMapVisit' => '<h3>Parameter Mapping für visit-scope benutzerdefinierte Variablen</h3><em>Hierüber können pro Zeile ein URL Parameter in Matomos visit-scope <a href="http://matomo.org/docs/custom-variables/" target="_blank" title="Was ist eine benutzerdefinierte Variable">benutzerdefinierten Variablen</a> gespeichert werden. (leer lassen wenn nicht benötigt)<p><b>Konfiguration:</b> parameter => index|Bezeichnung<br><code>foo => 4|Parameter 1<br>foo2 => 5|Parameter2</code><br>Bei einem Aufruf von "http://www.shop.tld/index.php?foo=bar" wird in Matomo in die benutzerdefinierte Variable mit dem Index 4 und dem Namen "Parameter 1" der Wert "bar" gespeichert.<br><b>Achtung</b> ein visit-scope Index wird auch schon für das Zahlungsart-Tracking verwendet!</p></em>',
'SHOP_MODULE_blaMatomo_aParamMapPage' => '<h3>Parameter Mapping für page-scope benutzerdefinierte Variablen</h3><em>Hierüber können pro Zeile ein URL Parameter in Matomos page-scope <a href="http://matomo.org/docs/custom-variables/" target="_blank" title="Was ist eine benutzerdefinierte Variable">benutzerdefinierten Variablen</a> gespeichert werden. (leer lassen wenn nicht benötigt)<br> Funktionsweise wie beim visit-scope Parameter-Mapping.<br><b>Achtung</b> ein page-scope Index wird auch schon für das Newsletter-Tracking verwendet!</em>'
];
);
4 changes: 2 additions & 2 deletions copy_this/modules/bla/matomo/application/views/admin/en/matomo_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// RESOURCE IDENTITFIER = STRING
// -------------------------------
$css = '<style type="text/css">.groupExp a.rc b {font-size:medium;color:#ff3600;}.groupExp dt input.txt {width:430px !important} .groupExp dl {display:block !important;} input.confinput {position:fixed;top:20px;right:70px;background:#008B2D;padding:10px 25px;color:white;border:1px solid black;cursor:pointer;font-size:125%;} input.confinput:hover {outline:3px solid #ff3600;} .groupExp dt textarea.txtfield {width:430px;height:150px;}</style>';
$aLang = [
$aLang = array(
'charset' => 'UTF-8',
'SHOP_MODULE_GROUP_blaMatomo_Main' => $css . 'Matomo Configuration',
'SHOP_MODULE_blaMatomo_debug' => 'Debug Mode (display Matomo Tracking variables in template for shop admins)',
Expand Down Expand Up @@ -68,4 +68,4 @@
'SHOP_MODULE_GROUP_blaMatomo_Params' => 'Additional parameter mapping',
'SHOP_MODULE_blaMatomo_aParamMapVisit' => '<h3>Parameter mapping for visit-scope custom variables</h3><em>You can define addition URL parameters that will get stored in Matomo\'s visit-scope <a href="http://matomo.org/docs/custom-variables/" target="_blank" title="What is a custom variable">custom variable</a>. (let it empty if you do not need this feature)<p><b>Configuration:</b> parameter => index|Label<br><code>foo => 4|Parameter 1<br>foo2 => 5|Parameter2</code><br>On a request like "http://www.shop.tld/index.php?foo=bar" Matomo will store in the custom variable with the the index 4 and the label "Parameter 1" the value "bar".<br><b>Caution</b> one visit-scope index is already used for payment method tracking!</p></em>',
'SHOP_MODULE_blaMatomo_aParamMapPage' => '<h3>Parameter mapping for page-scope custom variables</h3><em>You can define additional URL parameters that will get stored in Matomo\'s page-scope <a href="http://matomo.org/docs/custom-variables/" target="_blank" title="What is a custom variable">custom variable</a>. (let it empty if you do not need this feature)<br> See visit-scope parameter mapping for instructions.<br><b>Caution</b> one page-scope index is already used for the newsletter registration tracking!</em>'
];
);
98 changes: 49 additions & 49 deletions copy_this/modules/bla/matomo/metadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,79 +26,79 @@
* @license GPLv3
*
* changelog:
*
*
* --- 2018-02-16 :: version 2.3
* + piwik in matomo umbenannt
* + kurzes timeout für standorterkennung, damit es keine Probleme gibt, wenn matomo server unerreichbar ist.
*
*
* --- 2016-10-23 :: version 2.2.3
* + Standorterkennung über IP
*
* --- 2016-09-07 :: version 2.2.2
* + fehlendes pushPageView ergänzt
* + newsletter goal: fehlende ] hinzugefügt
*
*
*/
$sMetadataVersion = '1.1';

$oLang = oxRegistry::getLang();

$aModule = [
$aModule = array(
'id' => 'matomo',
'title' => '<strong style="color:#95b900;font-size:125%;">best</strong><strong style="color:#c4ca77;font-size:125%;">life</strong> <strong>Matomo Analytics (ehemals Piwik)</strong>',
'description' => [
'description' => array(
'en' => 'Add Matomo (formerly Piwik) tracking codes to your online shop.<br/>You need a <a href="http://www.matomo.org" target="_blank">matomo</a> installation to use this module.',
'de' => 'Fügt Matomo (ehemals Piwik) Tracking Codes in Ihren online Shops ein.<br/>Sie benötigen eine <a href="http://www.matomo.org" target="_blank">matomo</a> Installation, um dieses Modul zu nutzen.'
],
),
'thumbnail' => '../bestlife.png',
'version' => '2.3.0 2018-2-16',
'author' => ' bestlife AG',
'email' => 'oxid@bestlife.ag',
'url' => 'https://github.com/vanilla-thunder/oxid-module-bla-matomo',
'extend' => [
'extend' => array(
'oxviewconfig' => 'bla/matomo/application/extend/oxviewconfig_matomo'
],
'blocks' => [
['template' => 'layout/base.tpl', 'block' => 'base_style', 'file' => '/application/views/blocks/matomo.tpl'],
['template' => 'layout/base.tpl', 'block' => 'base_js', 'file' => '/application/views/blocks/matomo-content-tracking.tpl']
],
'settings' => [
['group' => 'blaMatomo_Main', 'name' => 'blaMatomo_debug', 'type' => 'bool', 'value' => true],
['group' => 'blaMatomo_Main', 'name' => 'blaMatomo_sUrl', 'type' => 'str', 'value' => ''],
['group' => 'blaMatomo_Main', 'name' => 'blaMatomo_sToken', 'type' => 'str', 'value' => ''],
['group' => 'blaMatomo_Main', 'name' => 'blaMatomo_iPageid', 'type' => 'str', 'value' => ''],
['group' => 'blaMatomo_Main', 'name' => 'blaMatomo_iNewsgoalid', 'type' => 'str', 'value' => '0'],
['group' => 'blaMatomo_Main', 'name' => 'blaMatomo_iMaxCustVar', 'type' => 'str', 'value' => '5'],
['group' => 'blaMatomo_Main', 'name' => 'blaMatomo_iCustindexNewsletter', 'type' => 'str', 'value' => '0'],
['group' => 'blaMatomo_Main', 'name' => 'blaMatomo_iCustindexPayment', 'type' => 'str', 'value' => '0'],
['group' => 'blaMatomo_Main', 'name' => 'blaMatomo_blUseUserID', 'type' => 'bool', 'value' => false],
['group' => 'blaMatomo_Main', 'name' => 'blaMatomo_blFirstReferrerConv', 'type' => 'bool', 'value' => false],
['group' => 'blaMatomo_Main', 'name' => 'blaMatomo_blEnableJSErrorTrackin', 'type' => 'bool', 'value' => false],
['group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sCustomvarNewsletter', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_CUSTOM_NEWSLETTER')],
['group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sCustomvarPayment', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_CUSTOM_PAYMENT')],
['group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterAccount', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_ACCOUNT')],
['group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterAccountOn', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_ACCOUNT_ON')],
['group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterAccountOff', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_ACCOUNT_OFF')],
['group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterViewed', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_VIEWED')],
['group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterOrdered', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_ORDERED')],
['group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterActivated', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_ACTIVATED')],
['group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterCanceled', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_CANCELED')],
['group' => 'blaMatomo_Params', 'name' => 'blaMatomo_aParamMapVisit', 'type' => 'aarr', 'value' => null],
['group' => 'blaMatomo_Params', 'name' => 'blaMatomo_aParamMapPage', 'type' => 'aarr', 'value' => null],
),
'blocks' => array(
array('template' => 'layout/base.tpl', 'block' => 'base_style', 'file' => '/application/views/blocks/matomo.tpl'),
array('template' => 'layout/base.tpl', 'block' => 'base_js', 'file' => '/application/views/blocks/matomo-content-tracking.tpl')
),
'settings' => array(
array('group' => 'blaMatomo_Main', 'name' => 'blaMatomo_debug', 'type' => 'bool', 'value' => TRUE),
array('group' => 'blaMatomo_Main', 'name' => 'blaMatomo_sUrl', 'type' => 'str', 'value' => ''),
array('group' => 'blaMatomo_Main', 'name' => 'blaMatomo_sToken', 'type' => 'str', 'value' => ''),
array('group' => 'blaMatomo_Main', 'name' => 'blaMatomo_iPageid', 'type' => 'str', 'value' => ''),
array('group' => 'blaMatomo_Main', 'name' => 'blaMatomo_iNewsgoalid', 'type' => 'str', 'value' => '0'),
array('group' => 'blaMatomo_Main', 'name' => 'blaMatomo_iMaxCustVar', 'type' => 'str', 'value' => '5'),
array('group' => 'blaMatomo_Main', 'name' => 'blaMatomo_iCustindexNewsletter', 'type' => 'str', 'value' => '0'),
array('group' => 'blaMatomo_Main', 'name' => 'blaMatomo_iCustindexPayment', 'type' => 'str', 'value' => '0'),
array('group' => 'blaMatomo_Main', 'name' => 'blaMatomo_blUseUserID', 'type' => 'bool', 'value' => FALSE),
array('group' => 'blaMatomo_Main', 'name' => 'blaMatomo_blFirstReferrerConv', 'type' => 'bool', 'value' => FALSE),
array('group' => 'blaMatomo_Main', 'name' => 'blaMatomo_blEnableJSErrorTrackin', 'type' => 'bool', 'value' => FALSE),
array('group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sCustomvarNewsletter', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_CUSTOM_NEWSLETTER')),
array('group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sCustomvarPayment', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_CUSTOM_PAYMENT')),
array('group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterAccount', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_ACCOUNT')),
array('group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterAccountOn', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_ACCOUNT_ON')),
array('group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterAccountOff', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_ACCOUNT_OFF')),
array('group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterViewed', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_VIEWED')),
array('group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterOrdered', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_ORDERED')),
array('group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterActivated', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_ACTIVATED')),
array('group' => 'blaMatomo_CustomVars', 'name' => 'blaMatomo_sNewsletterCanceled', 'type' => 'str', 'value' => $oLang->translateString('SHOP_MODULE_blaMatomo_NEWSLETTER_CANCELED')),
array('group' => 'blaMatomo_Params', 'name' => 'blaMatomo_aParamMapVisit', 'type' => 'aarr', 'value' => NULL),
array('group' => 'blaMatomo_Params', 'name' => 'blaMatomo_aParamMapPage', 'type' => 'aarr', 'value' => NULL),

['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_enable', 'type' => 'bool', 'value' => false],
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_enable', 'type' => 'bool', 'value' => FALSE),

['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_flexprev', 'type' => 'str', 'value' => '.flex-prev'],
['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_flexnext', 'type' => 'str', 'value' => '.flex-next'],
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_flexprev', 'type' => 'str', 'value' => '.flex-prev'),
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_flexnext', 'type' => 'str', 'value' => '.flex-next'),

['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_zoom1', 'type' => 'str', 'value' => '#zoom1'],
['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_pic1', 'type' => 'str', 'value' => '#morePics_1'],
['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_pic2', 'type' => 'str', 'value' => '#morePics_2'],
['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_pic3', 'type' => 'str', 'value' => '#morePics_3'],
['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_pic4', 'type' => 'str', 'value' => '#morePics_4'],
['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_description', 'type' => 'str', 'value' => 'a[href="#description"]'],
['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_pricealarm', 'type' => 'str', 'value' => 'a[href="#pricealarm"]'],
['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_tags', 'type' => 'str', 'value' => 'a[href="#tags"]'],
['group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_productFbComments', 'type' => 'str', 'value' => 'a[href="#productFbComments"]'],
]
];
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_zoom1', 'type' => 'str', 'value' => '#zoom1'),
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_pic1', 'type' => 'str', 'value' => '#morePics_1'),
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_pic2', 'type' => 'str', 'value' => '#morePics_2'),
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_pic3', 'type' => 'str', 'value' => '#morePics_3'),
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_pic4', 'type' => 'str', 'value' => '#morePics_4'),
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_description', 'type' => 'str', 'value' => 'a[href="#description"]'),
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_pricealarm', 'type' => 'str', 'value' => 'a[href="#pricealarm"]'),
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_tags', 'type' => 'str', 'value' => 'a[href="#tags"]'),
array('group' => 'blaMatomo_contentTracking', 'name' => 'blaMatomo_ct_productFbComments', 'type' => 'str', 'value' => 'a[href="#productFbComments"]'),
)
);