Merged in 2.0 branch

boards/abstracts/settingsmanager.py

@@ -0,0 +1,143 b''
+from django.shortcuts import get_object_or_404
+from boards.models import Tag
+
+__author__ = 'neko259'
+
+SESSION_SETTING = 'setting'
+
+PERMISSION_MODERATE = 'moderator'
+
+SETTING_THEME = 'theme'
+SETTING_FAVORITE_TAGS = 'favorite_tags'
+SETTING_HIDDEN_TAGS = 'hidden_tags'
+SETTING_PERMISSIONS = 'permissions'
+
+DEFAULT_THEME = 'md'
+
+
+def get_settings_manager(request):
+    """
+    Get settings manager based on the request object. Currently only
+    session-based manager is supported. In the future, cookie-based or
+    database-based managers could be implemented.
+    """
+    return SessionSettingsManager(request.session)
+
+
+class SettingsManager:
+    """
+    Base settings manager class. get_setting and set_setting methods should
+    be overriden.
+    """
+    def __init__(self):
+        pass
+
+    def get_theme(self):
+        theme = self.get_setting(SETTING_THEME)
+        if not theme:
+            theme = DEFAULT_THEME
+            self.set_setting(SETTING_THEME, theme)
+
+        return theme
+
+    def set_theme(self, theme):
+        self.set_setting(SETTING_THEME, theme)
+
+    def has_permission(self, permission):
+        permissions = self.get_setting(SETTING_PERMISSIONS)
+        if permissions:
+            return permission in permissions
+        else:
+            return False
+
+    def get_setting(self, setting):
+        pass
+
+    def set_setting(self, setting, value):
+        pass
+
+    def add_permission(self, permission):
+        permissions = self.get_setting(SETTING_PERMISSIONS)
+        if not permissions:
+            permissions = [permission]
+        else:
+            permissions.append(permission)
+        self.set_setting(SETTING_PERMISSIONS, permissions)
+
+    def del_permission(self, permission):
+        permissions = self.get_setting(SETTING_PERMISSIONS)
+        if not permissions:
+            permissions = []
+        else:
+            permissions.remove(permission)
+        self.set_setting(SETTING_PERMISSIONS, permissions)
+
+    def get_fav_tags(self):
+        tag_names = self.get_setting(SETTING_FAVORITE_TAGS)
+        tags = []
+        if tag_names:
+            for tag_name in tag_names:
+                tag = get_object_or_404(Tag, name=tag_name)
+                tags.append(tag)
+
+        return tags
+
+    def add_fav_tag(self, tag):
+        tags = self.get_setting(SETTING_FAVORITE_TAGS)
+        if not tags:
+            tags = [tag.name]
+        else:
+            if not tag.name in tags:
+                tags.append(tag.name)
+        self.set_setting(SETTING_FAVORITE_TAGS, tags)
+
+    def del_fav_tag(self, tag):
+        tags = self.get_setting(SETTING_FAVORITE_TAGS)
+        if tag.name in tags:
+            tags.remove(tag.name)
+            self.set_setting(SETTING_FAVORITE_TAGS, tags)
+
+    def get_hidden_tags(self):
+        tag_names = self.get_setting(SETTING_HIDDEN_TAGS)
+        tags = []
+        if tag_names:
+            for tag_name in tag_names:
+                tag = get_object_or_404(Tag, name=tag_name)
+                tags.append(tag)
+
+        return tags
+
+    def add_hidden_tag(self, tag):
+        tags = self.get_setting(SETTING_HIDDEN_TAGS)
+        if not tags:
+            tags = [tag.name]
+        else:
+            if not tag.name in tags:
+                tags.append(tag.name)
+        self.set_setting(SETTING_HIDDEN_TAGS, tags)
+
+    def del_hidden_tag(self, tag):
+        tags = self.get_setting(SETTING_HIDDEN_TAGS)
+        if tag.name in tags:
+            tags.remove(tag.name)
+            self.set_setting(SETTING_HIDDEN_TAGS, tags)
+
+
+class SessionSettingsManager(SettingsManager):
+    """
+    Session-based settings manager. All settings are saved to the user's
+    session.
+    """
+    def __init__(self, session):
+        SettingsManager.__init__(self)
+        self.session = session
+
+    def get_setting(self, setting):
+        if setting in self.session:
+            return self.session[setting]
+        else:
+            return None
+
+    def set_setting(self, setting, value):
+        self.session[setting] = value
+

boards/migrations/0029_auto__del_setting__del_user__del_field_post_user.py

@@ -0,0 +1,146 b''
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting model 'Setting'
+        db.delete_table(u'boards_setting')
+
+        # Deleting model 'User'
+        db.delete_table(u'boards_user')
+
+        # Removing M2M table for field hidden_threads on 'User'
+        db.delete_table(db.shorten_name(u'boards_user_hidden_threads'))
+
+        # Removing M2M table for field fav_threads on 'User'
+        db.delete_table(db.shorten_name(u'boards_user_fav_threads'))
+
+        # Removing M2M table for field fav_tags on 'User'
+        db.delete_table(db.shorten_name(u'boards_user_fav_tags'))
+
+        # Removing M2M table for field hidden_tags on 'User'
+        db.delete_table(db.shorten_name(u'boards_user_hidden_tags'))
+
+        # Deleting field 'Post.user'
+        db.delete_column(u'boards_post', 'user_id')
+
+
+    def backwards(self, orm):
+        # Adding model 'Setting'
+        db.create_table(u'boards_setting', (
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['boards.User'])),
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('value', self.gf('django.db.models.fields.CharField')(max_length=50)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=50)),
+        ))
+        db.send_create_signal('boards', ['Setting'])
+
+        # Adding model 'User'
+        db.create_table(u'boards_user', (
+            ('registration_time', self.gf('django.db.models.fields.DateTimeField')()),
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user_id', self.gf('django.db.models.fields.CharField')(max_length=50)),
+            ('rank', self.gf('django.db.models.fields.IntegerField')()),
+        ))
+        db.send_create_signal('boards', ['User'])
+
+        # Adding M2M table for field hidden_threads on 'User'
+        m2m_table_name = db.shorten_name(u'boards_user_hidden_threads')
+        db.create_table(m2m_table_name, (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('user', models.ForeignKey(orm['boards.user'], null=False)),
+            ('post', models.ForeignKey(orm['boards.post'], null=False))
+        ))
+        db.create_unique(m2m_table_name, ['user_id', 'post_id'])
+
+        # Adding M2M table for field fav_threads on 'User'
+        m2m_table_name = db.shorten_name(u'boards_user_fav_threads')
+        db.create_table(m2m_table_name, (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('user', models.ForeignKey(orm['boards.user'], null=False)),
+            ('post', models.ForeignKey(orm['boards.post'], null=False))
+        ))
+        db.create_unique(m2m_table_name, ['user_id', 'post_id'])
+
+        # Adding M2M table for field fav_tags on 'User'
+        m2m_table_name = db.shorten_name(u'boards_user_fav_tags')
+        db.create_table(m2m_table_name, (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('user', models.ForeignKey(orm['boards.user'], null=False)),
+            ('tag', models.ForeignKey(orm['boards.tag'], null=False))
+        ))
+        db.create_unique(m2m_table_name, ['user_id', 'tag_id'])
+
+        # Adding M2M table for field hidden_tags on 'User'
+        m2m_table_name = db.shorten_name(u'boards_user_hidden_tags')
+        db.create_table(m2m_table_name, (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('user', models.ForeignKey(orm['boards.user'], null=False)),
+            ('tag', models.ForeignKey(orm['boards.tag'], null=False))
+        ))
+        db.create_unique(m2m_table_name, ['user_id', 'tag_id'])
+
+        # Adding field 'Post.user'
+        db.add_column(u'boards_post', 'user',
+                      self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['boards.User'], null=True),
+                      keep_default=False)
+
+
+    models = {
+        'boards.ban': {
+            'Meta': {'object_name': 'Ban'},
+            'can_read': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'reason': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '200'})
+        },
+        'boards.post': {
+            'Meta': {'ordering': "('id',)", 'object_name': 'Post'},
+            '_text_rendered': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'images': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'ip+'", 'to': "orm['boards.PostImage']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True', 'db_index': 'True'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'poster_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'poster_user_agent': ('django.db.models.fields.TextField', [], {}),
+            'pub_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'referenced_posts': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'rfp+'", 'to': "orm['boards.Post']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True', 'db_index': 'True'}),
+            'refmap': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'text': ('markupfield.fields.MarkupField', [], {'rendered_field': 'True'}),
+            'text_markup_type': ('django.db.models.fields.CharField', [], {'default': "'markdown'", 'max_length': '30'}),
+            'thread_new': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['boards.Thread']", 'null': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'boards.postimage': {
+            'Meta': {'ordering': "('id',)", 'object_name': 'PostImage'},
+            'hash': ('django.db.models.fields.CharField', [], {'max_length': '36'}),
+            'height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('boards.thumbs.ImageWithThumbsField', [], {'max_length': '100', 'blank': 'True'}),
+            'pre_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'pre_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'width': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'boards.tag': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Tag'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'linked': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['boards.Tag']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'db_index': 'True'}),
+            'threads': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'tag+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Thread']"})
+        },
+        'boards.thread': {
+            'Meta': {'object_name': 'Thread'},
+            'archived': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'bump_time': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'replies': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'tre+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Post']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['boards.Tag']", 'symmetrical': 'False'})
+        }
+    }
+
+    complete_apps = ['boards']
  No newline at end of file

boards/migrations/0030_auto__del_field_tag_linked.py

@@ -0,0 +1,73 b''
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'Tag.linked'
+        db.delete_column(u'boards_tag', 'linked_id')
+
+
+    def backwards(self, orm):
+        # Adding field 'Tag.linked'
+        db.add_column(u'boards_tag', 'linked',
+                      self.gf('django.db.models.fields.related.ForeignKey')(to=orm['boards.Tag'], null=True, blank=True),
+                      keep_default=False)
+
+
+    models = {
+        'boards.ban': {
+            'Meta': {'object_name': 'Ban'},
+            'can_read': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'reason': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '200'})
+        },
+        'boards.post': {
+            'Meta': {'ordering': "('id',)", 'object_name': 'Post'},
+            '_text_rendered': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'images': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'ip+'", 'to': "orm['boards.PostImage']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True', 'db_index': 'True'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'poster_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'poster_user_agent': ('django.db.models.fields.TextField', [], {}),
+            'pub_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'referenced_posts': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'rfp+'", 'to': "orm['boards.Post']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True', 'db_index': 'True'}),
+            'refmap': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'text': ('markupfield.fields.MarkupField', [], {'rendered_field': 'True'}),
+            'text_markup_type': ('django.db.models.fields.CharField', [], {'default': "'bbcode'", 'max_length': '30'}),
+            'thread_new': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['boards.Thread']", 'null': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'boards.postimage': {
+            'Meta': {'ordering': "('id',)", 'object_name': 'PostImage'},
+            'hash': ('django.db.models.fields.CharField', [], {'max_length': '36'}),
+            'height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('boards.thumbs.ImageWithThumbsField', [], {'max_length': '100', 'blank': 'True'}),
+            'pre_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'pre_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'width': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'boards.tag': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Tag'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'db_index': 'True'}),
+            'threads': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'tag+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Thread']"})
+        },
+        'boards.thread': {
+            'Meta': {'object_name': 'Thread'},
+            'archived': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'bump_time': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'replies': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'tre+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Post']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['boards.Tag']", 'symmetrical': 'False'})
+        }
+    }
+
+    complete_apps = ['boards']
  No newline at end of file

boards/views/logout.py

@@ -0,0 +1,24 b''
+from django.shortcuts import render
+
+from boards.abstracts.settingsmanager import PERMISSION_MODERATE,\
+    get_settings_manager
+from boards.forms import LoginForm
+from boards.views.base import BaseBoardView, CONTEXT_FORM
+
+
+__author__ = 'neko259'
+
+
+class LogoutView(BaseBoardView):
+
+    def get(self, request, form=None):
+        settings_manager = get_settings_manager(request)
+        settings_manager.del_permission(PERMISSION_MODERATE)
+
+        context = self.get_context_data(request=request)
+
+        if not form:
+            form = LoginForm()
+        context[CONTEXT_FORM] = form
+
+        return render(request, 'boards/login.html', context)
  No newline at end of file

boards/admin.py

@@ -1,40 +1,31 b''
 from django.contrib import admin
-from boards.models import Post, Tag, User, Ban, Thread
+from boards.models import Post, Tag, Ban, Thread
 
 
 class PostAdmin(admin.ModelAdmin):
 
     list_display = ('id', 'title', 'text')
     list_filter = ('pub_time', 'thread_new')
     search_fields = ('id', 'title', 'text')
 
 
 class TagAdmin(admin.ModelAdmin):
 
-    list_display = ('name', 'linked')
-    list_filter = ('linked',)
-
-
-class UserAdmin(admin.ModelAdmin):
-
-    list_display = ('user_id', 'rank')
-    search_fields = ('user_id',)
-
+    list_display = ('name',)
 
 class ThreadAdmin(admin.ModelAdmin):
 
     def title(self, obj):
         return obj.get_opening_post().title
 
     def reply_count(self, obj):
         return obj.get_reply_count()
 
     list_display = ('id', 'title', 'reply_count', 'archived')
     list_filter = ('bump_time', 'archived')
     search_fields = ('id', 'title')
 
 admin.site.register(Post, PostAdmin)
 admin.site.register(Tag, TagAdmin)
-admin.site.register(User, UserAdmin)
 admin.site.register(Ban)
 admin.site.register(Thread, ThreadAdmin)

boards/context_processors.py

@@ -1,39 +1,37 b''
+from boards.abstracts.settingsmanager import PERMISSION_MODERATE, \
+    get_settings_manager
+
 __author__ = 'neko259'
 
-from boards import utils, settings
+from boards import settings
 from boards.models import Post
-from boards.models.post import SETTING_MODERATE
 
 CONTEXT_SITE_NAME = 'site_name'
 CONTEXT_VERSION = 'version'
 CONTEXT_MODERATOR = 'moderator'
 CONTEXT_THEME_CSS = 'theme_css'
 CONTEXT_THEME = 'theme'
 CONTEXT_PPD = 'posts_per_day'
 CONTEXT_TAGS = 'tags'
 CONTEXT_USER = 'user'
 
 
 def user_and_ui_processor(request):
     context = {}
 
-    user = utils.get_user(request)
-    context[CONTEXT_USER] = user
-    context[CONTEXT_TAGS] = user.fav_tags.all()
     context[CONTEXT_PPD] = float(Post.objects.get_posts_per_day())
 
-    theme = utils.get_theme(request, user)
+    settings_manager = get_settings_manager(request)
+    context[CONTEXT_TAGS] = settings_manager.get_fav_tags()
+    theme = settings_manager.get_theme()
     context[CONTEXT_THEME] = theme
     context[CONTEXT_THEME_CSS] = 'css/' + theme + '/base_page.css'
 
     # This shows the moderator panel
-    moderate = user.get_setting(SETTING_MODERATE)
-    if moderate == 'True':
-        context[CONTEXT_MODERATOR] = user.is_moderator()
-    else:
-        context[CONTEXT_MODERATOR] = False
+    moderate = settings_manager.has_permission(PERMISSION_MODERATE)
+    context[CONTEXT_MODERATOR] = moderate
 
     context[CONTEXT_VERSION] = settings.VERSION
     context[CONTEXT_SITE_NAME] = settings.SITE_NAME
 
     return context
  No newline at end of file

boards/forms.py

@@ -1,357 +1,341 b''
 import re
 import time
 import hashlib
 
 from captcha.fields import CaptchaField
 from django import forms
 from django.forms.util import ErrorList
 from django.utils.translation import ugettext_lazy as _
 
 from boards.mdx_neboard import formatters
 from boards.models.post import TITLE_MAX_LENGTH
-from boards.models import User, PostImage
+from boards.models import PostImage
 from neboard import settings
 from boards import utils
 import boards.settings as board_settings
 
 VETERAN_POSTING_DELAY = 5
 
 ATTRIBUTE_PLACEHOLDER = 'placeholder'
 
 LAST_POST_TIME = 'last_post_time'
 LAST_LOGIN_TIME = 'last_login_time'
