Surplus_Up (2DU) 7 年 前
コミット
3fb2f13344
3 ファイル変更19 行追加19 行削除
  1. 14 14
      app.py
  2. 3 3
      func.py
  3. 2 2
      set_mark/tool.py

+ 14 - 14
app.py

@@ -2512,15 +2512,15 @@ def login():
         if not bcrypt.checkpw(bytes(flask.request.form.get('pw', None), 'utf-8'), bytes(user[0][0], 'utf-8')):
             return re_error('/error/10')
 
-        flask.session['Now'] = 1
-        flask.session['DREAMER'] = flask.request.form.get('id', None)
+        flask.session['state'] = 1
+        flask.session['id'] = flask.request.form.get('id', None)
         
         curs.execute("select css from custom where user = ?", [flask.request.form.get('id', None)])
         css_data = curs.fetchall()
         if css_data:
-            flask.session['Daydream'] = css_data[0][0]
+            flask.session['head'] = css_data[0][0]
         else:
-            flask.session['Daydream'] = ''
+            flask.session['head'] = ''
         
         curs.execute("insert into ua_d (name, ip, ua, today, sub) values (?, ?, ?, ?, '')", [flask.request.form.get('id', None), ip, agent, get_time()])
         conn.commit()
@@ -2563,7 +2563,7 @@ def change_password():
                 if flask.request.form.get('pw2', None) != flask.request.form.get('pw3', None):
                     return re_error('/error/20')
 
-                curs.execute("select pw from user where id = ?", [flask.session['DREAMER']])
+                curs.execute("select pw from user where id = ?", [flask.session['id']])
                 user = curs.fetchall()
                 if not user:
                     return re_error('/error/10')
@@ -2573,7 +2573,7 @@ def change_password():
 
                 hashed = bcrypt.hashpw(bytes(flask.request.form.get('pw2', None), 'utf-8'), bcrypt.gensalt())
                 
-                curs.execute("update user set pw = ? where id = ?", [hashed.decode(), flask.session['DREAMER']])
+                curs.execute("update user set pw = ? where id = ?", [hashed.decode(), flask.session['id']])
 
             auto_list = ['email', 'skin', 'lang']
 
@@ -2764,9 +2764,9 @@ def register():
 
             first = 0
 
-        flask.session['Now'] = 1
-        flask.session['DREAMER'] = flask.request.form.get('id', None)
-        flask.session['Daydream'] = ''
+        flask.session['state'] = 1
+        flask.session['id'] = flask.request.form.get('id', None)
+        flask.session['head'] = ''
 
         ip = ip_check()
         agent = flask.request.headers.get('User-Agent')
@@ -2808,8 +2808,8 @@ def register():
             
 @app.route('/logout')
 def logout():
-    flask.session['Now'] = 0
-    flask.session.pop('DREAMER', None)
+    flask.session['state'] = 0
+    flask.session.pop('id', None)
 
     return redirect('/user')
     
@@ -3710,7 +3710,7 @@ def custom_head_view():
             
             conn.commit()
 
-        flask.session['MyMaiToNight'] = flask.request.form.get('content', None)
+        flask.session['head'] = flask.request.form.get('content', None)
 
         return redirect('/user')
     else:
@@ -3726,8 +3726,8 @@ def custom_head_view():
         else:
             start = '<span>' + load_lang('user_head_warring') + '</span><hr>'
             
-            if 'MyMaiToNight' in flask.session:
-                data = flask.session['MyMaiToNight']
+            if 'head' in flask.session:
+                data = flask.session['head']
             else:
                 data = ''
 

+ 3 - 3
func.py

@@ -429,12 +429,12 @@ def ip_pas(raw_ip):
     return ip
 
 def custom():
-    if 'MyMaiToNight' in flask.session:
-        user_head = flask.session['MyMaiToNight']
+    if 'head' in flask.session:
+        user_head = flask.session['head']
     else:
         user_head = ''
 
-    if 'Now' in flask.session and flask.session['Now'] == 1:
+    if 'state' in flask.session and flask.session['state'] == 1:
         curs.execute('select name from alarm where name = ? limit 1', [ip_check()])
         if curs.fetchall():
             user_icon = 2

+ 2 - 2
set_mark/tool.py

@@ -8,8 +8,8 @@ def get_time():
     return str(datetime.datetime.today().strftime("%Y-%m-%d %H:%M:%S"))
     
 def ip_check():
-    if flask.session and ('Now' and 'DREAMER') in flask.session and flask.session['Now'] == 1:
-        ip = flask.session['DREAMER']
+    if flask.session and ('state' and 'id') in flask.session and flask.session['state'] == 1:
+        ip = flask.session['id']
     else:
         try:
             ip = flask.request.environ.get('HTTP_X_REAL_IP', flask.request.environ.get('HTTP_X_FORWARDED_FOR', flask.request.remote_addr))