Changes in [20:b3faeb72eb1a:30:648fc619304f]

Files:

• .hgignore (modified) (1 diff)
• apps/forum/migrations/001_forum_updated.py (deleted)
• apps/forum/migrations/002_post_count.py (deleted)
• apps/forum/migrations/__init__.py (deleted)
• apps/forum/models.py (modified) (4 diffs)
• apps/forum/settings.py (modified) (2 diffs)
• apps/forum/subscription.py (modified) (1 diff)
• apps/forum/templates/forum/forum_row.html (modified) (2 diffs)
• apps/forum/templates/forum/moderate.html (modified) (1 diff)
• apps/forum/templates/forum/topic.html (modified) (1 diff)
• apps/forum/templates/forum/user.html (modified) (1 diff)
• apps/forum/templatetags/forum_extras.py (modified) (1 diff)
• apps/forum/util.py (modified) (3 diffs)
• apps/forum/views.py (modified) (19 diffs)
• settings.py (modified) (4 diffs)

.hgignore

@@ -13 +13 @@
 *.autosave
 static/forum/avatars
+secret.txt

apps/forum/models.py

@@ -128 +128 @@
 
     class Meta:
-        ordering = ['-created']
+        ordering = ['-updated']
         verbose_name = _('Topic')
         verbose_name_plural = _('Topics')
@@ -206 +206 @@
         self.body_html = urlize(self.body_html)
         self.body_html = smiles(self.body_html)
-
         new = self.id is None
-
         if new:
+            #new post created
+            super(Post, self).save(*args, **kwargs)
             self.topic.updated = datetime.now()
-            self.topic.post_count += 1
+            self.topic.post_count = Post.objects.filter(topic=self.topic).count()
             self.topic.save()
             self.topic.forum.updated = self.topic.updated
-            self.topic.forum.post_count += 1
+            self.topic.forum.post_count = Post.objects.filter(topic__forum=self.topic.forum).count()
             self.topic.forum.save()
-
-        super(Post, self).save(*args, **kwargs)
+        else:
+            #edit post
+            super(Post, self).save(*args, **kwargs)
 
     def get_absolute_url(self):
@@ -226 +227 @@
         head_post_id = self.topic.posts.order_by('created')[0].id
         super(Post, self).delete(*args, **kwargs)
-        
-        self.topic.post_count -= 1
+        self.topic.post_count = Post.objects.filter(topic=self.topic).count()
         self.topic.save()
-        self.topic.forum.post_count -= 1
+        self.topic.forum.post_count = Post.objects.filter(topic__forum=self.topic.forum).count()
         self.topic.forum.save()
-        
+
         if self_id == head_post_id:
             self.topic.delete()
@@ -275 +275 @@
         verbose_name = _('Profile')
         verbose_name_plural = _('Profiles')
-        
+
     def last_post(self):
         posts = Post.objects.filter(user=self.user).order_by('-created').select_related()

apps/forum/settings.py

@@ -1 +1 @@
 from django.conf import settings
+import re
 
 def get(key, default):
@@ -47 +48 @@
 EMOTION_ROLL = get('EMOTION_ROLL', '<img src="%sforum/img/smilies/roll.png">' % settings.MEDIA_URL)
 EMOTION_COOL = get('EMOTION_COOL', '<img src="%sforum/img/smilies/cool.png">' % settings.MEDIA_URL)
+SMILES = ((r'(:|=)\)', EMOTION_SMILE), #:), =)
+          (r'(:|=)\|',  EMOTION_NEUTRAL), #:|, =| 
+          (r'(:|=)\(', EMOTION_SAD), #:(, =(
+          (r'(:|=)D', EMOTION_BIG_SMILE), #:D, =D
+          (r':o', EMOTION_YIKES), # :o, :O
+          (r';\)', EMOTION_WINK), # ;\ 
+          (r':/', EMOTION_HMM), #:/
+          (r':P', EMOTION_TONGUE), # :P
+          (r':lol:', EMOTION_LOL),
+          (r':mad:', EMOTION_MAD),
+          (r':rolleyes:', EMOTION_ROLL),
+          (r':cool:', EMOTION_COOL)
+         )
+SMILES = get('SMILES', SMILES)

