From 09c8c44210ad80b0a78bf5a89868508ac6537f1e Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Fri, 26 Feb 2021 16:15:45 +0100 Subject: [PATCH] fix line endings --- .gitattributes | 65 +--------------- src/IntelliSenseHelper.php | 74 +++++++++---------- .../core/d3_oxutilsview_googleanalytics.php | 72 +++++++++--------- 3 files changed, 74 insertions(+), 137 deletions(-) diff --git a/.gitattributes b/.gitattributes index 174bcdb..f9073bf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,65 +1,2 @@ * text=auto !eol -Sources/Admin1.jpg -text -Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#250[!!-~]-[!!-~]'Conversion-Tracking'[!!-~]-[!!-~]adwords_google_com_ct_ConversionTracking_Manager___c=1858313983&__u=7452293233&__o=cues#acc_ALL_con.png -text -Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#251[!!-~]-[!!-~]'Conversion-Tracking'[!!-~]-[!!-~]adwords_google_com_ct_ConversionTracking_Manager___c=1858313983&__u=7452293233&__o=cues#acc_ALL_con.png -text -Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#252[!!-~]-[!!-~]'Google[!!-~]Analytics'[!!-~]-[!!-~]www_google_com_analytics_web__authuser=0#management_Settings_a50621059w82651812p85583465__m_page=CustomMetrics.png -text -Sources/Google[!!-~]AdWords-Einrichtung.docx -text -Sources/Google[!!-~]Analytics-Einrichtung.docx -text -Sources/Google[!!-~]Services-Installation.docx -text -Sources/UGA_Custom_Dimensions.jpg -text -Sources/UGA_Einstellungen.jpg -text -Sources/UGA_Trichtereinrichtung.jpg -text -Sources/UGA_Trichtereinrichtung_1.jpg -text -Sources/trustedShops.jpg -text -changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl -text -changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl -text -changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl -text -changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl -text -changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl -text -changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl -text -changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl -text -changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl -text -changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl -text -changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl -text -changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl -text -changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl -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_adwords.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_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_trustedstore.php -text -copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog.php -text -copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog_list.php -text -copy_this/modules/d3/d3_googleanalytics/core/smarty/plugins/function.d3getArticleFromOrderArticle.php -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/models/d3_google_remarketing_articlelister.php -text -copy_this/modules/d3/d3_googleanalytics/models/d3_google_trustedstore_articlelister.php -text -copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php -text -copy_this/modules/d3/d3_googleanalytics/modules/controllers/d3_order_googleanalytics.php -text -copy_this/modules/d3/d3_googleanalytics/modules/controllers/d3_thankyou_googleanalytics.php -text -copy_this/modules/d3/d3_googleanalytics/modules/core/d3_oxutilsview_googleanalytics.php -text -copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasket_googleanalytics.php -text -copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasketitem_googleanalytics.php -text -copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxorder_googleanalytics.php -text -copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics.css -text -copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_mobile.css -text -copy_this/modules/d3/d3_googleanalytics/picture.png -text -copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php -text -copy_this/modules/d3/d3_googleanalytics/translations/de/d3_googleanalytics_lang.php -text -copy_this/modules/d3/d3_googleanalytics/translations/en/d3_googleanalytics_lang.php -text -copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php -text -copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php -text -copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl -text -copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl -text -copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl -text -copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl -text -setup+doku/Google[!!-~]AdWords-Einrichtung.pdf -text svneol=unset#unset -setup+doku/Google[!!-~]Analytics-Einrichtung.pdf -text svneol=unset#unset -setup+doku/Google[!!-~]Services-Installation.pdf -text -setup+doku/Precheck/d3precheck.php -text -setup+doku/changelog.txt -text +*.tpl text eol=lf diff --git a/src/IntelliSenseHelper.php b/src/IntelliSenseHelper.php index 9f6e117..1667281 100644 --- a/src/IntelliSenseHelper.php +++ b/src/IntelliSenseHelper.php @@ -1,38 +1,38 @@ -. - * - * @link http://www.oxidmodule.com - * @link http://www.shopmodule.com - * @copyright (C) D3 Data Development (Inh. Thomas Dartsch) - */ - -class d3_oxcmp_utils_googleAnalytics_parent extends oxcmp_utils {} - -/** */ -class d3_oxorder_googleanalytics_parent extends oxOrder {} - -/** */ -class d3_thankyou_googleanalytics_parent extends thankyou {} - -/** */ -class d3_order_googleanalytics_parent extends order {} - -/** */ -class d3_oxutilsview_googleanalytics_parent extends oxUtilsView {} - -/** */ -class d3_oxbasket_googleanalytics_parent extends oxbasket {} - -/** */ +. + * + * @link http://www.oxidmodule.com + * @link http://www.shopmodule.com + * @copyright (C) D3 Data Development (Inh. Thomas Dartsch) + */ + +class d3_oxcmp_utils_googleAnalytics_parent extends oxcmp_utils {} + +/** */ +class d3_oxorder_googleanalytics_parent extends oxOrder {} + +/** */ +class d3_thankyou_googleanalytics_parent extends thankyou {} + +/** */ +class d3_order_googleanalytics_parent extends order {} + +/** */ +class d3_oxutilsview_googleanalytics_parent extends oxUtilsView {} + +/** */ +class d3_oxbasket_googleanalytics_parent extends oxbasket {} + +/** */ class d3_oxbasketitem_googleanalytics_parent extends oxBasketItem {} \ No newline at end of file diff --git a/src/modules/core/d3_oxutilsview_googleanalytics.php b/src/modules/core/d3_oxutilsview_googleanalytics.php index 732ae28..b165fe2 100644 --- a/src/modules/core/d3_oxutilsview_googleanalytics.php +++ b/src/modules/core/d3_oxutilsview_googleanalytics.php @@ -1,36 +1,36 @@ -. - * - * @link http://www.oxidmodule.com - * @link http://www.shopmodule.com - * @copyright (C) D3 Data Development (Inh. Thomas Dartsch) - */ - -class d3_oxutilsview_googleanalytics extends d3_oxutilsview_googleanalytics_parent -{ - /** - * @param object $oSmarty - * - * @return null|void - */ - protected function _fillCommonSmartyProperties($oSmarty) - { - parent::_fillCommonSmartyProperties($oSmarty); - - $oSmarty->plugins_dir[] = - oxRegistry::getConfig()->getActiveView()->getViewConfig()->getModulePath('d3_googleanalytics'). - 'core/smarty/plugins'; - } -} +. + * + * @link http://www.oxidmodule.com + * @link http://www.shopmodule.com + * @copyright (C) D3 Data Development (Inh. Thomas Dartsch) + */ + +class d3_oxutilsview_googleanalytics extends d3_oxutilsview_googleanalytics_parent +{ + /** + * @param object $oSmarty + * + * @return null|void + */ + protected function _fillCommonSmartyProperties($oSmarty) + { + parent::_fillCommonSmartyProperties($oSmarty); + + $oSmarty->plugins_dir[] = + oxRegistry::getConfig()->getActiveView()->getViewConfig()->getModulePath('d3_googleanalytics'). + 'core/smarty/plugins'; + } +}