Merge branch 'evgenyfadeev/master'

Conflicts:
	.gitignore
	INSTALL
	TODO
	cnprog.wsgi
	django_authopenid/urls.py
	django_authopenid/views.py
	drop-all-tables.sh
	forum/auth.py
	forum/managers.py
	forum/models.py
	forum/templatetags/extra_tags.py
	forum/views.py
	locale/es/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.po
	settings.py
	settings_local.py.dist
	sql_scripts/update_2009_01_25_001.sql
	sql_scripts/update_2009_02_26_001.sql
	sql_scripts/update_2009_04_10_001.sql
	templates/authopenid/confirm_email.txt
	templates/authopenid/sendpw_email.txt
	templates/content/js/compress.bat
	templates/content/js/flot-build.bat
	templates/content/style/style.css
	templates/footer.html
	templates/question.html
	templates/user_reputation.html
	templates/user_stats.html
	templates/user_votes.html
	templates/users_questions.html
	urls.py

4 files changed, 54 insertions, 1 deletions

diff --git a/middleware/__init__.py~HEAD b/middleware/__init__.py~HEAD
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/middleware/__init__.py~HEAD
diff --git a/middleware/anon_user.py b/middleware/anon_user.py
new file mode 100644
index 00000000..8422d89b
--- /dev/null
+++ b/middleware/anon_user.py
@@ -0,0 +1,34 @@
+from django.http import HttpResponseRedirect
+from django_authopenid.util import get_next_url
+from django.utils.translation import ugettext as _
+from user_messages import create_message, get_and_delete_messages
+import settings
+import logging
+
+class AnonymousMessageManager(object):
+    def __init__(self,request):
+        self.request = request
+    def create(self,message=''):
+        create_message(self.request,message)  
+    def get_and_delete(self):
+        messages = get_and_delete_messages(self.request)
+        return messages
+
+def dummy_deepcopy(*arg):
+    """this is necessary to prevent deepcopy() on anonymous user object
+    that now contains reference to request, which cannot be deepcopied
+    """
+    return None
+
+class ConnectToSessionMessagesMiddleware(object):
+    def process_request(self, request):
+        if not request.user.is_authenticated():
+            request.user.__deepcopy__ = dummy_deepcopy #plug on deepcopy which may be called by django db "driver"
+            request.user.message_set = AnonymousMessageManager(request) #here request is linked to anon user
+            request.user.get_and_delete_messages = request.user.message_set.get_and_delete
+
+            #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 greeting with %(url)s') % {'url':settings.GREETING_URL}
+                request.user.message_set.create(message=msg)
diff --git a/middleware/cancel.py b/middleware/cancel.py
new file mode 100644
index 00000000..f03ff35e
--- /dev/null
+++ b/middleware/cancel.py
@@ -0,0 +1,15 @@
+from django.http import HttpResponseRedirect
+from django_authopenid.util import get_next_url
+import logging
+class CancelActionMiddleware(object):
+    def process_view(self, request, view_func, view_args, view_kwargs):
+        if 'cancel' in request.REQUEST:
+            #todo use session messages for the anonymous users
+            try:
+                msg = getattr(view_func,'CANCEL_MESSAGE')
+            except AttributeError:
+                msg = 'action canceled'
+            request.user.message_set.create(message=msg)
+            return HttpResponseRedirect(get_next_url(request))
+        else:
+            return None
diff --git a/middleware/pagesize.py b/middleware/pagesize.py
index bb6c7aa3..f6e6fcfd 100644
--- a/middleware/pagesize.py
+++ b/middleware/pagesize.py
@@ -26,4 +26,8 @@ class QuestionsPageSizeMiddleware(object):
                 user.questions_per_page = pagesize
                 user.save()
         # put pagesize into session
-        request.session["pagesize"] = pagesize
\ No newline at end of file
+        request.session["pagesize"] = pagesize
+
+    def process_exception(self,request,exception):
+        import logging
+        logging.debug('have exception %s' % str(exception))