apps/forum/subscription.py

@@ -61 +61 @@
 
 def notify_pm_recipients(pm):
-    from apps.forum.models import PrivateMessage
-    
-    subject = (u'There are new messages')
-    to_email = pm.dst_user.email
-    text_content = PM_RECIPIENT_TEXT_TEMPLATE % {
-        'username': pm.src_user.username,
-        'message': pm.body_text,
-        'pm_url': absolute_url(pm.get_absolute_url()),
-     }
-    send_mail([to_email], subject, text_content)
+    if not pm.read:
+        from apps.forum.models import PrivateMessage 
+        subject = (u'There are new messages')
+        to_email = pm.dst_user.email
+        text_content = PM_RECIPIENT_TEXT_TEMPLATE % {
+            'username': pm.src_user.username,
+            'message': pm.body_text,
+            'pm_url': absolute_url(pm.get_absolute_url()),
+         }
+        send_mail([to_email], subject, text_content)

apps/forum/templates/forum/forum_row.html

@@ -1 +1 @@
 {% load forum_extras %}
+{% load i18n %}
 
 {% if forum.last_post.topic %}
@@ -30 +31 @@
                 {% if forum.last_post.topic %}
                 <a href="{{ forum.last_post.get_absolute_url }}">{% forum_time forum.last_post.created %}</a>
-                <span class="byuser">оставил {{ forum.last_post.user }}</span>
+                <span class="byuser">{% trans "by" %} {{ forum.last_post.user }}</span>
                 {% endif %}
                 {% endif %}

apps/forum/templates/forum/moderate.html

@@ -69 +69 @@
                                         <td class="tc2">{{ topic.reply_count }}</td>
                                         <td class="tc3">{{ topic.views }}</td>
-                                        <td class="tcr"><a href="{{ topic.get_absolute_url }}">{% forum_time topic.updated %}</a> <span class="byuser">оставил {{ topic.last_post.user }}</span></td>
+                                        <td class="tcr"><a href="{{ topic.get_absolute_url }}">{% forum_time topic.updated %}</a> <span class="byuser">{% trans "by" %} {{ topic.last_post.user }}</span></td>
                                         <td class="tcmod"><input type="checkbox" name="topic_id[{{ topic.id }}]" value="1" /></td>
                                 </tr>

apps/forum/templates/forum/topic.html

@@ -8 +8 @@
                 <p class="pagelink conl">{% pagination %}</p>
                 {% if not topic.closed and user.is_authenticated %}
-                <p class="postlink conr"><a href="{% url add_post topic.id %}">Ответить</a></p>
+                <p class="postlink conr"><a href="{% url add_post topic.id %}">{% trans "Reply" %}</a></p>
                 {% endif %}
                                 <ul><li><a href="{% url index %}">{% trans "Root" %} </a></li><li>&raquo; {% link topic.forum %} </li><li>&raquo; {{ topic }} 

apps/forum/templates/forum/user.html

@@ -126 +126 @@
                                                 <dl>
                                                         <dt>{% trans "Posts:" %} </dt>
-                                                        <dd>{{ profile.forum_profile.post_count }} - <a href="{% url search %}?action=show_user&user_id={{ profile.id }}">Показать все сообщения</a></dd>
+                                                        <dd>{{ profile.forum_profile.post_count }} - <a href="{% url search %}?action=show_user&user_id={{ profile.id }}">{% trans "Show all posts" %}</a></dd>
                                                         <dt>{% trans "Last post:" %} </dt>
                                                         {% if profile.forum_profile.last_post %}

apps/forum/templatetags/forum_extras.py

