Surplus_Up (2DU) 6 роки тому
батько
коміт
0b1d8557dc
3 змінених файлів з 21 додано та 17 видалено
  1. 15 14
      emergency_tool.py
  2. 3 3
      route/login_pw_change.py
  3. 3 0
      route/login_register.py

+ 15 - 14
emergency_tool.py

@@ -35,8 +35,8 @@ print('5. Change port')
 print('6. Change skin')
 print('7. Change password')
 print('8. Reset version')
-print('9. New DB create')
-print('10. Delete set.json')
+print('9. Delete set.json')
+print('10. Change name')
 
 print('----')
 print('Select : ', end = '')
@@ -98,7 +98,7 @@ elif what_i_do == '5':
     curs.execute("update other set data = ? where name = 'port'", [port])
 elif what_i_do == '6':
     print('----')
-    print('Skin\'s name : ', end = '')
+    print('Skin name : ', end = '')
     skin = input()
 
     curs.execute("update other set data = ? where name = 'skin'", [skin])
@@ -112,11 +112,11 @@ elif what_i_do == '7':
     what_i_do = int(input())
 
     print('----')
-    print('User\'s name : ', end = '')
+    print('User name : ', end = '')
     user_name = input()
 
     print('----')
-    print('User\'s password : ', end = '')
+    print('User password : ', end = '')
     user_pw = input()
 
     if what_i_do == '1':
@@ -131,19 +131,20 @@ elif what_i_do == '7':
 elif what_i_do == '8':
     curs.execute("update other set data = '00000' where name = 'ver'")
 elif what_i_do == '9':
-    print('----')
-    print('DB name (data) : ', end = '')
-    
-    db_name = input()
-    if db_name == '':
-        db_name = 'data'
-
-    sqlite3.connect(db_name + '.db', check_same_thread = False)
-elif what_i_do == '10':
     try:
         os.remove('data/set.json')
     except:
         pass
+else:
+    print('----')
+    print('User name : ', end = '')
+    user_name = input()
+
+    print('----')
+    print('New name : ', end = '')
+    new_name = input()
+
+    curs.execute("update user set id = ? where id = ?", [new_name, user_name])
 
 conn.commit()
 

+ 3 - 3
route/login_pw_change.py

@@ -24,14 +24,14 @@ def login_pw_change_2(conn):
                 flask.request.form.get('pw4', ''), 
                 user[0][0],
                 user[0][1],
-                flask.request.form.get('id', None)
+                ip
             )
             if pw_check_d != 1:
                 return re_error('/error/10')
 
             hashed = pw_encode(flask.request.form.get('pw2', None))
                 
-            curs.execute("update user set pw = ? where id = ?", [hashed, ip_check()])
+            curs.execute("update user set pw = ? where id = ?", [hashed, ip])
 
             return redirect('/user')
     else:
@@ -45,7 +45,7 @@ def login_pw_change_2(conn):
                     <hr class=\"main_hr\">
                     <input placeholder="''' + load_lang('password_confirm') + '''" name="pw3" type="password">
                     <hr class=\"main_hr\">
-                    <button type="submit">''' + load_lang('restart') + '''</button>
+                    <button type="submit">''' + load_lang('save') + '''</button>
                 </form>
             ''',
             menu = [['change', load_lang('return')]]

+ 3 - 0
route/login_register.py

@@ -22,6 +22,9 @@ def login_register_2(conn):
         else:
             captcha_post('', 0)
 
+        if flask.request.form.get('id', None) == '' or flask.request.form.get('pw', None) == '':
+            return redirect('/register')
+
         if flask.request.form.get('pw', None) != flask.request.form.get('pw2', None):
             return re_error('/error/20')