Added login and logout for moderators

boards/views/login.py

@@ -0,0 +1,33 b''
+from django.shortcuts import render, redirect
+
+from boards.abstracts.settingsmanager import SettingsManager, \
+    PERMISSION_MODERATE
+from boards.forms import LoginForm, PlainErrorList
+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():
+            settings_manager = SettingsManager(request.session)
+            settings_manager.add_permission(PERMISSION_MODERATE)
+            return redirect('index')
+        else:
+            return self.get(request, form)

boards/views/logout.py

@@ -0,0 +1,24 b''
+from django.shortcuts import render
+
+from boards.abstracts.settingsmanager import SettingsManager, \
+    PERMISSION_MODERATE
+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 = SettingsManager(request.session)
+        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/abstracts/settingsmanager.py

@@ -52,7 +52,15 b' class SettingsManager:'
         if not permissions:
             permissions = [permission]
         else:
-            permissions += permission
+            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):

boards/forms.py

@@ -278,12 +278,6 b' class SettingsForm(NeboardForm):'
                               label=_('Theme'))
 
 
-class ModeratorSettingsForm(SettingsForm):
-
-    moderate = forms.BooleanField(required=False, label=_('Enable moderation '
-                                                          'panel'))
-
-
 class AddTagForm(NeboardForm):
 
     tag = forms.CharField(max_length=TAG_MAX_LENGTH, label=LABEL_TAG)
@@ -305,4 +299,44 b' class AddTagForm(NeboardForm):'
 
 
 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

@@ -7,7 +7,7 b' 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-05 18:10+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"
@@ -18,19 +18,19 b' msgstr ""'
 "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 "дизайнер"
 
@@ -62,7 +62,7 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xba\xd1\x81\xd1\x82"'
 msgid "Tag"
 msgstr "Тег"
 
-#: forms.py:32 templates/boards/base.html:50 templates/search/search.html:9
+#: forms.py:32 templates/boards/base.html:54 templates/search/search.html:9
 #: templates/search/search.html.py:13
 msgid "Search"
 msgstr "Поиск"
@@ -71,59 +71,55 b' msgstr "\xd0\x9f\xd0\xbe\xd0\xb8\xd1\x81\xd0\xba"'
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:113
+#: forms.py:114
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:124
+#: forms.py:125
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:133
+#: forms.py:134
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:144
+#: forms.py:145
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:179
+#: forms.py:180
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:202
+#: forms.py:200
 #, 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:216 templates/boards/tags.html:7 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: forms.py:225 forms.py:344
+#: forms.py:223 forms.py:291
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
-#: forms.py:253 forms.py:274
+#: forms.py:251 forms.py:272
 msgid "Captcha validation failed"
 msgstr "Проверка капчи провалена"
 
-#: forms.py:280
+#: forms.py:278
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:285
-msgid "Enable moderation panel"
-msgstr "Включить панель модерации"
+#: forms.py:314
+msgid "Invalid master password"
+msgstr "Неверный мастер-пароль"
 
-#: forms.py:300
-msgid "No such user found"
-msgstr "Данный пользователь не найден"
-
-#: forms.py:314
+#: forms.py:328
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
@@ -168,17 +164,21 b' msgstr "\xd0\xa3\xd0\xbf\xd1\x80\xd0\xb0\xd0\xb2\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5 \xd1\x82\xd0\xb5\xd0\xb3\xd0\xb0\xd0\xbc\xd0\xb8"'
 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 "Вверх"
 
@@ -249,7 +249,7 b' msgstr "\xd0\x9f\xd1\x80\xd0\xb5\xd0\xb4\xd1\x8b\xd0\xb4\xd1\x83\xd1\x89\xd0\xb0\xd1\x8f \xd1\x81\xd1\x82\xd1\x80\xd0\xb0\xd0\xbd\xd0\xb8\xd1\x86\xd0\xb0"'
 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 "Следующая страница"
 
@@ -278,35 +278,15 b' msgstr "\xd0\xa1\xd0\xb8\xd0\xbd\xd1\x82\xd0\xb0\xd0\xba\xd1\x81\xd0\xb8\xd1\x81 \xd1\x82\xd0\xb5\xd0\xba\xd1\x81\xd1\x82\xd0\xb0"'
 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
+#: templates/boards/settings.html:20
 msgid "Hidden tags:"
 msgstr "Скрытые теги:"
 
-#: templates/boards/settings.html:44
+#: templates/boards/settings.html:35
 msgid "Save"
 msgstr "Сохранить"
 
@@ -385,8 +365,4 b' msgstr "\xd0\x9f\xd0\xb5\xd1\x80\xd0\xb5\xd0\xb4 \xd1\x8d\xd1\x82\xd0\xb8\xd0\xbc\xd0\xb8 \xd1\x82\xd0\xb5\xd0\xb3\xd0\xb0\xd0\xbc\xd0\xb8 \xd0\xbd\xd1\x83\xd0\xb6\xd0\xbd\xd0\xb0 \xd0\xbd\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x8f \xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xba\xd0\xb0:"'
 
 #: templates/boards/staticpages/help.html:18
 msgid "Comment"
-msgstr "Комментарий"
-
-#: templates/search/search.html:30
-msgid "No results found."
-msgstr "Результаты не найдены."
+msgstr "Комментарий"
  No newline at end of file

boards/settings.py

@@ -17,4 +17,7 b' 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/templates/boards/base.html

@@ -46,6 +46,11 b''
 
 <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 %}

boards/urls.py

@@ -2,7 +2,7 b' from django.conf.urls import patterns, u'
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views import api, tag_threads, all_threads, \
-        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
@@ -22,6 +22,10 b" urlpatterns = patterns('',"
     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/views/settings.py

@@ -1,12 +1,9 b''
 from django.db import transaction
 from django.shortcuts import render, redirect
-from boards import utils
-from boards.abstracts.settingsmanager import SettingsManager, \
-    PERMISSION_MODERATE
+from boards.abstracts.settingsmanager import SettingsManager
 
 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
 
 
 class SettingsView(BaseBoardView):
@@ -14,16 +11,9 b' class SettingsView(BaseBoardView):'
     def get(self, request):
         context = self.get_context_data(request=request)
         settings_manager = SettingsManager(request.session)
-        is_moderator = settings_manager.has_permission(PERMISSION_MODERATE)
 
         selected_theme = settings_manager.get_theme()
 
-        if is_moderator:
-            form = ModeratorSettingsForm(initial={
-                'theme': selected_theme,
-                'moderate': settings_manager.has_permission(PERMISSION_MODERATE)
-            }, error_class=PlainErrorList)
-        else:
             form = SettingsForm(initial={'theme': selected_theme},
                                 error_class=PlainErrorList)
 
@@ -33,13 +23,8 b' class SettingsView(BaseBoardView):'
 
     def post(self, request):
         settings_manager = SettingsManager(request.session)
-        is_moderator = settings_manager.has_permission(PERMISSION_MODERATE)
 
         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():
@@ -47,9 +32,4 b' class SettingsView(BaseBoardView):'
 
                 settings_manager.set_theme(selected_theme)
 
-                if is_moderator:
-                    moderate = form.cleaned_data['moderate']
-                    if moderate == 'True':
-                        settings_manager.add_permission(PERMISSION_MODERATE)
-
             return redirect('settings')