@@ -198 +198 @@
 @register.filter
 def forum_stars(user):
-    posts = user.posts.count()
+    posts = user.forum_profile.post_count
     if posts >= forum_settings.FORUM_STAR_5: 
         return mark_safe('<img src="%sforum/img/stars/Star_5.gif" alt="" >' % (settings.MEDIA_URL))

apps/forum/util.py

@@ -16 +16 @@
 from apps.forum import settings as forum_settings
 
-def render_to(template_path):
-    """
-    Expect the dict from view. Render returned dict with
-    RequestContext.
-    """
-
-    def decorator(func):
-        def wrapper(request, *args, **kwargs):
-            output = func(request, *args, **kwargs)
-            if not isinstance(output, dict):
-                return output
-            kwargs = {'context_instance': RequestContext(request)}
-            if 'MIME_TYPE' in output:
-                kwargs['mimetype'] = output.pop('MIME_TYPE')
-            if 'TEMPLATE' in output:
-                template = output.pop('TEMPLATE')
-            else:
-                template = template_path
-            return render_to_response(template, output, **kwargs)
+#compile smiles regexp
+_SMILES = [(re.compile(smile_re), path) for smile_re, path in forum_settings.SMILES]
+
+def render_to(template):
+    """
+    Decorator for Django views that sends returned dict to render_to_response function
+    with given template and RequestContext as context instance.
+
+    If view doesn't return dict then decorator simply returns output.
+    Additionally view can return two-tuple, which must contain dict as first
+    element and string with template name as second. This string will
+    override template name, given as parameter
+
+    Parameters:
+
+     - template: template name to use
+
+    Examples::
+
+      @render_to('some/tmpl.html')
+      def view(request):
+          if smth:
+              return {'context': 'dict'}
+          else:
+              return {'context': 'dict'}, 'other/tmpl.html'
+
+     2006-2009 Alexander Solovyov, new BSD License
+    """
+    def renderer(func):
+        def wrapper(request, *args, **kw):
+            output = func(request, *args, **kw)
+            if isinstance(output, (list, tuple)):
+                return render_to_response(output[1], output[0], RequestContext(request))
+            elif isinstance(output, dict):
+                return render_to_response(template, output, RequestContext(request))
+            return output
         return wrapper
-
-    return decorator
+    return renderer
 
 def absolute_url(path):
@@ -140 +156 @@
     return form
 
-def urlize(data):
-    """
-    Urlize plain text links in the HTML contents.
-   
-    Do not urlize content of A and CODE tags.
-    """
-    
-    class URLizeHTMLParser(HTMLParser):
-    
-        def __init__(self):
+class ExcludeTagsHTMLParser(HTMLParser):
+        """
+        Class for html parsing with excluding specified tags.
+        """
+
+        def __init__(self, func, tags=('a', 'code')):
             HTMLParser.__init__(self)
-            self.is_link = False
-            self.urlized_html = []
-            
+            self.func = func
+            self.is_ignored = False
+            self.tags = tags
+            self.html = []
+
         def handle_starttag(self, tag, attrs):
-            self.urlized_html.append('<%s%s>' % (tag, self.__html_attrs(attrs)))
-            if tag in ('a', 'code'):
-                self.is_link = True
-    
+            self.html.append('<%s%s>' % (tag, self.__html_attrs(attrs)))
+            if tag in self.tags:
+                self.is_ignored = True
+
         def handle_data(self, data):
-            if not self.is_link:
-                data = django_urlize(data)
-            self.urlized_html.append(data)
-    
+            if not self.is_ignored:
+                data = self.func(data)
+            self.html.append(data)
+
         def handle_startendtag(self, tag, attrs):
-            self.urlized_html.append('<%s%s/>' % (tag, self.__html_attrs(attrs))) 
-    
+            self.html.append('<%s%s/>' % (tag, self.__html_attrs(attrs))) 
+
         def handle_endtag(self, tag):
