sh4nks 10 years ago
parent
commit
a1d25c01e3
3 changed files with 10 additions and 8 deletions
  1. 3 4
      flaskbb/utils/helpers.py
  2. 7 3
      flaskbb/utils/permissions.py
  3. 0 1
      flaskbb/utils/populate.py

+ 3 - 4
flaskbb/utils/helpers.py

@@ -36,7 +36,6 @@ def slugify(text, delim=u'-'):
    :param text: The text which should be slugified
    :param delim: Default "-". The delimeter for whitespace
     """
-
     text = unidecode.unidecode(text)
     result = []
     for word in _punct_re.split(text.lower()):
@@ -158,6 +157,7 @@ def forum_is_unread(forum, forumsread, user):
         return forum.last_post.date_created > read_cutoff
 
     try:
+        # A user has never marked a forum as cleared
         return forumsread.cleared < forum.last_post.date_created
     except TypeError:
         return forumsread.last_read < forum.last_post.date_created
@@ -327,7 +327,6 @@ def time_delta_format(dt, default=None):
     note: when Babel1.0 is released, use format_timedelta/timedeltaformat
           instead
     """
-
     if default is None:
         default = 'just now'
 
@@ -359,8 +358,8 @@ def time_delta_format(dt, default=None):
 def format_quote(post):
     """Returns a formatted quote depending on the markup language.
 
-    :param post: The quoted post."""
-
+    :param post: The quoted post.
+    """
     if flaskbb_config['MARKUP_TYPE'] == 'markdown':
         profile_url = url_for('user.profile', username=post.username)
         content = "\n> ".join(post.content.strip().split('\n'))

+ 7 - 3
flaskbb/utils/permissions.py

@@ -27,8 +27,10 @@ def check_perm(user, perm, forum, post_user_id=None):
     """
     if can_moderate(user=user, forum=forum):
         return True
+
     if post_user_id and user.is_authenticated():
         return user.permissions[perm] and user.id == post_user_id
+
     return not user.permissions['banned'] and user.permissions[perm]
 
 
@@ -95,24 +97,25 @@ def can_moderate(user, forum=None, perm=None):
 def can_edit_post(user, post):
     """Check if the post can be edited by the user"""
     topic = post.topic
+
     if can_moderate(user, topic.forum):
         return True
+
     if topic.locked or topic.forum.locked:
         return False
+
     return check_perm(user=user, perm='editpost', forum=post.topic.forum,
                       post_user_id=post.user_id)
 
 
 def can_delete_post(user, post):
     """Check if the post can be deleted by the user"""
-
     return check_perm(user=user, perm='deletepost', forum=post.topic.forum,
                       post_user_id=post.user_id)
 
 
 def can_delete_topic(user, topic):
     """Check if the topic can be deleted by the user"""
-
     return check_perm(user=user, perm='deletetopic', forum=topic.forum,
                       post_user_id=topic.user_id)
 
@@ -121,14 +124,15 @@ def can_post_reply(user, topic):
     """Check if the user is allowed to post in the forum"""
     if can_moderate(user, topic.forum):
         return True
+
     if topic.locked or topic.forum.locked:
         return False
+
     return check_perm(user=user, perm='postreply', forum=topic.forum)
 
 
 def can_post_topic(user, forum):
     """Checks if the user is allowed to create a new topic in the forum"""
-
     return check_perm(user=user, perm='posttopic', forum=forum)
 
 

+ 0 - 1
flaskbb/utils/populate.py

@@ -139,7 +139,6 @@ def create_welcome_forum():
     This will create the `welcome forum` that nearly every
     forum software has after the installation process is finished
     """
-
     if User.query.count() < 1:
         raise "You need to create the admin user first!"