Merge 424bb03 into 0c4af72

hasgeek · May 11, 2020 · e8aac3c · e8aac3c
2 parents 0c4af72 + 424bb03
commit e8aac3c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/baseframe/__init__.py b/baseframe/__init__.py
@@ -186,6 +186,11 @@ def init_app(
                 ],
             )
 
+        # Default .js and tracking file for Matomo
+        if app.config.get('MATOMO_URL') and app.config.get('MATOMO_ID'):
+            app.config.setdefault('MATOMO_JS', 'matomo.js')
+            app.config.setdefault('MATOMO_FILE', 'matomo.php')
+
         # Since Flask 0.11, templates are no longer auto reloaded.
         # Setting the config alone doesn't seem to work, so we explicitly
         # set the jinja environment here.

diff --git a/baseframe/templates/baseframe/bootstrap3/baseframe.html.jinja2 b/baseframe/templates/baseframe/bootstrap3/baseframe.html.jinja2
@@ -129,17 +129,17 @@
     <script type="text/javascript" src="{{ ASSET_URL }}"></script>
   {%- endassets -%}
 
-  {%- if config['MATOMO_ID'] and not config['DEBUG'] -%}
+  {%- if config['MATOMO_URL'] and config['MATOMO_ID'] and not config['DEBUG'] -%}
     <script type="text/javascript">
     var _paq = window._paq || [];
     _paq.push(['trackPageView']);
     _paq.push(['enableLinkTracking']);
     (function() {
-      var u="//stats.hasgeek.co.in/";
-      _paq.push(['setTrackerUrl', u+'matomo.php']);
+      var u="{{ config['MATOMO_URL'] }}";
+      _paq.push(['setTrackerUrl', u+'{{ config['MATOMO_FILE'] }}']);
       _paq.push(['setSiteId', '{{ config['MATOMO_ID'] }}']);
       var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-      g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'stats.js'; s.parentNode.insertBefore(g,s);
+      g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'{{ config['MATOMO_JS'] }}'; s.parentNode.insertBefore(g,s);
     })();
     </script>
   {%- endif -%}

diff --git a/baseframe/templates/baseframe/mui/baseframe.html.jinja2 b/baseframe/templates/baseframe/mui/baseframe.html.jinja2
@@ -142,17 +142,17 @@
     <script type="text/javascript" src="{{ ASSET_URL }}"></script>
   {%- endassets -%}
 
-  {%- if config['MATOMO_ID'] and not config['DEBUG'] -%}
+  {%- if config['MATOMO_URL'] and config['MATOMO_ID'] and not config['DEBUG'] -%}
     <script type="text/javascript">
     var _paq = window._paq || [];
     _paq.push(['trackPageView']);
     _paq.push(['enableLinkTracking']);
     (function() {
-      var u="//stats.hasgeek.co.in/";
-      _paq.push(['setTrackerUrl', u+'matomo.php']);
+      var u="{{ config['MATOMO_URL'] }}";
+      _paq.push(['setTrackerUrl', u+'{{ config['MATOMO_FILE'] }}']);
       _paq.push(['setSiteId', '{{ config['MATOMO_ID'] }}']);
       var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-      g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'stats.js'; s.parentNode.insertBefore(g,s);
+      g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'{{ config['MATOMO_JS'] }}'; s.parentNode.insertBefore(g,s);
     })();
     </script>
   {%- endif -%}