user set

route/user_setting.py

@@ -11,30 +11,32 @@ def user_setting_2(conn, server_init):
 
     if ip_or_user(ip) == 0:
         if flask.request.method == 'POST':
-            pass_list = ['2fa']
-            auto_list = ['skin', 'lang'] + pass_list + ['2fa_pw', '2fa_pw_encode']
-
+            auto_list = [
+                ['skin', flask.request.form.get('skin', '')], 
+                ['lang', flask.request.form.get('lang', '')]
+            ]
+                
+            twofa_turn_on = 0 
+            twofa_on = flask.request.form.get('2fa', '')
+            if twofa_on != '':
+                twofa_turn_on = 1
+                twofa_pw = flask.request.form.get('2fa_pw', '')
+                if twofa_pw != '':
+                    twofa_pw = pw_encode(twofa_pw)
+                    curs.execute(db_change("select encode from user where id = ?"), [ip])
+                    twofa_encode = curs.fetchall()[0][0]
+                    auto_list += [['2fa', 'on'], ['2fa_pw', twofa_pw], ['2fa_pw_encode', twofa_encode]]
+                else:
+                    auto_list += [['2fa', 'on']]
+            else:
+                auto_list += [['2fa', '']]
+                
             for auto_data in auto_list:
-                if auto_data == '2fa_pw':
-                    if flask.request.form.get('2fa_pw', '') != '':
-                        get_data = pw_encode(flask.request.form.get(auto_data, ''))
-                    else:
-                        get_data = ''
-                elif auto_data == '2fa_pw_encode':
-                    if flask.request.form.get('2fa_pw', '') != '':
-                        curs.execute(db_change("select encode from user where id = ?"), [ip])
-                        get_data = curs.fetchall()[0][0]
-                    else:
-                        get_data = ''
+                curs.execute(db_change('select data from user_set where name = ? and id = ?'), [auto_data[0], ip])
+                if curs.fetchall():
+                    curs.execute(db_change("update user_set set data = ? where name = ? and id = ?"), [auto_data[1], auto_data[0], ip])
                 else:
-                    get_data = flask.request.form.get(auto_data, '')
-
-                if auto_data in pass_list or get_data != '':
-                    curs.execute(db_change('select data from user_set where name = ? and id = ?'), [auto_data, ip])
-                    if curs.fetchall():
-                        curs.execute(db_change("update user_set set data = ? where name = ? and id = ?"), [get_data, auto_data, ip])
-                    else:
-                        curs.execute(db_change("insert into user_set (name, id, data) values (?, ?, ?)"), [auto_data, ip, get_data])
+                    curs.execute(db_change("insert into user_set (name, id, data) values (?, ?, ?)"), [auto_data[0], ip, auto_data[1]])
 
             conn.commit()
 

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.2.0-stable-13 (beta-51) (dev-2021-02-21-02)",
+        "r_ver" : "v3.2.0-stable-13 (beta-52) (dev-2021-02-26-01)",
         "c_ver" : "3203400",
         "s_ver" : "11"
     }