-TEXT_PLACEHOLDER = _('''Type message here. You can reply to message >>123 like
- this. 2 new lines are required to start new paragraph.''')
+TEXT_PLACEHOLDER = _('''Type message here. Use formatting panel for more advanced usage.''')
 TAGS_PLACEHOLDER = _('tag1 several_words_tag')
 
 ERROR_IMAGE_DUPLICATE = _('Such image was already posted')
 
 LABEL_TITLE = _('Title')
 LABEL_TEXT = _('Text')
 LABEL_TAG = _('Tag')
 LABEL_SEARCH = _('Search')
 
 TAG_MAX_LENGTH = 20
 
 REGEX_TAG = ur'^[\w\d]+$'
 
 
 class FormatPanel(forms.Textarea):
     def render(self, name, value, attrs=None):
         output = '<div id="mark-panel">'
         for formatter in formatters:
             output += u'<span class="mark_btn"' + \
                       u' onClick="addMarkToMsg(\'' + formatter.format_left + \
                       '\', \'' + formatter.format_right + '\')">' + \
                       formatter.preview_left + formatter.name + \
                       formatter.preview_right + u'</span>'
 
         output += '</div>'
         output += super(FormatPanel, self).render(name, value, attrs=None)
 
         return output
 
 
 class PlainErrorList(ErrorList):
     def __unicode__(self):
         return self.as_text()
 
     def as_text(self):
         return ''.join([u'(!) %s ' % e for e in self])
 
 
 class NeboardForm(forms.Form):
 
     def as_div(self):
         """
         Returns this form rendered as HTML <as_div>s.
         """
 
         return self._html_output(
             # TODO Do not show hidden rows in the list here
             normal_row='<div class="form-row"><div class="form-label">'
                        '%(label)s'
                        '</div></div>'
                        '<div class="form-row"><div class="form-input">'
                        '%(field)s'
                        '</div></div>'
                        '<div class="form-row">'
                        '%(help_text)s'
                        '</div>',
             error_row='<div class="form-row">'
                       '<div class="form-label"></div>'
                       '<div class="form-errors">%s</div>'
                       '</div>',
             row_ender='</div>',
             help_text_html='%s',
             errors_on_separate_row=True)
 
     def as_json_errors(self):
         errors = []
 
         for name, field in self.fields.items():
             if self[name].errors:
                 errors.append({
                     'field': name,
                     'errors': self[name].errors.as_text(),
                 })
 
         return errors
 
 
 class PostForm(NeboardForm):
 
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False,
                             label=LABEL_TITLE)
     text = forms.CharField(
         widget=FormatPanel(attrs={ATTRIBUTE_PLACEHOLDER: TEXT_PLACEHOLDER}),
         required=False, label=LABEL_TEXT)
     image = forms.ImageField(required=False, label=_('Image'),
                              widget=forms.ClearableFileInput(
                                  attrs={'accept': 'image/*'}))
 
     # This field is for spam prevention only
     email = forms.CharField(max_length=100, required=False, label=_('e-mail'),
                             widget=forms.TextInput(attrs={
                                 'class': 'form-email'}))
 
     session = None
     need_to_ban = False
 
     def clean_title(self):
         title = self.cleaned_data['title']
         if title:
             if len(title) > TITLE_MAX_LENGTH:
                 raise forms.ValidationError(_('Title must have less than %s '
                                               'characters') %
                                             str(TITLE_MAX_LENGTH))
         return title
 
     def clean_text(self):
         text = self.cleaned_data['text'].strip()
         if text:
             if len(text) > board_settings.MAX_TEXT_LENGTH:
                 raise forms.ValidationError(_('Text must have less than %s '
                                               'characters') %
                                             str(board_settings
                                             .MAX_TEXT_LENGTH))
         return text
 
     def clean_image(self):
         image = self.cleaned_data['image']
         if image:
             if image.size > board_settings.MAX_IMAGE_SIZE:
                 raise forms.ValidationError(
                     _('Image must be less than %s bytes')
                     % str(board_settings.MAX_IMAGE_SIZE))
 
             md5 = hashlib.md5()
             for chunk in image.chunks():
                 md5.update(chunk)
             image_hash = md5.hexdigest()
             if PostImage.objects.filter(hash=image_hash).exists():
                 raise forms.ValidationError(ERROR_IMAGE_DUPLICATE)
 
         return image
 
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
         if not self.session:
             raise forms.ValidationError('Humans have sessions')
 
         if cleaned_data['email']:
             self.need_to_ban = True
             raise forms.ValidationError('A human cannot enter a hidden field')
 
         if not self.errors:
             self._clean_text_image()
 
         if not self.errors and self.session:
             self._validate_posting_speed()
 
         return cleaned_data
 
     def _clean_text_image(self):
         text = self.cleaned_data.get('text')
         image = self.cleaned_data.get('image')
 
         if (not text) and (not image):
             error_message = _('Either text or image must be entered.')
             self._errors['text'] = self.error_class([error_message])
 
     def _validate_posting_speed(self):
         can_post = True
 
         # TODO Remove this, it's only for test
         if not 'user_id' in self.session:
             return
 
-        user = User.objects.get(id=self.session['user_id'])
-        if user.is_veteran():
-            posting_delay = VETERAN_POSTING_DELAY
-        else:
             posting_delay = settings.POSTING_DELAY
 
         if board_settings.LIMIT_POSTING_SPEED and LAST_POST_TIME in \
                 self.session:
             now = time.time()
             last_post_time = self.session[LAST_POST_TIME]
 
             current_delay = int(now - last_post_time)
 
             if current_delay < posting_delay:
                 error_message = _('Wait %s seconds after last posting') % str(
                     posting_delay - current_delay)
                 self._errors['text'] = self.error_class([error_message])
 
                 can_post = False
 
         if can_post:
             self.session[LAST_POST_TIME] = time.time()
 
 
 class ThreadForm(PostForm):
 
     regex_tags = re.compile(ur'^[\w\s\d]+$', re.UNICODE)
 
     tags = forms.CharField(
         widget=forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER: TAGS_PLACEHOLDER}),
         max_length=100, label=_('Tags'), required=True)
 
     def clean_tags(self):
         tags = self.cleaned_data['tags'].strip()
 
         if not tags or not self.regex_tags.match(tags):
             raise forms.ValidationError(
                 _('Inappropriate characters in tags.'))
 
         return tags
 
     def clean(self):
         cleaned_data = super(ThreadForm, self).clean()
 
         return cleaned_data
 
 
 class PostCaptchaForm(PostForm):
     captcha = CaptchaField()
 
     def __init__(self, *args, **kwargs):
         self.request = kwargs['request']
         del kwargs['request']
 
         super(PostCaptchaForm, self).__init__(*args, **kwargs)
 
     def clean(self):
         cleaned_data = super(PostCaptchaForm, self).clean()
 
         success = self.is_valid()
         utils.update_captcha_access(self.request, success)
 
         if success:
             return cleaned_data
         else:
             raise forms.ValidationError(_("Captcha validation failed"))
 
 
 class ThreadCaptchaForm(ThreadForm):
     captcha = CaptchaField()
 
     def __init__(self, *args, **kwargs):
         self.request = kwargs['request']
         del kwargs['request']
 
         super(ThreadCaptchaForm, self).__init__(*args, **kwargs)
 
     def clean(self):
         cleaned_data = super(ThreadCaptchaForm, self).clean()
 
         success = self.is_valid()
         utils.update_captcha_access(self.request, success)
 
         if success:
             return cleaned_data
         else:
             raise forms.ValidationError(_("Captcha validation failed"))
 
 
 class SettingsForm(NeboardForm):
 
     theme = forms.ChoiceField(choices=settings.THEMES,
                               label=_('Theme'))
 
 
-class ModeratorSettingsForm(SettingsForm):
-
-    moderate = forms.BooleanField(required=False, label=_('Enable moderation '
-                                                          'panel'))
-
-
-class LoginForm(NeboardForm):
-
-    user_id = forms.CharField()
-
-    session = None
-
-    def clean_user_id(self):
-        user_id = self.cleaned_data['user_id']
-        if user_id:
-            users = User.objects.filter(user_id=user_id)
-            if len(users) == 0:
-                raise forms.ValidationError(_('No such user found'))
-
-        return user_id
-
-    def _validate_login_speed(self):
-        can_post = True
-
-        if LAST_LOGIN_TIME in self.session:
-            now = time.time()
-            last_login_time = self.session[LAST_LOGIN_TIME]
-
-            current_delay = int(now - last_login_time)
-
-            if current_delay < board_settings.LOGIN_TIMEOUT:
-                error_message = _('Wait %s minutes after last login') % str(
-                    (board_settings.LOGIN_TIMEOUT - current_delay) / 60)
-                self._errors['user_id'] = self.error_class([error_message])
-
-                can_post = False
-
-        if can_post:
-            self.session[LAST_LOGIN_TIME] = time.time()
-
-    def clean(self):
-        if not self.session:
-            raise forms.ValidationError('Humans have sessions')
-
-        self._validate_login_speed()
-
-        cleaned_data = super(LoginForm, self).clean()
-
-        return cleaned_data
-
-
 class AddTagForm(NeboardForm):
 
     tag = forms.CharField(max_length=TAG_MAX_LENGTH, label=LABEL_TAG)
     method = forms.CharField(widget=forms.HiddenInput(), initial='add_tag')
 
     def clean_tag(self):
         tag = self.cleaned_data['tag']
 
         regex_tag = re.compile(REGEX_TAG, re.UNICODE)
         if not regex_tag.match(tag):
             raise forms.ValidationError(_('Inappropriate characters in tags.'))
 
         return tag
 
     def clean(self):
         cleaned_data = super(AddTagForm, self).clean()
 
         return cleaned_data
 
 
 class SearchForm(NeboardForm):
-    query = forms.CharField(max_length=500, label=LABEL_SEARCH, required=False)
  No newline at end of file
+    query = forms.CharField(max_length=500, label=LABEL_SEARCH, required=False)
+
+
+class LoginForm(NeboardForm):
+
+    password = forms.CharField()
+
+    session = None
+
+    def clean_password(self):
+        password = self.cleaned_data['password']
+        if board_settings.MASTER_PASSWORD != password:
+            raise forms.ValidationError(_('Invalid master password'))
+
+        return password
+
+    def _validate_login_speed(self):
+        can_post = True
+
+        if LAST_LOGIN_TIME in self.session:
+            now = time.time()
+            last_login_time = self.session[LAST_LOGIN_TIME]
+
+            current_delay = int(now - last_login_time)
+
+            if current_delay < board_settings.LOGIN_TIMEOUT:
+                error_message = _('Wait %s minutes after last login') % str(
+                    (board_settings.LOGIN_TIMEOUT - current_delay) / 60)
+                self._errors['password'] = self.error_class([error_message])
+
+                can_post = False
+
+        if can_post:
+            self.session[LAST_LOGIN_TIME] = time.time()
+
+    def clean(self):
+        self._validate_login_speed()
+
+        cleaned_data = super(LoginForm, self).clean()
+
+        return cleaned_data

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,392 +1,361 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-29 13:46+0300\n"
+"POT-Creation-Date: 2014-07-20 20:11+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: authors.py:5
+#: authors.py:9
 msgid "author"
 msgstr "автор"
 
-#: authors.py:6
+#: authors.py:10
 msgid "developer"
 msgstr "разработчик"
 
-#: authors.py:7
+#: authors.py:11
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
-#: authors.py:8
+#: authors.py:12
 msgid "designer"
 msgstr "дизайнер"
 
 #: forms.py:23
-msgid ""
-"Type message here. You can reply to message >>123 like\n"
-" this. 2 new lines are required to start new paragraph."
+msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
-"Введите сообщение здесь. Вы можете ответить на сообщение >>123 вот так. 2 "
-"переноса строки обязательны для создания нового абзаца."
+"Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
-#: forms.py:25
+#: forms.py:24
 msgid "tag1 several_words_tag"
 msgstr "тег1 тег_из_нескольких_слов"
 
-#: forms.py:27
+#: forms.py:26
 msgid "Such image was already posted"
 msgstr "Такое изображение уже было загружено"
 
-#: forms.py:29
+#: forms.py:28
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:30
+#: forms.py:29
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:31
+#: forms.py:30
 msgid "Tag"
 msgstr "Тег"
 
-#: forms.py:32 templates/boards/base.html:50 templates/search/search.html:9
+#: forms.py:31 templates/boards/base.html:54 templates/search/search.html:9
 #: templates/search/search.html.py:13
 msgid "Search"
 msgstr "Поиск"
 
-#: forms.py:109
+#: forms.py:108
 msgid "Image"
 msgstr "Изображение"
 
 #: forms.py:113
 msgid "e-mail"
 msgstr ""
 
 #: forms.py:124
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
 #: forms.py:133
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
 #: forms.py:144
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
 #: forms.py:179
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:202
+#: forms.py:199
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:218 templates/boards/tags.html:7 templates/boards/rss/post.html:10
+#: forms.py:215 templates/boards/tags.html:7 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: forms.py:225 forms.py:344
+#: forms.py:222 forms.py:290
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
-#: forms.py:253 forms.py:274
+#: forms.py:250 forms.py:271
 msgid "Captcha validation failed"
 msgstr "Проверка капчи провалена"
 
-#: forms.py:280
+#: forms.py:277
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:285
-msgid "Enable moderation panel"
-msgstr "Включить панель модерации"
+#: forms.py:313
+msgid "Invalid master password"
+msgstr "Неверный мастер-пароль"
 
-#: forms.py:300
-msgid "No such user found"
-msgstr "Данный пользователь не найден"
-
-#: forms.py:314
+#: forms.py:327
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:26
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:28
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:30
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:12
 msgid "Feed"
 msgstr "Лента"
 
 #: templates/boards/base.html:29
 msgid "All threads"
 msgstr "Все темы"
 
 #: templates/boards/base.html:34
 msgid "Tag management"
 msgstr "Управление тегами"
 
 #: templates/boards/base.html:36 templates/boards/settings.html:7
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:49 templates/boards/login.html:6
+#: templates/boards/base.html:50
+msgid "Logout"
+msgstr "Выход"
+
+#: templates/boards/base.html:52 templates/boards/login.html:6
 #: templates/boards/login.html.py:16
 msgid "Login"
 msgstr "Вход"
 
-#: templates/boards/base.html:52
+#: templates/boards/base.html:56
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
-#: templates/boards/base.html:54
+#: templates/boards/base.html:58
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/login.html:19
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
-#: templates/boards/post.html:21 templates/boards/staticpages/help.html:19
+#: templates/boards/post.html:21 templates/boards/staticpages/help.html:17
 msgid "Quote"
 msgstr "Цитата"
 
 #: templates/boards/post.html:31
 msgid "Open"
 msgstr "Открыть"
 
 #: templates/boards/post.html:33
 msgid "Reply"
 msgstr "Ответ"
 
 #: templates/boards/post.html:40
 msgid "Edit"
 msgstr "Изменить"
 
 #: templates/boards/post.html:42
 msgid "Delete"
 msgstr "Удалить"
 
 #: templates/boards/post.html:45
 msgid "Ban IP"
 msgstr "Заблокировать IP"
 
 #: templates/boards/post.html:76
 msgid "Replies"
 msgstr "Ответы"
 
 #: templates/boards/post.html:86 templates/boards/thread.html:88
 #: templates/boards/thread_gallery.html:61
-msgid "replies"
-msgstr "ответов"
+msgid "messages"
+msgstr "сообщений"
 
 #: templates/boards/post.html:87 templates/boards/thread.html:89
 #: templates/boards/thread_gallery.html:62
 msgid "images"
 msgstr "изображений"
 
 #: templates/boards/post_admin.html:19
 msgid "Tags:"
 msgstr "Теги:"
 
 #: templates/boards/post_admin.html:30
 msgid "Add tag"
 msgstr "Добавить тег"
 
 #: templates/boards/posting_general.html:56
 msgid "Show tag"
 msgstr "Показывать тег"
 
 #: templates/boards/posting_general.html:60
 msgid "Hide tag"
 msgstr "Скрывать тег"
 
 #: templates/boards/posting_general.html:79 templates/search/search.html:22
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/posting_general.html:94
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/posting_general.html:121 templates/search/search.html:35
+#: templates/boards/posting_general.html:121 templates/search/search.html:33
 msgid "Next page"
 msgstr "Следующая страница"
 
 #: templates/boards/posting_general.html:126
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
 #: templates/boards/posting_general.html:132
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/posting_general.html:137 templates/boards/thread.html:58
 msgid "Post"
 msgstr "Отправить"
 
 #: templates/boards/posting_general.html:142
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/posting_general.html:145 templates/boards/thread.html:66
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
 #: templates/boards/posting_general.html:157
 msgid "Pages:"
 msgstr "Страницы: "
 
-#: templates/boards/settings.html:14
-msgid "User:"
-msgstr "Пользователь:"
-
-#: templates/boards/settings.html:16
+#: templates/boards/settings.html:15
 msgid "You are moderator."
 msgstr "Вы модератор."
 
 #: templates/boards/settings.html:19
-msgid "You are veteran."
-msgstr "Вы ветеран."
-
-#: templates/boards/settings.html:22
-msgid "Posts:"
-msgstr "Сообщений:"
-
-#: templates/boards/settings.html:23
-msgid "First access:"
-msgstr "Первый доступ:"
-
-#: templates/boards/settings.html:25
-msgid "Last access:"
-msgstr "Последний доступ: "
-
-#: templates/boards/settings.html:29
 msgid "Hidden tags:"
 msgstr "Скрытые теги:"
 