-            self.is_link = False
-            self.urlized_html.append('</%s>' % (tag))
-    
+            self.is_ignored = False
+            self.html.append('</%s>' % (tag))
+
+        def handle_entityref(self, name):
+            self.html.append('&%s;' % name)
+
+        def handle_charref(self, name):
+            self.html.append('&%s;' % name)
+
         def __html_attrs(self, attrs):
             _attrs = ''
@@ -176 +196 @@
                 _attrs = ' %s' % (' '.join([('%s="%s"' % (k,v)) for k,v in attrs]))
             return _attrs
-    
+
         def feed(self, data):
             HTMLParser.feed(self, data)
-            self.urlized_html = ''.join(self.urlized_html)
-        
-    parser = URLizeHTMLParser()
+            self.html = ''.join(self.html)
+
+def urlize(data):
+    """
+    Urlize plain text links in the HTML contents.
+   
+    Do not urlize content of A and CODE tags.
+    """
+
+    parser = ExcludeTagsHTMLParser(django_urlize)
     parser.feed(data)
-    urlized_html = parser.urlized_html
+    urlized_html = parser.html
     parser.close()
     return urlized_html
 
+def _smile_replacer(data):
+    for smile, path in _SMILES:
+        data = smile.sub(path, data)
+    return data
+
 def smiles(data):
-    # TODO: code refactoring; ignore smiles in tag [code]
-    data = re.compile(r':\)').sub(forum_settings.EMOTION_SMILE, data)
-    data = re.compile(r'=\)').sub(forum_settings.EMOTION_SMILE, data)
-    data = re.compile(r':\|').sub(forum_settings.EMOTION_NEUTRAL, data)
-    data = re.compile(r'=\|').sub(forum_settings.EMOTION_NEUTRAL, data)
-    data = re.compile(r':\(').sub(forum_settings.EMOTION_SAD, data)
-    data = re.compile(r'=\(').sub(forum_settings.EMOTION_SAD, data)
-    data = re.compile(r':D').sub(forum_settings.EMOTION_BIG_SMILE, data)
-    data = re.compile(r'=D').sub(forum_settings.EMOTION_BIG_SMILE, data)
-    data = re.compile(r':o').sub(forum_settings.EMOTION_YIKES, data)
-    data = re.compile(r':O').sub(forum_settings.EMOTION_YIKES, data)
-    data = re.compile(r';\)').sub(forum_settings.EMOTION_WINK, data)
-    data = re.compile(r'(?<!http):/').sub(forum_settings.EMOTION_HMM, data)
-    data = re.compile(r':P').sub(forum_settings.EMOTION_TONGUE, data)
-    data = re.compile(r':lol:').sub(forum_settings.EMOTION_LOL, data)
-    data = re.compile(r':mad:').sub(forum_settings.EMOTION_MAD, data)
-    data = re.compile(r':rolleyes:').sub(forum_settings.EMOTION_ROLL, data)
-    data = re.compile(r':cool:').sub(forum_settings.EMOTION_COOL, data)
-    return data
-
+    """
+    Replace text smiles.
+    """
+
+    parser = ExcludeTagsHTMLParser(_smile_replacer)
+    parser.feed(data)
+    smiled_html = parser.html
+    parser.close()
+    return smiled_html

apps/forum/views.py

@@ -3 +3 @@
 import datetime
 
-from django.shortcuts import get_object_or_404, render_to_response
-from django.template import RequestContext
+from django.shortcuts import get_object_or_404
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.contrib.auth.models import User
@@ -27 +26 @@
         if cache.get(str(user.id)):
             users_online.append(user)
-    guest_count = len(cache._cache) - users_online.__len__()
+    guest_count = len(cache._cache) - len(users_online)
 
     cats = {}
@@ -46 +45 @@
             'users': User.objects.count(),
             'users_online': users_online,
