recaptcha for conventional registration\n\

simpler email subscription form at registration\n\
fixed urls in rss feed\n\
added experimental remote password login api (cleartext password for remote site entered locally)\n\
included example for Mediawiki Authentication plugin\n\
very simple message to everyone management command

10 files changed, 84 insertions, 19 deletions

diff --git a/forum/feed.py b/forum/feed.py
index ad1d5cbd..e4b929e9 100644
--- a/forum/feed.py
+++ b/forum/feed.py
@@ -13,16 +13,16 @@
 from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
 from django.utils.translation import ugettext as _
 from models import Question
-import settings
+from django.conf import settings
 class RssLastestQuestionsFeed(Feed):
     title = settings.APP_TITLE + _(' - ')+ _('latest questions')
-    link = settings.APP_URL + '/' + _('question/')
+    link = settings.APP_URL #+ '/' + _('question/')
     description = settings.APP_DESCRIPTION
     #ttl = 10
     copyright = settings.APP_COPYRIGHT
 
     def item_link(self, item):
-        return self.link + '%s/' % item.id
+        return self.link + item.get_absolute_url()
 
     def item_author_name(self, item):
         return item.author.username
diff --git a/forum/forms.py b/forum/forms.py
index 2d2021b5..42becc11 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -4,8 +4,10 @@ from django import forms
 from models import *
 from const import *
 from django.utils.translation import ugettext as _
-from django_authopenid.forms import NextUrlField, UserNameField
-import settings
+from utils.forms import NextUrlField, UserNameField
+from recaptcha_django import ReCaptchaField
+from django.conf import settings
+import logging
 
 class TitleField(forms.CharField):
     def __init__(self, *args, **kwargs):
@@ -109,6 +111,9 @@ class ModerateUserForm(forms.ModelForm):
         model = User
         fields = ('is_approved',)
 
+class NotARobotForm(forms.Form):
+    recaptcha = ReCaptchaField()
+
 class FeedbackForm(forms.Form):
     name = forms.CharField(label=_('Your name:'), required=False)
     email = forms.EmailField(label=_('Email (not shared with anyone):'), required=False)
@@ -204,8 +209,8 @@ class EditUserForm(forms.Form):
 
     def __init__(self, user, *args, **kwargs):
         super(EditUserForm, self).__init__(*args, **kwargs)
-        #self.fields['username'].initial = user.username
-        #self.fields['username'].user_instance = user
+        self.fields['username'].initial = user.username
+        self.fields['username'].user_instance = user
         self.fields['email'].initial = user.email
         self.fields['realname'].initial = user.real_name
         self.fields['website'].initial = user.website
@@ -299,14 +304,24 @@ class EditUserEmailFeedsForm(forms.Form):
         self.initial = self.NO_EMAIL_INITIAL
         return self
 
-    def save(self,user):
+    def save(self,user,save_unbound=False):
+        """
+            with save_unbound==True will bypass form validation and save initial values
+        """
         changed = False
         for form_field, feed_type in self.FORM_TO_MODEL_MAP.items():
             s, created = EmailFeedSetting.objects.get_or_create(subscriber=user,\
                                                     feed_type=feed_type)
-            new_value = self.cleaned_data[form_field]
+            if save_unbound:
+                #just save initial values instead
+                if form_field in self.initial:
+                    new_value = self.initial[form_field]
+                else:
+                    new_value = self.fields[form_field].initial
+            else:
+                new_value = self.cleaned_data[form_field]
             if s.frequency != new_value:
-                s.frequency = self.cleaned_data[form_field]
+                s.frequency = new_value
                 s.save()
                 changed = True
             else:
@@ -316,3 +331,22 @@ class EditUserEmailFeedsForm(forms.Form):
                 feed_type = ContentType.objects.get_for_model(Question)
                 user.followed_questions.clear()
         return changed
+
+
+class SimpleEmailSubscribeForm(forms.Form):
+    SIMPLE_SUBSCRIBE_CHOICES = (
+        ('y',_('okay, let\'s try!')),
+        ('n',_('no OSQA community email please, thanks'))
+    )
+    subscribe = forms.ChoiceField(widget=forms.widgets.RadioSelect(), \
+                                error_messages={'required':_('please choose one of the options above')},
+                                choices=SIMPLE_SUBSCRIBE_CHOICES)
+
+    def save(self,user=None):
+        EFF = EditUserEmailFeedsForm
+        if self.cleaned_data['subscribe'] == 'y':
+            email_settings_form = EFF()
+            logging.debug('%s wants to subscribe' % user.username)
+        else:
+            email_settings_form = EFF(initial=EFF.NO_EMAIL_INITIAL)
+        email_settings_form.save(user,save_unbound=True)
diff --git a/forum/management/commands/message_to_everyone.py b/forum/management/commands/message_to_everyone.py
new file mode 100644
index 00000000..c020c178
--- /dev/null
+++ b/forum/management/commands/message_to_everyone.py
@@ -0,0 +1,12 @@
+from django.core.management.base import NoArgsCommand
+from django.contrib.auth.models import User
+import sys
+
+class Command(NoArgsCommand):
+    def handle_noargs(self, **options):
+        msg = None
+        if msg == None:
+            print 'to run this command, please first edit the file %s' % __file__
+            sys.exit(1)
+        for u in User.objects.all():
+            u.message_set.create(message = msg % u.username)
diff --git a/forum/management/commands/multi_award_badges.py b/forum/management/commands/multi_award_badges.py
index c6dbc250..6b330cf9 100644
--- a/forum/management/commands/multi_award_badges.py
+++ b/forum/management/commands/multi_award_badges.py
@@ -345,4 +345,4 @@ class Command(BaseCommand):
                 award = Award(user=user, badge=badge, content_type=content_type, object_id=object_id)
                 award.save()
         finally:
