Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

1 files changed, 57 insertions, 31 deletions

diff --git a/packages/views/flag.py b/packages/views/flag.py
index 760bdd94..92b35b70 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -1,20 +1,18 @@
+import re
+
 from django import forms
 from django.conf import settings
 from django.contrib.auth.decorators import permission_required
-from django.core.mail import send_mail
+from django.core.mail import EmailMessage
 from django.db import transaction
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import get_object_or_404, redirect, render
 from django.template import loader, Context
-from django.views.generic.simple import direct_to_template
-from django.views.decorators.cache import never_cache
+from django.utils.timezone import now
+from django.views.decorators.cache import cache_page, never_cache
 
 from ..models import FlagRequest
 from main.models import Package
-from main.utils import utc_now
-
 
-def flaghelp(request):
-    return direct_to_template(request, 'packages/flaghelp.html')
 
 class FlagForm(forms.Form):
     email = forms.EmailField(label='E-mail Address')
@@ -26,14 +24,36 @@ class FlagForm(forms.Form):
             widget=forms.TextInput(attrs={'style': 'display:none;'}),
             required=False)
 
+    def __init__(self, *args, **kwargs):
+        # we remove the 'email' field if this form is being shown to a
+        # logged-in user, e.g., a developer.
+        auth = kwargs.pop('authenticated', False)
+        super(FlagForm, self).__init__(*args, **kwargs)
+        if auth:
+            del self.fields['email']
+
+    def clean_message(self):
+        data = self.cleaned_data['message']
+        # make sure the message isn't garbage (only punctuation or whitespace)
+        # and ensure a certain minimum length
+        if re.match(r'^[^0-9A-Za-z]+$', data) or len(data) < 3:
+            raise forms.ValidationError(
+                    "Enter a valid and useful out-of-date message.")
+        return data
+
+
+@cache_page(3600)
+def flaghelp(request):
+    return render(request, 'packages/flaghelp.html')
+
+
 @never_cache
 def flag(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     if pkg.flag_date is not None:
         # already flagged. do nothing.
-        return direct_to_template(request, 'packages/flagged.html',
-                {'pkg': pkg})
+        return render(request, 'packages/flagged.html', {'pkg': pkg})
     # find all packages from (hopefully) the same PKGBUILD
     pkgs = Package.objects.normal().filter(
             pkgbase=pkg.pkgbase, flag_date__isnull=True,
@@ -41,34 +61,40 @@ def flag(request, name, repo, arch):
             repo__staging=pkg.repo.staging).order_by(
             'pkgname', 'repo__name', 'arch__name')
 
+    authenticated = request.user.is_authenticated()
+
     if request.POST:
-        form = FlagForm(request.POST)
+        form = FlagForm(request.POST, authenticated=authenticated)
         if form.is_valid() and form.cleaned_data['website'] == '':
             # save the package list for later use
             flagged_pkgs = list(pkgs)
 
             # find a common version if there is one available to store
-            versions = set(pkg.full_version for pkg in flagged_pkgs)
+            versions = set((pkg.pkgver, pkg.pkgrel, pkg.epoch)
+                    for pkg in flagged_pkgs)
             if len(versions) == 1:
                 version = versions.pop()
             else:
-                version = ''
+                version = ('', '', 0)
 
-            email = form.cleaned_data['email']
             message = form.cleaned_data['message']
             ip_addr = request.META.get('REMOTE_ADDR')
+            if authenticated:
+                email = request.user.email
+            else:
+                email = form.cleaned_data['email']
 
             @transaction.commit_on_success
             def perform_updates():
-                now = utc_now()
-                pkgs.update(flag_date=now)
+                current_time = now()
+                pkgs.update(flag_date=current_time)
                 # store our flag request
-                flag_request = FlagRequest(created=now,
+                flag_request = FlagRequest(created=current_time,
                         user_email=email, message=message,
                         ip_address=ip_addr, pkgbase=pkg.pkgbase,
-                        version=version, repo=pkg.repo,
-                        num_packages=len(flagged_pkgs))
-                if request.user.is_authenticated():
+                        repo=pkg.repo, pkgver=version[0], pkgrel=version[1],
+                        epoch=version[2], num_packages=len(flagged_pkgs))
+                if authenticated:
                     flag_request.user = request.user
                 flag_request.save()
 
@@ -84,7 +110,7 @@ def flag(request, name, repo, arch):
                 subject = '%s package [%s] marked out-of-date' % \
                         (pkg.repo.name, pkg.pkgname)
                 for maint in maints:
-                    if maint.get_profile().notify == True:
+                    if maint.userprofile.notify == True:
                         toemail.append(maint.email)
 
             if toemail:
@@ -96,26 +122,26 @@ def flag(request, name, repo, arch):
                     'pkg': pkg,
                     'packages': flagged_pkgs,
                 })
-                send_mail(subject,
+                msg = EmailMessage(subject,
                         tmpl.render(ctx),
                         settings.BRANDING_EMAIL,
                         toemail,
-                        fail_silently=True)
+                        headers={"Reply-To": email }
+                )
+                msg.send(fail_silently=True)
 
             return redirect('package-flag-confirmed', name=name, repo=repo,
                     arch=arch)
     else:
         initial = {}
-        if request.user.is_authenticated():
-            initial['email'] = request.user.email
-        form = FlagForm(initial=initial)
+        form = FlagForm(authenticated=authenticated)
 
     context = {
         'package': pkg,
         'packages': pkgs,
         'form': form
     }
-    return direct_to_template(request, 'packages/flag.html', context)
+    return render(request, 'packages/flag.html', context)
 
 def flag_confirmed(request, name, repo, arch):
     pkg = get_object_or_404(Package,
@@ -128,11 +154,11 @@ def flag_confirmed(request, name, repo, arch):
 
     context = {'package': pkg, 'packages': pkgs}
 
-    return direct_to_template(request, 'packages/flag_confirmed.html', context)
+    return render(request, 'packages/flag_confirmed.html', context)
 
 @permission_required('main.change_package')
 def unflag(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     pkg.flag_date = None
     pkg.save()
@@ -140,7 +166,7 @@ def unflag(request, name, repo, arch):
 
 @permission_required('main.change_package')
 def unflag_all(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     # find all packages from (hopefully) the same PKGBUILD
     pkgs = Package.objects.filter(pkgbase=pkg.pkgbase,