various minor fixes

8 files changed, 393 insertions, 28 deletions

diff --git a/TODO b/TODO
index 81033e36..7c37071d 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,3 @@
-* per-tag email subscriptions

+* per-tag email  subscriptions

 * make sorting tabs work in question search - done

 * allow multiple logins to the same account

diff --git a/forum/forms.py b/forum/forms.py
index 42becc11..308f853b 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -200,7 +200,8 @@ class EditAnswerForm(forms.Form):
 
 class EditUserForm(forms.Form):
     email = forms.EmailField(label=u'Email', help_text=_('this email does not have to be linked to gravatar'), required=True, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    #username = UserNameField(label=_('Screen name'))
+    if settings.EDITABLE_SCREEN_NAME:
+    	username = UserNameField(label=_('Screen name'))
     realname = forms.CharField(label=_('Real name'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
     website = forms.URLField(label=_('Website'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
     city = forms.CharField(label=_('Location'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
@@ -209,8 +210,10 @@ 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
+        logging.debug('initializing the form')
+        if settings.EDITABLE_SCREEN_NAME:
+            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
diff --git a/forum/forms.py.orig b/forum/forms.py.orig
new file mode 100644
index 00000000..42becc11
--- /dev/null
+++ b/forum/forms.py.orig
@@ -0,0 +1,352 @@
+import re
+from datetime import date
+from django import forms
+from models import *
+from const import *
+from django.utils.translation import ugettext as _
+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):
+        super(TitleField, self).__init__(*args, **kwargs)
+        self.required = True
+        self.widget = forms.TextInput(attrs={'size' : 70, 'autocomplete' : 'off'})
+        self.max_length = 255
+        self.label  = _('title')
+        self.help_text = _('please enter a descriptive title for your question')
+        self.initial = ''
+
+    def clean(self, value):
+        if len(value) < 10:
+            raise forms.ValidationError(_('title must be > 10 characters'))
+
+        return value
+
+class EditorField(forms.CharField):
+    def __init__(self, *args, **kwargs):
+        super(EditorField, self).__init__(*args, **kwargs)
+        self.required = True
+        self.widget = forms.Textarea(attrs={'id':'editor'})
+        self.label  = _('content')
+        self.help_text = u''
+        self.initial = ''
+
+    def clean(self, value):
+        if len(value) < 10:
+            raise forms.ValidationError(_('question content must be > 10 characters'))
+
+        return value
+
+class TagNamesField(forms.CharField):
+    def __init__(self, *args, **kwargs):
+        super(TagNamesField, self).__init__(*args, **kwargs)
+        self.required = True
+        self.widget = forms.TextInput(attrs={'size' : 50, 'autocomplete' : 'off'})
+        self.max_length = 255
+        self.label  = _('tags')
+        #self.help_text = _('please use space to separate tags (this enables autocomplete feature)')
+        self.help_text = _('Tags are short keywords, with no spaces within. Up to five tags can be used.')
+        self.initial = ''
+
+    def clean(self, value):
+        value = super(TagNamesField, self).clean(value)
+        data = value.strip()
+        if len(data) < 1:
+            raise forms.ValidationError(_('tags are required'))
+
+        split_re = re.compile(r'[ ,]+')
+        list = split_re.split(data)
+        list_temp = []
+        if len(list) > 5:
+            raise forms.ValidationError(_('please use 5 tags or less'))
+        for tag in list:
+            if len(tag) > 20:
+                raise forms.ValidationError(_('tags must be shorter than 20 characters'))
+            #take tag regex from settings
+            tagname_re = re.compile(r'[a-z0-9]+')
+            if not tagname_re.match(tag):
+                raise forms.ValidationError(_('please use following characters in tags: letters \'a-z\', numbers, and characters \'.-_#\''))
+            # only keep one same tag
+            if tag not in list_temp and len(tag.strip()) > 0:
+                list_temp.append(tag)
+        return u' '.join(list_temp)
+
+class WikiField(forms.BooleanField):
+    def __init__(self, *args, **kwargs):
+        super(WikiField, self).__init__(*args, **kwargs)
+        self.required = False
+        self.label  = _('community wiki')
+        self.help_text = _('if you choose community wiki option, the question and answer do not generate points and name of author will not be shown')
+    def clean(self,value):
+        return value and settings.WIKI_ON
+
+class EmailNotifyField(forms.BooleanField):
+    def __init__(self, *args, **kwargs):
+        super(EmailNotifyField, self).__init__(*args, **kwargs)
+        self.required = False
+        self.widget.attrs['class'] = 'nomargin'
+
+class SummaryField(forms.CharField):
+    def __init__(self, *args, **kwargs):
+        super(SummaryField, self).__init__(*args, **kwargs)
+        self.required = False
+        self.widget = forms.TextInput(attrs={'size' : 50, 'autocomplete' : 'off'})
+        self.max_length = 300
+        self.label  = _('update summary:')
+        self.help_text = _('enter a brief summary of your revision (e.g. fixed spelling, grammar, improved style, this field is optional)')
+
+class ModerateUserForm(forms.ModelForm):
+    is_approved = forms.BooleanField(label=_("Automatically accept user's contributions for the email updates"),
+                                     required=False)
+
+    def clean_is_approved(self):
+        if 'is_approved' not in self.cleaned_data:
+            self.cleaned_data['is_approved'] = False
+        return self.cleaned_data['is_approved']
+
+    class Meta:
+        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)
+    message = forms.CharField(label=_('Your message:'), max_length=800,widget=forms.Textarea(attrs={'cols':60}))
+    next = NextUrlField()
+
+class AskForm(forms.Form):
+    title  = TitleField()
+    text   = EditorField()
+    tags   = TagNamesField()
+    wiki = WikiField()
+
+    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))
+    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+
+class AnswerForm(forms.Form):
+    text   = EditorField()
+    wiki   = WikiField()
+    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))
+    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    email_notify = EmailNotifyField()
+    def __init__(self, question, user, *args, **kwargs):
+        super(AnswerForm, self).__init__(*args, **kwargs)
+        self.fields['email_notify'].widget.attrs['id'] = 'question-subscribe-updates';
+        if question.wiki and settings.WIKI_ON:
+            self.fields['wiki'].initial = True
+        if user.is_authenticated():
+            if user in question.followed_by.all():
+                self.fields['email_notify'].initial = True
+                return
+        self.fields['email_notify'].initial = False
+
+
+class CloseForm(forms.Form):
+    reason = forms.ChoiceField(choices=CLOSE_REASONS)
+
+class RetagQuestionForm(forms.Form):
+    tags   = TagNamesField()
+    # initialize the default values
+    def __init__(self, question, *args, **kwargs):
+        super(RetagQuestionForm, self).__init__(*args, **kwargs)
+        self.fields['tags'].initial = question.tagnames
+
+class RevisionForm(forms.Form):
+    """
+    Lists revisions of a Question or Answer
+    """
+    revision = forms.ChoiceField(widget=forms.Select(attrs={'style' : 'width:520px'}))
+
+    def __init__(self, post, latest_revision, *args, **kwargs):
+        super(RevisionForm, self).__init__(*args, **kwargs)
+        revisions = post.revisions.all().values_list(
+            'revision', 'author__username', 'revised_at', 'summary')
+        date_format = '%c'
+        self.fields['revision'].choices = [
+            (r[0], u'%s - %s (%s) %s' % (r[0], r[1], r[2].strftime(date_format), r[3]))
+            for r in revisions]
+        self.fields['revision'].initial = latest_revision.revision
+
+class EditQuestionForm(forms.Form):
+    title  = TitleField()
+    text   = EditorField()
+    tags   = TagNamesField()
+    summary = SummaryField()
+
+    def __init__(self, question, revision, *args, **kwargs):
+        super(EditQuestionForm, self).__init__(*args, **kwargs)
+        self.fields['title'].initial = revision.title
+        self.fields['text'].initial = revision.text
+        self.fields['tags'].initial = revision.tagnames
+        # Once wiki mode is enabled, it can't be disabled
+        if not question.wiki:
+            self.fields['wiki'] = WikiField()
+
+class EditAnswerForm(forms.Form):
+    text = EditorField()
+    summary = SummaryField()
+
+    def __init__(self, answer, revision, *args, **kwargs):
+        super(EditAnswerForm, self).__init__(*args, **kwargs)
+        self.fields['text'].initial = revision.text
+
+class EditUserForm(forms.Form):
+    email = forms.EmailField(label=u'Email', help_text=_('this email does not have to be linked to gravatar'), required=True, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    #username = UserNameField(label=_('Screen name'))
+    realname = forms.CharField(label=_('Real name'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    website = forms.URLField(label=_('Website'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    city = forms.CharField(label=_('Location'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    birthday = forms.DateField(label=_('Date of birth'), help_text=_('will not be shown, used to calculate age, format: YYYY-MM-DD'), required=False, widget=forms.TextInput(attrs={'size' : 35}))
+    about = forms.CharField(label=_('Profile'), required=False, widget=forms.Textarea(attrs={'cols' : 60}))
+
+    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['email'].initial = user.email
+        self.fields['realname'].initial = user.real_name
+        self.fields['website'].initial = user.website
+        self.fields['city'].initial = user.location
+
+        if user.date_of_birth is not None:
+            self.fields['birthday'].initial = user.date_of_birth
+        else:
+            self.fields['birthday'].initial = '1990-01-01'
+        self.fields['about'].initial = user.about
+        self.user = user
+
+    def clean_email(self):
+        """For security reason one unique email in database"""
+        if self.user.email != self.cleaned_data['email']:
+            #todo dry it, there is a similar thing in openidauth
+            if settings.EMAIL_UNIQUE == True:
+                if 'email' in self.cleaned_data:
+                    try:
+                        user = User.objects.get(email = self.cleaned_data['email'])
+                    except User.DoesNotExist:
+                        return self.cleaned_data['email']
+                    except User.MultipleObjectsReturned:
+                        raise forms.ValidationError(_('this email has already been registered, please use another one'))
+                    raise forms.ValidationError(_('this email has already been registered, please use another one'))
+        return self.cleaned_data['email']
+
+class TagFilterSelectionForm(forms.ModelForm):
+    tag_filter_setting = forms.ChoiceField(choices=TAG_EMAIL_FILTER_CHOICES, #imported from forum/const.py
+                                            initial='ignored',
+                                            label=_('Choose email tag filter'),
+                                            widget=forms.RadioSelect)
+    class Meta:
+        model = User
+        fields = ('tag_filter_setting',)
+
+    def save(self):
+        before = self.instance.tag_filter_setting
+        super(TagFilterSelectionForm, self).save()
+        after = self.instance.tag_filter_setting #User.objects.get(pk=self.instance.id).tag_filter_setting
+        if before != after:
+            return True
+        return False
+
+class EditUserEmailFeedsForm(forms.Form):
+    WN = (('w',_('weekly')),('n',_('no email')))
+    DWN = (('d',_('daily')),('w',_('weekly')),('n',_('no email')))
+    FORM_TO_MODEL_MAP = {
+                'all_questions':'q_all',
+                'asked_by_me':'q_ask',
+                'answered_by_me':'q_ans',
+                'individually_selected':'q_sel',
+                }
+    NO_EMAIL_INITIAL = {
+                'all_questions':'n',
+                'asked_by_me':'n',
+                'answered_by_me':'n',
+                'individually_selected':'n',
+                }
+    asked_by_me = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Asked by me'))
+    answered_by_me = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Answered by me'))
+    individually_selected = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Individually selected'))
+    all_questions = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Entire forum (tag filtered)'),)
+
+    def set_initial_values(self,user=None):
+        KEY_MAP = dict([(v,k) for k,v in self.FORM_TO_MODEL_MAP.iteritems()])
+        if user != None:
+            settings = EmailFeedSetting.objects.filter(subscriber=user) 
+            initial_values = {}
+            for setting in settings:
+                feed_type = setting.feed_type
+                form_field = KEY_MAP[feed_type]
+                frequency = setting.frequency
+                initial_values[form_field] = frequency
+            self.initial = initial_values
+        return self
+
+    def reset(self):
+        self.cleaned_data['all_questions'] = 'n'
+        self.cleaned_data['asked_by_me'] = 'n'
+        self.cleaned_data['answered_by_me'] = 'n'
+        self.cleaned_data['individually_selected'] = 'n'
+        self.initial = self.NO_EMAIL_INITIAL
+        return self
+
+    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)
+            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 = new_value
+                s.save()
+                changed = True
+            else:
+                if created:
+                    s.save()
+            if form_field == 'individually_selected':
+                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/managers.py b/forum/managers.py
index b352ad37..3f580bd3 100644
--- a/forum/managers.py
+++ b/forum/managers.py
@@ -92,7 +92,7 @@ class TagManager(models.Manager):
         'SET used_count = ('
             'SELECT COUNT(*) FROM question_tags '
             'INNER JOIN question ON question_id=question.id '
-            'WHERE tag_id = tag.id AND question.deleted=0'
+            'WHERE tag_id = tag.id AND question.deleted=False'
         ') '
         'WHERE id IN (%s)')
 
diff --git a/forum/models.py b/forum/models.py
index a2988be4..acde1033 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -389,7 +389,7 @@ class QuestionRevision(models.Model):
         return self.question.title
 
     def get_absolute_url(self):
-        print 'in QuestionRevision.get_absolute_url()'
+        #print 'in QuestionRevision.get_absolute_url()'
         return reverse('question_revisions', args=[self.question.id])
 
     def save(self, **kwargs):
@@ -416,7 +416,7 @@ class AnonymousAnswer(models.Model):
     def publish(self,user):
         from forum.views import create_new_answer
         added_at = datetime.datetime.now()
-        print user.id
+        #print user.id
         create_new_answer(question=self.question,wiki=self.wiki,
                             added_at=added_at,text=self.text,
                             author=user)
@@ -481,6 +481,9 @@ class Answer(models.Model):
             logging.debug('problem pinging google did you register you sitemap with google?')
 
     def get_user_vote(self, user):
+	if user.__class__.__name__ == "AnonymousUser":
+	    return None
+
         votes = self.votes.filter(user=user)
         if votes and votes.count() > 0:
             return votes[0]
@@ -692,13 +695,13 @@ def user_is_username_taken(cls,username):
         return False
 
 def user_get_q_sel_email_feed_frequency(self):
-    print 'looking for frequency for user %s' % self
+    #print 'looking for frequency for user %s' % self
     try:
         feed_setting = EmailFeedSetting.objects.get(subscriber=self,feed_type='q_sel')
     except Exception, e:
-        print 'have error %s' % e.message
+        #print 'have error %s' % e.message
         raise e
-    print 'have freq=%s' % feed_setting.frequency
+    #print 'have freq=%s' % feed_setting.frequency
     return feed_setting.frequency
 
 User.add_to_class('is_approved', models.BooleanField(default=False))
diff --git a/forum/views.py b/forum/views.py
index bad37693..5a5462e2 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -202,7 +202,7 @@ def questions(request, tagname=None, unanswered=False):
                                 'SELECT COUNT(1) FROM forum_markedtag, question_tags '
                                   + 'WHERE forum_markedtag.user_id = %s '
                                   + 'AND forum_markedtag.tag_id = question_tags.tag_id '
-                                  + 'AND forum_markedtag.reason = "good" '
+                                  + 'AND forum_markedtag.reason = \'good\' '
                                   + 'AND question_tags.question_id = question.id'
                             ),
                                 ]),
@@ -220,7 +220,7 @@ def questions(request, tagname=None, unanswered=False):
                                 'SELECT COUNT(1) FROM forum_markedtag, question_tags '
                                   + 'WHERE forum_markedtag.user_id = %s '
                                   + 'AND forum_markedtag.tag_id = question_tags.tag_id '
-                                  + 'AND forum_markedtag.reason = "bad" '
+                                  + 'AND forum_markedtag.reason = \'bad\' '
                                   + 'AND question_tags.question_id = question.id'
                             )
                                 ]),
