Separate configuration

[cavote.git] / main.py

diff --git a/main.py b/main.py
index b460113..5cc7e32 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -15,15 +15,7 @@ import hashlib
 import smtplib
 import string
 
-DATABASE = '/tmp/cavote.db'
-PASSWD_SALT = 'change this value to some random chars!'
-SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:'
-DEBUG = True
-TITLE = u"Cavote FFDN"
-EMAIL = '"' + TITLE + '"' + ' <' + u"cavote@ffdn.org" + '>'
-VERSION = "cavote 0.1.1"
-SMTP_SERVER = "127.0.0.1"
-PATTERNS = {u'Oui/Non': [u'Oui', u'Non'], u'Oui/Non/Blanc': [u'Oui', u'Non', u'Blanc'], u'Oui/Non/Peut-être': [u'Oui', u'Non', u'Peut-être']}
+from settings import *
 
 app = Flask(__name__)
 app.config.from_object(__name__)
@@ -200,8 +192,8 @@ def user_edit(userid):
     if request.method == 'POST':
         if query_db('select * from users where email=? and id!=?', [request.form['email'], userid], one=True) is None:
             if query_db('select * from users where name=? and id!=?', [request.form['name'], userid], one=True) is None:
-                g.db.execute('update users set email = ?, name = ?, organization = ? where id = ?',
-                        [request.form['email'], request.form['name'], request.form['organization'], session['user']['id']])
+                g.db.execute('update users set email = ?, openid = ?, name = ?, organization = ? where id = ?',
+                        [request.form['email'], request.form['openid'], request.form['name'], request.form['organization'], session['user']['id']])
                 g.db.commit()
                 disconnect_user()
                 user = query_db('select * from users where id=?', [userid], one=True)
@@ -334,8 +326,8 @@ def admin_user_edit(iduser):
                 admin = 0
                 if 'admin' in request.form.keys():
                     admin = 1
-                g.db.execute('update users set email = ?, name = ?, organization = ?, is_admin = ? where id = ?',
-                        [request.form['email'], request.form['name'], request.form['organization'], admin, iduser])
+                g.db.execute('update users set email = ?, name = ?, organization = ?, openid= ?, is_admin = ? where id = ?',
+                        [request.form['email'], request.form['name'], request.form['organization'], request.form['openid'], admin, iduser])
                 g.db.commit()
                 groups = request.form.getlist('groups')
                 groups.append('1')