Update readers.py

[osqa.git] / forum / views / meta.py

diff --git a/forum/views/meta.py b/forum/views/meta.py
index 3330a3b641120295baa5387724e1343ca3cf3e47..a47cf1d8bbc5f04ffbae53c942c41d4e0842e414 100644 (file)
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -1,24 +1,28 @@
 import os
 from itertools import groupby
 import os
 from itertools import groupby

-from django.shortcuts import render_to_response, get_object_or_404
-from django.core.urlresolvers import reverse
-from django.template import RequestContext, loader
-from django.http import HttpResponseRedirect, HttpResponse, Http404
+
+from django.shortcuts import render_to_response
+from django.template import RequestContext
+from django.http import HttpResponseRedirect, HttpResponse

 from django.views.static import serve
 from django.views.static import serve

+from django.views.decorators.cache import cache_page
+from django.utils.translation import ugettext as _
+from django.utils.safestring import mark_safe
+
+from django.contrib import messages
+

 from forum import settings
 from forum import settings

+from forum.views.decorators import login_required

 from forum.forms import FeedbackForm
 from forum.forms import FeedbackForm

-from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext as _
-from django.db.models import Count
+from forum.modules import decorate

 from forum.forms import get_next_url
 from forum.models import Badge, Award, User, Page
 from forum.forms import get_next_url
 from forum.models import Badge, Award, User, Page

-from forum.badges.base import BadgesMeta
-from forum import settings
+from forum.http_responses import HttpResponseNotFound, HttpResponseIntServerError

 from forum.utils.mail import send_template_email
 from forum.utils.mail import send_template_email

-from django.utils.safestring import mark_safe

 from forum.templatetags.extra_filters import or_preview
 from forum.templatetags.extra_filters import or_preview

+

 import decorators
 import decorators

-import re
+import logging, traceback

 
 def favicon(request):
     return HttpResponseRedirect(str(settings.APP_FAVICON))
 
 def favicon(request):
     return HttpResponseRedirect(str(settings.APP_FAVICON))


@@ -31,13 +35,20 @@ def static(request, title, content):
                               context_instance=RequestContext(request))
 
 def media(request, skin, path):
                               context_instance=RequestContext(request))
 
 def media(request, skin, path):

-    return serve(request, "%s/media/%s" % (skin, path),
+    response = serve(request, "%s/media/%s" % (skin, path),

                  document_root=os.path.join(os.path.dirname(os.path.dirname(__file__)), 'skins').replace('\\', '/'))
                  document_root=os.path.join(os.path.dirname(os.path.dirname(__file__)), 'skins').replace('\\', '/'))

+    content_type = response['Content-Type']
+    if ('charset=' not in content_type):
+        if (content_type.startswith('text') or content_type=='application/x-javascript'):
+            content_type += '; charset=utf-8'
+            response['Content-Type'] = content_type
+    return response
+

 
 def markdown_help(request):
     return render_to_response('markdown_help.html', context_instance=RequestContext(request))
 
 
 def markdown_help(request):
     return render_to_response('markdown_help.html', context_instance=RequestContext(request))
 

-
+@cache_page(60 * 60 * 24 * 30) #30 days

 def opensearch(request):
     return render_to_response('opensearch.html', {'settings' : settings}, context_instance=RequestContext(request))
 
 def opensearch(request):
     return render_to_response('opensearch.html', {'settings' : settings}, context_instance=RequestContext(request))
 


@@ -58,7 +69,7 @@ def feedback(request):
             send_template_email(recipients, "notifications/feedback.html", context)
 
             msg = _('Thanks for the feedback!')
             send_template_email(recipients, "notifications/feedback.html", context)
 
             msg = _('Thanks for the feedback!')

-            request.user.message_set.create(message=msg)
+            messages.info(request, msg)

             return HttpResponseRedirect(get_next_url(request))
     else:
         form = FeedbackForm(request.user, initial={'next':get_next_url(request)})
             return HttpResponseRedirect(get_next_url(request))
     else:
         form = FeedbackForm(request.user, initial={'next':get_next_url(request)})