-            'online_count': users_online.__len__(),
+            'online_count': len(users_online),
             'guest_count': guest_count,
             'last_user': User.objects.order_by('-date_joined')[0],
-            }
+           }
 
 @render_to('forum/moderate.html')
@@ -64 +63 @@
                     topic_id = topic_match.group(1)
                     reverse('move_topic', args=[topic_id])
-                        
+
             return HttpResponseRedirect(reverse('index'))
         elif 'delete_topics' in request.POST:
             for topic in request.POST:
                 topic_match = re.match('topic_id\[(\d+)\]', reputation)
-                    
+
                 if topic_match:
                     topic_id = topic_match.group(1)
@@ -79 +78 @@
             for topic in request.POST:
                 topic_match = re.match('topic_id\[(\d+)\]', topic)
-                    
+
                 if topic_match:
                     topic_id = topic_match.group(1)
                     open_topic(request, topic_id)
-                        
+
             return HttpResponseRedirect(reverse('index'))
         elif 'close_topics' in request.POST:
             for topic in request.POST:
                 topic_match = re.match('topic_id\[(\d+)\]', topic)
-                    
+
                 if topic_match:
                     topic_id = topic_match.group(1)
@@ -94 +93 @@
                         
             return HttpResponseRedirect(reverse('index'))
-    
+
         return {'forum': forum,
                 'topics': topics,
@@ -104 +103 @@
         raise Http404
 
+@render_to('forum/search_topics.html')
 def search(request):
     if 'action' in request.GET:
-        if 'show_24h' in request.GET['action']:
+        action = request.GET['action']
+        if action == 'show_24h':
             date =  datetime.datetime.today() - datetime.timedelta(1)
             topics = Topic.objects.filter(created__gte=date).order_by('created')
-            return render_to_response('forum/search_topics.html', 
-                                     {'topics': topics,
-                                     }, RequestContext(request))
-        elif 'show_new' in request.GET['action']:
+        elif action == 'show_new':
             topics = Topic.objects.all().order_by('created')
             topics = [topic for topic in topics if forum_extras.has_unreads(topic, request.user)]
-            return render_to_response('forum/search_topics.html', 
-                                     {'topics': topics,
-                                     }, RequestContext(request))
-        elif 'show_unanswered' in request.GET['action']:
+        elif action == 'show_unanswered':
             topics = Topic.objects.filter(post_count=1)
-            return render_to_response('forum/search_topics.html', 
-                                     {'topics': topics,
-                                     }, RequestContext(request))
-        elif 'show_subscriptions' in request.GET['action']:
+        elif action == 'show_subscriptions':
             topics = Topic.objects.filter(subscribers=request.user)
-            return render_to_response('forum/search_topics.html', 
-                                     {'topics': topics,
-                                     }, RequestContext(request))
-        elif 'show_user' in request.GET['action']:
+        elif action == 'show_user':
             user_id = request.GET['user_id']
             posts = Post.objects.filter(user__id=user_id)
             topics = [post.topic for post in posts]
-            return render_to_response('forum/search_topics.html', 
-                                     {'topics': topics,
-                                     }, RequestContext(request))
-        elif 'search' in request.GET['action']:
+        elif action == 'search':
             posts = Post.objects.all()
             form = PostSearchForm(request.GET)
             posts = form.filter(posts)
             topics = [post.topic for post in posts]
-            if 'topics' in request.GET['show_as']:
-                return render_to_response('forum/search_topics.html', 
-                                    {'topics': topics,
-                                     }, RequestContext(request))
+            if action == 'topics':
+                return {'topics': topics}
             elif 'posts' in request.GET['show_as']:
-                return render_to_response('forum/search_posts.html', 
-                                    {'posts': posts,
-                                     }, RequestContext(request))
-    else:  
+                return {'posts': posts}, 'forum/search_posts.html'
+        return {'topics': topics}
+    else:
         form = PostSearchForm()
-        category = Category.objects.all()[0]
-        return render_to_response('forum/search_form.html', 
-                                {'categories': Category.objects.all(),
-                                'form': form,
-                                }, RequestContext(request))
-        
-@login_required
+        return {'categories': Category.objects.all(),
+                'form': form,
+                }, 'forum/search_form.html'
+
+@login_required
+@render_to('forum/report.html')
 def misc(request):
     if 'action' in request.GET:
-        if 'markread' in request.GET['action']:
+        action = request.GET['action']
+        if action =='markread':
             for category in Category.objects.all():
                 for topic in category.topics:
@@ -168 +151 @@
             return HttpResponseRedirect(reverse('index'))
         
-        elif 'report' in request.GET['action']:
-            if request.GET['post_id']:
+        elif action == 'report':
+            if request.GET.get('post_id', ''):
                 post_id = request.GET['post_id']
                 post = get_object_or_404(Post, id=post_id)
                 form = build_form(ReportForm, request, reported_by=request.user, post=post_id)
-                if request.POST and form.is_valid():
+                if request.method == 'POST' and form.is_valid():
                     form.save()
                     return HttpResponseRedirect(post.get_absolute_url())
-                return render_to_response('forum/report.html', 
-                            {'form':form,
-                             }, RequestContext(request))
+                return {'form':form}
         
     elif 'submit' in request.POST and 'mail_to' in request.GET:
@@ -192 +173 @@
         user = get_object_or_404(User, username=request.GET['mail_to'])
         form = MailToForm()
-        return render_to_response('forum/mail_to.html', 
-                        {'form':form,
-                         'user': user,
-                         }, RequestContext(request))
+        return {'form':form,
+                'user': user,
+               }, 'forum/mail_to.html'
 
 @render_to('forum/forum.html')
@@ -293 +273 @@
             }
 
