fix bug

route/tool/func.py

@@ -971,16 +971,15 @@ def pw_encode(data, db_data_encode = ''):
 def pw_check(data, data2, type_d = 'no', id_d = ''):
     curs = conn.cursor()
 
-    curs.execute(db_change('select data from other where name = "encode"'))
-    db_data = curs.fetchall()
-
     if type_d != 'no':
         if type_d == '':
             set_data = 'sha3'
         else:
             set_data = type_d
     else:
-        set_data = db_data[0][0]
+        curs.execute(db_change('select data from other where name = "encode"'))
+        db_data = curs.fetchall()
+        set_data = db_data[0][0] if db_data and db_data[0][0] != '' else 'sha3'
 
     re_data = 1 if pw_encode(data, set_data) == data2 else 0
     if db_data[0][0] != set_data and re_data == 1 and id_d != '':

route/user_setting_pw.py

@@ -12,8 +12,8 @@ def user_setting_pw():
             return redirect('/login')
 
         if flask.request.method == 'POST':
-            user_pw = flask.request.form.get('password_new', '')
             user_pw_now = flask.request.form.get('password_now', '')
+            user_pw = flask.request.form.get('password_new', '')
             user_repeat = flask.request.form.get('password_new_repeat', '')
         
             # PW 검증
@@ -48,10 +48,7 @@ def user_setting_pw():
             if pw_check(user_pw_now, db_user_pw, db_user_encode, ip) != 1:
                 return re_error('/error/10')
 
-            curs.execute(db_change("update user_set set data = ? where id = ? and name = 'pw'"), [
-                pw_encode(new_pw), 
-                ip
-            ])
+            curs.execute(db_change("update user_set set data = ? where id = ? and name = 'pw'"), [pw_encode(user_pw), ip])
             
             conn.commit()