Merge branch 'duration' into 'master'

[motion.git] / motion.py

diff --git a/motion.py b/motion.py
index 51f21dee8070a233c553e3f8e45169b612e494f8..eb04effb9844d7734e69549b93532a265110b391 100644 (file)
--- a/motion.py
+++ b/motion.py
@@ -5,8 +5,6 @@ from flask import request
 import postgresql
 import filters
 
-times=[3,5,14]
-
 def get_db():
     db = getattr(g, '_database', None)
     if db is None:
@@ -22,12 +20,21 @@ app.config.from_pyfile('config.py')
 
 prefix=app.config.get("GROUP_PREFIX")
 
+times=app.config.get("DURATION")
+
+debuguser=app.config.get("DEBUGUSER")
+
 @app.before_request
 def lookup_user():
     global prefix
 
     env = request.environ
     user = None
+    if debuguser is not None:
+        parts =debuguser[request.host].split("/", 1)
+        user = parts[0]
+        roles = parts[1]
+
     if "USER_ROLES" in env:
         parts = env.get("USER_ROLES").split("/", 1)
         user = parts[0]
@@ -145,7 +152,7 @@ def main():
             prev = rs[9][0]
         else:
             prev = -1
-    return render_template('index.html', motions=rv[:10], more=rv[10]["id"] if len(rv) == 11 else None, times=times, prev=prev,
+    return render_template('index.html', motions=rv[:10], more=rv[10]["id"] if len(rv) == 11 else None, times=times[request.host], prev=prev,
                            categories=get_allowed_cats("create"))
 
 def rel_redirect(loc):
@@ -159,7 +166,7 @@ def put_motion():
     if cat not in get_allowed_cats("create"):
         return "Forbidden", 403
     time = int(request.form.get("days", "3"));
-    if time not in times:
+    if time not in times[request.host]:
         return "Error, invalid length", 500
     db = get_db()
     with db.xact():