2du 4 лет назад
Родитель
Сommit
c443565d85
4 измененных файлов с 22 добавлено и 13 удалено
  1. 2 2
      route/give_user_check.py
  2. 1 1
      route/main_tool_admin.py
  3. 18 9
      route/tool/func_tool.py
  4. 1 1
      version.json

+ 2 - 2
route/give_user_check.py

@@ -29,7 +29,7 @@ def give_user_check_2(conn, name):
                     div += '''
                         <table id="main_table_set">
                             <tbody>
-                                <tr>
+                                <tr id="main_table_top_tr">
                                     <td>Q</td>
                                     <td>''' + approval_question[0][0] + '''</td>
                                     <td>A</td>
@@ -94,7 +94,7 @@ def give_user_check_2(conn, name):
             div += '''
                 <table id="main_table_set">
                     <tbody>
-                        <tr>
+                        <tr id="main_table_top_tr">
                             <td id="main_table_width">''' + load_lang('name') + '''</td>
                             <td id="main_table_width">''' + load_lang('ip') + '''</td>
                             <td id="main_table_width">''' + load_lang('time') + '''</td>

+ 1 - 1
route/main_tool_admin.py

@@ -87,7 +87,7 @@ def main_tool_admin(num = 1, add_2 = ''):
             else:
                 return redirect('/' + title_list[num][1] + '/' + url_pas(add_1))
         else:
-            if title_list[(num - 2)][0] == 0:
+            if title_list[num][0] == 0:
                 placeholder = load_lang('user_name')
             else:
                 placeholder = title_list[num][0]

+ 18 - 9
route/tool/func_tool.py

@@ -32,17 +32,26 @@ def ip_check(d_type = 0):
     ip = ''
     if d_type == 0 and (flask.session and 'id' in flask.session):
         ip = flask.session['id']
-    else:
-        ip_list = [
-            flask.request.environ.get('HTTP_X_REAL_IP', '::1'),
-            flask.request.environ.get('HTTP_X_FORWARDED_FOR', '::1'),
-            flask.request.environ.get('REMOTE_ADDR', '::1')
-        ]
-        for ip in ip_list:
+    else:    
+        for for_a in range(5):
+            if for_a == 0:
+                ip = flask.request.environ.get('HTTP_X_REAL_IP', '::1')
+            elif for_a == 1:
+                ip = flask.request.environ.get('HTTP_CLIENT_IP', '::1')
+            elif for_a == 2:
+                ip = flask.request.environ.get('HTTP_X_FORWARDED_FOR', '::1')
+            elif for_a == 3:
+                ip = flask.request.environ.get('HTTP_CF_CONNECTING_IP', '::1')
+            else:
+                ip = flask.request.environ.get('REMOTE_ADDR', '::1')
+            
             if type(ip) == type([]):
-                ip = ip[len(ip) - 1]
+                ip = ip[0]
+            else:
+                ip = ip.split(',')
+                ip = ip[0]
 
-            if not ip in ('::1', '127.0.0.1'):
+            if ip != '::1':
                 break
 
     return ip

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.3 (stable1) (beta18) (dev33)",
+        "r_ver" : "v3.4.3 (stable1) (beta19) (dev34)",
         "c_ver" : "3500101",
         "s_ver" : "3500110"
     }