1.2

diff --git a/CHANGES b/CHANGES
index 1cdfe6b..32db3c8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.2
+---
+
+* Ajout de PIWIK_HTTPFORCE pour que le protocle soit 'http' et non 'https'
+
 1.1
 ---
 

diff --git a/auf/django/piwik/middleware.py b/auf/django/piwik/middleware.py
index b4628e2..73cfa49 100644 (file)
--- a/auf/django/piwik/middleware.py
+++ b/auf/django/piwik/middleware.py
@@ -4,7 +4,7 @@ import re
 
 from django.conf import settings
 
-from settings import PIWIK_TOKEN, PIWIK_HOST, PIWIK_TRACKCODE
+from settings import PIWIK_TOKEN, PIWIK_HOST, PIWIK_HTTPFORCE, PIWIK_TRACKCODE
 
 ire_body = re.compile(re.escape('</body>'), re.IGNORECASE)
 
@@ -19,7 +19,7 @@ class TrackMiddleware:
         if PIWIK_TOKEN is None:
             return response
 
-        if request.is_secure():
+        if request.is_secure() and not PIWIK_HTTPFORCE:
             protocol = "https"
         else:
             protocol = "http"

diff --git a/auf/django/piwik/settings.py b/auf/django/piwik/settings.py
index 14e21a0..3a0f177 100644 (file)
--- a/auf/django/piwik/settings.py
+++ b/auf/django/piwik/settings.py
@@ -4,7 +4,7 @@
 from django.conf import settings
 
 PIWIK_TOKEN = getattr(settings, 'PIWIK_TOKEN', None)
-
+PIWIK_HTTPFORCE = getattr(settings, 'PIWIK_HTTPFORCE', False)
 PIWIK_HOST = getattr(settings, 'PIWIK_HOST', 'auf.stats.mysnip-hosting.de')
 
 PIWIK_TRACKCODE = """

diff --git a/setup.py b/setup.py
index 1e06662..191e184 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 name = 'auf.django.piwik'
-version = '1.1'
+version = '1.2'
 
 setup(name=name,
       version=version,