-#: templates/boards/settings.html:44
+#: templates/boards/settings.html:26
+msgid "No hidden tags."
+msgstr "Нет скрытых тегов."
+
+#: templates/boards/settings.html:35
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/tags.html:22
 msgid "No tags found."
 msgstr "Теги не найдены."
 
 #: templates/boards/thread.html:20 templates/boards/thread_gallery.html:21
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
 #: templates/boards/thread.html:21 templates/boards/thread_gallery.html:22
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
 #: templates/boards/thread.html:29
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
 #: templates/boards/thread.html:50
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
 #: templates/boards/thread.html:63
 msgid "Switch mode"
 msgstr "Переключить режим"
 
 #: templates/boards/thread.html:90 templates/boards/thread_gallery.html:63
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
 #: templates/boards/staticpages/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/staticpages/help.html:6
 #: templates/boards/staticpages/help.html:10
 msgid "Syntax"
 msgstr "Синтаксис"
 
 #: templates/boards/staticpages/help.html:11
-msgid "2 line breaks for a new line."
-msgstr "2 перевода строки создают новый абзац."
-
-#: templates/boards/staticpages/help.html:12
 msgid "Italic text"
 msgstr "Курсивный текст"
 
-#: templates/boards/staticpages/help.html:13
+#: templates/boards/staticpages/help.html:12
 msgid "Bold text"
 msgstr "Полужирный текст"
 
-#: templates/boards/staticpages/help.html:14
+#: templates/boards/staticpages/help.html:13
 msgid "Spoiler"
 msgstr "Спойлер"
 
-#: templates/boards/staticpages/help.html:15
+#: templates/boards/staticpages/help.html:14
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
-#: templates/boards/staticpages/help.html:16
+#: templates/boards/staticpages/help.html:15
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
-#: templates/boards/staticpages/help.html:17
-msgid "You need to new line before:"
-msgstr "Перед этими тегами нужна новая строка:"
-
-#: templates/boards/staticpages/help.html:18
+#: templates/boards/staticpages/help.html:16
 msgid "Comment"
 msgstr "Комментарий"
-
-#: templates/search/search.html:30
-msgid "No results found."
-msgstr "Результаты не найдены."

boards/management/commands/enforce_privacy.py

@@ -1,16 +1,16 b''
 from django.core.management import BaseCommand
 from django.db import transaction
 
 from boards.models import Post
 from boards.models.post import NO_IP
 
 
 __author__ = 'neko259'
 
 
 class Command(BaseCommand):
     help = 'Removes user and IP data from all posts'
 
     @transaction.atomic
     def handle(self, *args, **options):
-        Post.objects.all().update(poster_ip=NO_IP, user=None)
  No newline at end of file
+        Post.objects.all().update(poster_ip=NO_IP)
  No newline at end of file

boards/mdx_neboard.py

@@ -1,207 +1,152 b''
 # coding=utf-8
 
-import markdown
-from markdown.inlinepatterns import Pattern
-from markdown.util import etree
+import re
+import bbcode
 
 import boards
 
 
 __author__ = 'neko259'
 
 
-AUTOLINK_PATTERN = r'(https?://\S+)'
-QUOTE_PATTERN = r'^(?<!>)(>[^>].*)$'
-REFLINK_PATTERN = r'((>>)(\d+))'
-SPOILER_PATTERN = r'%%([^(%%)]+)%%'
-COMMENT_PATTERN = r'^(//(.+))'
-STRIKETHROUGH_PATTERN = r'~(.+)~'
-DASH_PATTERN = r'--'
+REFLINK_PATTERN = re.compile(r'\d+')
 
 
 class TextFormatter():
     """
     An interface for formatter that can be used in the text format panel
     """
 
     def __init__(self):
         pass
 
     name = ''
 
     # Left and right tags for the button preview
     preview_left = ''
     preview_right = ''
 
     # Left and right characters for the textarea input
     format_left = ''
     format_right = ''
 
 
-class AutolinkPattern(Pattern):
+class AutolinkPattern():
     def handleMatch(self, m):
         link_element = etree.Element('a')
         href = m.group(2)
         link_element.set('href', href)
         link_element.text = href
 
         return link_element
 
 
-class QuotePattern(Pattern, TextFormatter):
-    name = ''
-    preview_left = '<span class="quote">&gt; '
+class QuotePattern(TextFormatter):
+    name = 'q'
+    preview_left = '<span class="multiquote">'
     preview_right = '</span>'
 
-    format_left = '&gt;'
-
-    def handleMatch(self, m):
-        quote_element = etree.Element('span')
-        quote_element.set('class', 'quote')
-        quote_element.text = m.group(2)
-
-        return quote_element
+    format_left = '[quote]'
+    format_right = '[/quote]'
 
 
-class ReflinkPattern(Pattern):
-    def handleMatch(self, m):
-        post_id = m.group(4)
-
-        posts = boards.models.Post.objects.filter(id=post_id)
-        if posts.count() > 0:
-            ref_element = etree.Element('a')
-
-            post = posts[0]
-
-            ref_element.set('href', post.get_url())
-            ref_element.text = m.group(2)
-
-            return ref_element
-
-
-class SpoilerPattern(Pattern, TextFormatter):
-    name = 's'
+class SpoilerPattern(TextFormatter):
+    name = 'spoiler'
     preview_left = '<span class="spoiler">'
     preview_right = '</span>'
 
-    format_left = '%%'
-    format_right = '%%'
+    format_left = '[spoiler]'
+    format_right = '[/spoiler]'
 
     def handleMatch(self, m):
         quote_element = etree.Element('span')
         quote_element.set('class', 'spoiler')
         quote_element.text = m.group(2)
 
         return quote_element
 
 
-class CommentPattern(Pattern, TextFormatter):
+class CommentPattern(TextFormatter):
     name = ''
     preview_left = '<span class="comment">// '
     preview_right = '</span>'
 
-    format_left = '//'
-
-    def handleMatch(self, m):
-        quote_element = etree.Element('span')
-        quote_element.set('class', 'comment')
-        quote_element.text = '//' + m.group(3)
-
-        return quote_element
+    format_left = '[comment]'
+    format_right = '[/comment]'
 
 
-class StrikeThroughPattern(Pattern, TextFormatter):
+class StrikeThroughPattern(TextFormatter):
     name = 's'
     preview_left = '<span class="strikethrough">'
     preview_right = '</span>'
 
-    format_left = '~'
-    format_right = '~'
-
-    def handleMatch(self, m):
-        quote_element = etree.Element('span')
-        quote_element.set('class', 'strikethrough')
-        quote_element.text = m.group(2)
-
-        return quote_element
+    format_left = '[s]'
+    format_right = '[/s]'
 
 
 class ItalicPattern(TextFormatter):
     name = 'i'
     preview_left = '<i>'
     preview_right = '</i>'
 
-    format_left = '_'
-    format_right = '_'
+    format_left = '[i]'
+    format_right = '[/i]'
 
 
 class BoldPattern(TextFormatter):
     name = 'b'
     preview_left = '<b>'
     preview_right = '</b>'
 
-    format_left = '__'
-    format_right = '__'
+    format_left = '[b]'
+    format_right = '[/b]'
 
 
 class CodePattern(TextFormatter):
     name = 'code'
     preview_left = '<code>'
     preview_right = '</code>'
 
-    format_left = '    '
-
-
-class DashPattern(Pattern):
-    def handleMatch(self, m):
-        return u'—'
+    format_left = '[code]'
+    format_right = '[/code]'
 
 
-class NeboardMarkdown(markdown.Extension):
-    def extendMarkdown(self, md, md_globals):
-        self._add_neboard_patterns(md)
-        self._delete_patterns(md)
+def render_reflink(tag_name, value, options, parent, context):
+    if not REFLINK_PATTERN.match(value):
+        return u'>>%s' % value
 
-    def _delete_patterns(self, md):
-        del md.parser.blockprocessors['quote']
-
-        del md.inlinePatterns['image_link']
-        del md.inlinePatterns['image_reference']
+    post_id = int(value)
 
-    def _add_neboard_patterns(self, md):
-        autolink = AutolinkPattern(AUTOLINK_PATTERN, md)
-        quote = QuotePattern(QUOTE_PATTERN, md)
-        reflink = ReflinkPattern(REFLINK_PATTERN, md)
-        spoiler = SpoilerPattern(SPOILER_PATTERN, md)
-        comment = CommentPattern(COMMENT_PATTERN, md)
-        strikethrough = StrikeThroughPattern(STRIKETHROUGH_PATTERN, md)
-        dash = DashPattern(DASH_PATTERN, md)
+    posts = boards.models.Post.objects.filter(id=post_id)
+    if posts.exists():
+        post = posts[0]
 
-        md.inlinePatterns[u'autolink_ext'] = autolink
-        md.inlinePatterns[u'spoiler'] = spoiler
-        md.inlinePatterns[u'strikethrough'] = strikethrough
-        md.inlinePatterns[u'comment'] = comment
-        md.inlinePatterns[u'reflink'] = reflink
-        md.inlinePatterns[u'quote'] = quote
-        md.inlinePatterns[u'dash'] = dash
+        return u'<a href=%s>&gt;&gt;%s</a>' % (post.get_url(), post_id)
+    else:
+        return u'>>%s' % value
 
 
-def make_extension(configs=None):
-    return NeboardMarkdown(configs=configs)
-
-neboard_extension = make_extension()
-
-
-def markdown_extended(markup):
-    return markdown.markdown(markup, [neboard_extension, 'nl2br'],
-                             safe_mode='escape')
+def bbcode_extended(markup):
+    parser = bbcode.Parser(newline='</p><p>')
+    parser.add_formatter('post', render_reflink, strip=True)
+    parser.add_simple_formatter('quote',
+            u'<span class="multiquote">%(value)s</span>')
+    parser.add_simple_formatter('comment',
+            u'<span class="comment">//%(value)s</span>')
+    parser.add_simple_formatter('spoiler',
+            u'<span class="spoiler">%(value)s</span>')
+    parser.add_simple_formatter('s',
+            u'<span class="strikethrough">%(value)s</span>')
+    parser.add_simple_formatter('code',
+            u'<pre><code>%(value)s</pre></code>')
+    return '<p>%s</p>' % parser.format(markup)
 
 formatters = [
     QuotePattern,
     SpoilerPattern,
     ItalicPattern,
     BoldPattern,
     CommentPattern,
     StrikeThroughPattern,
     CodePattern,
 ]

boards/models/__init__.py

@@ -1,9 +1,7 b''
 __author__ = 'neko259'
 
 from boards.models.image import PostImage
 from boards.models.thread import Thread
 from boards.models.post import Post
 from boards.models.tag import Tag
 from boards.models.user import Ban
-from boards.models.user import Setting
-from boards.models.user import User

boards/models/post.py

@@ -1,351 +1,343 b''
 from datetime import datetime, timedelta, date
 from datetime import time as dtime
 import logging
 import re
 
 from django.core.cache import cache
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
 from django.template.loader import render_to_string
 from django.utils import timezone
 from markupfield.fields import MarkupField
 
 from boards.models import PostImage
 from boards.models.base import Viewable
 from boards.models.thread import Thread
 
 
 APP_LABEL_BOARDS = 'boards'
 
 CACHE_KEY_PPD = 'ppd'
 CACHE_KEY_POST_URL = 'post_url'
 
-POSTS_PER_DAY_RANGE = range(7)
+POSTS_PER_DAY_RANGE = 7
 
 BAN_REASON_AUTO = 'Auto'
 
 IMAGE_THUMB_SIZE = (200, 150)
 
 TITLE_MAX_LENGTH = 200
 
-DEFAULT_MARKUP_TYPE = 'markdown'
+DEFAULT_MARKUP_TYPE = 'bbcode'
 
 # TODO This should be removed
 NO_IP = '0.0.0.0'
 
 # TODO Real user agent should be saved instead of this
 UNKNOWN_UA = ''
 
-SETTING_MODERATE = "moderate"
-
-REGEX_REPLY = re.compile('>>(\d+)')
+REGEX_REPLY = re.compile(r'>>(\d+)')
 
 logger = logging.getLogger(__name__)
 
 
 class PostManager(models.Manager):
-
-    def create_post(self, title, text, image=None, thread=None,
-                    ip=NO_IP, tags=None, user=None):
+    def create_post(self, title, text, image=None, thread=None, ip=NO_IP,
+                    tags=None):
         """
         Creates new post
         """
 
         posting_time = timezone.now()
         if not thread:
             thread = Thread.objects.create(bump_time=posting_time,
                                            last_edit_time=posting_time)
             new_thread = True
         else:
             thread.bump()
             thread.last_edit_time = posting_time
             thread.save()
             new_thread = False
 
         post = self.create(title=title,
                            text=text,
                            pub_time=posting_time,
                            thread_new=thread,
                            poster_ip=ip,
                            poster_user_agent=UNKNOWN_UA,  # TODO Get UA at
                            # last!
-                           last_edit_time=posting_time,
-                           user=user)
+                           last_edit_time=posting_time)
 
         if image:
             post_image = PostImage.objects.create(image=image)
             post.images.add(post_image)
             logger.info('Created image #%d for post #%d' % (post_image.id,
                                                             post.id))
 
         thread.replies.add(post)
         if tags:
-            linked_tags = []
-            for tag in tags:
-                tag_linked_tags = tag.get_linked_tags()
-                if len(tag_linked_tags) > 0:
-                    linked_tags.extend(tag_linked_tags)
-
-            tags.extend(linked_tags)
             map(thread.add_tag, tags)
 
         if new_thread:
             Thread.objects.process_oldest_threads()
         self.connect_replies(post)
 
-        logger.info('Created post #%d' % post.id)
+        logger.info('Created post #%d with title %s' % (post.id,
+                                                        post.get_title()))
 
         return post
 
     def delete_post(self, post):
         """
         Deletes post and update or delete its thread
         """
 
         post_id = post.id
 
         thread = post.get_thread()
 
         if post.is_opening():
             thread.delete()
         else:
             thread.last_edit_time = timezone.now()
             thread.save()
 
             post.delete()
 
-        logger.info('Deleted post #%d' % post_id)
+        logger.info('Deleted post #%d (%s)' % (post_id, post.get_title()))
 
     def delete_posts_by_ip(self, ip):
         """
         Deletes all posts of the author with same IP
         """
 
         posts = self.filter(poster_ip=ip)
         map(self.delete_post, posts)
 
     def connect_replies(self, post):
         """
         Connects replies to a post to show them as a reflink map
         """
 
-        for reply_number in re.finditer(REGEX_REPLY, post.text.raw):
+        for reply_number in re.finditer(REGEX_REPLY, post.text.rendered):
             post_id = reply_number.group(1)
             ref_post = self.filter(id=post_id)
             if ref_post.count() > 0:
                 referenced_post = ref_post[0]
                 referenced_post.referenced_posts.add(post)
                 referenced_post.last_edit_time = post.pub_time
                 referenced_post.build_refmap()
                 referenced_post.save(update_fields=['refmap', 'last_edit_time'])
 
                 referenced_thread = referenced_post.get_thread()
                 referenced_thread.last_edit_time = post.pub_time
                 referenced_thread.save(update_fields=['last_edit_time'])
 
     def get_posts_per_day(self):
         """
         Gets average count of posts per day for the last 7 days
         """
 
-        today = date.today()
-        ppd = cache.get(CACHE_KEY_PPD + str(today))
+        day_end = date.today()
+        day_start = day_end - timedelta(POSTS_PER_DAY_RANGE)
+
+        cache_key = CACHE_KEY_PPD + str(day_end)
+        ppd = cache.get(cache_key)
         if ppd:
             return ppd
 
-        posts_per_days = []
-        for i in POSTS_PER_DAY_RANGE:
-            day_end = today - timedelta(i + 1)
-            day_start = today - timedelta(i + 2)
-
             day_time_start = timezone.make_aware(datetime.combine(
                 day_start, dtime()), timezone.get_current_timezone())
             day_time_end = timezone.make_aware(datetime.combine(
                 day_end, dtime()), timezone.get_current_timezone())
 
-            posts_per_days.append(float(self.filter(
+        posts_per_period = float(self.filter(
                 pub_time__lte=day_time_end,
-                pub_time__gte=day_time_start).count()))
+            pub_time__gte=day_time_start).count())
 
-        ppd = (sum(posts_per_day for posts_per_day in posts_per_days) /
-               len(posts_per_days))
-        cache.set(CACHE_KEY_PPD + str(today), ppd)
+        ppd = posts_per_period / POSTS_PER_DAY_RANGE
+
+        cache.set(cache_key, ppd)
         return ppd
 
 
 class Post(models.Model, Viewable):
     """A post is a message."""
 
     objects = PostManager()
 
     class Meta:
         app_label = APP_LABEL_BOARDS
         ordering = ('id',)
 
     title = models.CharField(max_length=TITLE_MAX_LENGTH)
     pub_time = models.DateTimeField()
     text = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE,
                        escape_html=False)
 
     images = models.ManyToManyField(PostImage, null=True, blank=True,
                                     related_name='ip+', db_index=True)
 
     poster_ip = models.GenericIPAddressField()
     poster_user_agent = models.TextField()
 
     thread_new = models.ForeignKey('Thread', null=True, default=None,
                                    db_index=True)
     last_edit_time = models.DateTimeField()
