Explorar o código

401, 404 문구 커스텀 기능

Surplus_Up (2DU) %!s(int64=6) %!d(string=hai) anos
pai
achega
e35c9077d7
Modificáronse 5 ficheiros con 31 adicións e 5 borrados
  1. 2 0
      language/en-US.json
  2. 3 1
      language/ko-KR.json
  3. 11 1
      route/setting.py
  4. 14 2
      route/view_read.py
  5. 1 1
      version.json

+ 2 - 0
language/en-US.json

@@ -217,6 +217,8 @@
                 "email_insert_text" : "Email input box text",
                 "password_search_text" : "Password finder text",
                 "reset_user_text" : "Password reset complete text",
+                "error_401" : "ACL view limited document notice",
+                "error_404" : "Missing document notice",
             "_comment_2.2.4_" : "Google",
                 "recaptcha" : "reCAPTCHA",
                 "google_imap" : "Google IMAP",

+ 3 - 1
language/ko-KR.json

@@ -287,5 +287,7 @@
     "email_error" : "이런 이메일을 가진 사용자가 없습니다.",
     "regex_error" : "정규표현식에 오류가 있습니다.",
     "decument_404_error" : "이 문서는 존재하지 않습니다.",
-    "user_tool" : "사용자 도구"
+    "user_tool" : "사용자 도구",
+    "error_401" : "ACL 보기 제한 문서 문구",
+    "error_404" : "없는 문서 문구"
 }

+ 11 - 1
route/setting.py

@@ -226,7 +226,9 @@ def setting_2(conn, num):
             'email_text',
             'email_insert_text',
             'password_search_text',
-            'reset_user_text'
+            'reset_user_text',
+            'error_401',
+            'error_404'
         ]
         if flask.request.method == 'POST':
             for i in i_list:
@@ -295,6 +297,14 @@ def setting_2(conn, num):
                         <hr class=\"main_hr\">
                         <input name="''' + i_list[8] + '''" value="''' + html.escape(d_list[8]) + '''">
                         <hr class=\"main_hr\">
+                        <span>''' + load_lang('error_401') + '''</span>
+                        <hr class=\"main_hr\">
+                        <input name="''' + i_list[9] + '''" value="''' + html.escape(d_list[9]) + '''">
+                        <hr class=\"main_hr\">
+                        <span>''' + load_lang('error_404') + '''</span>
+                        <hr class=\"main_hr\">
+                        <input name="''' + i_list[10] + '''" value="''' + html.escape(d_list[10]) + '''">
+                        <hr class=\"main_hr\">
                         <button id="save" type="submit">''' + load_lang('save') + '''</button>
                     </form>
                 ''',

+ 14 - 2
route/view_read.py

@@ -107,10 +107,22 @@ def view_read_2(conn, name):
 
     if end_data == 'HTTP Request 401.3':
         response_data = 401
-        end_data = '<h2>' + load_lang('error') + '</h2><ul><li>' + load_lang('authority_error') + '</li></ul>'
+        
+        curs.execute('select data from other where name = "error_401"')
+        sql_d = curs.fetchall()
+        if sql_d and sql_d[0][0] != '':
+            end_data = '<h2>' + load_lang('error') + '</h2><ul><li>' + sql_d[0][0] + '</li></ul>'
+        else:
+            end_data = '<h2>' + load_lang('error') + '</h2><ul><li>' + load_lang('authority_error') + '</li></ul>'
     elif end_data == 'HTTP Request 404':
         response_data = 404
-        end_data = '<h2>' + load_lang('error') + '</h2><ul><li>' + load_lang('decument_404_error') + '</li></ul>'
+        
+        curs.execute('select data from other where name = "error_404"')
+        sql_d = curs.fetchall()
+        if sql_d and sql_d[0][0] != '':
+            end_data = '<h2>' + load_lang('error') + '</h2><ul><li>' + sql_d[0][0] + '</li></ul>'
+        else:
+            end_data = '<h2>' + load_lang('error') + '</h2><ul><li>' + load_lang('decument_404_error') + '</li></ul>'
     else:
         response_data = 200
     

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.2-master-04",
+        "r_ver" : "v3.1.2-master-05",
         "c_ver" : "400001",
         "s_ver" : "2"
     }, "stable" : {