Merge pull request #1066 from 2du/dev

mod http warring

route/login.py

@@ -47,11 +47,6 @@ def login_2(conn):
 
             return redirect('/user')
     else:
-        http_warring = '' + \
-            '<hr class="main_hr">' + \
-            '<span>' + load_lang('http_warring') + '</span>' + \
-        ''
-
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('login'), wiki_set(), custom(), other2([0, 0])],
             data =  '''
@@ -62,7 +57,7 @@ def login_2(conn):
                         <hr class=\"main_hr\">
                         ''' + captcha_get() + '''
                         <button type="submit">''' + load_lang('login') + '''</button>
-                        ''' + http_warring + '''
+                        ''' + http_warring() + '''
                     </form>
                     ''',
             menu = [['user', load_lang('return')]]

route/login_2fa.py

@@ -47,11 +47,6 @@ def login_2fa_2(conn):
 
         return redirect('/user')
     else:
-        http_warring = '' + \
-            '<hr class="main_hr">' + \
-            '<span>' + load_lang('http_warring') + '</span>' + \
-        ''
-
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('login'), wiki_set(), custom(), other2([0, 0])],
             data =  '''
@@ -60,7 +55,7 @@ def login_2fa_2(conn):
                         <hr class=\"main_hr\">
                         ''' + captcha_get() + '''
                         <button type="submit">''' + load_lang('login') + '''</button>
-                        ''' + http_warring + '''
+                        ''' + http_warring() + '''
                     </form>
                     ''',
             menu = [['user', load_lang('return')]]

route/login_register.py

@@ -90,7 +90,6 @@ def login_register_2(conn):
         data = curs.fetchall()
         contract = (data[0][0] + '<hr class="main_hr">') if data and data[0][0] != '' else ''
 
-        http_warring = '<hr class="main_hr"><span>' + load_lang('http_warring') + '</span>'
         approval_question = ''
         
         curs.execute(db_change('select data from other where name = "requires_approval"'))
@@ -123,7 +122,7 @@ def login_register_2(conn):
                     ''' + approval_question + '''
                     ''' + captcha_get() + '''
                     <button type="submit">''' + load_lang('save') + '''</button>
-                    ''' + http_warring + '''
+                    ''' + http_warrin() + '''
                 </form>
             ''',
             menu = [['user', load_lang('return')]]

route/tool/func.py

@@ -77,6 +77,17 @@ def load_conn(data):
 
     load_conn2(data)
 
+def http_warring():
+    return '''
+        <div id="http_warring_text"></div>
+        <script>
+            if(window.location.protocol !== 'https:') {
+                document.getElementById('http_warring_text').innerHTML = "''' + load_lang('http_warring') + '''";
+                document.getElementById('http_warring_text').style.margin = "10px 0px 0px 0px";
+            }
+        </script>
+    '''
+    
 def send_email(who, title, data):
     try:
         curs.execute(db_change('' + \

route/user_setting.py

@@ -66,11 +66,6 @@ def user_setting_2(conn, server_init):
             curs.execute(db_change('select data from user_set where name = "2fa_pw" and id = ?'), [ip])
             fa_data_pw = curs.fetchall()
             fa_data_pw = load_lang('2fa_password_change') if fa_data_pw else load_lang('2fa_password')
-            
-            http_warring = '' + \
-                '<hr class="main_hr">' + \
-                '<span>' + load_lang('http_warring') + '</span>' + \
-            ''
 
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('user_setting'), wiki_set(), custom(), other2([0, 0])],
@@ -95,7 +90,7 @@ def user_setting_2(conn, server_init):
                         <input type="password" name="2fa_pw" placeholder="''' + fa_data_pw + '''">
                         <hr class="main_hr">
                         <button type="submit">''' + load_lang('save') + '''</button>
-                        ''' + http_warring + '''
+                        ''' + http_warring() + '''
                     </form>
                 ''',
                 menu = [['user', load_lang('return')]]
@@ -119,13 +114,6 @@ def user_setting_2(conn, server_init):
                     div3 = '<option value="' + lang_data + '">' + see_data + '</option>' + div3
                 else:
                     div3 += '<option value="' + lang_data + '">' + see_data + '</option>'
-                    
-            http_warring = '' + \
-                '<hr class="main_hr">' + \
-                '<span>' + load_lang('http_warring') + '</span>' + \
-                '<hr class="main_hr">' + \
-                '<span>' + load_lang('user_head_warring') + '</span>' + \
-            ''
             
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('user_setting'), wiki_set(), custom(), other2([0, 0])],
@@ -143,7 +131,9 @@ def user_setting_2(conn, server_init):
                         <select name="lang">''' + div3 + '''</select>
                         <hr class="main_hr">
                         <button type="submit">''' + load_lang('save') + '''</button>
-                        ''' + http_warring + '''
+                        ''' + http_warring() + '''
+                        <hr class="main_hr">
+                        <span>''' + load_lang('user_head_warring') + '''</span>
                     </form>
                 ''',
                 menu = [['user', load_lang('return')]]

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.2.0-stable-13 (beta-49) (dev-2021-02-14-01)",
+        "r_ver" : "v3.2.0-stable-13 (beta-50) (dev-2021-02-15-01)",
         "c_ver" : "3203400",
         "s_ver" : "11"
     }