]> git.openstreetmap.org Git - osqa.git/blobdiff - forum/views/users.py
Add an OSM authentication provider
[osqa.git] / forum / views / users.py
index baa8090b078db352bb9c04d0ec2a2633dcdf0810..adf9b5959d2f9ebca8a31f6b9077c33116dc487a 100644 (file)
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth.models import User
+from forum.models import User
+from django.db.models import Q, Count
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.template.defaultfilters import slugify
 from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.template.defaultfilters import slugify
 from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
-from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect, Http404
+from django.http import HttpResponse, HttpResponseRedirect, Http404
+from forum.http_responses import HttpResponseUnauthorized
 from django.utils.translation import ugettext as _
 from django.utils.http import urlquote_plus
 from django.utils.html import strip_tags
 from django.utils.translation import ugettext as _
 from django.utils.http import urlquote_plus
 from django.utils.html import strip_tags
-from django.core.urlresolvers import reverse
-from forum.forms import *#incomplete list is EditUserForm, ModerateUserForm, TagFilterSelectionForm,
+from django.utils.encoding import smart_unicode
+from django.core.urlresolvers import reverse, NoReverseMatch
+from forum.forms import *
 from forum.utils.html import sanitize_html
 from forum.utils.html import sanitize_html
-from forum import auth
-import calendar
-from django.contrib.contenttypes.models import ContentType
-
-question_type = ContentType.objects.get_for_model(Question)
-answer_type = ContentType.objects.get_for_model(Answer)
-comment_type = ContentType.objects.get_for_model(Comment)
-question_revision_type = ContentType.objects.get_for_model(QuestionRevision)
-answer_revision_type = ContentType.objects.get_for_model(AnswerRevision)
-repute_type = ContentType.objects.get_for_model(Repute)
-question_type_id = question_type.id
-answer_type_id = answer_type.id
-comment_type_id = comment_type.id
-question_revision_type_id = question_revision_type.id
-answer_revision_type_id = answer_revision_type.id
-repute_type_id = repute_type.id
+from forum.modules import decorate, ReturnImediatelyException
+from datetime import datetime, date
+from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction, ReportAction
+from forum.modules import ui
+from forum.utils import pagination
+from forum.views.readers import QuestionListPaginatorContext, AnswerPaginatorContext
+from forum.settings import ONLINE_USERS
+
+from django.contrib import messages
+
+import json 
+import time
+import datetime
+import decorators
+
+class UserReputationSort(pagination.SimpleSort):
+    def apply(self, objects):
+        return objects.order_by('-is_active', self.order_by)
+
+class UserListPaginatorContext(pagination.PaginatorContext):
+    def __init__(self, pagesizes=(20, 35, 60), default_pagesize=35):
+        super (UserListPaginatorContext, self).__init__('USERS_LIST', sort_methods=(
+            (_('reputation'), UserReputationSort(_('reputation'), '-reputation', _("sorted by reputation"))),
+            (_('newest'), pagination.SimpleSort(_('recent'), '-date_joined', _("newest members"))),
+            (_('last'), pagination.SimpleSort(_('oldest'), 'date_joined', _("oldest members"))),
+            (_('name'), pagination.SimpleSort(_('by username'), 'username', _("sorted by username"))),
+        ), pagesizes=pagesizes, default_pagesize=default_pagesize)
+
+class SubscriptionListPaginatorContext(pagination.PaginatorContext):
+    def __init__(self):
+        super (SubscriptionListPaginatorContext, self).__init__('SUBSCRIPTION_LIST', pagesizes=(5, 10, 20), default_pagesize=20)
+
+class UserAnswersPaginatorContext(pagination.PaginatorContext):
+    def __init__(self):
+        super (UserAnswersPaginatorContext, self).__init__('USER_ANSWER_LIST', sort_methods=(
+            (_('oldest'), pagination.SimpleSort(_('oldest answers'), 'added_at', _("oldest answers will be shown first"))),
+            (_('newest'), pagination.SimpleSort(_('newest answers'), '-added_at', _("newest answers will be shown first"))),
+            (_('votes'), pagination.SimpleSort(_('popular answers'), '-score', _("most voted answers will be shown first"))),
+        ), default_sort=_('votes'), pagesizes=(5, 10, 20), default_pagesize=20, prefix=_('answers'))
 
 USERS_PAGE_SIZE = 35# refactor - move to some constants file
 
 
 USERS_PAGE_SIZE = 35# refactor - move to some constants file
 
+@decorators.render('users/users.html', 'users', _('users'), weight=200)
 def users(request):
 def users(request):
-    is_paginated = True
-    sortby = request.GET.get('sort', 'reputation')
-    suser = request.REQUEST.get('q',  "")
-    try:
-        page = int(request.GET.get('page', '1'))
-    except ValueError:
-        page = 1
-
-    if suser == "":
-        if sortby == "newest":
-            objects_list = Paginator(User.objects.all().order_by('-date_joined'), USERS_PAGE_SIZE)
-        elif sortby == "last":
-            objects_list = Paginator(User.objects.all().order_by('date_joined'), USERS_PAGE_SIZE)
-        elif sortby == "user":
-            objects_list = Paginator(User.objects.all().order_by('username'), USERS_PAGE_SIZE)
-        # default
-        else:
-            objects_list = Paginator(User.objects.all().order_by('-reputation'), USERS_PAGE_SIZE)
-        base_url = reverse('users') + '?sort=%s&' % sortby
+    suser = request.REQUEST.get('q', "")
+    users = User.objects.all()
+
+    if suser != "":
+        users = users.filter(username__icontains=suser)
+
+    return pagination.paginated(request, ('users', UserListPaginatorContext()), {
+        "users" : users,
+        "suser" : suser,
+    })
+
+
+@decorators.render('users/online_users.html', 'online_users', _('Online Users'), weight=200, tabbed=False)
+def online_users(request):
+    suser = request.REQUEST.get('q', "")
+
+    sort = ""
+    if request.GET.get("sort", None):
+        try:
+            sort = int(request.GET["sort"])
+        except ValueError:
+            logging.error('Found invalid sort "%s", loading %s, refered by %s' % (
+                request.GET.get("sort", ''), request.path, request.META.get('HTTP_REFERER', 'UNKNOWN')
+            ))
+            raise Http404()
+
+    page = 0
+    if request.GET.get("page", None):
+        try:
+            page = int(request.GET["page"])
+        except ValueError:
+            logging.error('Found invalid page "%s", loading %s, refered by %s' % (
+                request.GET.get("page", ''), request.path, request.META.get('HTTP_REFERER', 'UNKNOWN')
+            ))
+            raise Http404()
+
+    pagesize = 10
+    if request.GET.get("pagesize", None):
+        try:
+            pagesize = int(request.GET["pagesize"])
+        except ValueError:
+            logging.error('Found invalid pagesize "%s", loading %s, refered by %s' % (
+                request.GET.get("pagesize", ''), request.path, request.META.get('HTTP_REFERER', 'UNKNOWN')
+            ))
+            raise Http404()
+
+
+    users = None
+    if sort == "reputation":
+        users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.reputation)
+    elif sort == "newest" :
+        users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.newest)
+    elif sort == "last":
+        users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.last)
+    elif sort == "name":
+        users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.name)
+    elif sort == "oldest":
+        users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.oldest)
+    elif sort == "newest":
+        users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.newest)
+    elif sort == "votes":
+        users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.votes)
     else:
     else:
-        sortby = "reputation"
-        objects_list = Paginator(User.objects.extra(where=['username like %s'], params=['%' + suser + '%']).order_by('-reputation'), USERS_PAGE_SIZE)
-        base_url = reverse('users') + '?name=%s&sort=%s&' % (suser, sortby)
+        users = sorted(ONLINE_USERS.iteritems(), key=lambda x: x[1])
 
 
-    try:
-        users = objects_list.page(page)
-    except (EmptyPage, InvalidPage):
-        users = objects_list.page(objects_list.num_pages)
-
-    return render_to_response('users.html', {
-                                "users" : users,
-                                "suser" : suser,
-                                "keywords" : suser,
-                                "tab_id" : sortby,
-                                "context" : {
-                                    'is_paginated' : is_paginated,
-                                    'pages': objects_list.num_pages,
-                                    'page': page,
-                                    'has_previous': users.has_previous(),
-                                    'has_next': users.has_next(),
-                                    'previous': users.previous_page_number(),
-                                    'next': users.next_page_number(),
-                                    'base_url' : base_url
-                                }
-
-                                }, context_instance=RequestContext(request))
-
-@login_required
-def moderate_user(request, id):
-    """ajax handler of user moderation
-    """
-    if not auth.can_moderate_users(request.user) or request.method != 'POST':
-        raise Http404
-    if not request.is_ajax():
-        return HttpResponseForbidden(mimetype="application/json")
+    return render_to_response('users/online_users.html', {
+        "users" : users,
+        "suser" : suser,
+        "sort" : sort,
+        "page" : page,
+        "pageSize" : pagesize,
+    })
 
 
-    user = get_object_or_404(User, id=id)
-    form = ModerateUserForm(request.POST, instance=user)
 
 
-    if form.is_valid():
-        form.save()
-        logging.debug('data saved')
-        response = HttpResponse(simplejson.dumps(''), mimetype="application/json")
-    else:
-        response = HttpResponseForbidden(mimetype="application/json")
-    return response
-
-def set_new_email(user, new_email, nomessage=False):
-    if new_email != user.email:
-        user.email = new_email
-        user.email_isvalid = False
-        user.save()
-        #if settings.EMAIL_VALIDATION == 'on':
-        #    send_new_email_key(user,nomessage=nomessage)    
-
-@login_required
-def edit_user(request, id):
+def edit_user(request, id, slug):
     user = get_object_or_404(User, id=id)
     user = get_object_or_404(User, id=id)
-    if request.user != user:
-        raise Http404
+    if not (request.user.is_superuser or request.user == user):
+        return HttpResponseUnauthorized(request)
     if request.method == "POST":
         form = EditUserForm(user, request.POST)
         if form.is_valid():
             new_email = sanitize_html(form.cleaned_data['email'])
 
     if request.method == "POST":
         form = EditUserForm(user, request.POST)
         if form.is_valid():
             new_email = sanitize_html(form.cleaned_data['email'])
 
-            set_new_email(user, new_email)
+            if new_email != user.email:
+                user.email = new_email
+                user.email_isvalid = False
+
+                try:
+                    hash = ValidationHash.objects.get(user=request.user, type='email')
+                    hash.delete()
+                except:
+                    pass
 
 
-            #user.username = sanitize_html(form.cleaned_data['username'])
+            if settings.EDITABLE_SCREEN_NAME:
+                user.username = sanitize_html(form.cleaned_data['username'])
             user.real_name = sanitize_html(form.cleaned_data['realname'])
             user.website = sanitize_html(form.cleaned_data['website'])
             user.location = sanitize_html(form.cleaned_data['city'])
             user.real_name = sanitize_html(form.cleaned_data['realname'])
             user.website = sanitize_html(form.cleaned_data['website'])
             user.location = sanitize_html(form.cleaned_data['city'])
-            user.date_of_birth = sanitize_html(form.cleaned_data['birthday'])
-            if len(user.date_of_birth) == 0:
-                user.date_of_birth = '1900-01-01'
+            user.date_of_birth = form.cleaned_data['birthday']
+            if user.date_of_birth == "None":
+                user.date_of_birth = datetime(1900, 1, 1, 0, 0)
             user.about = sanitize_html(form.cleaned_data['about'])
 
             user.save()
             user.about = sanitize_html(form.cleaned_data['about'])
 
             user.save()
-            # send user updated singal if full fields have been updated
-            if user.email and user.real_name and user.website and user.location and \
-                user.date_of_birth and user.about:
-                user_updated.send(sender=user.__class__, instance=user, updated_by=user)
+            EditProfileAction(user=user, ip=request.META['REMOTE_ADDR']).save()
+
+            messages.info(request, _("Profile updated."))
             return HttpResponseRedirect(user.get_profile_url())
     else:
         form = EditUserForm(user)
             return HttpResponseRedirect(user.get_profile_url())
     else:
         form = EditUserForm(user)
