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

1 files changed, 25 insertions, 0 deletions

diff --git a/utils/decorators.py b/utils/decorators.py
new file mode 100644
index 00000000..e4e7acb3
--- /dev/null
+++ b/utils/decorators.py
@@ -0,0 +1,25 @@
+from django.http import HttpResponse, HttpResponseForbidden, Http404
+from django.utils import simplejson
+
+def ajax_login_required(view_func):
+    def wrap(request,*args,**kwargs):
+        if request.user.is_authenticated():
+            return view_func(request,*args,**kwargs)
+        else:
+            json = simplejson.dumps({'login_required':True})
+            return HttpResponseForbidden(json,mimetype='application/json')
+    return wrap
+
+def ajax_method(view_func):
+    def wrap(request,*args,**kwargs):
+        if not request.is_ajax():
+            raise Http404
+        retval = view_func(request,*args,**kwargs)
+        if isinstance(retval, HttpResponse):
+            retval.mimetype = 'application/json'
+            return retval
+        else:
+            json = simplejson.dumps(retval)
+            return HttpResponse(json,mimetype='application/json')
+    return wrap
+