-
+@render_to('forum/user.html')
 def user(request, username):
     user = get_object_or_404(User, username=username)
@@ -308 +288 @@
             #             'reports': reports,
             #             }, RequestContext(request))
-            if 'privacy' in request.GET['section']:
+            section = request.GET['section']
+            if section == 'privacy':
                 form = build_form(PrivacyProfileForm, request, instance=user.forum_profile)
-                if request.POST and form.is_valid():
-                    form.save()
-                return render_to_response('forum/profile/profile_privacy.html', 
-                        {'active_menu':'privacy',
-                         'profile': user,
-                         'form': form,
-                         }, RequestContext(request))
-            elif 'display' in request.GET['section']:
+                if request.method == 'POST' and form.is_valid():
+                    form.save()
+                return {'active_menu':'privacy',
+                        'profile': user,
+                        'form': form,
+                       }, 'forum/profile/profile_privacy.html'
+            elif section == 'display':
                 form = build_form(DisplayProfileForm, request, instance=user.forum_profile)
-                if request.POST and form.is_valid():
-                    form.save()
-                return render_to_response('forum/profile/profile_display.html', 
-                        {'active_menu':'display',
-                         'profile': user,
-                         'form': form,
-                         }, RequestContext(request))
-            elif 'personality' in request.GET['section']:
+                if request.method == 'POST' and form.is_valid():
+                    form.save()
+                return {'active_menu':'display',
+                        'profile': user,
+                        'form': form,
+                       }, 'forum/profile/profile_display.html'
+            elif section == 'personality':
                 form = build_form(PersonalityProfileForm, request, instance=user.forum_profile)
-                if request.POST and form.is_valid():
-                    form.save()
-                return render_to_response('forum/profile/profile_personality.html', 
-                        {'active_menu':'personality',
-                         'profile': user,
-                         'form': form,
-                         }, RequestContext(request))
-            elif 'messaging' in request.GET['section']:
+                if request.method == 'POST' and form.is_valid():
+                    form.save()
+                return {'active_menu':'personality',
+                        'profile': user,
+                        'form': form,
+                        }, 'forum/profile/profile_personality.html'
+            elif section == 'messaging':
                 form = build_form(MessagingProfileForm, request, instance=user.forum_profile)