-    return render_to_response('user_edit.html', {
-                                                'form' : form,
-                                                'gravatar_faq_url' : reverse('faq') + '#gravatar',
-                                    }, context_instance=RequestContext(request))
-
-def user_stats(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
-    questions = Question.objects.extra(
-        select={
-            'vote_count' : 'question.score',
-            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s AND f.question_id = question.id',
-            'la_user_id' : 'auth_user.id',
-            'la_username' : 'auth_user.username',
-            'la_user_gold' : 'auth_user.gold',
-            'la_user_silver' : 'auth_user.silver',
-            'la_user_bronze' : 'auth_user.bronze',
-            'la_user_reputation' : 'auth_user.reputation'
-            },
-        select_params=[user_id],
-        tables=['question', 'auth_user'],
-        where=['question.deleted=False AND question.author_id=%s AND question.last_activity_by_id = auth_user.id'],
-        params=[user_id],
-        order_by=['-vote_count', '-last_activity_at']
-    ).values('vote_count',
-             'favorited_myself',
-             'id',
-             'title',
-             'author_id',
-             'added_at',
-             'answer_accepted',
-             'answer_count',
-             'comment_count',
-             'view_count',
-             'favourite_count',
-             'summary',
-             'tagnames',
-             'vote_up_count',
-             'vote_down_count',
-             'last_activity_at',
-             'la_user_id',
-             'la_username',
-             'la_user_gold',
-             'la_user_silver',
-             'la_user_bronze',
-             'la_user_reputation')[:100]
-
-    answered_questions = Question.objects.extra(
-        select={
-            'vote_up_count' : 'answer.vote_up_count',
-            'vote_down_count' : 'answer.vote_down_count',
-            'answer_id' : 'answer.id',
-            'accepted' : 'answer.accepted',
-            'vote_count' : 'answer.score',
-            'comment_count' : 'answer.comment_count'
-            },
-        tables=['question', 'answer'],
-        where=['answer.deleted=False AND question.deleted=False AND answer.author_id=%s AND answer.question_id=question.id'],
-        params=[user_id],
-        order_by=['-vote_count', '-answer_id'],
-        select_params=[user_id]
-    ).distinct().values('comment_count',
-                        'id',
-                        'answer_id',
-                        'title',
-                        'author_id',
-                        'accepted',
-                        'vote_count',
-                        'answer_count',
-                        'vote_up_count',
-                        'vote_down_count')[:100]
-
-    up_votes = Vote.objects.get_up_vote_count_from_user(user)
-    down_votes = Vote.objects.get_down_vote_count_from_user(user)
-    votes_today = Vote.objects.get_votes_count_today_from_user(user)
-    votes_total = auth.VOTE_RULES['scope_votes_per_user_per_day']
-
-    question_id_set = set(map(lambda v: v['id'], list(questions))) \
-                        | set(map(lambda v: v['id'], list(answered_questions)))
-
-    user_tags = Tag.objects.filter(questions__id__in = question_id_set)
-    try:
-        from django.db.models import Count
-        awards = Award.objects.extra(
-                                        select={'id': 'badge.id', 
-                                                'name':'badge.name', 
-                                                'description': 'badge.description', 
-                                                'type': 'badge.type'},
-                                        tables=['award', 'badge'],
-                                        order_by=['-awarded_at'],
-                                        where=['user_id=%s AND badge_id=badge.id'],
-                                        params=[user.id]
-                                    ).values('id', 'name', 'description', 'type')
-        total_awards = awards.count()
-        awards = awards.annotate(count = Count('badge__id'))
-        user_tags = user_tags.annotate(user_tag_usage_count=Count('name'))
-
-    except ImportError:
-        awards = Award.objects.extra(
-                                        select={'id': 'badge.id', 
-                                                'count': 'count(badge_id)', 
-                                                'name':'badge.name', 
-                                                'description': 'badge.description', 
-                                                'type': 'badge.type'},
-                                        tables=['award', 'badge'],
-                                        order_by=['-awarded_at'],
-                                        where=['user_id=%s AND badge_id=badge.id'],
-                                        params=[user.id]
-                                    ).values('id', 'count', 'name', 'description', 'type')
-        total_awards = awards.count()
-        awards.query.group_by = ['badge_id']
-
-        user_tags = user_tags.extra(
-            select={'user_tag_usage_count': 'COUNT(1)',},
-            order_by=['-user_tag_usage_count'],
-        )
-        user_tags.query.group_by = ['name']
-
-    if auth.can_moderate_users(request.user):
-        moderate_user_form = ModerateUserForm(instance=user)
+    return render_to_response('users/edit.html', {
+    'user': user,
+    'form' : form,
+    'gravatar_faq_url' : reverse('faq') + '#gravatar',
+    }, context_instance=RequestContext(request))
+
+
+@decorate.withfn(decorators.command)
+def user_powers(request, id, action, status):
+    if not request.user.is_superuser:
+        raise decorators.CommandException(_("Only superusers are allowed to alter other users permissions."))
+
+    if (action == 'remove' and 'status' == 'super') and not request.user.is_siteowner():
+        raise decorators.CommandException(_("Only the site owner can remove the super user status from other user."))
+
+    user = get_object_or_404(User, id=id)
+    new_state = action == 'grant'
+
+    if status == 'super':
+        user.is_superuser = new_state
+    elif status == 'staff':
+        user.is_staff = new_state
     else:
     else:
-        moderate_user_form = None
-
-    return render_to_response(user_view.template_file,{
-                                'moderate_user_form': moderate_user_form,
-                                "tab_name" : user_view.id,
-                                "tab_description" : user_view.tab_description,
-                                "page_title" : user_view.page_title,
-                                "view_user" : user,
-                                "questions" : questions,
-                                "answered_questions" : answered_questions,
-                                "up_votes" : up_votes,
-                                "down_votes" : down_votes,
-                                "total_votes": up_votes + down_votes,
-                                "votes_today_left": votes_total-votes_today,
-                                "votes_total_per_day": votes_total,
-                                "user_tags" : user_tags[:50],
-                                "awards": awards,
-                                "total_awards" : total_awards,
-                            }, context_instance=RequestContext(request))
-
-def user_recent(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
-    def get_type_name(type_id):
-        for item in TYPE_ACTIVITY:
-            if type_id in item:
-                return item[1]
-
-    class Event:
-        def __init__(self, time, type, title, summary, answer_id, question_id):
-            self.time = time
-            self.type = get_type_name(type)
-            self.type_id = type
-            self.title = title
-            self.summary = summary
-            slug_title = slugify(title)
-            self.title_link = reverse('question', kwargs={'id':question_id}) + u'%s' % slug_title
-            if int(answer_id) > 0:
-                self.title_link += '#%s' % answer_id
-
-    class AwardEvent:
-        def __init__(self, time, type, id):
-            self.time = time
-            self.type = get_type_name(type)
-            self.type_id = type
-            self.badge = get_object_or_404(Badge, id=id)
-
-    activities = []
-    # ask questions
-    questions = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'active_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = ' +
-            'question.id AND question.deleted=False AND activity.user_id = %s AND activity.activity_type = %s'],
-        params=[question_type_id, user_id, TYPE_ACTIVITY_ASK_QUESTION],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'active_at',
-            'activity_type'
-            )
-    if len(questions) > 0:
-        questions = [(Event(q['active_at'], q['activity_type'], q['title'], '', '0', \
-                      q['question_id'])) for q in questions]
-        activities.extend(questions)
-
-    # answers
-    answers = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'active_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'answer', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' + 
-            'answer.question_id=question.id AND answer.deleted=False AND activity.user_id=%s AND '+ 
-            'activity.activity_type=%s AND question.deleted=False'],
-        params=[answer_type_id, user_id, TYPE_ACTIVITY_ANSWER],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'active_at',
-            'activity_type'
-            )
-    if len(answers) > 0:
-        answers = [(Event(q['active_at'], q['activity_type'], q['title'], '', q['answer_id'], \
-                    q['question_id'])) for q in answers]
-        activities.extend(answers)
-
-    # question comments
-    comments = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'comment.object_id',
-            'added_at' : 'comment.added_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'question', 'comment'],
-
-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
-            'activity.user_id = comment.user_id AND comment.object_id=question.id AND '+
-            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s AND ' +
-            'question.deleted=False'],
-        params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],
-        order_by=['-comment.added_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'activity_type'
-            )
-
-    if len(comments) > 0:
-        comments = [(Event(q['added_at'], q['activity_type'], q['title'], '', '0', \
-                     q['question_id'])) for q in comments]
-        activities.extend(comments)
-
-    # answer comments
-    comments = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'comment.added_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'question', 'answer', 'comment'],
-
-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
-            'activity.user_id = comment.user_id AND comment.object_id=answer.id AND '+
-            'comment.content_type_id=%s AND question.id = answer.question_id AND '+
-            'activity.user_id = %s AND activity.activity_type=%s AND '+
-            'answer.deleted=False AND question.deleted=False'],
-        params=[comment_type_id, answer_type_id, user_id, TYPE_ACTIVITY_COMMENT_ANSWER],
-        order_by=['-comment.added_at']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'added_at',
-            'activity_type'
-            )
-
-    if len(comments) > 0:
-        comments = [(Event(q['added_at'], q['activity_type'], q['title'], '', q['answer_id'], \
-                     q['question_id'])) for q in comments]
-        activities.extend(comments)
-
-    # question revisions
-    revisions = Activity.objects.extra(
-        select={
-            'title' : 'question_revision.title',
-            'question_id' : 'question_revision.question_id',
-            'added_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type',
-            'summary' : 'question_revision.summary'
-            },
-        tables=['activity', 'question_revision', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND '+
-            'question_revision.id=question.id AND question.deleted=False AND '+
-            'activity.user_id = question_revision.author_id AND activity.user_id = %s AND '+
-            'activity.activity_type=%s'],
-        params=[question_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_QUESTION],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'activity_type',
-            'summary'
-            )
-
-    if len(revisions) > 0:
-        revisions = [(Event(q['added_at'], q['activity_type'], q['title'], q['summary'], '0', \
-                      q['question_id'])) for q in revisions]
-        activities.extend(revisions)
-
-    # answer revisions
-    revisions = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type',
-            'summary' : 'answer_revision.summary'
-            },
-        tables=['activity', 'answer_revision', 'question', 'answer'],
-
-        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND '+
-            'activity.user_id = answer_revision.author_id AND activity.user_id = %s AND '+
-            'answer_revision.answer_id=answer.id AND answer.question_id = question.id AND '+
-            'question.deleted=False AND answer.deleted=False AND '+
-            'activity.activity_type=%s'],
-        params=[answer_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_ANSWER],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'answer_id',
-            'activity_type',
-            'summary'
-            )
-
-    if len(revisions) > 0:
-        revisions = [(Event(q['added_at'], q['activity_type'], q['title'], q['summary'], \
-                      q['answer_id'], q['question_id'])) for q in revisions]
-        activities.extend(revisions)
-
-    # accepted answers
-    accept_answers = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'added_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type',
-            },
-        tables=['activity', 'answer', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND '+
-            'activity.user_id = question.author_id AND activity.user_id = %s AND '+
-            'answer.deleted=False AND question.deleted=False AND '+
-            'answer.question_id=question.id AND activity.activity_type=%s'],
-        params=[answer_type_id, user_id, TYPE_ACTIVITY_MARK_ANSWER],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'activity_type',
-            )
-    if len(accept_answers) > 0:
-        accept_answers = [(Event(q['added_at'], q['activity_type'], q['title'], '', '0', \
-            q['question_id'])) for q in accept_answers]
-        activities.extend(accept_answers)
-    #award history
-    awards = Activity.objects.extra(
-        select={
-            'badge_id' : 'badge.id',
-            'awarded_at': 'award.awarded_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'award', 'badge'],
-        where=['activity.user_id = award.user_id AND activity.user_id = %s AND '+
-            'award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
-        params=[user_id, TYPE_ACTIVITY_PRIZE],
-        order_by=['-activity.active_at']
-    ).values(
-            'badge_id',
-            'awarded_at',
-            'activity_type'
-            )
-    if len(awards) > 0:
-        awards = [(AwardEvent(q['awarded_at'], q['activity_type'], q['badge_id'])) for q in awards]
-        activities.extend(awards)
-
-    activities.sort(lambda x,y: cmp(y.time, x.time))
-
-    return render_to_response(user_view.template_file,{
-                                    "tab_name" : user_view.id,
-                                    "tab_description" : user_view.tab_description,
-                                    "page_title" : user_view.page_title,
-                                    "view_user" : user,
-                                    "activities" : activities[:user_view.data_size]
-                                }, context_instance=RequestContext(request))
-
-def user_responses(request, user_id, user_view):
-    """
-    We list answers for question, comments, and answer accepted by others for this user.
-    """
-    class Response:
-        def __init__(self, type, title, question_id, answer_id, time, username, user_id, content):
-            self.type = type
-            self.title = title
-            self.titlelink = reverse('question', args=[question_id]) + u'%s#%s' % (slugify(title), answer_id)
-            self.time = time
-            self.userlink = reverse('users') + u'%s/%s/' % (user_id, username)
-            self.username = username
-            self.content = u'%s ...' % strip_tags(content)[:300]
-
-        def __unicode__(self):
-            return u'%s %s' % (self.type, self.titlelink)
-
-    user = get_object_or_404(User, id=user_id)
-    responses = []
-    answers = Answer.objects.extra(
-                                    select={
-                                        'title' : 'question.title',
-                                        'question_id' : 'question.id',
-                                        'answer_id' : 'answer.id',
-                                        'added_at' : 'answer.added_at',
-                                        'html' : 'answer.html',
-                                        'username' : 'auth_user.username',
-                                        'user_id' : 'auth_user.id'
-                                        },
-                                    select_params=[user_id],
-                                    tables=['answer', 'question', 'auth_user'],
-                                    where=['answer.question_id = question.id AND answer.deleted=False AND question.deleted=False AND '+
-                                        'question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
-                                    params=[user_id, user_id],
-                                    order_by=['-answer.id']
-                                ).values(
-                                        'title',
-                                        'question_id',
-                                        'answer_id',
-                                        'added_at',
-                                        'html',
-                                        'username',
-                                        'user_id'
-                                        )
-    if len(answers) > 0:
-        answers = [(Response(TYPE_RESPONSE['QUESTION_ANSWERED'], a['title'], a['question_id'],
-        a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
-        responses.extend(answers)
-
-
-    # question comments
-    comments = Comment.objects.extra(
-                                select={
-                                    'title' : 'question.title',
-                                    'question_id' : 'comment.object_id',
-                                    'added_at' : 'comment.added_at',
-                                    'comment' : 'comment.comment',
-                                    'username' : 'auth_user.username',
-                                    'user_id' : 'auth_user.id'
-                                    },
-                                tables=['question', 'auth_user', 'comment'],
-                                where=['question.deleted=False AND question.author_id = %s AND comment.object_id=question.id AND '+
-                                    'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
-                                params=[user_id, question_type_id, user_id],
-                                order_by=['-comment.added_at']
-                            ).values(
-                                    'title',
-                                    'question_id',
-                                    'added_at',
-                                    'comment',
-                                    'username',
-                                    'user_id'
-                                    )
-
-    if len(comments) > 0:
-        comments = [(Response(TYPE_RESPONSE['QUESTION_COMMENTED'], c['title'], c['question_id'],
-            '', c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
-        responses.extend(comments)
-
-    # answer comments
-    comments = Comment.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'comment.added_at',
-            'comment' : 'comment.comment',
-            'username' : 'auth_user.username',
-            'user_id' : 'auth_user.id'
-            },
-        tables=['answer', 'auth_user', 'comment', 'question'],
-        where=['answer.deleted=False AND answer.author_id = %s AND comment.object_id=answer.id AND '+
-            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id '+
-            'AND question.id = answer.question_id'],
-        params=[user_id, answer_type_id, user_id],
-        order_by=['-comment.added_at']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'added_at',
-            'comment',
-            'username',
-            'user_id'
-            )
-
-    if len(comments) > 0:
-        comments = [(Response(TYPE_RESPONSE['ANSWER_COMMENTED'], c['title'], c['question_id'],
-        c['answer_id'], c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
-        responses.extend(comments)
-
-    # answer has been accepted
-    answers = Answer.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'answer.accepted_at',
-            'html' : 'answer.html',
-            'username' : 'auth_user.username',
-            'user_id' : 'auth_user.id'
-            },
-        select_params=[user_id],
-        tables=['answer', 'question', 'auth_user'],
-        where=['answer.question_id = question.id AND answer.deleted=False AND question.deleted=False AND '+
-            'answer.author_id = %s AND answer.accepted=True AND question.author_id=auth_user.id'],
-        params=[user_id],
-        order_by=['-answer.id']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'added_at',
-            'html',
-            'username',
-            'user_id'
-            )
-    if len(answers) > 0:
-        answers = [(Response(TYPE_RESPONSE['ANSWER_ACCEPTED'], a['title'], a['question_id'],
-            a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
-        responses.extend(answers)
-
-    # sort posts by time
-    responses.sort(lambda x,y: cmp(y.time, x.time))
-
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "responses" : responses[:user_view.data_size],
+        raise Http404()
 
 
-    }, context_instance=RequestContext(request))
+    user.save()
+    return decorators.RefreshPageCommand()
 
 
-def user_votes(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
-    if not auth.can_view_user_votes(request.user, user):
-        raise Http404
-    votes = []
-    question_votes = Vote.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 0,
-            'voted_at' : 'vote.voted_at',
-            'vote' : 'vote',
-            },
-        select_params=[user_id],
-        tables=['vote', 'question', 'auth_user'],
-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id '+
-            'AND vote.user_id=auth_user.id'],
-        params=[question_type_id, user_id],
-        order_by=['-vote.id']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'voted_at',
-            'vote',
-            )
-    if(len(question_votes) > 0):
-        votes.extend(question_votes)
-
-    answer_votes = Vote.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'voted_at' : 'vote.voted_at',
-            'vote' : 'vote',
-            },
-        select_params=[user_id],
-        tables=['vote', 'answer', 'question', 'auth_user'],
-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id '+
-            'AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
-        params=[answer_type_id, user_id],
-        order_by=['-vote.id']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'voted_at',
-            'vote',
-            )
-    if(len(answer_votes) > 0):
-        votes.extend(answer_votes)
-    votes.sort(lambda x,y: cmp(y['voted_at'], x['voted_at']))
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "votes" : votes[:user_view.data_size]
 
 
-    }, context_instance=RequestContext(request))
+@decorate.withfn(decorators.command)
+def award_points(request, id):
+    if not request.POST:
+        return render_to_response('users/karma_bonus.html')
+
+    if not request.user.is_superuser:
+        raise decorators.CommandException(_("Only superusers are allowed to award reputation points"))
 
 
-def user_reputation(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
     try:
     try:
-        from django.db.models import Sum
-        reputation = Repute.objects.extra(
-                                          select={'question_id':'question_id',
-                                          'title': 'question.title'},
-                                          tables=['repute', 'question'],
-                                          order_by=['-reputed_at'],
-                                          where=['user_id=%s AND question_id=question.id'],
-                                          params=[user.id]
-                                          ).values('question_id', 'title', 'reputed_at', 'reputation')
-        reputation = reputation.annotate(positive=Sum("positive"), negative=Sum("negative"))
-    except ImportError:
-        reputation = Repute.objects.extra(
-                                          select={'positive':'sum(positive)', 'negative':'sum(negative)', 'question_id':'question_id',
-                                          'title': 'question.title'},
-                                          tables=['repute', 'question'],
-                                          order_by=['-reputed_at'],
-                                          where=['user_id=%s AND question_id=question.id'],
-                                          params=[user.id]
-                                          ).values('positive', 'negative', 'question_id', 'title', 'reputed_at', 'reputation')
-        reputation.query.group_by = ['question_id']
-
-    rep_list = []
-    for rep in Repute.objects.filter(user=user).order_by('reputed_at'):
-        dic = '[%s,%s]' % (calendar.timegm(rep.reputed_at.timetuple()) * 1000, rep.reputation)
-        rep_list.append(dic)
-    reps = ','.join(rep_list)
-    reps = '[%s]' % reps
-
-    return render_to_response(user_view.template_file, {
-                              "tab_name": user_view.id,
-                              "tab_description": user_view.tab_description,
-                              "page_title": user_view.page_title,
-                              "view_user": user,
-                              "reputation": reputation,
-                              "reps": reps
-                              }, context_instance=RequestContext(request))
-
-def user_favorites(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
-    questions = Question.objects.extra(
-        select={
-            'vote_count' : 'question.vote_up_count + question.vote_down_count',
-            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s '+
-                'AND f.question_id = question.id',
-            'la_user_id' : 'auth_user.id',
-            'la_username' : 'auth_user.username',
-            'la_user_gold' : 'auth_user.gold',
-            'la_user_silver' : 'auth_user.silver',
-            'la_user_bronze' : 'auth_user.bronze',
-            'la_user_reputation' : 'auth_user.reputation'
-            },
-        select_params=[user_id],
-        tables=['question', 'auth_user', 'favorite_question'],
-        where=['question.deleted=True AND question.last_activity_by_id = auth_user.id '+
-            'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
-        params=[user_id],
-        order_by=['-vote_count', '-question.id']
-    ).values('vote_count',
-             'favorited_myself',
-             'id',
-             'title',
-             'author_id',
-             'added_at',
-             'answer_accepted',
-             'answer_count',
-             'comment_count',
-             'view_count',
-             'favourite_count',
-             'summary',
-             'tagnames',
-             'vote_up_count',
-             'vote_down_count',
-             'last_activity_at',
-             'la_user_id',
-             'la_username',
-             'la_user_gold',
-             'la_user_silver',
-             'la_user_bronze',
-             'la_user_reputation')
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "questions" : questions[:user_view.data_size],
-        "view_user" : user
-    }, context_instance=RequestContext(request))
+        points = int(request.POST['points'])
+    except:
+        raise decorators.CommandException(_("Invalid number of points to award."))
+
+    awarding_user = get_object_or_404(User, id=request.user.pk)
+
+    if points > awarding_user.reputation:
+        raise decorators.CommandException(_("Invalid number of points to award."))
+
+    user = get_object_or_404(User, id=id)
+
+    extra = dict(message=request.POST.get('message', ''), awarding_user=request.user.id, value=points)
+
+    BonusRepAction(user=request.user, extra=extra).save(data=dict(value=points, affected=user))
 
 
-def user_email_subscriptions(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
-    if request.method == 'POST':
-        email_feeds_form = EditUserEmailFeedsForm(request.POST)
-        tag_filter_form = TagFilterSelectionForm(request.POST, instance=user)
-        if email_feeds_form.is_valid() and tag_filter_form.is_valid():
-
-            action_status = None
-            tag_filter_saved = tag_filter_form.save()
-            if tag_filter_saved:
-                action_status = _('changes saved')
-            if 'save' in request.POST:
-                feeds_saved = email_feeds_form.save(user)
-                if feeds_saved:
-                    action_status = _('changes saved')
-            elif 'stop_email' in request.POST:
-                email_stopped = email_feeds_form.reset().save(user)
-                initial_values = EditUserEmailFeedsForm.NO_EMAIL_INITIAL
-                email_feeds_form = EditUserEmailFeedsForm(initial=initial_values)
-                if email_stopped:
-                    action_status = _('email updates canceled')
+    return {'commands': {
+            'update_profile_karma': [user.reputation]
+        }}
+    
+
+@decorate.withfn(decorators.command)
+def suspend(request, id):
+    user = get_object_or_404(User, id=id)
+
+    if not request.user.is_superuser:
+        raise decorators.CommandException(_("Only superusers can suspend other users"))
+
+    if not request.POST.get('bantype', None):
+        if user.is_suspended():
+            suspension = user.suspension
+            suspension.cancel(user=request.user, ip=request.META['REMOTE_ADDR'])
+            return decorators.RefreshPageCommand()
+        else:
+            return render_to_response('users/suspend_user.html')
+
+    data = {
+        'bantype': request.POST.get('bantype', 'Indefinitely').strip(),
+        'publicmsg': request.POST.get('publicmsg', _('Bad behaviour')),
+        'privatemsg': request.POST.get('privatemsg', None) or request.POST.get('publicmsg', ''),
+        'suspended': user
+    }
+
+    if data['bantype'] == 'forxdays':
+        try:
+            data['forxdays'] = int(request.POST['forxdays'])
+        except:
+            raise decorators.CommandException(_('Invalid numeric argument for the number of days.'))
+
+    SuspendAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(data=data)
+
+    return decorators.RefreshPageCommand()
+
+@decorate.withfn(decorators.command)
+def report_user(request, id):
+    user = get_object_or_404(User, id=id)
+
+    if not request.POST.get('publicmsg', None):
+        return render_to_response('users/report_user.html')
+
+    data = {
+        'publicmsg': request.POST.get('publicmsg', _('N/A')),
+        'reported': user
+    }
+
+    ReportAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(data=data)
+
+
+    return decorators.RefreshPageCommand()
+
+
+
+def user_view(template, tab_name, tab_title, tab_description, private=False, tabbed=True, render_to=None, weight=500):
+    def decorator(fn):
+        def params(request, id=None, slug=None):
+            # Get the user object by id if the id parameter has been passed
+            if id is not None:
+                user = get_object_or_404(User, id=id)
+            # ...or by slug if the slug has been given
+            elif slug is not None:
+                try:
+                    user = User.objects.get(username__iexact=slug)
+                except User.DoesNotExist:
+                    raise Http404
+
+            if private and not (user == request.user or request.user.is_superuser):
+                raise ReturnImediatelyException(HttpResponseUnauthorized(request))
+
+            if render_to and (not render_to(user)):
+                raise ReturnImediatelyException(HttpResponseRedirect(user.get_profile_url()))
+
+            return [request, user], { 'slug' : slug, }
+
+        decorated = decorate.params.withfn(params)(fn)
+
+        def result(context_or_response, request, user, **kwargs):
+            rev_page_title = smart_unicode(user.username) + " - " + tab_description
+
+            # Check whether the return type of the decorated function is a context or Http Response
+            if isinstance(context_or_response, HttpResponse):
+                response = context_or_response
+
+                # If it is a response -- show it
+                return response
+            else:
+                # ...if it is a context move forward, update it and render it to response
+                context = context_or_response
+
+            context.update({
+                "tab": "users",
+                "active_tab" : tab_name,
+                "tab_description" : tab_description,
+                "page_title" : rev_page_title,
+                "can_view_private": (user == request.user) or request.user.is_superuser
+            })
+            return render_to_response(template, context, context_instance=RequestContext(request))
+
+        decorated = decorate.result.withfn(result, needs_params=True)(decorated)
+
+        if tabbed:
+            def url_getter(vu):
+                try:
+                    return reverse(fn.__name__, kwargs={'id': vu.id, 'slug': slugify(smart_unicode(vu.username))})
+                except NoReverseMatch:
+                    try:
+                        return reverse(fn.__name__, kwargs={'id': vu.id})
+                    except NoReverseMatch:
+                        return reverse(fn.__name__, kwargs={'slug': slugify(smart_unicode(vu.username))})
+
+            ui.register(ui.PROFILE_TABS, ui.ProfileTab(
+                tab_name, tab_title, tab_description,url_getter, private, render_to, weight
+            ))
+
+        return decorated
+    return decorator
+
+
+@user_view('users/stats.html', 'stats', _('overview'), _('user overview'))
+def user_profile(request, user, **kwargs):
+    questions = Question.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at')
+    answers = Answer.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at')
+
+    # Check whether the passed slug matches the one for the user object
+    slug = kwargs['slug']
+    if slug != slugify(smart_unicode(user.username)):
+        return HttpResponseRedirect(user.get_absolute_url())
+
+    up_votes = user.vote_up_count
+    down_votes = user.vote_down_count
+    votes_today = user.get_vote_count_today()
+    votes_total = user.can_vote_count_today()
+
+    user_tags = Tag.objects.filter(Q(nodes__author=user) | Q(nodes__children__author=user)) \
+        .annotate(user_tag_usage_count=Count('name')).order_by('-user_tag_usage_count')
+
+    awards = [(Badge.objects.get(id=b['id']), b['count']) for b in
+              Badge.objects.filter(awards__user=user).values('id').annotate(count=Count('cls')).order_by('-count')]
+
+    return pagination.paginated(request, (
+    ('questions', QuestionListPaginatorContext('USER_QUESTION_LIST', _('questions'), default_pagesize=15)),
+    ('answers', UserAnswersPaginatorContext())), {
+    "view_user" : user,
+    "questions" : questions,
+    "answers" : answers,
+    "up_votes" : up_votes,
+    "down_votes" : down_votes,
+    "total_votes": up_votes + down_votes,
+    "votes_today_left": votes_total-votes_today,
+    "votes_total_per_day": votes_total,
+    "user_tags" : user_tags[:50],
+    "awards": awards,
+    "total_awards" : len(awards),
+    })
+    
+@user_view('users/recent.html', 'recent', _('recent activity'), _('recent user activity'))
+def user_recent(request, user, **kwargs):
+    activities = user.actions.exclude(
+            action_type__in=("voteup", "votedown", "voteupcomment", "flag", "newpage", "editpage")).order_by(
+            '-action_date')[:USERS_PAGE_SIZE]
+
+    return {"view_user" : user, "activities" : activities}
+
+
+@user_view('users/reputation.html', 'reputation', _('reputation history'), _('graph of user karma'))
+def user_reputation(request, user, **kwargs):
+    rep = list(user.reputes.order_by('date'))
+    values = [r.value for r in rep]
+    redux = lambda x, y: x+y
+
+    graph_data = json.dumps([
+    (time.mktime(rep[i].date.timetuple()) * 1000, reduce(redux, values[:i+1], 0))
+    for i in range(len(values))
+    ])
+
+    rep = user.reputes.filter(action__canceled=False).order_by('-date')[0:20]
+
+    return {"view_user": user, "reputation": rep, "graph_data": graph_data}
+
+@user_view('users/votes.html', 'votes', _('votes'), _('user vote record'), True)
+def user_votes(request, user, **kwargs):
+    votes = user.votes.exclude(node__state_string__contains="(deleted").filter(
+            node__node_type__in=("question", "answer")).order_by('-voted_at')[:USERS_PAGE_SIZE]
+
+    return {"view_user" : user, "votes" : votes}
+
+@user_view('users/questions.html', 'favorites', _('favorites'), _('questions that user selected as his/her favorite'))
+def user_favorites(request, user, **kwargs):
+    favorites = FavoriteAction.objects.filter(canceled=False, user=user)
+
+    return {"favorites" : favorites, "view_user" : user}
+
+@user_view('users/subscriptions.html', 'subscriptions', _('subscription'), _('subscriptions'), True, tabbed=False)
+def user_subscriptions(request, user, **kwargs):
+    return _user_subscriptions(request, user, **kwargs)
+
+def _user_subscriptions(request, user, **kwargs):
+    enabled = True
+
+    tab = request.GET.get('tab', "settings")
+
+    # Manage tab
+    if tab == 'manage':
+        manage_open = True
+
+        auto = request.GET.get('auto', 'True')
+        if auto == 'True':
+            show_auto = True
+            subscriptions = QuestionSubscription.objects.filter(user=user).order_by('-last_view')
+        else:
+            show_auto = False
+            subscriptions = QuestionSubscription.objects.filter(user=user, auto_subscription=False).order_by('-last_view')
+
+        return pagination.paginated(request, ('subscriptions', SubscriptionListPaginatorContext()), {
+            'subscriptions':subscriptions,
+            'view_user':user,
+            "auto":show_auto,
+            'manage_open':manage_open,
+        })
+    # Settings Tab and everything else
     else:
     else:
-        email_feeds_form = EditUserEmailFeedsForm()
-        email_feeds_form.set_initial_values(user)
-        tag_filter_form = TagFilterSelectionForm(instance=user)
-        action_status = None
-    return render_to_response(user_view.template_file,{
-        'tab_name':user_view.id,
-        'tab_description':user_view.tab_description,
-        'page_title':user_view.page_title,
-        'view_user':user,
-        'email_feeds_form':email_feeds_form,
-        'tag_filter_selection_form':tag_filter_form,
-        'action_status':action_status,
-    }, context_instance=RequestContext(request))
+        manage_open = False
+        if request.method == 'POST':
+            manage_open = False
+            form = SubscriptionSettingsForm(data=request.POST, instance=user.subscription_settings)
 
 
-class UserView:
-    def __init__(self, id, tab_title, tab_description, page_title, view_func, template_file, data_size=0):
-        self.id = id
-        self.tab_title = tab_title
-        self.tab_description = tab_description
-        self.page_title = page_title
-        self.view_func = view_func 
-        self.template_file = template_file
-        self.data_size = data_size
-        
-USER_TEMPLATE_VIEWS = (
-    UserView(
-        id = 'stats',
-        tab_title = _('overview'),
-        tab_description = _('user profile'),
-        page_title = _('user profile overview'),
-        view_func = user_stats,
-        template_file = 'user_stats.html'
-    ),
-    UserView(
-        id = 'recent',
-        tab_title = _('recent activity'),
-        tab_description = _('recent user activity'),
-        page_title = _('profile - recent activity'),
-        view_func = user_recent,
-        template_file = 'user_recent.html',
-        data_size = 50
-    ),
-    UserView(
-        id = 'responses',
-        tab_title = _('responses'),
-        tab_description = _('comments and answers to others questions'),
-        page_title = _('profile - responses'),
-        view_func = user_responses,
-        template_file = 'user_responses.html',
-        data_size = 50
-    ),
-    UserView(
-        id = 'reputation',
-        tab_title = _('reputation'),
-        tab_description = _('user reputation in the community'),
-        page_title = _('profile - user reputation'),
-        view_func = user_reputation,
-        template_file = 'user_reputation.html'
-    ),
-    UserView(
-        id = 'favorites',
-        tab_title = _('favorite questions'),
-        tab_description = _('users favorite questions'),
-        page_title = _('profile - favorite questions'),
-        view_func = user_favorites,
-        template_file = 'user_favorites.html',
-        data_size = 50
-    ),
-    UserView(
-        id = 'votes',
-        tab_title = _('casted votes'),
-        tab_description = _('user vote record'),
-        page_title = _('profile - votes'),
-        view_func = user_votes,
-        template_file = 'user_votes.html',
-        data_size = 50
-    ),
-    UserView(
-        id = 'email_subscriptions',
-        tab_title = _('email subscriptions'),
-        tab_description = _('email subscription settings'),
-        page_title = _('profile - email subscriptions'),
-        view_func = user_email_subscriptions,
-        template_file = 'user_email_subscriptions.html'
-    )
-)
-
-def user(request, id):
-    sort = request.GET.get('sort', 'stats')
-    user_view = dict((v.id, v) for v in USER_TEMPLATE_VIEWS).get(sort, USER_TEMPLATE_VIEWS[0])
-    from forum.views import users
-    func = user_view.view_func
-    return func(request, id, user_view)
-
-
-@login_required
-def changepw(request):
-    """
-    change password view.
-
-    url : /changepw/
-    template: authopenid/changepw.html
-    """
-    logging.debug('')
-    user_ = request.user
-
-    if not user_.has_usable_password():
-        raise Http404
+            if form.is_valid():
+                form.save()
+                message = _('New subscription settings are now saved')
+
+                user.subscription_settings.enable_notifications = enabled
+                user.subscription_settings.save()
+
+                messages.info(request, message)
+        else:
+            form = SubscriptionSettingsForm(instance=user.subscription_settings)
 
 
+        return {
+            'view_user':user,
+            'notificatons_on': enabled,
+            'form':form,
+            'manage_open':manage_open,
+        }
+
+@user_view('users/preferences.html', 'preferences', _('preferences'), _('preferences'), True, tabbed=False)
+def user_preferences(request, user, **kwargs):
     if request.POST:
     if request.POST:
-        form = ChangePasswordForm(request.POST, user=user_)
+        form = UserPreferencesForm(request.POST)
+
         if form.is_valid():
         if form.is_valid():
-            user_.set_password(form.cleaned_data['password1'])
-            user_.save()
-            msg = _("Password changed.")
-            redirect = "%s?msg=%s" % (
-                    reverse('user_account_settings'),
-                    urlquote_plus(msg))
-            return HttpResponseRedirect(redirect)
+            user.prop.preferences = form.cleaned_data
+            messages.info(request, _('New preferences saved'))
+
     else:
     else:
-        form = ChangePasswordForm(user=user_)
-
-    return render_to_response('changepw.html', {'form': form },
-                                context_instance=RequestContext(request))
-
-@login_required
-def account_settings(request):
-    """
-    index pages to changes some basic account settings :
-     - change password
-     - change email
-     - associate a new openid
-     - delete account
-
-    url : /
-
-    template : authopenid/settings.html
-    """
-    logging.debug('')
-    msg = request.GET.get('msg', '')
-    is_openid = False
-
-    return render_to_response('account_settings.html', {
-        'msg': msg,
-        'is_openid': is_openid
-        }, context_instance=RequestContext(request))
+        preferences = user.prop.preferences
+
+        if preferences:
+            form = UserPreferencesForm(initial=preferences)
+        else:
+            form = UserPreferencesForm()
+            
+    return {'view_user': user, 'form': form}
+