@@ -1287,7 +1287,7 @@ def user_stats(request, user_id, user_view):
             },
         select_params=[user_id],
         tables=['question', 'auth_user'],
-        where=['question.deleted = 0 AND question.author_id=%s AND question.last_activity_by_id = auth_user.id'],
+        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',
@@ -1323,7 +1323,7 @@ def user_stats(request, user_id, user_view):
             'comment_count' : 'answer.comment_count'
             },
         tables=['question', 'answer'],
-        where=['answer.deleted=0 AND question.deleted=0 AND answer.author_id=%s AND answer.question_id=question.id'],
+        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]
@@ -1445,7 +1445,7 @@ def user_recent(request, user_id, user_view):
             },
         tables=['activity', 'question'],
         where=['activity.content_type_id = %s AND activity.object_id = ' +
-            'question.id AND question.deleted=0 AND activity.user_id = %s AND activity.activity_type = %s'],
+            '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(
@@ -1470,8 +1470,8 @@ def user_recent(request, user_id, user_view):
             },
         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=0 AND activity.user_id=%s AND '+ 
-            'activity.activity_type=%s AND question.deleted=0'],
+            '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(
@@ -1499,7 +1499,7 @@ def user_recent(request, user_id, user_view):
         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=0'],
+            'question.deleted=False'],
         params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],
         order_by=['-comment.added_at']
     ).values(
@@ -1529,7 +1529,7 @@ def user_recent(request, user_id, user_view):
             '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=0 AND question.deleted=0'],