@@ -70,6 +81,7 @@ feedback.CANCEL_MESSAGE=_('We look forward to hearing your feedback! Please, giv
 def privacy(request):
     return render_to_response('privacy.html', context_instance=RequestContext(request))
 
 def privacy(request):
     return render_to_response('privacy.html', context_instance=RequestContext(request))
 

+@decorate.withfn(login_required)

 def logout(request):
     return render_to_response('logout.html', {
     'next' : get_next_url(request),
 def logout(request):
     return render_to_response('logout.html', {
     'next' : get_next_url(request),


@@ -77,10 +89,11 @@ def logout(request):
 
 @decorators.render('badges.html', 'badges', _('badges'), weight=300)
 def badges(request):
 
 @decorators.render('badges.html', 'badges', _('badges'), weight=300)
 def badges(request):

-    badges = [b.ondb for b in sorted(BadgesMeta.by_id.values(), lambda b1, b2: cmp(b1.name, b2.name))]
+    from forum.badges.base import BadgesMeta
+    badges = sorted([Badge.objects.get(id=id) for id in BadgesMeta.by_id.keys()], lambda b1, b2: cmp(b1.name, b2.name))

 
     if request.user.is_authenticated():
 
     if request.user.is_authenticated():

-        my_badges = Award.objects.filter(user=request.user).values('badge_id').distinct()
+        my_badges = Award.objects.filter(user=request.user).values_list('badge_id', flat=True).distinct()

     else:
         my_badges = []
 
     else:
         my_badges = []
 


@@ -103,17 +116,19 @@ def badge(request, id, slug):
     'badge' : badge,
     }, context_instance=RequestContext(request))
 
     'badge' : badge,
     }, context_instance=RequestContext(request))
 

-def page(request, path):
+def page(request):
+    path = request.path[1:]
+

     if path in settings.STATIC_PAGE_REGISTRY:
         try:
             page = Page.objects.get(id=settings.STATIC_PAGE_REGISTRY[path])
 
             if (not page.published) and (not request.user.is_superuser):
     if path in settings.STATIC_PAGE_REGISTRY:
         try:
             page = Page.objects.get(id=settings.STATIC_PAGE_REGISTRY[path])
 
             if (not page.published) and (not request.user.is_superuser):

-                raise Http404
+                return HttpResponseNotFound(request)

         except:
         except:

-            raise Http404
+            return HttpResponseNotFound(request)

     else:
     else:

-        raise Http404
+        return HttpResponseNotFound(request)

 
     template = page.extra.get('template', 'default')
     sidebar = page.extra.get('sidebar', '')
 
     template = page.extra.get('template', 'default')
     sidebar = page.extra.get('sidebar', '')


@@ -150,3 +165,39 @@ def page(request, path):
     }, context_instance=RequestContext(request))
 
 
     }, context_instance=RequestContext(request))
 
 

+def error_handler(request):
+
+    stacktrace = "".join(["\t\t%s\n" % l for l in traceback.format_exc().split("\n")])
+
+    try:
+        log_msg = """
+        error executing request:
+        PATH: %(path)s
+        USER: %(user)s
+        METHOD: %(method)s
+        POST PARAMETERS:
+        %(post)s
+        GET PARAMETERS:
+        %(get)s
+        HTTP HEADERS:
+        %(headers)s
+        COOKIES:
+        %(cookies)s
+        EXCEPTION INFO:
+        %(stacktrace)s
+        """ % {
+            'path': request.path,
+            'user': request.user.is_authenticated() and ("%s (%s)" % (request.user.username, request.user.id)) or "<anonymous>",
+            'method': request.method,
+            'post': request.POST and "".join(["\t\t%s: %s\n" % (k, v) for k, v in request.POST.items()]) or "None",
+            'get': request.GET and "".join(["\t\t%s: %s\n" % (k, v) for k, v in request.GET.items()]) or "None",
+            'cookies': request.COOKIES and "".join(["\t\t%s: %s\n" % (k, v) for k, v in request.COOKIES.items()]) or "None",
+            'headers': request.META and "".join(["\t\t%s: %s\n" % (k, v) for k, v in request.META.items()]) or "None",
+            'stacktrace': stacktrace
+        }
+    except:
+        log_msg = "error executing request:\n%s" % stacktrace
+
+
+    logging.error(log_msg)
+    return HttpResponseIntServerError(request)