-                if request.POST and form.is_valid():
-                    form.save()
-                return render_to_response('forum/profile/profile_messaging.html', 
-                        {'active_menu':'messaging',
-                         'profile': user,
-                         'form': form,
-                         }, RequestContext(request))
-            elif 'personal' in request.GET['section']:
+                if request.method == 'POST' and form.is_valid():
+                    form.save()
+                return {'active_menu':'messaging',
+                        'profile': user,
+                        'form': form,
+                       }, 'forum/profile/profile_messaging.html'
+            elif section == 'personal':
                 form = build_form(PersonalProfileForm, request, instance=user.forum_profile, user=user)
-                if request.POST and form.is_valid():
-                    form.save()
-                return render_to_response('forum/profile/profile_personal.html', 
-                        {'active_menu':'personal',
-                         'profile': user,
-                         'form': form,
-                         }, RequestContext(request))
-            elif 'essentials' in request.GET['section']:
+                if request.method == 'POST' and form.is_valid():
+                    form.save()
+                return {'active_menu':'personal',
+                        'profile': user,
+                        'form': form,
+                       }, 'forum/profile/profile_personal.html'
+            elif section == 'essentials':
                 form = build_form(EssentialsProfileForm, request, instance=user.forum_profile, user=user)
-                if request.POST and form.is_valid():
-                    form.save()
-                return render_to_response('forum/profile/profile_essentials.html', 
-                        {'active_menu':'essentials',
-                         'profile': user,
-                         'form': form,
-                         }, RequestContext(request))
+                if request.method == 'POST' and form.is_valid():
+                    form.save()
+                return {'active_menu':'essentials',
+                        'profile': user,
+                        'form': form,
+                        }, 'forum/profile/profile_essentials.html'
                 
         elif 'action' in request.GET:
-            if 'upload_avatar' in request.GET['action']:
+            action = request.GET['action']
+            if action == 'upload_avatar':
                 form = build_form(UploadAvatarForm, request, instance=user.forum_profile)
-                if request.POST and form.is_valid():
+                if request.method == 'POST' and form.is_valid():
                     form.save()
                     return HttpResponseRedirect(reverse('forum_profile', args=[user.username]))
-                return render_to_response('forum/upload_avatar.html', 
-                        {'form': form,
-                         'avatar_width': forum_settings.FORUM_AVATAR_WIDTH,
-                         'avatar_height': forum_settings.FORUM_AVATAR_HEIGHT,
-                         }, RequestContext(request))
-            elif 'delete_avatar' in request.GET['action']:
+                return {'form': form,
+                        'avatar_width': forum_settings.FORUM_AVATAR_WIDTH,
+                        'avatar_height': forum_settings.FORUM_AVATAR_HEIGHT,
+                       }, 'forum/upload_avatar.html'
+            elif action == 'delete_avatar':
                 profile = get_object_or_404(Profile, user=request.user)
                 profile.avatar = None
@@ -382 +357 @@
         else:
             form = build_form(EssentialsProfileForm, request, instance=user.forum_profile, user=user)
-            if request.POST and form.is_valid():
+            if request.method == 'POST' and form.is_valid():
                 form.save()
-            return render_to_response('forum/profile/profile_essentials.html', 
-                    {'active_menu':'essentials',
-                     'profile': user,
-                     'form': form,
-                     }, RequestContext(request))
+            return {'active_menu':'essentials',
+                    'profile': user,
+                    'form': form,
+                   }, 'forum/profile/profile_essentials.html'
             
     else:
         topic_count = Topic.objects.filter(user=user).count()
