surplus-dev 4 лет назад
Родитель
Сommit
37e276509a

+ 1 - 1
route/login_login_2fa.py

@@ -60,7 +60,7 @@ def login_login_2fa_2(conn):
             data =  '''
                     <form method="post">
                         <input placeholder="''' + load_lang('2fa_password') + '''" name="pw" type="password">
-                        <hr class=\"main_hr\">
+                        <hr class="main_hr">
                         ''' + captcha_get() + '''
                         <button type="submit">''' + load_lang('login') + '''</button>
                         ''' + http_warning() + '''

+ 1 - 1
route/main_manager.py

@@ -80,7 +80,7 @@ def main_manager_2(conn, num, r_ver):
         if flask.request.method == 'POST':
             if flask.request.args.get('plus', None):
                 return redirect(
-                    '/' + title_list[(num - 2)][1] + '/' + url_pas(flask.request.args.get('plus', 'test')) + '?plus=' + flask.request.form.get('name', 'test')
+                    '/' + title_list[(num - 2)][1] + '/' + url_pas(flask.request.args.get('plus', 'test')) + '?plus=' + url_pas(flask.request.form.get('name', 'test'))
                 )
             elif flask.request.form.get('regex', None):
                 return redirect('/' + title_list[(num - 2)][1] + '/' + url_pas(flask.request.form.get('name', 'test')) + '?type=regex')

+ 1 - 1
route/tool/func.py

@@ -84,7 +84,7 @@ if sys.version_info < (3, 6):
 global_lang = {}
 global_wiki_set = {}
 
-data_css_ver = '101'
+data_css_ver = '102'
 data_css = ''
 
 conn = ''

+ 12 - 2
route/user_setting.py

@@ -64,7 +64,15 @@ def user_setting_2(conn, server_init):
 
             curs.execute(db_change('select data from user_set where name = "2fa" and id = ?'), [ip])
             fa_data = curs.fetchall()
-            fa_data = 'checked' if fa_data and fa_data[0][0] != '' else ''
+            fa_data = fa_data[0][0] if fa_data and fa_data[0][0] != '' else ''
+            fa_data_select = ''
+            fa_data_sp_list = [['off', ''], ['pw', 'on']]
+            for fa_data_get in fa_data_sp_list:
+                fa_data_selected = ''
+                if fa_data == fa_data_get[1]:
+                    fa_data_selected = 'selected'
+                
+                fa_data_select += '<option ' + fa_data_selected + ' value="' + fa_data_get[1] + '">' + fa_data_get[0] + '</option>'
 
             curs.execute(db_change('select data from user_set where name = "2fa_pw" and id = ?'), [ip])
             fa_data_pw = curs.fetchall()
@@ -89,7 +97,9 @@ def user_setting_2(conn, server_init):
                         <hr class="main_hr">
                         <select name="lang">''' + div3 + '''</select>
                         <h2>''' + load_lang('2fa') + '''</h2>
-                        <input type="checkbox" id="twofa_check_input" onclick="do_twofa_check(0);" name="2fa" value="on" ''' + fa_data + '''> ''' + load_lang('on') + '''
+                        <select name="2fa"
+                                id="twofa_check_input"
+                                onchange="do_twofa_check(0);">''' + fa_data_select + '''</select>
                         <div id="fa_plus_content">
                             <hr class="main_hr">
                             <input type="password" name="2fa_pw" placeholder="''' + fa_data_pw + '''">

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.0-stable-01b (beta-01b) (dev-21.09.05-02)",
+        "r_ver" : "v3.4.0-stable-01b (beta-01b) (dev-21.09.15-01)",
         "c_ver" : "3400101",
         "s_ver" : "12"
     }

+ 7 - 10
views/main_css/file/easter_egg.html

@@ -1,6 +1,6 @@
 <div id="easter_egg"></div>
 <script>
-    var random_code = [
+    let random_code = [
         'DzjjcMNrTHU', // 상해홍차관
         'xpg2Ag-xt_c', // 죽취비상
         'IKIoAlhQV-c', // 유령악단
@@ -16,25 +16,22 @@
         'EsnW_hyI-V8', // 디자이어 드라이브
         'es9twrnfZ_Q', // 유심지의 유정천
     ];
-    var get_num = location.search.replace(/[^0-9]+/g, '');
+    let get_num = location.search.replace(/[^0-9]+/g, '');
     if(get_num !== '' && Number(get_num) < random_code.length) {
-        var random_num = Number(get_num);
+        get_num = Number(get_num);
     } else {
-        var random_num = Math.floor(Math.random() * random_code.length);
+        get_num = Math.floor(Math.random() * random_code.length);
     }
-    var random_code_select = random_code[random_num];
 
-    var i = 0;
-    var add_link = '';
-    while(i < random_code.length) {
+    let add_link = '';
+    for(let i = 0; i < random_code.length; i++) {
         add_link += '<a href="?select=' + String(i) + '">(' + String(i) + ')</a> ';
-        i += 1;
     }
 
     document.getElementById('easter_egg').innerHTML = '' +
         add_link +
         '<hr class="main_hr">' +
         '<iframe     style="width: 560px; height: 315px;" ' +
-                    'src="https://www.youtube.com/embed/' + random_code_select + '" allowfullscreen></iframe>' +
+                    'src="https://www.youtube.com/embed/' + random_code[get_num] + '" allowfullscreen></iframe>' +
         '';
 </script>

+ 9 - 2
views/main_css/js/load_something.js

@@ -54,8 +54,15 @@ function do_skin_ver_check() {
 }
 
 function do_twofa_check(init = 0) {
-    var data_check = document.getElementById('twofa_check_input').checked;
-    document.getElementById('fa_plus_content').style.display = data_check === true ? "block" : "none";
+    let twofa_option = document.getElementById('twofa_check_input');
+    let twofa_option_num = twofa_option.options.selectedIndex;
+    let twofa_select_data = twofa_option.options[twofa_option_num].value;
+    
+    if(twofa_select_data === 'on') {
+        document.getElementById('fa_plus_content').style.display = "block";
+    } else {
+        document.getElementById('fa_plus_content').style.display = "none";
+    }
 }
 
 function do_ip_pas(i = 0) {