Use default settings, don't let apply styles if disabled

Author: ntrrgc

sendfile.py

@@ -1,11 +1,10 @@
 from django.http import HttpResponse, Http404
-from django.conf import settings
 from django.utils.http import urlquote
 import os
 import re
 import mimetypes
 
-from django.conf import settings
+from . settings import LASANA_USE_X_SENDFILE
 
 #For no-XSendfile approach
 from django.core.servers.basehttp import FileWrapper
@@ -20,7 +19,7 @@ def send(request, file):
     if detected_type is None:
         detected_type = 'application/octet-stream'
 
-    if settings.LASANA_USE_X_SENDFILE:
+    if LASANA_USE_X_SENDFILE:
         response = HttpResponse(content_type=detected_type)
         response['Content-Disposition'] = 'filename=%s' % urlquote(os.path.basename(file.name))
         content_range = request.META.get('HTTP_RANGE')

settings.py

@@ -9,3 +9,7 @@ def get(key, default):
 LASANA_DEFAULT_STYLE = get('LASANA_DEFAULT_STYLE', 'original')
 
 LASANA_ALLOW_CHANGE_STYLE = get('LASANA_ALLOW_CHANGE_STYLE', True)
+
+LASANA_USE_X_SENDFILE = get('LASANA_USE_X_SENDFILE', False)
+
+LASANA_UPLOAD_ROOT = get('LASANA_UPLOAD_ROOT', './uploads')

styles.py

@@ -1,5 +1,5 @@
 import re
-from . settings import LASANA_DEFAULT_STYLE
+from . settings import LASANA_DEFAULT_STYLE, LASANA_ALLOW_CHANGE_STYLE
 
 basic_name = re.compile(r'^[a-zA-Z0-9_\-]+$')
 
@@ -8,6 +8,9 @@ def is_basic_name(style):
     return bool(basic_name.match(style))
 
 def get_style(request):
+    if not LASANA_ALLOW_CHANGE_STYLE:
+        return LASANA_DEFAULT_STYLE
+
     style_from_session = request.session.get('style')
 
     style_from_get = request.GET.get('style')