Remove DJANGO_VERSION from the recommended settings

[osqa.git] / forum / middleware / anon_user.py

diff --git a/forum/middleware/anon_user.py b/forum/middleware/anon_user.py
index a517f664b0e37c8c513cb5445e94a92bb3e8ed54..25f192a00f94f83adaeec97d785352e943e60038 100644 (file)
--- a/forum/middleware/anon_user.py
+++ b/forum/middleware/anon_user.py
@@ -1,5 +1,5 @@
-from django.http import HttpResponseRedirect
-from forum.utils.forms import get_next_url
+from django.http import HttpResponseRedirect, HttpResponse
+from forum.forms import get_next_url

 from django.utils.translation import ugettext as _
 from forum.user_messages import create_message, get_and_delete_messages
 from forum import settings
 from django.utils.translation import ugettext as _
 from forum.user_messages import create_message, get_and_delete_messages
 from forum import settings


@@ -31,5 +31,13 @@ class ConnectToSessionMessagesMiddleware(object):
             #also set the first greeting one time per session only
             if 'greeting_set' not in request.session:
                 request.session['greeting_set'] = True
             #also set the first greeting one time per session only
             if 'greeting_set' not in request.session:
                 request.session['greeting_set'] = True

+

                 msg = _('First time here? Check out the <a href="%s">FAQ</a>!') % reverse('faq')
                 msg = _('First time here? Check out the <a href="%s">FAQ</a>!') % reverse('faq')

-                request.user.message_set.create(message=msg)
+
+                # If the store greeting in cookie setting is activated make sure that the greeting_set cookies isn't set
+                if (settings.STORE_GREETING_IN_COOKIE and not request.COOKIES.has_key('greeting_set')) or \
+                  not settings.STORE_GREETING_IN_COOKIE:
+                    request.user.message_set.create(message=msg)
+
+                if settings.STORE_GREETING_IN_COOKIE:
+                    request.COOKIES.set(key='greeting_set', value=True)