뚝딱뚝딱 수정

language/en-US.json

@@ -185,6 +185,7 @@
         "edit_req" : "Edit request",
         "edit_req_check" : "Check edit request",
         "history_add" : "Add history",
+        "all_register_num" : "The number of application forms",
         "_comment_2.1_" : "Filter",
             "_comment_2.1.1_" : "List",
                 "interwiki_list" : "Interwiki(s) list",

language/ko-KR.json

@@ -329,5 +329,6 @@
     "approval_question_visible_only_when_approval_on" : "회원가입 질문은 가입시 승인필요 설정이 활성화됐을때만 보여집니다.",
     "no_applications_now" : "회원가입 신청이 없습니다.",
     "application_not_found" : "존재하지 않는 회원가입 신청입니다.",
-    "approval_requirement_disabled": "현재 가입시 승인필요 설정이 비활성화되어있습니다. 필요시 설정에서 활성화할 수 있습니다."
+    "approval_requirement_disabled": "현재 가입시 승인필요 설정이 비활성화되어있습니다. 필요시 설정에서 활성화할 수 있습니다.",
+    "all_register_num" : "모든 가입 신청자의 수"
 }

route/applications.py

@@ -17,9 +17,9 @@ def applications_2(conn):
     if flask.request.method == 'GET':
         curs.execute(db_change('select id, date, question, answer, token, email from user_application'))
         db_data = curs.fetchall()
-        
         if db_data:
-            div += '<p>총 ' + str(len(db_data)) + ' 개의 가입신청이 있습니다.</p><br>'
+            div += '<p>' + load_lang('all_register_num') + ' : ' + str(len(db_data)) + '</p><br>'
+
             for application in db_data:
                 question = application[2]
                 answer = application[3]
@@ -75,10 +75,20 @@ def applications_2(conn):
             if curs.fetchall():
                 return re_error('/error/6')
             
-            curs.execute(db_change("insert into user (id, pw, acl, date, encode) values (?, ?, 'user', ?, ?)"), [application[0], application[1], application[2], application[3]])
+            curs.execute(db_change("insert into user (id, pw, acl, date, encode) values (?, ?, 'user', ?, ?)"), [
+                application[0], 
+                application[1], 
+                application[2], 
+                application[3]
+            ])
             curs.execute(db_change("insert into user_set (name, id, data) values ('approval_question', ?, ?)"), [application[0], application[4]])
             curs.execute(db_change("insert into user_set (name, id, data) values ('approval_question_answer', ?, ?)"), [application[0], application[5]])
-            curs.execute(db_change("insert into ua_d (name, ip, ua, today, sub) values (?, ?, ?, ?, '')"), [application[0], application[6], application[7], application[2]])
+            curs.execute(db_change("insert into ua_d (name, ip, ua, today, sub) values (?, ?, ?, ?, '')"), [
+                application[0], 
+                application[6], 
+                application[7], 
+                application[2]
+            ])
             if application[8] and application[8] != '':
                 curs.execute(db_change("insert into user_set (name, id, data) values ('email', ?, ?)"), [application[0], application[8]])
             curs.execute(db_change('delete from user_application where token = ?'), [flask.request.form.get('approve', '')])
@@ -88,6 +98,7 @@ def applications_2(conn):
         elif flask.request.form.get('decline', '') != '':
             curs.execute(db_change('delete from user_application where token = ?'), [flask.request.form.get('decline', '')])
             conn.commit()