-            cursor.close()
\ No newline at end of file
+            cursor.close()
diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index f5974e6b..62f13d69 100644
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -7,7 +7,7 @@ from django.core.mail import EmailMessage
 from django.utils.translation import ugettext as _
 from django.utils.translation import ungettext
 import datetime
-import settings
+from django.conf import settings
 import logging
 from utils.odict import OrderedDict
 
@@ -58,10 +58,10 @@ class Command(NoArgsCommand):
                     q_ans.cutoff_time = cutoff_time
                 elif feed.feed_type == 'q_all':
                     if user.tag_filter_setting == 'ignored':
-                        ignored_tags = Tag.objects.filter(user_selections___reason='bad',user_selections__user=user)
+                        ignored_tags = Tag.objects.filter(user_selections__reason='bad',user_selections__user=user)
                         q_all = Q_set.exclude( tags__in=ignored_tags )
                     else:
-                        selected_tags = Tag.objects.filter(user_selections___reason='good',user_selections__user=user)
+                        selected_tags = Tag.objects.filter(user_selections__reason='good',user_selections__user=user)
                         q_all = Q_set.filter( tags__in=selected_tags )
                     q_all.cutoff_time = cutoff_time
         #build list in this order
@@ -154,6 +154,7 @@ class Command(NoArgsCommand):
             if num_q > 0:
                 url_prefix = settings.APP_URL
                 subject = _('email update message subject')
+                print 'have %d updated questions for %s' % (num_q, user.username)
                 text = ungettext('%(name)s, this is an update message header for a question', 
                             '%(name)s, this is an update message header for %(num)d questions',num_q) \
                                 % {'num':num_q, 'name':user.username}
diff --git a/forum/management/commands/subscribe_everyone.py b/forum/management/commands/subscribe_everyone.py
index f5cbf8eb..c79528f3 100644
--- a/forum/management/commands/subscribe_everyone.py
+++ b/forum/management/commands/subscribe_everyone.py
@@ -6,7 +6,7 @@ from django.core.mail import EmailMessage
 from django.utils.translation import ugettext as _
 from django.utils.translation import ungettext
 import datetime
-import settings
+from django.conf import settings
 
 class Command(NoArgsCommand):
     def handle_noargs(self,**options):
diff --git a/forum/models.py b/forum/models.py
index c3b89ce9..a2988be4 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -15,7 +15,7 @@ from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.contrib.sitemaps import ping_google
 import django.dispatch
-import settings
+from django.conf import settings
 import logging
 
 if settings.USE_SPHINX_SEARCH == True:
@@ -831,7 +831,7 @@ def notify_award_message(instance, created, **kwargs):
     """
     if created:
         user = instance.user
-        user.message_set.create(message=u"%s" % instance.badge.name)
+        user.message_set.create(message=u"Congratulations, you have received a badge '%s'" % instance.badge.name)
 
 def record_answer_accepted(instance, created, **kwargs):
     """
diff --git a/forum/sitemap.py b/forum/sitemap.py
index dc97a009..c0c60b5e 100644
--- a/forum/sitemap.py
+++ b/forum/sitemap.py
@@ -9,3 +9,6 @@ class QuestionsSitemap(Sitemap):
 
     def lastmod(self, obj):
         return obj.last_activity_at
+
+    def location(self, obj):
+        return obj.get_absolute_url()
diff --git a/forum/urls.py b/forum/urls.py
index f7d6eba5..42746d44 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -54,7 +54,7 @@ urlpatterns = patterns('',
                                                 app.delete_comment, kwargs={'commented_object_type':'answer'}, \
                                                 name='delete_answer_comment'), \
     #place general question item in the end of other operations
-    url(r'^%s(?P<id>\d+)//*' % _('question/'), app.question, name='question'),
+    url(r'^%s(?P<id>\d+)/' % _('question/'), app.question, name='question'),
     url(r'^%s$' % _('tags/'), app.tags, name='tags'),
     url(r'^%s(?P<tag>[^/]+)/$' % _('tags/'), app.tag, name='tag_questions'),
 
diff --git a/forum/views.py b/forum/views.py
index c4514912..bad37693 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -33,7 +33,7 @@ from forum.auth import *
 from forum.const import *
 from forum.user import *
 from forum import auth
-from django_authopenid.util import get_next_url
+from utils.forms import get_next_url
 
 # used in index page
 INDEX_PAGE_SIZE = 20
@@ -436,6 +436,21 @@ def question(request, id):
     logging.debug('view_id=' + str(view_id))
 
     question = get_object_or_404(Question, id=id)
+    try:
+        pattern = r'/%s%s%d/([\w-]+)' % (settings.FORUM_SCRIPT_ALIAS,_('question/'), question.id)
+        path_re = re.compile(pattern)
+        logging.debug(pattern)
+        logging.debug(request.path)
+        m = path_re.match(request.path)
+        if m:
+            slug = m.group(1)
+            logging.debug('have slug %s' % slug)
+            assert(slug == slugify(question.title))
+        else:
+            logging.debug('no match!')
+    except:
+        return HttpResponseRedirect(question.get_absolute_url())
+
     if question.deleted and not can_view_deleted_post(request.user, question):
         raise Http404
     answer_form = AnswerForm(question,request.user)