-    user = models.ForeignKey('User', null=True, default=None, db_index=True)
 
     referenced_posts = models.ManyToManyField('Post', symmetrical=False,
                                               null=True,
                                               blank=True, related_name='rfp+',
                                               db_index=True)
     refmap = models.TextField(null=True, blank=True)
 
     def __unicode__(self):
         return '#' + str(self.id) + ' ' + self.title + ' (' + \
                self.text.raw[:50] + ')'
 
     def get_title(self):
         """
         Gets original post title or part of its text.
         """
 
         title = self.title
         if not title:
             title = self.text.rendered
 
         return title
 
     def build_refmap(self):
+        """
+        Builds a replies map string from replies list. This is a cache to stop
+        the server from recalculating the map on every post show.
+        """
         map_string = ''
 
         first = True
         for refpost in self.referenced_posts.all():
             if not first:
                 map_string += ', '
-            map_string += '<a href="%s">&gt;&gt;%s</a>' % (refpost.get_url(), refpost.id)
+            map_string += '<a href="%s">&gt;&gt;%s</a>' % (refpost.get_url(),
+                                                           refpost.id)
             first = False
 
         self.refmap = map_string
 
     def get_sorted_referenced_posts(self):
         return self.refmap
 
     def is_referenced(self):
         return len(self.refmap) > 0
 
     def is_opening(self):
         """
         Checks if this is an opening post or just a reply.
         """
 
         return self.get_thread().get_opening_post_id() == self.id
 
     @transaction.atomic
     def add_tag(self, tag):
         edit_time = timezone.now()
 
         thread = self.get_thread()
         thread.add_tag(tag)
         self.last_edit_time = edit_time
-        self.save()
+        self.save(update_fields=['last_edit_time'])
 
         thread.last_edit_time = edit_time
-        thread.save()
+        thread.save(update_fields=['last_edit_time'])
 
     @transaction.atomic
     def remove_tag(self, tag):
         edit_time = timezone.now()
 
         thread = self.get_thread()
         thread.remove_tag(tag)
         self.last_edit_time = edit_time
-        self.save()
+        self.save(update_fields=['last_edit_time'])
 
         thread.last_edit_time = edit_time
-        thread.save()
+        thread.save(update_fields=['last_edit_time'])
 
     def get_url(self, thread=None):
         """
         Gets full url to the post.
         """
 
         cache_key = CACHE_KEY_POST_URL + str(self.id)
         link = cache.get(cache_key)
 
         if not link:
             if not thread:
                 thread = self.get_thread()
 
             opening_id = thread.get_opening_post_id()
 
             if self.id != opening_id:
                 link = reverse('thread', kwargs={
                     'post_id': opening_id}) + '#' + str(self.id)
             else:
                 link = reverse('thread', kwargs={'post_id': self.id})
 
             cache.set(cache_key, link)
 
         return link
 
     def get_thread(self):
         """
         Gets post's thread.
         """
 
         return self.thread_new
 
     def get_referenced_posts(self):
         return self.referenced_posts.only('id', 'thread_new')
 
     def get_text(self):
         return self.text
 
     def get_view(self, moderator=False, need_open_link=False,
                  truncated=False, *args, **kwargs):
         if 'is_opening' in kwargs:
             is_opening = kwargs['is_opening']
         else:
             is_opening = self.is_opening()
 
         if 'thread' in kwargs:
             thread = kwargs['thread']
         else:
             thread = self.get_thread()
 
         if 'can_bump' in kwargs:
             can_bump = kwargs['can_bump']
         else:
             can_bump = thread.can_bump()
 
         if is_opening:
             opening_post_id = self.id
         else:
             opening_post_id = thread.get_opening_post_id()
 
         return render_to_string('boards/post.html', {
             'post': self,
             'moderator': moderator,
             'is_opening': is_opening,
             'thread': thread,
             'bumpable': can_bump,
             'need_open_link': need_open_link,
             'truncated': truncated,
             'opening_post_id': opening_post_id,
         })
 
     def get_first_image(self):
         return self.images.earliest('id')
 
     def delete(self, using=None):
         """
-        Delete all post images and the post itself.
+        Deletes all post images and the post itself.
         """
 
         self.images.all().delete()
 
-        super(Post, self).delete(using)
  No newline at end of file
+        super(Post, self).delete(using)

boards/models/tag.py

@@ -1,100 +1,78 b''
 from django.template.loader import render_to_string
-from boards.models import Thread, Post
 from django.db import models
 from django.db.models import Count, Sum
 from django.core.urlresolvers import reverse
+
+from boards.models import Thread
 from boards.models.base import Viewable
 
+
 __author__ = 'neko259'
 
 
 class TagManager(models.Manager):
 
     def get_not_empty_tags(self):
         """
         Gets tags that have non-archived threads.
         """
 
         tags = self.annotate(Count('threads')) \
             .filter(threads__count__gt=0).order_by('name')
 
         return tags
 
 
 class Tag(models.Model, Viewable):
     """
     A tag is a text node assigned to the thread. The tag serves as a board
     section. There can be multiple tags for each thread
     """
 
     objects = TagManager()
 
     class Meta:
         app_label = 'boards'
         ordering = ('name',)
 
     name = models.CharField(max_length=100, db_index=True)
     threads = models.ManyToManyField(Thread, null=True,
                                      blank=True, related_name='tag+')
-    linked = models.ForeignKey('Tag', null=True, blank=True)
 
     def __unicode__(self):
         return self.name
 
     def is_empty(self):
         """
         Checks if the tag has some threads.
         """
 
         return self.get_thread_count() == 0
 
     def get_thread_count(self):
         return self.threads.count()
 
-    def get_linked_tags(self):
-        """
-        Gets tags linked to the current one.
-        """
-
-        tag_list = []
-        self.get_linked_tags_list(tag_list)
-
-        return tag_list
-
-    def get_linked_tags_list(self, tag_list=[]):
-        """
-        Returns the list of tags linked to current. The list can be got
-        through returned value or tag_list parameter
-        """
-
-        linked_tag = self.linked
-
-        if linked_tag and not (linked_tag in tag_list):
-            tag_list.append(linked_tag)
-
-            linked_tag.get_linked_tags_list(tag_list)
-
     def get_post_count(self, archived=False):
         """
         Gets posts count for the tag's threads.
         """
 
         posts_count = 0
 
         threads = self.threads.filter(archived=archived)
         if threads.exists():
             posts_count = threads.annotate(posts_count=Count('replies')) \
                 .aggregate(posts_sum=Sum('posts_count'))['posts_sum']
 
         if not posts_count:
             posts_count = 0
 
         return posts_count
 
     def get_url(self):
         return reverse('tag', kwargs={'tag_name': self.name})
 
     def get_view(self, *args, **kwargs):
         return render_to_string('boards/tag.html', {
             'tag': self,
         })

boards/models/user.py

@@ -1,132 +1,20 b''
 from django.db import models
-from django.db.models import Count
-from boards import settings
-from boards.models import Post
-from django.core.cache import cache
 
 __author__ = 'neko259'
 
-RANK_ADMIN = 0
-RANK_MODERATOR = 10
-RANK_USER = 100
-
 BAN_REASON_AUTO = 'Auto'
 BAN_REASON_MAX_LENGTH = 200
 
-VETERAN_POSTS = 1000
-
-
-class User(models.Model):
-
-    class Meta:
-        app_label = 'boards'
-
-    user_id = models.CharField(max_length=50)
-    rank = models.IntegerField()
-
-    registration_time = models.DateTimeField()
-
-    fav_tags = models.ManyToManyField('Tag', null=True, blank=True)
-    fav_threads = models.ManyToManyField(Post, related_name='+', null=True,
-                                         blank=True)
-
-    hidden_tags = models.ManyToManyField('Tag', null=True, blank=True,
-                                         related_name='ht+')
-    hidden_threads = models.ManyToManyField('Post', null=True, blank=True,
-                                            related_name='hth+')
-
-    def save_setting(self, name, value):
-        setting, created = Setting.objects.get_or_create(name=name, user=self)
-        setting.value = str(value)
-        setting.save()
-
-        return setting
-
-    def get_setting(self, name):
-        if Setting.objects.filter(name=name, user=self).exists():
-            setting = Setting.objects.get(name=name, user=self)
-            setting_value = setting.value
-        else:
-            setting_value = None
-
-        return setting_value
-
-    def is_moderator(self):
-        return RANK_MODERATOR >= self.rank
-
-    def get_sorted_fav_tags(self):
-        cache_key = self._get_tag_cache_key()
-        fav_tags = cache.get(cache_key)
-        if fav_tags:
-            return fav_tags
-
-        tags = self.fav_tags.annotate(Count('threads')) \
-            .filter(threads__count__gt=0).order_by('name')
-
-        if tags:
-            cache.set(cache_key, tags)
-
-        return tags
-
-    def get_post_count(self):
-        return Post.objects.filter(user=self).count()
-
-    def __unicode__(self):
-        return self.user_id + '(' + str(self.rank) + ')'
-
-    def get_last_access_time(self):
-        """
-        Gets user's last post time.
-        """
-
-        posts = Post.objects.filter(user=self)
-        if posts.exists() > 0:
-            return posts.latest('pub_time').pub_time
-
-    def add_tag(self, tag):
-        self.fav_tags.add(tag)
-        cache.delete(self._get_tag_cache_key())
-
-    def remove_tag(self, tag):
-        self.fav_tags.remove(tag)
-        cache.delete(self._get_tag_cache_key())
-
-    def hide_tag(self, tag):
-        self.hidden_tags.add(tag)
-
-    def unhide_tag(self, tag):
-        self.hidden_tags.remove(tag)
-
-    def is_veteran(self):
-        """
-        Returns if a user is old (veteran).
-        """
-
-        return self.get_post_count() >= VETERAN_POSTS
-
-    def _get_tag_cache_key(self):
-        return self.user_id + '_tags'
-
-
-class Setting(models.Model):
-
-    class Meta:
-        app_label = 'boards'
-
-    name = models.CharField(max_length=50)
-    value = models.CharField(max_length=50)
-    user = models.ForeignKey(User)
-
 
 class Ban(models.Model):
 
     class Meta:
         app_label = 'boards'
 
     ip = models.GenericIPAddressField()
     reason = models.CharField(default=BAN_REASON_AUTO,
                               max_length=BAN_REASON_MAX_LENGTH)
     can_read = models.BooleanField(default=True)
 
     def __unicode__(self):
         return self.ip

boards/settings.py

@@ -1,20 +1,23 b''
 VERSION = '1.8.1 Kara'
 SITE_NAME = 'Neboard'
 
 CACHE_TIMEOUT = 600  # Timeout for caching, if cache is used
 LOGIN_TIMEOUT = 3600  # Timeout between login tries
 MAX_TEXT_LENGTH = 30000  # Max post length in characters
 MAX_IMAGE_SIZE = 8 * 1024 * 1024  # Max image size
 
 # Thread bumplimit
 MAX_POSTS_PER_THREAD = 10
 # Old posts will be archived or deleted if this value is reached
 MAX_THREAD_COUNT = 5
 THREADS_PER_PAGE = 3
 DEFAULT_THEME = 'md'
 LAST_REPLIES_COUNT = 3
 
 # Enable archiving threads instead of deletion when the thread limit is reached
 ARCHIVE_THREADS = True
 # Limit posting speed
-LIMIT_POSTING_SPEED = False
  No newline at end of file
+LIMIT_POSTING_SPEED = False
+
+# This password is used to add admin permissions to the user
+MASTER_PASSWORD = u'password'
  No newline at end of file

boards/static/css/md/base_page.css

@@ -1,430 +1,440 b''
 html {
     background: #555;
     color: #ffffff;
 }
 
 body {
     margin: 0;
 }
 
 #admin_panel {
     background: #FF0000;
     color: #00FF00
 }
 
 .input_field_error {
     color: #FF0000;
 }
 
 .title {
     font-weight: bold;
     color: #ffcc00;
 }
 
 .link, a {
     color: #afdcec;
 }
 
 .block {
     display: inline-block;
     vertical-align: top;
 }
 
 .tag {
     color: #FFD37D;
 }
 
 .post_id {
     color: #fff380;
 }
 
 .post, .dead_post, .archive_post, #posts-table {
     background: #333;
     padding: 10px;
     clear: left;
     word-wrap: break-word;
     border-top: 1px solid #777;
     border-bottom: 1px solid #777;
 }
 
 .post + .post {
     border-top: none;
 }
 
 .dead_post + .dead_post {
     border-top: none;
 }
 
 .archive_post + .archive_post {
     border-top: none;
 }
 
 .metadata {
     padding-top: 5px;
     margin-top: 10px;
     border-top: solid 1px #666;
     color: #ddd;
 }
 
 .navigation_panel, .tag_info {
     background: #444;
     margin-bottom: 5px;
     margin-top: 5px;
     padding: 10px;
     border-bottom: solid 1px #888;
     border-top: solid 1px #888;
     color: #eee;
 }
 
 .navigation_panel .link {
     border-right: 1px solid #fff;
     font-weight: bold;
     margin-right: 1ex;
     padding-right: 1ex;
 }
 .navigation_panel .link:last-child {
     border-left: 1px solid #fff;
     border-right: none;
     float: right;
     margin-left: 1ex;
     margin-right: 0;
     padding-left: 1ex;
     padding-right: 0;
 }
 
 .navigation_panel::after, .post::after {
     clear: both;
     content: ".";
     display: block;
     height: 0;
     line-height: 0;
     visibility: hidden;
 }
 
 p {
     margin-top: .5em;
     margin-bottom: .5em;
 }
 
 .post-form-w {
     background: #333344;
     border-top: solid 1px #888;
     border-bottom: solid 1px #888;
     color: #fff;
     padding: 10px;
     margin-bottom: 5px;
     margin-top: 5px;
 }
 
 .form-row {
     width: 100%;
 }
 
 .form-label {
     padding: .25em 1ex .25em 0;
     vertical-align: top;
 }
 
 .form-input {
     padding: .25em 0;
 }
 
 .form-errors {
     font-weight: bolder;
     vertical-align: middle;
 }
 
 .post-form input:not([name="image"]), .post-form textarea {
     background: #333;
     color: #fff;
     border: solid 1px;
     padding: 0;
     font: medium sans-serif;
     width: 100%;
 }
 
 .form-submit {
     display: table;
     margin-bottom: 1ex;
     margin-top: 1ex;
 }
 
 .form-title {
     font-weight: bold;
     font-size: 2ex;
     margin-bottom: 0.5ex;
 }
 
 .post-form input[type="submit"], input[type="submit"] {
     background: #222;
     border: solid 2px #fff;
     color: #fff;
     padding: 0.5ex;
 }
 
 input[type="submit"]:hover {
     background: #060;
 }
 
 blockquote {
     border-left: solid 2px;
     padding-left: 5px;
     color: #B1FB17;
     margin: 0;
 }
 
 .post > .image {
     float: left;
     margin: 0 1ex .5ex 0;
     min-width: 1px;
     text-align: center;
     display: table-row;
 }
 
 .post > .metadata {
     clear: left;
 }
 
 .get {
     font-weight: bold;
     color: #d55;
 }
 
 * {
     text-decoration: none;
 }
 
 .dead_post {
     background-color: #442222;
 }
 
 .archive_post {
     background-color: #000;
 }
 
 .mark_btn {
     border: 1px solid;
     min-width: 2ex;
     padding: 2px 2ex;
 }
 
 .mark_btn:hover {
     background: #555;
 }
 
 .quote {
     color: #92cf38;
     font-style: italic;
 }
 
