X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/3236874239f091690f47e1c8b076e21ec0b142d1..5737916435bfeaec27dfd64af918bd8c7ae6ac0f:/forum/views/meta.py diff --git a/forum/views/meta.py b/forum/views/meta.py index 932c627..436676d 100644 --- a/forum/views/meta.py +++ b/forum/views/meta.py @@ -6,6 +6,8 @@ from django.template import RequestContext, loader from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.views.static import serve from forum import settings +from forum.modules import decorate +from forum.views.decorators import login_required from forum.forms import FeedbackForm from django.core.urlresolvers import reverse from django.utils.translation import ugettext as _ @@ -13,11 +15,13 @@ from django.db.models import Count from forum.forms import get_next_url from forum.models import Badge, Award, User, Page from forum.badges.base import BadgesMeta +from forum.http_responses import HttpResponseNotFound, HttpResponseIntServerError from forum import settings from forum.utils.mail import send_template_email from django.utils.safestring import mark_safe from forum.templatetags.extra_filters import or_preview -import re +import decorators +import re, sys, logging, traceback def favicon(request): return HttpResponseRedirect(str(settings.APP_FAVICON)) @@ -30,8 +34,15 @@ def static(request, title, content): 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('\\', '/')) + 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)) @@ -43,15 +54,15 @@ def opensearch(request): def feedback(request): if request.method == "POST": - form = FeedbackForm(request.POST) + form = FeedbackForm(request.user, data=request.POST) if form.is_valid(): - context = {'user': request.user} - - if not request.user.is_authenticated: - context['email'] = form.cleaned_data.get('email', None) - context['message'] = form.cleaned_data['message'] - context['name'] = form.cleaned_data.get('name', None) - context['ip'] = request.META['REMOTE_ADDR'] + context = { + 'user': request.user, + 'email': request.user.is_authenticated() and request.user.email or form.cleaned_data.get('email', None), + 'message': form.cleaned_data['message'], + 'name': request.user.is_authenticated() and request.user.username or form.cleaned_data.get('name', None), + 'ip': request.META['REMOTE_ADDR'], + } recipients = User.objects.filter(is_superuser=True) send_template_email(recipients, "notifications/feedback.html", context) @@ -60,7 +71,7 @@ def feedback(request): request.user.message_set.create(message=msg) return HttpResponseRedirect(get_next_url(request)) else: - form = FeedbackForm(initial={'next':get_next_url(request)}) + form = FeedbackForm(request.user, initial={'next':get_next_url(request)}) return render_to_response('feedback.html', {'form': form}, context_instance=RequestContext(request)) @@ -69,23 +80,25 @@ 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)) +@decorate.withfn(login_required) def logout(request): return render_to_response('logout.html', { 'next' : get_next_url(request), }, context_instance=RequestContext(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))] + 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(): my_badges = Award.objects.filter(user=request.user).values('badge_id').distinct() else: my_badges = [] - return render_to_response('badges.html', { - 'badges' : badges, - 'mybadges' : my_badges, - }, context_instance=RequestContext(request)) + return { + 'badges' : badges, + 'mybadges' : my_badges, + } def badge(request, id, slug): badge = Badge.objects.get(id=id) @@ -101,17 +114,19 @@ def badge(request, id, slug): '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): - raise Http404 + return HttpResponseNotFound(request) except: - raise Http404 + return HttpResponseNotFound(request) else: - raise Http404 + return HttpResponseNotFound(request) template = page.extra.get('template', 'default') sidebar = page.extra.get('sidebar', '') @@ -148,3 +163,39 @@ def page(request, path): }, 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 "", + '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)