소스 검색

3가지 더 추가

Surplus_Up (2DU) 7 년 전
부모
커밋
85dc3bbae5
5개의 변경된 파일58개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 0
      language/en-US.json
  2. 3 0
      language/ko-KR.json
  3. 8 1
      route/login_check_key.py
  4. 31 2
      route/login_need_email.py
  5. 13 1
      route/setting.py

+ 3 - 0
language/en-US.json

@@ -234,6 +234,9 @@
                 "Check authentication key" : "Check authentication key notice",
                 "email_title" : "Email subject",
                 "email_text" : "Email content",
+                "email_insert_text" : "Email input box text",
+                "password_search_text" : "Password finder text",
+                "reset_user_text" : "Password reset complete text",
             "_comment_2.2.4_" : "Google",
                 "recaptcha" : "reCAPTCHA",
                 "google_imap" : "Google IMAP",

+ 3 - 0
language/ko-KR.json

@@ -234,6 +234,9 @@
                 "check_key_text" : "인증키 검사 문구",
                 "email_title" : "이메일 제목",
                 "email_text" : "이메일 내용",
+                "email_insert_text" : "이메일 입력란 문구",
+                "password_search_text" : "비밀번호 찾기 문구",
+                "reset_user_text" : "암호 초기화 완료 문구",
             "_comment_2.2.4_" : "Google",
                 "recaptcha" : "reCAPTCHA",
                 "google_imap" : "Google IMAP",

+ 8 - 1
route/login_check_key.py

@@ -76,9 +76,16 @@ def login_check_key_2(conn, tool):
                 flask.session.pop('c_id', None)
                 flask.session.pop('c_key', None)
 
+                curs.execute('select data from other where name = "reset_user_text"')
+                sql_d = curs.fetchall()
+                if sql_d and sql_d[0][0] != '':
+                    b_text = sql_d[0][0] + '<hr class=\"main_hr\">'
+                else:
+                    b_text = ''
+
                 return easy_minify(flask.render_template(skin_check(),    
                     imp = [load_lang('reset_user_ok'), wiki_set(), custom(), other2([0, 0])],
-                    data = load_lang('id') + ' : ' + d_id + '<br>' + load_lang('password') + ' : ' + pw,
+                    data = b_text + load_lang('id') + ' : ' + d_id + '<br>' + load_lang('password') + ' : ' + pw,
                     menu = [['user', load_lang('return')]]
                 ))
             else:

+ 31 - 2
route/login_need_email.py

@@ -50,18 +50,40 @@ def login_need_email_2(conn, tool):
                 flask.session['c_key'] = ''.join(random.choice("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") for i in range(16))
                 flask.session['c_id'] = flask.request.form.get('id', '')
 
-                send_email(flask.request.form.get('email', ''), wiki_set()[0] + '\'s key', 'Key : ' + flask.session['c_key'])
+                curs.execute('select data from other where name = "email_title"')
+                sql_d = curs.fetchall()
+                if sql_d and sql_d[0][0] != '':
+                    t_text = html.escape(sql_d[0][0])
+                else:
+                    t_text = wiki_set()[0] + '\'s Key'
+
+                curs.execute('select data from other where name = "email_text"')
+                sql_d = curs.fetchall()
+                if sql_d and sql_d[0][0] != '':
+                    i_text = html.escape(sql_d[0][0]) + '\n\nKey : ' + flask.session['c_key']
+                else:
+                    i_text = 'Key : ' + flask.session['c_key']
+
+                send_email(flask.request.form.get('email', ''), t_text, i_text)
 
                 return redirect('/check_pass_key')
             else:
                 return re_error('/error/12')
     else:
         if tool == 'need_email':
+            curs.execute('select data from other where name = "email_insert_text"')
+            sql_d = curs.fetchall()
+            if sql_d and sql_d[0][0] != '':
+                b_text = sql_d[0][0] + '<hr class=\"main_hr\">'
+            else:
+                b_text = ''
+
             return easy_minify(flask.render_template(skin_check(),    
                 imp = [load_lang('email'), wiki_set(), custom(), other2([0, 0])],
                 data =  '''
                         <a href="/email_filter">(''' + load_lang('email_filter_list') + ''')</a>
                         <hr class=\"main_hr\">
+                        ''' + b_text + '''
                         <form method="post">
                             <input placeholder="''' + load_lang('email') + '''" name="email" type="text">
                             <hr class=\"main_hr\">
@@ -71,9 +93,16 @@ def login_need_email_2(conn, tool):
                 menu = [['user', load_lang('return')]]
             ))
         else:
+            curs.execute('select data from other where name = "password_search_text"')
+            sql_d = curs.fetchall()
+            if sql_d and sql_d[0][0] != '':
+                b_text = sql_d[0][0] + '<hr class=\"main_hr\">'
+            else:
+                b_text = ''
+
             return easy_minify(flask.render_template(skin_check(),    
                 imp = [load_lang('password_search'), wiki_set(), custom(), other2([0, 0])],
-                data =  '''
+                data =  b_text + '''
                         <form method="post">
                             <input placeholder="''' + load_lang('id') + '''" name="id" type="text">
                             <hr class=\"main_hr\">

+ 13 - 1
route/setting.py

@@ -192,7 +192,7 @@ def setting_2(conn, num):
 
             return redirect('/setting/2')
         else:
-            n_list = ['', '', '', '', '', '']
+            n_list = ['', '', '', '', '', '', '', '', '']
             d_list = []
             
             x = 0
@@ -239,6 +239,18 @@ def setting_2(conn, num):
                             <hr class=\"main_hr\">
                             <input type="text" name="email_text" value="''' + html.escape(d_list[5]) + '''">
                             <hr class=\"main_hr\">
+                            <span>''' + load_lang('email_insert_text') + '''</span>
+                            <hr class=\"main_hr\">
+                            <input type="text" name="email_insert_text" value="''' + html.escape(d_list[6]) + '''">
+                            <hr class=\"main_hr\">
+                            <span>''' + load_lang('password_search_text') + '''</span>
+                            <hr class=\"main_hr\">
+                            <input type="text" name="password_search_text" value="''' + html.escape(d_list[7]) + '''">
+                            <hr class=\"main_hr\">
+                            <span>''' + load_lang('reset_user_text') + '''</span>
+                            <hr class=\"main_hr\">
+                            <input type="text" name="reset_user_text" value="''' + html.escape(d_list[8]) + '''">
+                            <hr class=\"main_hr\">
                             <button id="save" type="submit">''' + load_lang('save') + '''</button>
                         </form>
                         ''',