+.multiquote {
+    border-left: solid 4px #ccc;
+    padding: 3px;
+    display: inline-block;
+    background: #222;
+    border-right: solid 1px #ccc;
+    border-top: solid 1px #ccc;
+    border-bottom: solid 1px #ccc;
+}
+
 .spoiler {
     background: white;
     color: white;
 }
 
 .spoiler:hover {
     color: black;
 }
 
 .comment {
     color: #eb2;
 }
 
 a:hover {
     text-decoration: underline;
 }
 
 .last-replies {
     margin-left: 3ex;
     margin-right: 3ex;
 }
 
 .thread {
     margin-bottom: 3ex;
     margin-top: 1ex;
 }
 
 .post:target {
     border: solid 2px white;
 }
 
 pre{
     white-space:pre-wrap
 }
 
 li {
     list-style-position: inside;
 }
 
 .fancybox-skin {
     position: relative;
     background-color: #fff;
     color: #ddd;
     text-shadow: none;
 }
 
 .fancybox-image {
     border: 1px solid black;
 }
 
 .image-mode-tab {
     background: #444;
     color: #eee;
     margin-top: 5px;
     padding: 5px;
     border-top: 1px solid #888;
     border-bottom: 1px solid #888;
 }
 
 .image-mode-tab > label {
     margin: 0 1ex;
 }
 
 .image-mode-tab > label > input {
     margin-right: .5ex;
 }
 
 #posts-table {
     margin-top: 5px;
     margin-bottom: 5px;
 }
 
 .tag_info > h2 {
     margin: 0;
 }
 
 .post-info {
     color: #ddd;
     margin-bottom: 1ex;
 }
 
 .moderator_info {
     color: #e99d41;
     float: right;
     font-weight: bold;
 }
 
 .refmap {
     font-size: 0.9em;
     color: #ccc;
     margin-top: 1em;
 }
 
 .fav {
     color: yellow;
 }
 
 .not_fav {
     color: #ccc;
 }
 
 .role {
     text-decoration: underline;
 }
 
 .form-email {
     display: none;
 }
 
 .footer {
     margin: 5px;
 }
 
 .bar-value {
     background: rgba(50, 55, 164, 0.45);
     font-size: 0.9em;
     height: 1.5em;
 }
 
 .bar-bg {
     position: relative;
     border-top: solid 1px #888;
     border-bottom: solid 1px #888;
     margin-top: 5px;
     overflow: hidden;
 }
 
 .bar-text {
     padding: 2px;
     position: absolute;
     left: 0;
     top: 0;
 }
 
 .page_link {
     background: #444;
     border-top: solid 1px #888;
     border-bottom: solid 1px #888;
     padding: 5px;
     color: #eee;
     font-size: 2ex;
 }
 
 .skipped_replies {
     margin: 5px;
 }
 
 .current_page {
     border: solid 1px #afdcec;
     padding: 2px;
 }
 
 .current_mode {
     font-weight: bold;
 }
 
 .gallery_image {
     border: solid 1px;
     padding: 0.5ex;
     margin: 0.5ex;
     text-align: center;
 }
 
 code {
     border: dashed 1px #ccc;
     background: #111;
     padding: 2px;
     font-size: 1.2em;
     display: inline-block;
 }
 
 pre {
     overflow: auto;
 }
 
 .img-full {
     background: #222;
     border: solid 1px white;
 }
 
 .tag_item {
     display: inline-block;
     border: 1px dashed #666;
     margin: 0.2ex;
     padding: 0.1ex;
 }
 
 #id_models li {
     list-style: none;
 }
 
 #id_q {
     margin-left: 1ex;
 }
 
 ul {
     padding-left: 0px;
 }
 
 /* Reflink preview */
 .post_preview {
     border-left: 1px solid #777;
     border-right: 1px solid #777;
 }
 
 /* Code highlighter */
 .hljs {
     color: #fff;
     background: #000;
     display: inline-block;
 }

boards/static/js/thread.js

@@ -1,61 +1,61 b''
 /*
  @licstart  The following is the entire license notice for the
  JavaScript code in this page.
 
 
  Copyright (C) 2013  neko259
 
  The JavaScript code in this page is free software: you can
  redistribute it and/or modify it under the terms of the GNU
  General Public License (GNU GPL) as published by the Free Software
  Foundation, either version 3 of the License, or (at your option)
  any later version.  The code is distributed WITHOUT ANY WARRANTY;
  without even the implied warranty of MERCHANTABILITY or FITNESS
  FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
 
  As additional permission under GNU GPL version 3 section 7, you
  may distribute non-source (e.g., minimized or compacted) forms of
  that code without the copy of the GNU GPL normally required by
  section 4, provided you include this license notice and a URL
  through which recipients can access the Corresponding Source.
 
  @licend  The above is the entire license notice
  for the JavaScript code in this page.
  */
 
 function moveCaretToEnd(el) {
         if (typeof el.selectionStart == "number") {
             el.selectionStart = el.selectionEnd = el.value.length;
         } else if (typeof el.createTextRange != "undefined") {
             el.focus();
             var range = el.createTextRange();
             range.collapse(false);
             range.select();
         }
 }
 
 function addQuickReply(postId) {
-    var textToAdd = '>>' + postId + '\n\n';
+    var textToAdd = '[post]' + postId + '[/post]\n';
     var selection = window.getSelection().toString();
     if (selection.length > 0) {
-        textToAdd += '> ' + selection + '\n\n';
+        textToAdd += '[quote]' + selection + '[/quote]\n';
     }
 
     var textAreaId = 'textarea';
     $(textAreaId).val($(textAreaId).val()+ textToAdd);
 
     var textarea = document.getElementsByTagName('textarea')[0];
     $(textAreaId).focus();
     moveCaretToEnd(textarea);
 
     $("html, body").animate({ scrollTop: $(textAreaId).offset().top }, "slow");
 }
 
 function scrollToBottom() {
     var $target = $('html,body');
     $target.animate({scrollTop: $target.height()}, "fast");
 }
 
 $(document).ready(function() {
     swapForm();
 })

boards/templates/boards/base.html

@@ -1,62 +1,66 b''
 {% load staticfiles %}
 {% load i18n %}
 {% load l10n %}
 {% load static from staticfiles %}
 
 <!DOCTYPE html>
 <html>
 <head>
     <link rel="stylesheet" type="text/css" href="{% static 'css/base.css' %}" media="all"/>
     <link rel="stylesheet" type="text/css" href="{% static 'css/3party/highlight.css' %}" media="all"/>
     <link rel="stylesheet" type="text/css" href="{% static theme_css %}" media="all"/>
     <link rel="alternate" type="application/rss+xml" href="rss/" title="{% trans 'Feed' %}"/>
 
     <link rel="icon" type="image/png"
         href="{% static 'favicon.png' %}">
 
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta charset="utf-8"/>
 
     {% block head %}{% endblock %}
 </head>
 <body>
 <script src="{% static 'js/jquery-2.0.1.min.js' %}"></script>
 <script src="{% static 'js/jquery-ui-1.10.3.custom.min.js' %}"></script>
 <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
 <script src="{% url 'js_info_dict' %}"></script>
 
 <div class="navigation_panel">
     <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
     {% for tag in tags %}
         <a class="tag" href="{% url 'tag' tag_name=tag.name %}"
                 >#{{ tag.name }}</a>,
     {% endfor %}
     <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
             >[...]</a>
     <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
 </div>
 
 {% block content %}{% endblock %}
 
 <script src="{% static 'js/popup.js' %}"></script>
 <script src="{% static 'js/image.js' %}"></script>
 <script src="{% static 'js/3party/highlight.min.js' %}"></script>
 <script src="{% static 'js/refpopup.js' %}"></script>
 <script src="{% static 'js/main.js' %}"></script>
 
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
+    {% if moderator %}
+        [<a href="{% url "logout" %}">{% trans 'Logout' %}</a>]
+    {% else %}
     [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
+    {% endif %}
     [<a href="{% url "search" %}">{% trans 'Search' %}</a>]
     {% with ppd=posts_per_day|floatformat:2 %}
         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
     {% endwith %}
     <a class="link" href="#top">{% trans 'Up' %}</a>
 </div>
 
 <div class="footer">
     <!-- Put your banners here -->
 </div>
 
 </body>
 </html>

boards/templates/boards/post.html

@@ -1,99 +1,99 b''
 {% load i18n %}
 {% load board %}
 {% load cache %}
 
 {% get_current_language as LANGUAGE_CODE %}
 
 {% spaceless %}
     {% cache 600 post post.id post.last_edit_time thread.archived bumpable truncated moderator LANGUAGE_CODE need_open_link %}
         {% if thread.archived %}
             <div class="post archive_post" id="{{ post.id }}">
         {% elif bumpable %}
             <div class="post" id="{{ post.id }}">
         {% else %}
             <div class="post dead_post" id="{{ post.id }}">
         {% endif %}
 
         <div class="post-info">
             <a class="post_id" href="{% post_object_url post thread=thread %}"
                 {% if not truncated and not thread.archived %}
                     onclick="javascript:addQuickReply('{{ post.id }}'); return false;"
                     title="{% trans 'Quote' %}"
                 {% endif %}
                 >({{ post.id }}) </a>
             <span class="title">{{ post.title }} </span>
             <span class="pub_time">{{ post.pub_time }}</span>
             {% if thread.archived %}
                 — {{ thread.bump_time }}
             {% endif %}
             {% if is_opening and need_open_link %}
                 {% if thread.archived %}
                     [<a class="link" href="{% url 'thread' post.id %}">{% trans "Open" %}</a>]
                 {% else %}
                     [<a class="link" href="{% url 'thread' post.id %}#form">{% trans "Reply" %}</a>]
                 {% endif %}
             {% endif %}
 
             {% if moderator %}
                 <span class="moderator_info">
                     [<a href="{% url 'post_admin' post_id=post.id %}"
                         >{% trans 'Edit' %}</a>]
                     [<a href="{% url 'delete' post_id=post.id %}"
                         >{% trans 'Delete' %}</a>]
                     ({{ post.poster_ip }})
                     [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
                         >{% trans 'Ban IP' %}</a>]
                 </span>
             {% endif %}
         </div>
         {% if post.images.exists %}
             {% with post.images.all.0 as image %}
             <div class="image">
                 <a
                         class="thumb"
                         href="{{ image.image.url }}"><img
                         src="{{ image.image.url_200x150 }}"
                         alt="{{ post.id }}"
                         width="{{ image.pre_width }}"
                         height="{{ image.pre_height }}"
                         data-width="{{ image.width }}"
                         data-height="{{ image.height }}"/>
                 </a>
             </div>
             {% endwith %}
         {% endif %}
         <div class="message">
             {% autoescape off %}
                 {% if truncated %}
                     {{ post.text.rendered|truncatewords_html:50 }}
                 {% else %}
                     {{ post.text.rendered }}
                 {% endif %}
             {% endautoescape %}
             {% if post.is_referenced %}
                 <div class="refmap">
                     {% autoescape off %}
                         {% trans "Replies" %}: {{ post.refmap }}
                     {% endautoescape %}
                 </div>
             {% endif %}
         </div>
     {% endcache %}
         {% if is_opening %}
         {% cache 600 post_thread thread.id thread.last_edit_time LANGUAGE_CODE need_open_link %}
             <div class="metadata">
                 {% if is_opening and need_open_link %}
-                    {{ thread.get_reply_count }} {% trans 'replies' %},
+                    {{ thread.get_reply_count }} {% trans 'messages' %},
                     {{ thread.get_images_count }} {% trans 'images' %}.
                 {% endif %}
                 <span class="tags">
                     {% for tag in thread.get_tags %}
                         <a class="tag" href="{% url 'tag' tag.name %}">
                             #{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
                     {% endfor %}
                 </span>
             </div>
         {% endcache %}
         {% endif %}
         </div>
 {% endspaceless %}

boards/templates/boards/posting_general.html

@@ -1,197 +1,197 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load board %}
 {% load static %}
 
 {% block head %}
     {% if tag %}
         <title>{{ tag.name }} - {{ site_name }}</title>
     {% else %}
         <title>{{ site_name }}</title>
     {% endif %}
 
     {% if current_page.has_previous %}
         <link rel="prev" href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=current_page.previous_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.previous_page_number %}
             {% else %}
                 {% url "index" page=current_page.previous_page_number %}
             {% endif %}
         " />
     {% endif %}
     {% if current_page.has_next %}
         <link rel="next" href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=current_page.next_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.next_page_number %}
             {% else %}
                 {% url "index" page=current_page.next_page_number %}
             {% endif %}
         " />
     {% endif %}
 
 {% endblock %}
 
 {% block content %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
 {% if tag %}
     <div class="tag_info">
         <h2>
-            {% if tag in user.fav_tags.all %}
+            {% if tag in fav_tags %}
                 <a href="{% url 'tag' tag.name %}?method=unsubscribe&next={{ request.path }}"
                    class="fav">★</a>
             {% else %}
                 <a href="{% url 'tag' tag.name %}?method=subscribe&next={{ request.path }}"
                    class="not_fav">★</a>
             {% endif %}
-            {% if tag in user.hidden_tags.all %}
+            {% if tag in hidden_tags %}
                 <a href="{% url 'tag' tag.name %}?method=unhide&next={{ request.path }}"
                    title="{% trans 'Show tag' %}"
                    class="fav">H</a>
             {% else %}
                 <a href="{% url 'tag' tag.name %}?method=hide&next={{ request.path }}"
                    title="{% trans 'Hide tag' %}"
                    class="not_fav">H</a>
             {% endif %}
             #{{ tag.name }}
         </h2>
     </div>
 {% endif %}
 
     {% if threads %}
         {% if current_page.has_previous %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=current_page.previous_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.previous_page_number %}
             {% else %}
                 {% url "index" page=current_page.previous_page_number %}
             {% endif %}
                 ">{% trans "Previous page" %}</a>
             </div>
         {% endif %}
 
         {% for thread in threads %}
             {% cache 600 thread_short thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
                 {% with can_bump=thread.can_bump %}
                 {% post_view thread.get_opening_post moderator is_opening=True thread=thread can_bump=can_bump truncated=True need_open_link=True %}
                 {% if not thread.archived %}
                     {% with last_replies=thread.get_last_replies %}
                         {% if last_replies %}
                             {% if thread.get_skipped_replies_count %}
                                 <div class="skipped_replies">
                                     <a href="{% url 'thread' thread.get_opening_post.id %}">
                                         {% blocktrans with count=thread.get_skipped_replies_count %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
                                     </a>
                                 </div>
                             {% endif %}
                             <div class="last-replies">
                                 {% for post in last_replies %}
                                     {% post_view post moderator=moderator is_opening=False thread=thread can_bump=can_bump truncated=True %}
                                 {% endfor %}
                             </div>
                         {% endif %}
                     {% endwith %}
                 {% endif %}
                 {% endwith %}
             </div>
             {% endcache %}
         {% endfor %}
 
         {% if current_page.has_next %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=current_page.next_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.next_page_number %}
             {% else %}
                 {% url "index" page=current_page.next_page_number %}
             {% endif %}
                 ">{% trans "Next page" %}</a>
             </div>
         {% endif %}
     {% else %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
     <div class="post-form-w">
         <script src="{% static 'js/panel.js' %}"></script>
         <div class="post-form">
             <div class="form-title">{% trans "Create new thread" %}</div>
             <div class="swappable-form-full">
             <form enctype="multipart/form-data" method="post">{% csrf_token %}
                 {{ form.as_div }}
                 <div class="form-submit">
                     <input type="submit" value="{% trans "Post" %}"/>
                 </div>
             </form>
             </div>
             <div>
                 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
             </div>
             <div><a href="{% url "staticpage" name="help" %}">
                 {% trans 'Text syntax' %}</a></div>
         </div>
     </div>
 
     <script src="{% static 'js/form.js' %}"></script>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         <b><a href="{% url "authors" %}">{{ site_name }}</a> {{ version }}</b>
         {% trans "Pages:" %}
         <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=paginator.page_range|first %}
             {% elif archived %}
                 {% url "archive" page=paginator.page_range|first %}
             {% else %}
                 {% url "index" page=paginator.page_range|first %}
             {% endif %}
         ">&lt;&lt;</a>
         [
         {% for page in paginator.center_range %}
             <a
                 {% ifequal page current_page.number %}
                     class="current_page"
                 {% endifequal %}
                 href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=page %}
             {% elif archived %}
                 {% url "archive" page=page %}
             {% else %}
                 {% url "index" page=page %}
             {% endif %}
             ">{{ page }}</a>
             {% if not forloop.last %},{% endif %}
         {% endfor %}
         ]
         <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=paginator.page_range|last %}
             {% elif archived %}
                 {% url "archive" page=paginator.page_range|last %}
             {% else %}
                 {% url "index" page=paginator.page_range|last %}
             {% endif %}
         ">&gt;&gt;</a>
         [<a href="rss/">RSS</a>]
     </span>
 
 {% endblock %}

boards/templates/boards/settings.html

@@ -1,50 +1,41 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load humanize %}
 
 {% block head %}
     <title>{% trans 'Settings' %} - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
 
     <div class="post">
     <p>
-        {% trans 'User:' %} <b>{{ user.user_id }}</b>.
-        {% if user.is_moderator %}
+            {% if moderator %}
             {% trans 'You are moderator.' %}
         {% endif %}
-        {% if user.is_veteran %}
-            {% trans 'You are veteran.' %}
-        {% endif %}
     </p>
-    <p>{% trans 'Posts:' %} {{ user.get_post_count }}</p>
-    <p>{% trans 'First access:' %} {{ user.registration_time|naturaltime }}</p>
-    {% if user.get_last_access_time %}
-        <p>{% trans 'Last access:' %} {{ user.get_last_access_time|naturaltime }}</p>
-    {% endif %}
-    {% with hidden_tags=user.hidden_tags.all %}
         {% if hidden_tags %}
             <p>{% trans 'Hidden tags:' %}
             {% for tag in hidden_tags %}
                 <a class="tag" href="{% url 'tag' tag.name %}">
                     #{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
             {% endfor %}
             </p>
