rewrite \r\n instead of \n

[cavote.git] / main.py

diff --git a/main.py b/main.py
index 6b391c3..21a7500 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -92,6 +92,8 @@ def login():
         else:
             connect_user(user)
             flash(u'Vous êtes connecté. Bienvenue, %s !' % user['name'], 'success')
+            if request.args.get('continue'):
+                return redirect(request.args['continue'])
             return redirect(url_for('home'))
     return render_template('login.html')
 
@@ -99,6 +101,8 @@ def login():
 def logout():
     disconnect_user()
     flash(u'Vous avez été déconnecté.', 'info')
+    if request.args.get('continue') and not "admin" in request.args.get('continue'):
+        return redirect(request.args['continue'])
     return redirect(url_for('home'))
 
 #-----------------
@@ -120,7 +124,7 @@ def password_lost():
                 "From: %s" % EMAIL,
                 "To: %s" % user['email'],
                 "Subject: [Cavote] Password lost",
-                "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()),
+                "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'),
                 "X-Mailer: %s" % VERSION,
                 "",
                 "You have lost your password.",
@@ -250,7 +254,7 @@ def admin_user_add():
                             "From: %s" % EMAIL,
                             "To: %s" % user['email'],
                             "Subject: [Cavote] Welcome",
-                            "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()),
+                            "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'),
                             "X-Mailer: %s" % VERSION,
                             "",
                             "Hi %s!" % user['name'],