+
         return redirect('/applications')
 
     return easy_minify(flask.render_template(skin_check(),

route/give_user_check.py

@@ -18,24 +18,28 @@ def give_user_check_2(conn, name):
     else:
         sql_num = 0
 
-    approval_question_div = ''
     if ip_or_user(name) == 0:
         curs.execute(db_change("select data from user_set where name = \"approval_question\" and id = ?"), [name])
         approval_question = curs.fetchall()
         if approval_question and approval_question[0][0]:
-            approval_question = approval_question[0][0]
-            approval_question_div = '''<table>
-            <thead>
-            <tr><td colspan="2">회원가입 질문</td></tr>
-            </thead>
-            <tbody>
-            <tr><td>질문</td><td>''' + approval_question + '''
-            '''
             curs.execute(db_change("select data from user_set where name = \"approval_question_answer\" and id = ?"), [name])
             approval_question_answer = curs.fetchall()
             if approval_question_answer and approval_question_answer[0]:
-                approval_question_div += '<tr><td>답변</td><td>' + approval_question_answer[0][0] + '</td></tr>'
-            approval_question_div += '</tbody></table><br>'
+                div = '''
+                    <table id="main_table_set">
+                        <tbody>
+                            <tr>
+                                <td>Q</td>
+                                <td>''' + approval_question[0][0] + '''</td>
+                                <td>A</td>
+                                <td>''' + approval_question_answer[0][0] + '''</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <hr class=\"main_hr\">
+                '''
+    else:
+        div = ''
 
     if flask.request.args.get('plus', None):
         end_check = 1
@@ -61,19 +65,19 @@ def give_user_check_2(conn, name):
     record = curs.fetchall()
     if record:
         if not flask.request.args.get('plus', None):
-            div = '<a href="/manager/14?plus=' + url_pas(name) + '">(' + load_lang('compare') + ')</a><hr class=\"main_hr\">'
+            div = '<a href="/manager/14?plus=' + url_pas(name) + '">(' + load_lang('compare') + ')</a><hr class=\"main_hr\">' + div
         else:
-            div = '<a href="/check/' + url_pas(name) + '">(' + name + ')</a> <a href="/check/' + url_pas(flask.request.args.get('plus', None)) + '">(' + flask.request.args.get('plus', None) + ')</a><hr class=\"main_hr\">'
+            div = '<a href="/check/' + url_pas(name) + '">(' + name + ')</a> <a href="/check/' + url_pas(flask.request.args.get('plus', None)) + '">(' + flask.request.args.get('plus', None) + ')</a><hr class=\"main_hr\">' + div
 
-        div +=  approval_question_div + '''
-                <table id="main_table_set">
-                    <tbody>
-                        <tr>
-                            <td id="main_table_width">''' + load_lang('name') + '''</td>
-                            <td id="main_table_width">ip</td>
-                            <td id="main_table_width">''' + load_lang('time') + '''</td>
-                        </tr>
-                '''
+        div += '''
+            <table id="main_table_set">
+                <tbody>
+                    <tr>
+                        <td id="main_table_width">''' + load_lang('name') + '''</td>
+                        <td id="main_table_width">ip</td>
+                        <td id="main_table_width">''' + load_lang('time') + '''</td>
+                    </tr>
+        '''
 
         for data in record:
             if data[2]:

route/login_check_key.py

@@ -54,7 +54,9 @@ def login_check_key_2(conn, tool):
                         requires_approval = curs.fetchall()
                         if requires_approval and requires_approval[0][0] == 'on':
                             application_token = ''.join(random.choice("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") for i in range(60))
-                            curs.execute(db_change("insert into user_application (id, pw, date, encode, question, answer, token, ip, ua, email) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"), [
+                            curs.execute(db_change(
+                                "insert into user_application (id, pw, date, encode, question, answer, token, ip, ua, email) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
+                            ), [
                                 flask.session['c_id'],
                                 flask.session['c_pw'],
                                 get_time(),

route/login_register.py

@@ -77,14 +77,32 @@ def login_register_2(conn):
 
             curs.execute(db_change("select id from user limit 1"))
             if not curs.fetchall():
-                curs.execute(db_change("insert into user (id, pw, acl, date, encode) values (?, ?, 'owner', ?, ?)"), [flask.request.form.get('id', None), hashed, get_time(), db_data[0][0]])
+                curs.execute(db_change("insert into user (id, pw, acl, date, encode) values (?, ?, 'owner', ?, ?)"), [
+                    flask.request.form.get('id', None), 
+                    hashed, 
+                    get_time(), 
+                    db_data[0][0]
+                ])
 
                 first = 1
             else:
                 if requires_approval:
                     application_token = ''.join(random.choice("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") for i in range(60))
-                    curs.execute(db_change("insert into user_application (id, pw, date, encode, question, answer, token, ip, ua, email) values (?, ?, ?, ?, ?, ?, ?, ?, ?, '')"), [flask.request.form.get('id', None), hashed, get_time(), db_data[0][0], approval_question, flask.request.form.get('approval_question_answer', None), application_token, ip_check(), flask.request.headers.get('User-Agent')])
+                    curs.execute(db_change(
+                        "insert into user_application (id, pw, date, encode, question, answer, token, ip, ua, email) values (?, ?, ?, ?, ?, ?, ?, ?, ?, '')"
+                    ), [
+                        flask.request.form.get('id', None), 
+                        hashed, 
+                        get_time(), 
+                        db_data[0][0], 
+                        approval_question, 
+                        flask.request.form.get('approval_question_answer', None), 
+                        application_token, 
+                        ip_check(), 
+                        flask.request.headers.get('User-Agent')
+                    ])
                     conn.commit()
+                    
                     return redirect('/application_submitted')
                 else:
                     curs.execute(db_change("insert into user (id, pw, acl, date, encode) values (?, ?, 'user', ?, ?)"), [flask.request.form.get('id', None), hashed, get_time(), db_data[0][0]])
@@ -115,8 +133,6 @@ def login_register_2(conn):
             contract = data[0][0] + '<hr class=\"main_hr\">'
 
         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"'))
@@ -126,29 +142,30 @@ def login_register_2(conn):
             curs.execute(db_change('select data from other where name = "approval_question"'))
             data = curs.fetchall()
             if data and data[0][0] != '':
-                approval_question = '''<hr class=\"main_hr\">
-                <span>''' + load_lang('approval_question') + ' : ' + data[0][0] + '''<span>
-                <hr class=\"main_hr\">
-                <input placeholder="''' + load_lang('approval_question') + '''" name="approval_question_answer" type="text">
-                <hr class=\"main_hr\">
+                approval_question = '''
+                    <hr class=\"main_hr\">
+                    <span>''' + load_lang('approval_question') + ' : ' + data[0][0] + '''<span>
+                    <hr class=\"main_hr\">
+                    <input placeholder="''' + load_lang('approval_question') + '''" name="approval_question_answer" type="text">
+                    <hr class=\"main_hr\">
                 '''
 
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('register'), wiki_set(), custom(), other2([0, 0])],
-            data =  '''
-                    <form method="post">
-                        ''' + contract + '''
-                        <input placeholder="''' + load_lang('id') + '''" name="id" type="text">
-                        <hr class=\"main_hr\">
-                        <input placeholder="''' + load_lang('password') + '''" name="pw" type="password">
-                        <hr class=\"main_hr\">
-                        <input placeholder="''' + load_lang('password_confirm') + '''" name="pw2" type="password">
-                        <hr class=\"main_hr\">
-                        ''' + approval_question + '''
-                        ''' + captcha_get() + '''
-                        <button type="submit">''' + load_lang('save') + '''</button>
-                        ''' + http_warring + '''
-                    </form>
-                    ''',
+            data = '''
+                <form method="post">
+                    ''' + contract + '''
+                    <input placeholder="''' + load_lang('id') + '''" name="id" type="text">
+                    <hr class=\"main_hr\">
+                    <input placeholder="''' + load_lang('password') + '''" name="pw" type="password">
+                    <hr class=\"main_hr\">
+                    <input placeholder="''' + load_lang('password_confirm') + '''" name="pw2" type="password">
+                    <hr class=\"main_hr\">
+                    ''' + approval_question + '''
+                    ''' + captcha_get() + '''
+                    <button type="submit">''' + load_lang('save') + '''</button>
+                    ''' + http_warring + '''
+                </form>
+            ''',
             menu = [['user', load_lang('return')]]
         ))

route/main_manager.py

@@ -36,6 +36,7 @@ def main_manager_2(conn, num, r_ver):
                     <ul>
                         <li><a href="/give_log">''' + load_lang('admin_group_list') + '''</a></li>
                         <li><a href="/many_delete">''' + load_lang('many_delete') + '''</a></li>
+                        <li><a href="/applications">''' + load_lang('application_list') + '''</a></li>
                         <li><a href="/setting">''' + load_lang('setting') + '''</a></li>
                     </ul>
                     <h3>''' + load_lang('filter') + '''</h3>

route/setting.py

@@ -25,8 +25,6 @@ def setting_2(conn, num):
             x += 1
             li_data += '<li><a href="/setting/' + str(x) + '">' + li + '</a></li>'
 
-        li_data += '<li><a href="/applications">' + load_lang('application_list') + '</a></li>'
-
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('setting'), wiki_set(), custom(), other2([0, 0])],
             data = '<h2>' + load_lang('list') + '</h2><ul>' + li_data + '</ul>',
@@ -51,7 +49,6 @@ def setting_2(conn, num):
             16 : 'host',
             19 : 'slow_edit',
             20 : 'requires_approval',
-            21 : 'approval_question'
         }
         n_list = {
             0 : 'Wiki',
@@ -70,8 +67,7 @@ def setting_2(conn, num):
             15 : 'sha3',
             16 : '0.0.0.0',
             19 : '0',
-            20 : '',
-            21 : ''
+            20 : ''
         }
 
         if flask.request.method == 'POST':
@@ -195,12 +191,6 @@ def setting_2(conn, num):
                         <hr class=\"main_hr\">
                         <input name="''' + i_list[19] + '''" value="''' + html.escape(d_list[19]) + '''">
                         <hr class=\"main_hr\">
-                        <span>''' + load_lang('approval_question') + '''</span>
-                        <hr class=\"main_hr\">
-                        <input name="''' + i_list[21] + '''" value="''' + html.escape(d_list[21]) + '''">
-                        <hr class=\"main_hr\">
-                        <span>''' + load_lang('approval_question_visible_only_when_approval_on') + '''
-                        <hr class=\"main_hr\">
                         <button id="save" type="submit">''' + load_lang('save') + '''</button>
                     </form>
                 ''',
@@ -219,7 +209,8 @@ def setting_2(conn, num):
             'reset_user_text',
             'error_401',
             'error_404',
-            'edit_help'
+            'edit_help',
+            'approval_question'
         ]
         if flask.request.method == 'POST':
             for i in i_list:
@@ -300,7 +291,15 @@ def setting_2(conn, num):
                         <hr class=\"main_hr\">
                         <input name="''' + i_list[11] + '''" value="''' + html.escape(d_list[11]) + '''">
                         <hr class=\"main_hr\">
+                        <span>''' + load_lang('approval_question') + '''</span> <a href="#rfn-1" id="fn-1">(1)</a>
+                        <hr class=\"main_hr\">
+                        <input name="''' + i_list[12] + '''" value="''' + html.escape(d_list[12]) + '''">
+                        <hr class=\"main_hr\">
                         <button id="save" type="submit">''' + load_lang('save') + '''</button>
+                        <hr>
+                        <ul>
+                            <li><a href="#fn-1" id="rfn-1">(1)</a> <span>''' + load_lang('approval_question_visible_only_when_approval_on') + '''</span></li>
+                        </ul>
                     </form>
                 ''',
                 menu = [['setting', load_lang('return')]]

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.6-master-02",
+        "r_ver" : "v3.1.6-master-03",
         "c_ver" : "400008",
         "s_ver" : "7"
     }, "stable" : {