-        return render_to_response('forum/user.html', 
-                        {'profile': user,
-                         'topic_count': topic_count,
-                         'reports': reports,
-                         }, RequestContext(request))
-    
-
+        return {'profile': user,
+                'topic_count': topic_count,
+                'reports': reports,
+               }
+    
+@render_to('forum/reputation.html')
 def reputation(request, username):
     user = get_object_or_404(User, username=username)
@@ -413 +386 @@
                 form.fields['sign'].initial = -1
             
-            return render_to_response('forum/reputation_form.html', 
-                    {'form': form,
-                     }, RequestContext(request))
+            return {'form': form}, 'forum/reputation_form.html'
         else:
             raise Http404
-        
-    elif request.POST:
+
+    elif request.method == 'POST':
         if 'del_reputation' in request.POST:
             for reputation in request.POST:
@@ -437 +408 @@
         else:
             raise Http404
-        
+
     else:
         reputations = Reputation.objects.filter(to_user=user).order_by('-time').select_related()
         
-        return render_to_response('forum/reputation.html', 
-                {'reputations': reputations,
+        return {'reputations': reputations,
                 'profile': user.forum_profile,
-                }, RequestContext(request))
-
+               }
 
 def show_post(request, post_id):
@@ -453 +422 @@
     url = '%s?page=%d#post-%d' % (reverse('topic', args=[post.topic.id]), page, post.id)
     return HttpResponseRedirect(url)
-   
+
 @login_required
 @render_to('forum/edit_post.html')
@@ -481 +450 @@
     topic.views += 1
     topic.save()
-    
+
     if forum_moderated_by(topic, request.user):
         deleted = False
@@ -680 +649 @@
         inbox = False
         post_user = msg.dst_user
-    msg.read = True
-    msg.save()
+    if not msg.read:
+        msg.read = True
+        msg.save()
     return {'msg': msg,
             'inbox': inbox,
             'post_user': post_user,
             }
-
 
 @login_required
@@ -697 +666 @@
         return HttpResponseRedirect(reverse('edit_profile'))
 
-
 @login_required
 def add_subscription(request, topic_id):
@@ -708 +676 @@
     html = '<link type="text/css" rel="stylesheet" href="%sforum/css/hljs_styles/phpbb_blue.css" /><p>' % settings.MEDIA_URL
     return HttpResponse(html+mypostmarkup.markup(request.POST.get('data', ''), auto_urls=False))
-

settings.py

@@ -13 +13 @@
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = 'DjangoBB'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'root'             # Not used with sqlite3.
+DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
@@ -29 +29 @@
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'ru-ru'
+LANGUAGE_CODE = 'en-us'
 
 SITE_ID = 1
@@ -52 +52 @@
 
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = 'qry+e%=0&2c(k$=+czmsv8sw74ci5*m8t$83cv!#72b9)ge%io'
+
+if not hasattr(globals(), 'SECRET_KEY'):
+    SECRET_FILE = os.path.join(PROJECT_ROOT, 'secret.txt')
+    try:
+        SECRET_KEY = open(SECRET_FILE).read().strip()
+    except IOError:
+        try:
+            from random import choice
+            import string
+            symbols = ''.join((string.lowercase, string.digits, string.punctuation ))
+            SECRET_KEY = ''.join([choice(symbols) for i in range(50)])
+            secret = file(SECRET_FILE, 'w')
+            secret.write(SECRET_KEY)
+            secret.close()
+        except IOError:
+            raise Exception('Please create a %s file with random characters to generate your secret key!' % SECRET_FILE)
 
 # List of callables that know how to import templates from various sources.
@@ -108 +123 @@
 ACCOUNT_USERNAME_MIN_LENGTH = 3
 ACCOUNT_PASSWORD_MIN_LENGTH = 2
-LOGIN_URL = '/forum/account/login/'
+LOGIN_URL = '/forum/login/'
 ACCOUNT_DOMAIN = '/forum/account/'
 ACCOUNT_AUTH_KEY_TIMEOUT = 60 * 60 * 24