+            '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(
@@ -1556,7 +1556,7 @@ def user_recent(request, user_id, user_view):
             },
         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=0 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],
@@ -1589,7 +1589,7 @@ def user_recent(request, user_id, user_view):
         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=0 AND answer.deleted=0 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']
@@ -1618,7 +1618,7 @@ def user_recent(request, user_id, user_view):
         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=0 AND question.deleted=0 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']
@@ -1694,7 +1694,7 @@ def user_responses(request, user_id, user_view):
                                         },
                                     select_params=[user_id],
                                     tables=['answer', 'question', 'auth_user'],
-                                    where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
+                                    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']
@@ -1724,7 +1724,7 @@ def user_responses(request, user_id, user_view):
                                     'user_id' : 'auth_user.id'
                                     },
                                 tables=['question', 'auth_user', 'comment'],
-                                where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND '+
+                                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']
@@ -1754,7 +1754,7 @@ def user_responses(request, user_id, user_view):
             'user_id' : 'auth_user.id'
             },
         tables=['answer', 'auth_user', 'comment', 'question'],
-        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND '+
+        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],
@@ -1787,8 +1787,8 @@ def user_responses(request, user_id, user_view):
             },
         select_params=[user_id],
         tables=['answer', 'question', 'auth_user'],
-        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
-            'answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
+        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(
@@ -1935,7 +1935,7 @@ def user_favorites(request, user_id, user_view):
             },
         select_params=[user_id],
         tables=['question', 'auth_user', 'favorite_question'],
-        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id '+
+        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']
diff --git a/osqa.wsgi b/osqa.wsgi
new file mode 100644
index 00000000..df664e99
--- /dev/null
+++ b/osqa.wsgi
@@ -0,0 +1,7 @@
+import os
+import sys
+sys.path.append('/usr/local/sites/osqa_staging')
+sys.path.append('/usr/local/sites/osqa_staging/robofaqs')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'robofaqs.settings'
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/rmpyc b/rmpyc
index 014575f6..014575f6 100644..100755
--- a/rmpyc
+++ b/rmpyc