+        {% else %}
+            <p>{% trans 'No hidden tags.' %}</p>
         {% endif %}
-    {% endwith %}
     </div>
 
     <div class="post-form-w">
     <div class="post-form">
         <form method="post">{% csrf_token %}
             {{ form.as_div }}
             <div class="form-submit">
                 <input type="submit" value="{% trans "Save" %}" />
             </div>
         </form>
     </div>
     </div>
 
 {% endblock %}

boards/templates/boards/staticpages/help.html

@@ -1,20 +1,18 b''
 {% extends "boards/static_base.html" %}
 
 {% load i18n %}
 
 {% block head %}
     <title>{% trans "Syntax" %}</title>
 {% endblock %}
 
 {% block staticcontent %}
     <h2>{% trans 'Syntax' %}</h2>
-    <p>{% trans '2 line breaks for a new line.' %}</p>
-    <p>_<i>{% trans 'Italic text' %}</i>_</p>
-    <p>__<b>{% trans 'Bold text' %}</b>__</p>
-    <p>%%<span class="spoiler">{% trans 'Spoiler' %}</span>%%</p>
-    <p><a>>>123</a> -- {% trans 'Link to a post' %}</p>
-    <p>~<span class="strikethrough">{% trans 'Strikethrough text' %}</span>~</p>
-    <p>{% trans 'You need to new line before:' %}</p>
-    <p><span class="comment">//{% trans 'Comment' %}</span></p>
-    <p><span class="quote">> {% trans 'Quote' %}</span></p>
+    <p>[i]<i>{% trans 'Italic text' %}</i>[/i]</p>
+    <p>[b]<b>{% trans 'Bold text' %}</b>[/b]</p>
+    <p>[spoiler]<span class="spoiler">{% trans 'Spoiler' %}</span>[/spoiler]</p>
+    <p>[post]123[/post] -- {% trans 'Link to a post' %}</p>
+    <p>[s]<span class="strikethrough">{% trans 'Strikethrough text' %}</span>[/s]</p>
+    <p>[comment]<span class="comment">{% trans 'Comment' %}</span>[/comment]</p>
+    <p>[quote]<span class="multiquote">{% trans 'Quote' %}</span>[/quote]</p>
 {% endblock %}

boards/templates/boards/thread.html

@@ -1,95 +1,95 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
 
 {% block head %}
     <title>{{ opening_post.get_title|striptags|truncatewords:10 }}
         - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
     {% spaceless %}
     {% get_current_language as LANGUAGE_CODE %}
 
     {% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
 
     <div class="image-mode-tab">
         <a class="current_mode" href="{% url 'thread' opening_post.id %}">{% trans 'Normal mode' %}</a>,
         <a href="{% url 'thread_mode' opening_post.id 'gallery' %}">{% trans 'Gallery mode' %}</a>
     </div>
 
     {% if bumpable %}
         <div class="bar-bg">
             <div class="bar-value" style="width:{{ bumplimit_progress }}%" id="bumplimit_progress">
             </div>
             <div class="bar-text">
                 <span id="left_to_limit">{{ posts_left }}</span> {% trans 'posts to bumplimit' %}
             </div>
         </div>
     {% endif %}
 
     <div class="thread">
         {% with can_bump=thread.can_bump %}
         {% for post in thread.get_replies %}
             {% if forloop.first %}
                 {% post_view post moderator=moderator is_opening=True thread=thread can_bump=can_bump opening_post_id=opening_post.id %}
             {% else %}
                 {% post_view post moderator=moderator is_opening=False thread=thread can_bump=can_bump opening_post_id=opening_post.id %}
             {% endif %}
         {% endfor %}
         {% endwith %}
     </div>
 
     {% if not thread.archived %}
 
     <div class="post-form-w" id="form">
         <script src="{% static 'js/panel.js' %}"></script>
         <div class="form-title">{% trans "Reply to thread" %} #{{ opening_post.id }}</div>
         <div class="post-form" id="compact-form">
             <div class="swappable-form-full">
                 <form enctype="multipart/form-data" method="post"
                         >{% csrf_token %}
                         <div class="compact-form-text"></div>
                     {{ form.as_div }}
                     <div class="form-submit">
                         <input type="submit" value="{% trans "Post" %}"/>
                     </div>
                 </form>
             </div>
             <a onclick="swapForm(); return false;" href="#">
                 {% trans 'Switch mode' %}
             </a>
             <div><a href="{% url "staticpage" name="help" %}">
                 {% trans 'Text syntax' %}</a></div>
         </div>
     </div>
 
     <script src="{% static 'js/jquery.form.min.js' %}"></script>
     <script src="{% static 'js/thread_update.js' %}"></script>
     {% endif %}
 
     <script src="{% static 'js/form.js' %}"></script>
     <script src="{% static 'js/thread.js' %}"></script>
 
     {% endcache %}
 
     {% endspaceless %}
 {% endblock %}
 
 {% block metapanel %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
     <span class="metapanel" data-last-update="{{ last_update }}">
         {% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %}
-            <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }} {% trans 'replies' %},
+            <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }} {% trans 'messages' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
             {% trans 'Last update: ' %}<span id="last-update">{{ thread.last_edit_time }}</span>
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>
 
 {% endblock %}

boards/templates/boards/thread_gallery.html

@@ -1,68 +1,68 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
 
 {% block head %}
     <title>{{ thread.get_opening_post.get_title|striptags|truncatewords:10 }}
         - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
     {% spaceless %}
     {% get_current_language as LANGUAGE_CODE %}
 
     <script src="{% static 'js/thread.js' %}"></script>
 
     {% cache 600 thread_gallery_view thread.id thread.last_edit_time LANGUAGE_CODE request.get_host %}
     <div class="image-mode-tab">
         <a href="{% url 'thread' thread.get_opening_post.id %}">{% trans 'Normal mode' %}</a>,
         <a class="current_mode" href="{% url 'thread_mode' thread.get_opening_post.id 'gallery' %}">{% trans 'Gallery mode' %}</a>
     </div>
 
     <div id="posts-table">
     {% for post in posts %}
         <div class="gallery_image">
         {% with post.get_first_image as image %}
             <div>
                 <a
                         class="thumb"
                         href="{{ image.image.url }}"><img
                         src="{{ image.image.url_200x150 }}"
                         alt="{{ post.id }}"
                         width="{{ image.pre_width }}"
                         height="{{ image.pre_height }}"
                         data-width="{{ image.width }}"
                         data-height="{{ image.height }}"/>
                 </a>
             </div>
             <div class="gallery_image_metadata">
                 {{ image.width }}x{{ image.height }}
                 {% image_actions image.image.url request.get_host %}
             </div>
         {% endwith %}
         </div>
     {% endfor %}
     </div>
     {% endcache %}
 
     {% endspaceless %}
 {% endblock %}
 
 {% block metapanel %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
     <span class="metapanel" data-last-update="{{ last_update }}">
         {% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %}
             <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }}
