Home Explore Help
Sign In
wiki
/
openNAMU__openNAMU
mirror of https://github.com/openNAMU/openNAMU.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

fix bug and fix category blur

2du 2 years ago
parent
a013ed64e3
commit
098e74b5f1
5 changed files with 21 additions and 9 deletions
Split View Show Diff Stats
  1. 2 2
      lang/en-US.json
  2. 1 1
      lang/ko-KR.json
  3. 4 0
      route/tool/func.py
  4. 6 2
      route/tool/func_render_namumark.py
  5. 8 4
      route/view_read.py

+ 2 - 2
lang/en-US.json
View File 

@@ -570,8 +570,8 @@
 
             "error_skin_set" : "The skin you are using does not support individual settings.",
 
             "error_skin_set_old" : "Some older skins may only work by using the old version link.",
 
             "same_id_exist_error" : "There are users using the same username.",
 
-            "long_id_error" : "Username must be shorter than 32 characters.",
 
-            "id_char_error" : "Only Korean letters and alphabets and numbers are allowed for Username.",
 
+            "long_id_error" : "Username must be shorter than 128 characters.",
 
+            "id_char_error" : "XSS characters(inequality symbol, quotation marks) and . and : are not available.",
 
             "file_exist_error" : "The file does not exist.",
 
             "password_error" : "Password does not match.",
 
             "recaptcha_error" : "Pass the reCAPTCHA.",

+ 1 - 1
lang/ko-KR.json
View File 

@@ -231,7 +231,7 @@
 
     "file_name": "파일명",
 
     "close_discussion": "닫힌 토론",
 
     "language": "언어",
 
-    "id_char_error": "XSS 문자(부등호, 따옴표)는 사용 불가능합니다.",
 
+    "id_char_error": "XSS 문자(부등호, 따옴표)와 .과 :는 사용 불가능합니다.",
 
     "id_filter_add": "ID 필터 추가",
 
     "skin": "스킨",
 
     "user_head": "사용자 <HEAD>",

+ 4 - 0
route/tool/func.py
View File 

@@ -1614,6 +1614,10 @@ def do_user_name_check(user_name):
 
         if html.escape(user_name) != user_name:
 
             return 1
 
 
+        # IP와 혼동 방지 
+        if ip_or_user(user_name) == 1:
 
+            return 1
 
+
 
         # ID 필터
 
         curs.execute(db_change('select html from html_filter where kind = "name"'))
 
         set_d = curs.fetchall()

+ 6 - 2
route/tool/func_render_namumark.py
View File 

@@ -990,7 +990,6 @@ class class_do_render_namumark:
 
                     category_blur = ''
 
                     if re.search(r'#blur$', link_main, flags = re.I):
 
                         link_main = re.sub(r'#blur$', '', link_main, flags = re.I)
 
-
 
                         category_blur = 'opennamu_category_blur'
 
                     
                     link_sub = link_main
 
@@ -1013,7 +1012,12 @@ class class_do_render_namumark:
 
                             self.data_backlink += [[self.doc_name, 'category:' + link_main, 'no', '']]
 
 
                         self.data_backlink += [[self.doc_name, 'category:' + link_main, 'cat', '']]
 
-                        self.data_backlink += [[self.doc_name, 'category:' + link_main, 'cat_view', link_view]]
 
+                        
+                        if link_view != '':
 
+                            self.data_backlink += [[self.doc_name, 'category:' + link_main, 'cat_view', link_view]]
 
+                        
+                        if category_blur != '':
 
+                            self.data_backlink += [[self.doc_name, 'category:' + link_main, 'cat_blur', '']]
 
 
                         link_main = url_pas(link_main)

+ 8 - 4
route/view_read.py
View File 

@@ -41,19 +41,23 @@ def view_read(name = 'Test', doc_rev = '', doc_from = '', do_type = ''):
 
                     db_data = curs.fetchall()
 
                     if db_data and db_data[0][0] != '':
 
                         link_view = db_data[0][0]
 
+                        
+                link_blur = ''
 
+                curs.execute(db_change("select data from back where title = ? and link = ? and type = 'cat_blur' limit 1"), [name, data[0]])
 
+                db_data = curs.fetchall()
 
+                if db_data:
 
+                    link_blur = 'opennamu_category_blur'
 
 
                 if data[0].startswith('category:'):
 
-                    category_sub += '<li><a href="/w/' + url_pas(data[0]) + '">' + html.escape(link_view) + '</a></li>'
 
-
 
+                    category_sub += '<li><a class="' + link_blur + '" href="/w/' + url_pas(data[0]) + '">' + html.escape(link_view) + '</a></li>'
 
                     count_sub_category += 1
 
                 else:
 
                     category_doc += '' + \
 
                         '<li>' + \
 
-                            '<a href="/w/' + url_pas(data[0]) + '">' + html.escape(link_view) + '</a> ' + \
 
+                            '<a class="' + link_blur + '" href="/w/' + url_pas(data[0]) + '">' + html.escape(link_view) + '</a> ' + \
 
                             '<a class="opennamu_link_inter" href="/xref/' + url_pas(data[0]) + '">(' + load_lang('backlink') + ')</a>' + \
 
                         '</li>' + \
 
                     ''
 
-
 
                     count_category += 1
 
 
             if category_sub != '':