-            {% trans 'replies' %},
+            {% trans 'messages' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
             {% trans 'Last update: ' %}{{ thread.last_edit_time }}
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>
 
 {% endblock %}

boards/tests.py

@@ -1,260 +1,270 b''
 # coding=utf-8
 import time
 import logging
 from django.core.paginator import Paginator
 
 from django.test import TestCase
 from django.test.client import Client
 from django.core.urlresolvers import reverse, NoReverseMatch
+from boards.abstracts.settingsmanager import get_settings_manager
 
 from boards.models import Post, Tag, Thread
 from boards import urls
 from boards import settings
 import neboard
 
+TEST_TAG = 'test_tag'
+
 PAGE_404 = 'boards/404.html'
 
 TEST_TEXT = 'test text'
 
 NEW_THREAD_PAGE = '/'
 THREAD_PAGE_ONE = '/thread/1/'
 THREAD_PAGE = '/thread/'
 TAG_PAGE = '/tag/'
 HTTP_CODE_REDIRECT = 302
 HTTP_CODE_OK = 200
 HTTP_CODE_NOT_FOUND = 404
 
 logger = logging.getLogger(__name__)
 
 
 class PostTests(TestCase):
 
     def _create_post(self):
-        return Post.objects.create_post(title='title',
-                                        text='text')
+        tag = Tag.objects.create(name=TEST_TAG)
+        return Post.objects.create_post(title='title', text='text',
+                                        tags=[tag])
 
     def test_post_add(self):
         """Test adding post"""
 
         post = self._create_post()
 
-        self.assertIsNotNone(post, 'No post was created')
+        self.assertIsNotNone(post, 'No post was created.')
+        self.assertEqual(TEST_TAG, post.get_thread().tags.all()[0].name,
+                         'No tags were added to the post.')
 
     def test_delete_post(self):
         """Test post deletion"""
 
         post = self._create_post()
         post_id = post.id
 
         Post.objects.delete_post(post)
 
         self.assertFalse(Post.objects.filter(id=post_id).exists())
 
     def test_delete_thread(self):
         """Test thread deletion"""
 
         opening_post = self._create_post()
         thread = opening_post.get_thread()
         reply = Post.objects.create_post("", "", thread=thread)
 
         thread.delete()
 
         self.assertFalse(Post.objects.filter(id=reply.id).exists())
 
     def test_post_to_thread(self):
         """Test adding post to a thread"""
 
         op = self._create_post()
         post = Post.objects.create_post("", "", thread=op.get_thread())
 
         self.assertIsNotNone(post, 'Reply to thread wasn\'t created')
         self.assertEqual(op.get_thread().last_edit_time, post.pub_time,
                          'Post\'s create time doesn\'t match thread last edit'
                          ' time')
 
     def test_delete_posts_by_ip(self):
         """Test deleting posts with the given ip"""
 
         post = self._create_post()
         post_id = post.id
 
         Post.objects.delete_posts_by_ip('0.0.0.0')
 
         self.assertFalse(Post.objects.filter(id=post_id).exists())
 
     def test_get_thread(self):
         """Test getting all posts of a thread"""
 
         opening_post = self._create_post()
 
         for i in range(0, 2):
             Post.objects.create_post('title', 'text',
                                      thread=opening_post.get_thread())
 
         thread = opening_post.get_thread()
 
         self.assertEqual(3, thread.replies.count())
 
     def test_create_post_with_tag(self):
         """Test adding tag to post"""
 
         tag = Tag.objects.create(name='test_tag')
         post = Post.objects.create_post(title='title', text='text', tags=[tag])
 
         thread = post.get_thread()
         self.assertIsNotNone(post, 'Post not created')
         self.assertTrue(tag in thread.tags.all(), 'Tag not added to thread')
         self.assertTrue(thread in tag.threads.all(), 'Thread not added to tag')
 
     def test_thread_max_count(self):
         """Test deletion of old posts when the max thread count is reached"""
 
         for i in range(settings.MAX_THREAD_COUNT + 1):
             self._create_post()
 
         self.assertEqual(settings.MAX_THREAD_COUNT,
                          len(Thread.objects.filter(archived=False)))
 
     def test_pages(self):
         """Test that the thread list is properly split into pages"""
 
         for i in range(settings.MAX_THREAD_COUNT):
             self._create_post()
 
         all_threads = Thread.objects.filter(archived=False)
 
         paginator = Paginator(Thread.objects.filter(archived=False),
                               settings.THREADS_PER_PAGE)
         posts_in_second_page = paginator.page(2).object_list
         first_post = posts_in_second_page[0]
 
         self.assertEqual(all_threads[settings.THREADS_PER_PAGE].id,
                          first_post.id)
 
-    def test_linked_tag(self):
-        """Test adding a linked tag"""
-
-        linked_tag = Tag.objects.create(name=u'tag1')
-        tag = Tag.objects.create(name=u'tag2', linked=linked_tag)
-
-        post = Post.objects.create_post("", "", tags=[tag])
-
-        self.assertTrue(linked_tag in post.get_thread().tags.all(),
-                        'Linked tag was not added')
-
 
 class PagesTest(TestCase):
 
     def test_404(self):
         """Test receiving error 404 when opening a non-existent page"""
 
         tag_name = u'test_tag'
         tag = Tag.objects.create(name=tag_name)
         client = Client()
 
         Post.objects.create_post('title', TEST_TEXT, tags=[tag])
 
         existing_post_id = Post.objects.all()[0].id
         response_existing = client.get(THREAD_PAGE + str(existing_post_id) +
                                        '/')
         self.assertEqual(HTTP_CODE_OK, response_existing.status_code,
                          u'Cannot open existing thread')
 
         response_not_existing = client.get(THREAD_PAGE + str(
             existing_post_id + 1) + '/')
         self.assertEqual(PAGE_404, response_not_existing.templates[0].name,
                          u'Not existing thread is opened')
 
         response_existing = client.get(TAG_PAGE + tag_name + '/')
         self.assertEqual(HTTP_CODE_OK,
                          response_existing.status_code,
                          u'Cannot open existing tag')
 
         response_not_existing = client.get(TAG_PAGE + u'not_tag' + '/')
         self.assertEqual(PAGE_404,
                          response_not_existing.templates[0].name,
                          u'Not existing tag is opened')
 
         reply_id = Post.objects.create_post('', TEST_TEXT,
                                             thread=Post.objects.all()[0]
                                             .get_thread())
         response_not_existing = client.get(THREAD_PAGE + str(
             reply_id) + '/')
         self.assertEqual(PAGE_404,
                          response_not_existing.templates[0].name,
                          u'Reply is opened as a thread')
 
 
 class FormTest(TestCase):
     def test_post_validation(self):
         # Disable captcha for the test
         captcha_enabled = neboard.settings.ENABLE_CAPTCHA
         neboard.settings.ENABLE_CAPTCHA = False
 
         client = Client()
 
         valid_tags = u'tag1 tag_2 тег_3'
         invalid_tags = u'$%_356 ---'
 
         response = client.post(NEW_THREAD_PAGE, {'title': 'test title',
                                                  'text': TEST_TEXT,
                                                  'tags': valid_tags})
         self.assertEqual(response.status_code, HTTP_CODE_REDIRECT,
                          msg='Posting new message failed: got code ' +
                              str(response.status_code))
 
         self.assertEqual(1, Post.objects.count(),
                          msg='No posts were created')
 
         client.post(NEW_THREAD_PAGE, {'text': TEST_TEXT,
                                       'tags': invalid_tags})
         self.assertEqual(1, Post.objects.count(), msg='The validation passed '
                                                       'where it should fail')
 
         # Change posting delay so we don't have to wait for 30 seconds or more
         old_posting_delay = neboard.settings.POSTING_DELAY
         # Wait fot the posting delay or we won't be able to post
         settings.POSTING_DELAY = 1
         time.sleep(neboard.settings.POSTING_DELAY + 1)
         response = client.post(THREAD_PAGE_ONE, {'text': TEST_TEXT,
                                                  'tags': valid_tags})
         self.assertEqual(HTTP_CODE_REDIRECT, response.status_code,
                          msg=u'Posting new message failed: got code ' +
                              str(response.status_code))
         # Restore posting delay
         settings.POSTING_DELAY = old_posting_delay
 
         self.assertEqual(2, Post.objects.count(),
                          msg=u'No posts were created')
 
         # Restore captcha setting
         settings.ENABLE_CAPTCHA = captcha_enabled
 
 
 class ViewTest(TestCase):
 
     def test_all_views(self):
-        '''
+        """
         Try opening all views defined in ulrs.py that don't need additional
         parameters
-        '''
+        """
 
         client = Client()
         for url in urls.urlpatterns:
             try:
                 view_name = url.name
                 logger.debug('Testing view %s' % view_name)
 
                 try:
                     response = client.get(reverse(view_name))
 
                     self.assertEqual(HTTP_CODE_OK, response.status_code,
                             '%s view not opened' % view_name)
                 except NoReverseMatch:
                     # This view just needs additional arguments
                     pass
                 except Exception, e:
                     self.fail('Got exception %s at %s view' % (e, view_name))
             except AttributeError:
                 # This is normal, some views do not have names
                 pass
+
+
+class AbstractTest(TestCase):
+    def test_settings_manager(self):
+        request = MockRequest()
+        settings_manager = get_settings_manager(request)
+
+        settings_manager.set_setting('test_setting', 'test_value')
+        self.assertEqual('test_value', settings_manager.get_setting(
+            'test_setting'), u'Setting update failed.')
+
+
+class MockRequest:
+    def __init__(self):
+        self.session = dict()

boards/urls.py

@@ -1,83 +1,84 b''
 from django.conf.urls import patterns, url, include
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views import api, tag_threads, all_threads, \
-        login, settings, all_tags
+    login, settings, all_tags, logout
 from boards.views.authors import AuthorsView
 from boards.views.delete_post import DeletePostView
 from boards.views.ban import BanUserView
 from boards.views.search import BoardSearchView
 from boards.views.static import StaticPageView
 from boards.views.post_admin import PostAdminView
 
 js_info_dict = {
     'packages': ('boards',),
 }
 
 urlpatterns = patterns('',
 
     # /boards/
     url(r'^$', all_threads.AllThreadsView.as_view(), name='index'),
     # /boards/page/
     url(r'^page/(?P<page>\w+)/$', all_threads.AllThreadsView.as_view(),
         name='index'),
 
     # login page
     url(r'^login/$', login.LoginView.as_view(), name='login'),
+    url(r'^logout/$', logout.LogoutView.as_view(), name='logout'),
 
     # /boards/tag/tag_name/
     url(r'^tag/(?P<tag_name>\w+)/$', tag_threads.TagView.as_view(),
         name='tag'),
     # /boards/tag/tag_id/page/
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/$',
         tag_threads.TagView.as_view(), name='tag'),
 
     # /boards/thread/
     url(r'^thread/(?P<post_id>\w+)/$', views.thread.ThreadView.as_view(),
         name='thread'),
     url(r'^thread/(?P<post_id>\w+)/mode/(?P<mode>\w+)/$', views.thread.ThreadView
         .as_view(), name='thread_mode'),
 
     # /boards/post_admin/
     url(r'^post_admin/(?P<post_id>\w+)/$', PostAdminView.as_view(),
             name='post_admin'),
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
     url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'),
     url(r'^captcha/', include('captcha.urls')),
     url(r'^authors/$', AuthorsView.as_view(), name='authors'),
     url(r'^delete/(?P<post_id>\w+)/$', DeletePostView.as_view(),
             name='delete'),
     url(r'^ban/(?P<post_id>\w+)/$', BanUserView.as_view(), name='ban'),
 
     url(r'^banned/$', views.banned.BannedView.as_view(), name='banned'),
     url(r'^staticpage/(?P<name>\w+)/$', StaticPageView.as_view(),
         name='staticpage'),
 
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),
     url(r'^page/(?P<page>\w+)/rss/$', AllThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/rss/$', TagThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/rss/$', TagThreadsFeed()),
     url(r'^thread/(?P<post_id>\w+)/rss/$', ThreadPostsFeed()),
 
     # i18n
     url(r'^jsi18n/$', 'boards.views.cached_js_catalog', js_info_dict,
         name='js_info_dict'),
 
     # API
     url(r'^api/post/(?P<post_id>\w+)/$', api.get_post, name="get_post"),
     url(r'^api/diff_thread/(?P<thread_id>\w+)/(?P<last_update_time>\w+)/$',
         api.api_get_threaddiff, name="get_thread_diff"),
     url(r'^api/threads/(?P<count>\w+)/$', api.api_get_threads,
             name='get_threads'),
     url(r'^api/tags/$', api.api_get_tags, name='get_tags'),
     url(r'^api/thread/(?P<opening_post_id>\w+)/$', api.api_get_thread_posts,
             name='get_thread'),
     url(r'^api/add_post/(?P<opening_post_id>\w+)/$', api.api_add_post,
             name='add_post'),
 
     # Search
     url(r'^search/$', BoardSearchView.as_view(), name='search'),
 
 )

boards/utils.py

@@ -1,129 +1,82 b''
 """
 This module contains helper functions and helper classes.
 """
 import hashlib
 import time
 
 from django.utils import timezone
-import boards
 
 from neboard import settings
-from boards.models import User
-from boards.models.user import RANK_USER
 
 
 KEY_CAPTCHA_FAILS = 'key_captcha_fails'
 KEY_CAPTCHA_DELAY_TIME = 'key_captcha_delay_time'
 KEY_CAPTCHA_LAST_ACTIVITY = 'key_captcha_last_activity'
 
 
 def need_include_captcha(request):
     """
     Check if request is made by a user.
     It contains rules which check for bots.
     """
 
     if not settings.ENABLE_CAPTCHA:
         return False
 
     enable_captcha = False
 
     #newcomer
     if KEY_CAPTCHA_LAST_ACTIVITY not in request.session:
         return settings.ENABLE_CAPTCHA
 
     last_activity = request.session[KEY_CAPTCHA_LAST_ACTIVITY]
     current_delay = int(time.time()) - last_activity
 
     delay_time = (request.session[KEY_CAPTCHA_DELAY_TIME]
                   if KEY_CAPTCHA_DELAY_TIME in request.session
                   else settings.CAPTCHA_DEFAULT_SAFE_TIME)
 
     if current_delay < delay_time:
         enable_captcha = True
 
     print 'ENABLING' + str(enable_captcha)
 
     return enable_captcha
 
 
 def update_captcha_access(request, passed):
     """
     Update captcha fields.
     It will reduce delay time if user passed captcha verification and
     it will increase it otherwise.
     """
     session = request.session
 
     delay_time = (request.session[KEY_CAPTCHA_DELAY_TIME]
                   if KEY_CAPTCHA_DELAY_TIME in request.session
                   else settings.CAPTCHA_DEFAULT_SAFE_TIME)
 
     print "DELAY TIME = " + str(delay_time)
 
     if passed:
         delay_time -= 2 if delay_time >= 7 else 5
     else:
         delay_time += 10
 
     session[KEY_CAPTCHA_LAST_ACTIVITY] = int(time.time())
     session[KEY_CAPTCHA_DELAY_TIME] = delay_time
 
 
 def get_client_ip(request):
     x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
     if x_forwarded_for:
         ip = x_forwarded_for.split(',')[-1].strip()
     else:
         ip = request.META.get('REMOTE_ADDR')
     return ip
 
 
 def datetime_to_epoch(datetime):
     return int(time.mktime(timezone.localtime(
         datetime,timezone.get_current_timezone()).timetuple())
-               * 1000000 + datetime.microsecond)
-
-
-def get_user(request):
-    """
-    Get current user from the session. If the user does not exist, create
-    a new one.
-    """
-
-    session = request.session
-    if not 'user_id' in session:
-        request.session.save()
-
-        md5 = hashlib.md5()
-        md5.update(session.session_key)
-        new_id = md5.hexdigest()
-
-        while User.objects.filter(user_id=new_id).exists():
-            md5.update(str(timezone.now()))
-            new_id = md5.hexdigest()
-
-        time_now = timezone.now()
-        user = User.objects.create(user_id=new_id, rank=RANK_USER,
-                                   registration_time=time_now)
-
-        session['user_id'] = user.id
-    else:
-        user = User.objects.select_related('fav_tags').get(
-            id=session['user_id'])
-
-    return user
-
-
-def get_theme(request, user=None):
-    """
-    Get user's CSS theme
-    """
-
-    if not user:
-        user = get_user(request)
-    theme = user.get_setting('theme')
-    if not theme:
-        theme = boards.settings.DEFAULT_THEME
-
-    return theme
  No newline at end of file
+               * 1000000 + datetime.microsecond)
  No newline at end of file

boards/views/all_threads.py

@@ -1,138 +1,139 b''
 import string
 
 from django.db import transaction
 from django.shortcuts import render, redirect
 
 from boards import utils, settings
 from boards.abstracts.paginator import get_paginator
+from boards.abstracts.settingsmanager import get_settings_manager
 from boards.forms import ThreadForm, PlainErrorList
 from boards.models import Post, Thread, Ban, Tag
 from boards.views.banned import BannedView
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 from boards.views.posting_mixin import PostMixin
 
 FORM_TAGS = 'tags'
 FORM_TEXT = 'text'
 FORM_TITLE = 'title'
 FORM_IMAGE = 'image'
 
 TAG_DELIMITER = ' '
 
 PARAMETER_CURRENT_PAGE = 'current_page'
 PARAMETER_PAGINATOR = 'paginator'
 PARAMETER_THREADS = 'threads'
 
 TEMPLATE = 'boards/posting_general.html'
 DEFAULT_PAGE = 1
 
 
 class AllThreadsView(PostMixin, BaseBoardView):
 
-    user = None
+    def __init__(self):
+        self.settings_manager = None
+        super(AllThreadsView, self).__init__()
 
     def get(self, request, page=DEFAULT_PAGE, form=None):
         context = self.get_context_data(request=request)
 
-        self.user = utils.get_user(request)
-
         if not form:
             form = ThreadForm(error_class=PlainErrorList)
 
+        self.settings_manager = get_settings_manager(request)
         paginator = get_paginator(self.get_threads(),
                                   settings.THREADS_PER_PAGE)
         paginator.current_page = int(page)
 
         threads = paginator.page(page).object_list
 
         context[PARAMETER_THREADS] = threads
         context[CONTEXT_FORM] = form
 
         self._get_page_context(paginator, context, page)
 
         return render(request, TEMPLATE, context)
 
     def post(self, request, page=DEFAULT_PAGE):
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
             return self.create_thread(request, form)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             self._ban_current_user(request)
 
         return self.get(request, page, form)
 
     @staticmethod
     def _get_page_context(paginator, context, page):
         """
         Get pagination context variables
         """
 
         context[PARAMETER_PAGINATOR] = paginator
         context[PARAMETER_CURRENT_PAGE] = paginator.page(int(page))
 
     @staticmethod
     def parse_tags_string(tag_strings):
         """
         Parses tag list string and returns tag object list.
         """
 
         tags = []
 
         if tag_strings:
             tag_strings = tag_strings.split(TAG_DELIMITER)
             for tag_name in tag_strings:
                 tag_name = string.lower(tag_name.strip())
                 if len(tag_name) > 0:
                     tag, created = Tag.objects.get_or_create(name=tag_name)
                     tags.append(tag)
 
         return tags
 
     @transaction.atomic
     def create_thread(self, request, form, html_response=True):
         """
         Creates a new thread with an opening post.
         """
 
         ip = utils.get_client_ip(request)
         is_banned = Ban.objects.filter(ip=ip).exists()
 
         if is_banned:
             if html_response:
                 return redirect(BannedView().as_view())
             else:
                 return
 
         data = form.cleaned_data
 
         title = data[FORM_TITLE]
         text = data[FORM_TEXT]
 
         text = self._remove_invalid_links(text)
 
         if FORM_IMAGE in data.keys():
             image = data[FORM_IMAGE]
         else:
             image = None
 
         tag_strings = data[FORM_TAGS]
 
         tags = self.parse_tags_string(tag_strings)
 
-        post = Post.objects.create_post(title=title, text=text, ip=ip,
-                                        image=image, tags=tags,
-                                        user=utils.get_user(request))
+        post = Post.objects.create_post(title=title, text=text, image=image,
+                                        ip=ip, tags=tags)
 
         if html_response:
             return redirect(post.get_url())
 
     def get_threads(self):
         """
         Gets list of threads that will be shown on a page.
         """
 
         return Thread.objects.all().order_by('-bump_time')\
-            .exclude(tags__in=self.user.hidden_tags.all())
+            .exclude(tags__in=self.settings_manager.get_hidden_tags())

boards/views/ban.py

@@ -1,24 +1,26 b''
 from django.db import transaction
 from django.shortcuts import get_object_or_404
-from boards import utils
 
+from boards.abstracts.settingsmanager import PERMISSION_MODERATE, \
+    get_settings_manager
 from boards.views.base import BaseBoardView
 from boards.models import Post, Ban
 from boards.views.mixins import RedirectNextMixin
 
 
 class BanUserView(BaseBoardView, RedirectNextMixin):
 
     @transaction.atomic
     def get(self, request, post_id):
-        user = utils.get_user(request)
         post = get_object_or_404(Post, id=post_id)
 
-        if user.is_moderator():
+        settings_manager = get_settings_manager(request)
+
+        if settings_manager.has_permission(PERMISSION_MODERATE):
             # TODO Show confirmation page before ban
             ban, created = Ban.objects.get_or_create(ip=post.poster_ip)
             if created:
                 ban.reason = 'Banned for post ' + str(post_id)
                 ban.save()
 
         return self.redirect_to_next(request)

boards/views/delete_post.py

@@ -1,27 +1,28 b''
 from django.shortcuts import redirect, get_object_or_404
 from django.db import transaction
-from boards import utils
 
+from boards.abstracts.settingsmanager import PERMISSION_MODERATE,\
+    get_settings_manager
 from boards.views.base import BaseBoardView
 from boards.views.mixins import RedirectNextMixin
 from boards.models import Post
 
 
 class DeletePostView(BaseBoardView, RedirectNextMixin):
 
     @transaction.atomic
     def get(self, request, post_id):
-        user = utils.get_user(request)
         post = get_object_or_404(Post, id=post_id)
 
         opening_post = post.is_opening()
 
-        if user.is_moderator():
+        settings_manager = get_settings_manager(request)
+        if settings_manager.has_permission(PERMISSION_MODERATE):
             # TODO Show confirmation page before deletion
             Post.objects.delete_post(post)
 
         if not opening_post:
             thread = post.thread_new
             return redirect('thread', post_id=thread.get_opening_post().id)
         else:
             return self.redirect_to_next(request)

boards/views/login.py

@@ -1,30 +1,33 b''
 from django.shortcuts import render, redirect
+
+from boards.abstracts.settingsmanager import PERMISSION_MODERATE, \
+    get_settings_manager
 from boards.forms import LoginForm, PlainErrorList
-from boards.models import User
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 
+
 __author__ = 'neko259'
 
 
 class LoginView(BaseBoardView):
 
     def get(self, request, form=None):
         context = self.get_context_data(request=request)
 
         if not form:
             form = LoginForm()
         context[CONTEXT_FORM] = form
 
         return render(request, 'boards/login.html', context)
 
     def post(self, request):
         form = LoginForm(request.POST, request.FILES,
                          error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
-            user = User.objects.get(user_id=form.cleaned_data['user_id'])
-            request.session['user_id'] = user.id
+            settings_manager = get_settings_manager(request)
+            settings_manager.add_permission(PERMISSION_MODERATE)
             return redirect('index')
         else:
             return self.get(request, form)

boards/views/post_admin.py

@@ -1,57 +1,60 b''
 from django.shortcuts import render, get_object_or_404, redirect
 
+from boards.abstracts.settingsmanager import PERMISSION_MODERATE,\
+    get_settings_manager
 from boards.views.base import BaseBoardView
 from boards.views.mixins import DispatcherMixin
 from boards.models.post import Post
 from boards.models.tag import Tag
 from boards.forms import AddTagForm, PlainErrorList
 
+
 class PostAdminView(BaseBoardView, DispatcherMixin):
 
     def get(self, request, post_id, form=None):
-        user = utils.get_user(request)
-        if not user.is_moderator:
+        settings_manager = get_settings_manager(request)
+        if not settings_manager.has_permission(PERMISSION_MODERATE):
             redirect('index')
 
         post = get_object_or_404(Post, id=post_id)
 
         if not form:
             dispatch_result = self.dispatch_method(request, post)
             if dispatch_result:
                 return dispatch_result
             form = AddTagForm()
 
         context = self.get_context_data(request=request)
 
         context['post'] = post
 
         context['tag_form'] = form
 
         return render(request, 'boards/post_admin.html', context)
 
     def post(self, request, post_id):
-        user = utils.get_user(request)
-        if not user.is_moderator:
+        settings_manager = get_settings_manager(request)
+        if not settings_manager.has_permission(PERMISSION_MODERATE):
             redirect('index')
 
         post = get_object_or_404(Post, id=post_id)
         return self.dispatch_method(request, post)
 
     def delete_tag(self, request, post):
         tag_name = request.GET['tag']
         tag = get_object_or_404(Tag, name=tag_name)
 
         post.remove_tag(tag)
 
         return redirect('post_admin', post.id)
 
     def add_tag(self, request, post):
         form = AddTagForm(request.POST, error_class=PlainErrorList)
         if form.is_valid():
             tag_name = form.cleaned_data['tag']
             tag, created = Tag.objects.get_or_create(name=tag_name)
 
             post.add_tag(tag)
             return redirect('post_admin', post.id)
         else:
             return self.get(request, post.id, form)

boards/views/search.py

@@ -1,41 +1,40 b''
 from django.shortcuts import render
 from django.template import RequestContext
 from django.views.generic import View
 from haystack.query import SearchQuerySet
 from boards.abstracts.paginator import get_paginator
 from boards.forms import SearchForm, PlainErrorList
 
 FORM_QUERY = 'query'
 
 CONTEXT_QUERY = 'query'
 CONTEXT_FORM = 'form'
 CONTEXT_PAGE = 'page'
 
 REQUEST_PAGE = 'page'
 
 __author__ = 'neko259'
 
 TEMPLATE = 'search/search.html'
 
 
 class BoardSearchView(View):
     def get(self, request):
         context = RequestContext(request)
         form = SearchForm(request.GET, error_class=PlainErrorList)
         context[CONTEXT_FORM] = form
 
         if form.is_valid():
             query = form.cleaned_data[FORM_QUERY]
             if len(query) >= 3:
-                results = SearchQuerySet().auto_query(query).order_by('-id') \
-                    .highlight()
+                results = SearchQuerySet().auto_query(query).order_by('-id')
                 paginator = get_paginator(results, 10)
 
                 if REQUEST_PAGE in request.GET:
                     page = int(request.GET[REQUEST_PAGE])
                 else:
                     page = 1
                 context[CONTEXT_PAGE] = paginator.page(page)
                 context[CONTEXT_QUERY] = query
 
         return render(request, TEMPLATE, context)
  No newline at end of file

boards/views/settings.py

@@ -1,53 +1,38 b''
 from django.db import transaction
 from django.shortcuts import render, redirect
-from boards import utils
 
+from boards.abstracts.settingsmanager import get_settings_manager
 from boards.views.base import BaseBoardView, CONTEXT_FORM
-from boards.forms import SettingsForm, ModeratorSettingsForm, PlainErrorList
-from boards.models.post import SETTING_MODERATE
+from boards.forms import SettingsForm, PlainErrorList
+
+CONTEXT_HIDDEN_TAGS = 'hidden_tags'
 
 
 class SettingsView(BaseBoardView):
 
     def get(self, request):
         context = self.get_context_data(request=request)
-        user = utils.get_user(request)
-        is_moderator = user.is_moderator()
-
-        selected_theme = utils.get_theme(request, user)
+        settings_manager = get_settings_manager(request)
 
-        if is_moderator:
-            form = ModeratorSettingsForm(initial={
-                'theme': selected_theme,
-                'moderate': user.get_setting(SETTING_MODERATE) and \
-                            user.is_moderator()
-            }, error_class=PlainErrorList)
-        else:
+        selected_theme = settings_manager.get_theme()
+
             form = SettingsForm(initial={'theme': selected_theme},
                                 error_class=PlainErrorList)
 
         context[CONTEXT_FORM] = form
+        context[CONTEXT_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
 
         return render(request, 'boards/settings.html', context)
 
     def post(self, request):
-        user = utils.get_user(request)
-        is_moderator = user.is_moderator()
+        settings_manager = get_settings_manager(request)
 
         with transaction.atomic():
-            if is_moderator:
-                form = ModeratorSettingsForm(request.POST,
-                                             error_class=PlainErrorList)
-            else:
                 form = SettingsForm(request.POST, error_class=PlainErrorList)
 
             if form.is_valid():
                 selected_theme = form.cleaned_data['theme']
 
-                user.save_setting('theme', selected_theme)
-
-                if is_moderator:
-                    moderate = form.cleaned_data['moderate']
-                    user.save_setting(SETTING_MODERATE, moderate)
+                settings_manager.set_theme(selected_theme)
 
             return redirect('settings')

boards/views/tag_threads.py

@@ -1,87 +1,92 b''
 from django.shortcuts import get_object_or_404
-from boards import utils
-from boards.models import Tag, Post
+
+from boards.abstracts.settingsmanager import get_settings_manager
+from boards.models import Tag
 from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE
 from boards.views.mixins import DispatcherMixin, RedirectNextMixin
 from boards.forms import ThreadForm, PlainErrorList
 
+
 __author__ = 'neko259'
 
 
 class TagView(AllThreadsView, DispatcherMixin, RedirectNextMixin):
 
     tag_name = None
 
     def get_threads(self):
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         return tag.threads.all().order_by('-bump_time')
 
     def get_context_data(self, **kwargs):
         context = super(TagView, self).get_context_data(**kwargs)
 
+        settings_manager = get_settings_manager(kwargs['request'])
+
         tag = get_object_or_404(Tag, name=self.tag_name)
         context['tag'] = tag
 
+        context['fav_tags'] = settings_manager.get_fav_tags()
+        context['hidden_tags'] = settings_manager.get_hidden_tags()
+
         return context
 
     def get(self, request, tag_name, page=DEFAULT_PAGE, form=None):
         self.tag_name = tag_name
 
         dispatch_result = self.dispatch_method(request)
         if dispatch_result:
             return dispatch_result
         else:
             return super(TagView, self).get(request, page, form)
 
     def post(self, request, tag_name, page=DEFAULT_PAGE):
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
             return self.create_thread(request, form)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             self._ban_current_user(request)
 
         return self.get(request, tag_name, page, form)
 
     def subscribe(self, request):
-        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
-        if not tag in user.fav_tags.all():
-            user.add_tag(tag)
+        settings_manager = get_settings_manager(request)
+        settings_manager.add_fav_tag(tag)
 
         return self.redirect_to_next(request)
 
     def unsubscribe(self, request):
-        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
-        if tag in user.fav_tags.all():
-            user.remove_tag(tag)
+        settings_manager = get_settings_manager(request)
+        settings_manager.del_fav_tag(tag)
 
         return self.redirect_to_next(request)
 
     def hide(self, request):
         """
         Adds tag to user's hidden tags. Threads with this tag will not be
         shown.
         """
 
-        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
-        user.hide_tag(tag)
+        settings_manager = get_settings_manager(request)
+        settings_manager.add_hidden_tag(tag)
 
     def unhide(self, request):
         """
         Removed tag from user's hidden tags.
         """
 
-        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
-        user.unhide_tag(tag)
+        settings_manager = get_settings_manager(request)
+        settings_manager.del_hidden_tag(tag)

boards/views/thread.py

@@ -1,144 +1,142 b''
 from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.http import Http404
 from django.shortcuts import get_object_or_404, render, redirect
 from django.views.generic.edit import FormMixin
 
 from boards import utils, settings
 from boards.forms import PostForm, PlainErrorList
 from boards.models import Post, Ban
 from boards.views.banned import BannedView
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 from boards.views.posting_mixin import PostMixin
 
 TEMPLATE_GALLERY = 'boards/thread_gallery.html'
 TEMPLATE_NORMAL = 'boards/thread.html'
 
 CONTEXT_POSTS = 'posts'
 CONTEXT_OP = 'opening_post'
 CONTEXT_BUMPLIMIT_PRG = 'bumplimit_progress'
 CONTEXT_POSTS_LEFT = 'posts_left'
 CONTEXT_LASTUPDATE = "last_update"
 CONTEXT_MAX_REPLIES = 'max_replies'
 CONTEXT_THREAD = 'thread'
 CONTEXT_BUMPABLE = 'bumpable'
 
 FORM_TITLE = 'title'
 FORM_TEXT = 'text'
 FORM_IMAGE = 'image'
 
 MODE_GALLERY = 'gallery'
 MODE_NORMAL = 'normal'
 
 
 class ThreadView(BaseBoardView, PostMixin, FormMixin):
 
     def get(self, request, post_id, mode=MODE_NORMAL, form=None):
         try:
             opening_post = Post.objects.filter(id=post_id).only('thread_new')[0]
         except IndexError:
             raise Http404
 
         # If this is not OP, don't show it as it is
         if not opening_post or not opening_post.is_opening():
             raise Http404
 
         if not form:
             form = PostForm(error_class=PlainErrorList)
 
         thread_to_show = opening_post.get_thread()
 
         context = self.get_context_data(request=request)
 
         context[CONTEXT_FORM] = form
         context[CONTEXT_LASTUPDATE] = utils.datetime_to_epoch(
             thread_to_show.last_edit_time)
         context[CONTEXT_THREAD] = thread_to_show
         context[CONTEXT_MAX_REPLIES] = settings.MAX_POSTS_PER_THREAD
 
         if MODE_NORMAL == mode:
             bumpable = thread_to_show.can_bump()
             context[CONTEXT_BUMPABLE] = bumpable
             if bumpable:
                 left_posts = settings.MAX_POSTS_PER_THREAD \
                              - thread_to_show.get_reply_count()
                 context[CONTEXT_POSTS_LEFT] = left_posts
                 context[CONTEXT_BUMPLIMIT_PRG] = str(
                     float(left_posts) / settings.MAX_POSTS_PER_THREAD * 100)
 
             context[CONTEXT_OP] = opening_post
 
             document = TEMPLATE_NORMAL
         elif MODE_GALLERY == mode:
             context[CONTEXT_POSTS] = thread_to_show.get_replies_with_images(
                 view_fields_only=True)
 
             document = TEMPLATE_GALLERY
         else:
             raise Http404
 
         return render(request, document, context)
 
     def post(self, request, post_id, mode=MODE_NORMAL):
         opening_post = get_object_or_404(Post, id=post_id)
 
         # If this is not OP, don't show it as it is
         if not opening_post.is_opening():
             raise Http404
 
         if not opening_post.get_thread().archived:
             form = PostForm(request.POST, request.FILES,
                             error_class=PlainErrorList)
             form.session = request.session
 
             if form.is_valid():
                 return self.new_post(request, form, opening_post)
             if form.need_to_ban:
                 # Ban user because he is suspected to be a bot
                 self._ban_current_user(request)
 
             return self.get(request, post_id, mode, form)
 
     @transaction.atomic
     def new_post(self, request, form, opening_post=None, html_response=True):
         """Add a new post (in thread or as a reply)."""
 
         ip = utils.get_client_ip(request)
         is_banned = Ban.objects.filter(ip=ip).exists()
 
         if is_banned:
             if html_response:
                 return redirect(BannedView().as_view())
             else:
                 return None
 
         data = form.cleaned_data
 
         title = data[FORM_TITLE]
         text = data[FORM_TEXT]
 
         text = self._remove_invalid_links(text)
 
         if FORM_IMAGE in data.keys():
             image = data[FORM_IMAGE]
         else:
             image = None
 
         tags = []
 
         post_thread = opening_post.get_thread()
 
-        post = Post.objects.create_post(title=title, text=text, ip=ip,
-                                        thread=post_thread, image=image,
-                                        tags=tags,
-                                        user=utils.get_user(request))
+        post = Post.objects.create_post(title=title, text=text, image=image,
+                                        thread=post_thread, ip=ip, tags=tags)
 
         thread_to_show = (opening_post.id if opening_post else post.id)
 
         if html_response:
             if opening_post:
                 return redirect(
                     reverse('thread', kwargs={'post_id': thread_to_show})
                     + '#' + str(post.id))
         else:
             return post

changelog.markdown

@@ -1,37 +1,43 b''
 # 1.5 Aker #
 * Saving image previews size. No space will be shown below images in some
 styles.
 * Showing notification in page title when new posts are loaded into the open
 thread.
 * Thread moderation fixes
 * Added new gallery with search links and image metadata
 
 # 1.6 Amon #
 * Deleted threads are moved to archive instead of permanent delete
 * User management fixes and optimizations
 * Markdown fixes
 * Pagination changes. Pages counter now starts from 1 instead of 0
 * Added API for viewing threads and posts
 * New tag popularity algorithm
 * Tags list page changes. Now tags list is more like a tag cloud
 
 # 1.7 Anubis
 * [ADMIN] Added admin page for post editing, capable of adding and removing tags
 * [CODE] Post view unification
 * Post caching instead of thread caching
 * Simplified tag list page
 * [API] Added api for thread update in json
 * Image duplicate check
 * Posting over ajax (no page reload now)
 * Update last update time with thread update
 * Added z-index to the images to move the dragged image to front
 * [CODE] Major view refactoring. Now almost all views are class-based
 
 # 1.8 Kara
 * [CODE] Removed thread update logging
 * [CODE] Refactored compact form. Now it uses the same one form and moves 
 elements instead of swapping them
 * [CODE] Moved image to a separate model. This will allow to add multiple
 images to a post
 * Added search over posts and tags
 * [ADMIN] Command to remove empty users
+
+# 2.0 D'Anna
+* Removed users. Now settings are stored in sessions
+* Changed markdown to bbcode
+* Removed linked tags
+* [ADMIN] Added title to the post logs to make them more informative

neboard/settings.py

@@ -1,260 +1,260 b''
 # Django settings for neboard project.
 import os
-from boards.mdx_neboard import markdown_extended
+from boards.mdx_neboard import bbcode_extended
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     # ('Your Name', '[e-mail]'),
     ('admin', '[e-mail]')
 )
 
 MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': 'database.db',                      # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
 	'CONN_MAX_AGE': None,
     }
 }
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # In a Windows environment this must be set to your system time zone.
 TIME_ZONE = 'Europe/Kiev'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en'
 
 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
 
 # If you set this to False, Django will not format dates, numbers and
 # calendars according to the current locale.
 USE_L10N = True
 
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = './media/' 
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
 MEDIA_URL = '/media/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = ''
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/static/'
 
 # Additional locations of static files
 # It is really a hack, put real paths, not related
 STATICFILES_DIRS = (
     os.path.dirname(__file__) + '/boards/static',
 
 #    '/d/work/python/django/neboard/neboard/boards/static',
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
 )
 
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
 
 if DEBUG:
     STATICFILES_STORAGE = \
         'django.contrib.staticfiles.storage.StaticFilesStorage'
 else:
     STATICFILES_STORAGE = \
         'django.contrib.staticfiles.storage.CachedStaticFilesStorage'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '@1rc$o(7=tt#kd+4s$u6wchm**z^)4x90)7f6z(i&55@o11*8o'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.media',
     'django.core.context_processors.static',
     'django.core.context_processors.request',
     'django.contrib.auth.context_processors.auth',
     'boards.context_processors.user_and_ui_processor',
 )
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'boards.middlewares.BanMiddleware',
     'boards.middlewares.MinifyHTMLMiddleware',
 )
 
 ROOT_URLCONF = 'neboard.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'neboard.wsgi.application'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
     'templates',
 )
 
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     # 'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     # Uncomment the next line to enable the admin:
     'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'django.contrib.humanize',
     'django_cleanup',
 
     # Migrations
     'south',
     'debug_toolbar',
 
     'captcha',
 
     # Search
     'haystack',
 
     'boards',
 )
 
 DEBUG_TOOLBAR_PANELS = (
     'debug_toolbar.panels.version.VersionDebugPanel',
     'debug_toolbar.panels.timer.TimerDebugPanel',
     'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
     'debug_toolbar.panels.headers.HeaderDebugPanel',
     'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
     'debug_toolbar.panels.template.TemplateDebugPanel',
     'debug_toolbar.panels.sql.SQLDebugPanel',
     'debug_toolbar.panels.signals.SignalDebugPanel',
     'debug_toolbar.panels.logger.LoggingPanel',
 )
 
 # TODO: NEED DESIGN FIXES
 CAPTCHA_OUTPUT_FORMAT = (u' %(hidden_field)s '
                          u'<div class="form-label">%(image)s</div>'
                          u'<div class="form-text">%(text_field)s</div>')
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.
 # See http://docs.djangoproject.com/en/dev/topics/logging for
 # more details on how to customize your logging configuration.
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
     'formatters': {
         'verbose': {
             'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
         },
         'simple': {
             'format': '%(levelname)s %(asctime)s [%(module)s] %(message)s'
         },
     },
     'filters': {
         'require_debug_false': {
             '()': 'django.utils.log.RequireDebugFalse'
         }
     },
     'handlers': {
         'console': {
             'level': 'DEBUG',
             'class': 'logging.StreamHandler',
             'formatter': 'simple'
         },
     },
     'loggers': {
         'boards': {
             'handlers': ['console'],
             'level': 'DEBUG',
         }
     },
 }
 
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
         'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
     },
 }
 
 MARKUP_FIELD_TYPES = (
-    ('markdown', markdown_extended),
+    ('bbcode', bbcode_extended),
 )
 
 THEMES = [
     ('md', 'Mystic Dark'),
     ('md_centered', 'Mystic Dark (centered)'),
     ('sw', 'Snow White'),
     ('pg', 'Photon Gray'),
 ]
 
 POPULAR_TAGS = 10
 
 ENABLE_CAPTCHA = False
 # if user tries to post before CAPTCHA_DEFAULT_SAFE_TIME. Captcha will be shown
 CAPTCHA_DEFAULT_SAFE_TIME = 30  # seconds
 POSTING_DELAY = 20  # seconds
 
 COMPRESS_HTML = True
 
 # Debug mode middlewares
 if DEBUG:
     MIDDLEWARE_CLASSES += (
         'boards.profiler.ProfilerMiddleware',
         'debug_toolbar.middleware.DebugToolbarMiddleware',
     )
 
     def custom_show_toolbar(request):
         return DEBUG
 
     DEBUG_TOOLBAR_CONFIG = {
         'INTERCEPT_REDIRECTS': False,
         'SHOW_TOOLBAR_CALLBACK': custom_show_toolbar,
         'HIDE_DJANGO_SQL': False,
         'ENABLE_STACKTRACES': True,
     }
 
     # FIXME Uncommenting this fails somehow. Need to investigate this
     #DEBUG_TOOLBAR_PANELS += (
     #    'debug_toolbar.panels.profiling.ProfilingDebugPanel',
     #)
 

requirements.txt

@@ -1,10 +1,10 b''
+south>=0.8.4
 line_profiler
 haystack
 pillow
 django>=1.6
 django_cleanup
 django-markupfield
-markdown
-python-markdown
 django-simple-captcha
 line-profiler
+bbcode