Главная Обзор Помощь
Вход
wiki
/
openNAMU__openNAMU
зеркало из https://github.com/openNAMU/openNAMU.git
2
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

Merge pull request #664 from 2du/master

버그 수정
잉여개발기 (SPDV) 7 лет назад
Родитель
f9c83c5472 02cd69a6f1
Сommit
d59872e45e
7 измененных файлов с 65 добавлено и 29 удалено
Единый вид Показать статистику Diff
  1. 5 3
      app.py
  2. 6 2
      language/en-US.json
  3. 5 1
      language/ko-KR.json
  4. 3 8
      route/api_version.py
  5. 23 7
      route/give_user_ban.py
  6. 12 8
      route/tool/func.py
  7. 11 0
      version.json

+ 5 - 3
app.py
Просмотреть файл 

@@ -8,9 +8,11 @@ for i_data in os.listdir("route"):
 
 
 
         exec("from route." + f_src + " import *")
 
         exec("from route." + f_src + " import *")
 
 
 
-r_ver = 'v3.1.0-stable-04'
 
-c_ver = '400001'
 
-s_ver = '2'
 
+version_list = json.loads(open('version.json', encoding='utf-8').read())
 
+
 
+r_ver = version_list['master']['r_ver']
 
+c_ver = version_list['master']['c_ver']
 
+s_ver = version_list['master']['s_ver']
 
 
 
 print('Version : ' + r_ver)
 
 print('Version : ' + r_ver)

+ 6 - 2
language/en-US.json
Просмотреть файл 

@@ -90,7 +90,7 @@
 
         "_comment_1.1_" : "Time",
 
         "_comment_1.1_" : "Time",
 
             "second" : "Second(s)",
 
             "second" : "Second(s)",
 
             "hour" : "Hour(s)",
 
             "hour" : "Hour(s)",
 
-            "limitless" : "No time limit",
 
+            "limitless" : "Limitless",
 
             "time" : "Time",
 
             "time" : "Time",
 
             "period" : "Period",
 
             "period" : "Period",
 
             "end" : "End",
 
             "end" : "End",
 
@@ -171,6 +171,11 @@
 
         "topic_open" : "Open discussion",
 
         "topic_open" : "Open discussion",
 
         "topic_agreement" : "Discussion agreement",
 
         "topic_agreement" : "Discussion agreement",
 
         "topic_destruction" : "Cancel discussion agreement",
 
         "topic_destruction" : "Cancel discussion agreement",
 
+        "1_day" : "1 day",
 
+        "5_day" : "5 days",
 
+        "30_day" : "30 days",
 
+        "180_day" : "180 days",
 
+        "360_day" : "360 days",
 
         "_comment_2.1_" : "Filter",
 
         "_comment_2.1_" : "Filter",
 
             "_comment_2.1.1_" : "List",
 
             "_comment_2.1.1_" : "List",
 
                 "interwiki_list" : "Interwiki(s) list",
 
                 "interwiki_list" : "Interwiki(s) list",
 
@@ -255,7 +260,6 @@
 
         "user_head_warring" : "User[s] <head> will deleted if you close the browser or sign-in",
 
         "user_head_warring" : "User[s] <head> will deleted if you close the browser or sign-in",
 
         "no_login_warring" : "Non-login status. IP is logged when working with non-login.",
 
         "no_login_warring" : "Non-login status. IP is logged when working with non-login.",
 
         "user_reset_sign" : "Your account information has changed like this.",
 
         "user_reset_sign" : "Your account information has changed like this.",
 
-        "ban_explanation" : "If the blockout period is not set, it is an indefinite block.",
 
         "update_warring" : "Manual updates are recommended if your version is 0.2 or lower than the latest version. For Windows, the contents of the route folder disappear.",
 
         "update_warring" : "Manual updates are recommended if your version is 0.2 or lower than the latest version. For Windows, the contents of the route folder disappear.",
 
         "markup_enabled" : "Markup enabled",
 
         "markup_enabled" : "Markup enabled",
 
         "_comment_3.1_" : "Error",
 
         "_comment_3.1_" : "Error",

+ 5 - 1
language/ko-KR.json
Просмотреть файл 

@@ -171,6 +171,11 @@
 
         "topic_open" : "토론 열기",
 
         "topic_open" : "토론 열기",
 
         "topic_agreement" : "토론 합의",
 
         "topic_agreement" : "토론 합의",
 
         "topic_destruction" : "토론 합의 취소",
 
         "topic_destruction" : "토론 합의 취소",
 
+        "1_day" : "1일",
 
+        "5_day" : "5일",
 
+        "30_day" : "30일",
 
+        "180_day" : "180일",
 
+        "360_day" : "360일",
 
         "_comment_2.1_" : "필터",
 
         "_comment_2.1_" : "필터",
 
             "_comment_2.1.1_" : "목록",
 
             "_comment_2.1.1_" : "목록",
 
                 "interwiki_list" : "인터위키 목록",
 
                 "interwiki_list" : "인터위키 목록",
 
@@ -255,7 +260,6 @@
 
         "user_head_warring" : "비로그인시 브라우저를 닫거나 로그인시 사용자의 <head>는 삭제됩니다.",
 
         "user_head_warring" : "비로그인시 브라우저를 닫거나 로그인시 사용자의 <head>는 삭제됩니다.",
 
         "no_login_warring" : "비로그인 상태입니다. 편집시 지금 접속한 IP 명의로 기록됩니다.",
 
         "no_login_warring" : "비로그인 상태입니다. 편집시 지금 접속한 IP 명의로 기록됩니다.",
 
         "user_reset_sign" : "사용자의 계정 정보가 다음과 같이 변경 되었습니다.",
 
         "user_reset_sign" : "사용자의 계정 정보가 다음과 같이 변경 되었습니다.",
 
-        "ban_explanation" : "차단 기간이 정해지지 않으면 무기한 차단 입니다.",
 
         "update_warring" : "최신 버전보다 0.2 버전 이상 낮은 경우 수동 업데이트를 권장 드립니다. 윈도우의 경우 route 폴더의 내용이 사라집니다.",
 
         "update_warring" : "최신 버전보다 0.2 버전 이상 낮은 경우 수동 업데이트를 권장 드립니다. 윈도우의 경우 route 폴더의 내용이 사라집니다.",
 
         "markup_enabled" : "문법 사용 가능",
 
         "markup_enabled" : "문법 사용 가능",
 
         "_comment_3.1_" : "오류",
 
         "_comment_3.1_" : "오류",

+ 3 - 8
route/api_version.py
Просмотреть файл 

@@ -6,17 +6,12 @@ def api_version_2(conn, r_ver, c_ver):
 
     n_ver = ''
 
     n_ver = ''
 
     data = None
 
     data = None
 
 
 
-    try:
 
-        if flask.request.host != 'namu.ml':
 
-            data = urllib.request.urlopen('https://namu.ml/api/version')
 
-    except:
 
-        pass
 
-
 
+    data = urllib.request.urlopen('https://raw.githubusercontent.com/2du/openNAMU/master/version.json')
 
     if data and data.getcode() == 200:
 
     if data and data.getcode() == 200:
 
         try:
 
         try:
 
             json_data = json.loads(data.read().decode())
 
             json_data = json.loads(data.read().decode())
 
-            if 'version' in json_data:
 
-                n_ver = json_data['version']
 
+            if 'master' in json_data:
 
+                n_ver = json_data['master']['r_ver']
 
         except:
 
         except:
 
             pass
 
             pass

+ 23 - 7
route/give_user_ban.py
Просмотреть файл 

@@ -52,7 +52,9 @@ def give_user_ban_2(conn, name):
 
         curs.execute("select end, why from ban where block = ?", [name])
 
         curs.execute("select end, why from ban where block = ?", [name])
 
         end = curs.fetchall()
 
         end = curs.fetchall()
 
         if end:
 
         if end:
 
-            now = load_lang('release')
 
+            main_name = name
 
+            b_now = load_lang('release')
 
+            now = '(' + b_now + ')'
 
 
 
             if end[0][0] == '':
 
             if end[0][0] == '':
 
                 data = '<ul><li>' + load_lang('limitless') + '</li>'
 
                 data = '<ul><li>' + load_lang('limitless') + '</li>'
 
@@ -69,6 +71,8 @@ def give_user_ban_2(conn, name):
 
                 data += '</ul><hr class=\"main_hr\">'
 
                 data += '</ul><hr class=\"main_hr\">'
 
         else:
 
         else:
 
             if name:
 
             if name:
 
+                main_name = name
 
+                
                 if name and re.search("^([0-9]{1,3}\.[0-9]{1,3})$", name):
 
                 if name and re.search("^([0-9]{1,3}\.[0-9]{1,3})$", name):
 
                     b_now = load_lang('band_ban')
 
                     b_now = load_lang('band_ban')
 
                 else:
 
                 else:
 
@@ -84,14 +88,30 @@ def give_user_ban_2(conn, name):
 
                 name += '<hr class=\"main_hr\">'
 
                 name += '<hr class=\"main_hr\">'
 
                 regex = ''
 
                 regex = ''
 
             else:
 
             else:
 
+                main_name = load_lang('ban')
 
                 name = '<input placeholder="' + load_lang('name_or_ip_or_regex') + '" name="name" type="text"><hr class=\"main_hr\">'
 
                 name = '<input placeholder="' + load_lang('name_or_ip_or_regex') + '" name="name" type="text"><hr class=\"main_hr\">'
 
                 regex = '<input type="checkbox" name="regex"> ' + load_lang('regex') + '<hr class=\"main_hr\">'
 
                 regex = '<input type="checkbox" name="regex"> ' + load_lang('regex') + '<hr class=\"main_hr\">'
 
                 plus = '<input type="checkbox" name="login"> ' + load_lang('login_able') + '<hr class=\"main_hr\">'
 
                 plus = '<input type="checkbox" name="login"> ' + load_lang('login_able') + '<hr class=\"main_hr\">'
 
                 now = 0
 
                 now = 0
 
                 b_now = load_lang('ban')
 
                 b_now = load_lang('ban')
 
+                
+            time_data = [
 
+                ['86400', load_lang('1_day')],
 
+                ['432000‬', load_lang('5_day')],
 
+                ['2592000', load_lang('30_day')],
 
+                ['15552000', load_lang('180_day')],
 
+                ['31104000‬', load_lang('360_day')],
 
+                ['0', load_lang('limitless')]
 
+            ]
 
+            insert_data = ''
 
+            for i in time_data:
 
+                insert_data += '<a href="javascript:insert_v(\'second\', \'' + i[0] + '\')">(' + i[1] + ')</a> '
 
+            # 언어 적용 필요
 
 
 
             data = name + '''
 
             data = name + '''
 
-                <input placeholder="''' + load_lang('ban_period') + ''' (''' + load_lang('second') + ''')" name="second" type="text">
 
+                <script>function insert_v(name, data) { document.getElementById(name).value = data; }</script>''' + insert_data + '''                
+                <hr class=\"main_hr\">
 
+                <input placeholder="''' + load_lang('ban_period') + ''' (''' + load_lang('second') + ''')" name="second" id="second" type="text">
 
                 <hr class=\"main_hr\">
 
                 <hr class=\"main_hr\">
 
                 ''' + regex + '''
 
                 ''' + regex + '''
 
                 <input placeholder="''' + load_lang('why') + '''" name="why" type="text">
 
                 <input placeholder="''' + load_lang('why') + '''" name="why" type="text">
 
@@ -99,16 +119,12 @@ def give_user_ban_2(conn, name):
 
             ''' + plus
 
             ''' + plus
 
 
 
         return easy_minify(flask.render_template(skin_check(), 
         return easy_minify(flask.render_template(skin_check(), 
-            imp = [load_lang('ban'), wiki_set(), custom(), other2([now, 0])],
 
+            imp = [main_name, wiki_set(), custom(), other2([now, 0])],
 
             data = '''
 
             data = '''
 
                 <form method="post">
 
                 <form method="post">
 
                     ''' + data + '''
 
                     ''' + data + '''
 
                     <button type="submit">''' + b_now + '''</button>
 
                     <button type="submit">''' + b_now + '''</button>
 
                 </form>
 
                 </form>
 
-                <h2>''' + load_lang('explanation') + '''</h2>
 
-                <ul>
 
-                    <li>''' + load_lang('ban_explanation') + '''</li>
 
-                </ul>
 
             ''',
 
             ''',
 
             menu = [['manager', load_lang('return')]]
 
             menu = [['manager', load_lang('return')]]
 
         ))   
         ))

+ 12 - 8
route/tool/func.py
Просмотреть файл 

@@ -314,11 +314,10 @@ def load_lang(data, num = 2, safe = 0):
 
         lang = json.loads(json_data)
 
         lang = json.loads(json_data)
 
 
 
         if data in lang:
 
         if data in lang:
 
-            t_data = re.sub('\[s\]', '\'s', lang[data])
 
             if safe == 1:
 
             if safe == 1:
 
-                return t_data
 
+                return lang[data]
 
             else:
 
             else:
 
-                return html.escape(t_data)
 
+                return html.escape(lang[data])
 
         else:
 
         else:
 
             return html.escape(data + ' (M)')
 
             return html.escape(data + ' (M)')
 
     else:
 
     else:
 
@@ -332,11 +331,10 @@ def load_lang(data, num = 2, safe = 0):
 
                 return load_lang(data, 1, safe)
 
                 return load_lang(data, 1, safe)
 
 
 
             if data in lang:
 
             if data in lang:
 
-                t_data = re.sub('\[s\]', '\'s', lang[data])
 
                 if safe == 1:
 
                 if safe == 1:
 
-                    return t_data
 
+                    return lang[data]
 
                 else:
 
                 else:
 
-                    return html.escape(t_data)
 
+                    return html.escape(lang[data])
 
             else:
 
             else:
 
                 return load_lang(data, 1, safe)
 
                 return load_lang(data, 1, safe)
 
         else:
 
         else:
 
@@ -363,11 +361,17 @@ def ip_or_user(data):
 
         return 0
 
         return 0
 
 
 
 def edit_button():
 
 def edit_button():
 
-    insert_list = [['[[|]]', '[[|]]'], ['[*()]', '[*()]'], ['{{{#!}}}', '{{{#!}}}'], ['||<>||', '||<>||'], ["\\'\\'\\'", "\'\'\'"]]
 
+    insert_list = [
 
+        ['[[|]]', '[[|]]'], 
+        ['[*()]', '[*()]'], 
+        ['{{{#!}}}', '{{{#!}}}'], 
+        ['||<>||', '||<>||'], 
+        ["\\'\\'\\'", "\'\'\'"]
 
+    ]
 
 
 
     data = ''
 
     data = ''
 
     for insert_data in insert_list:
 
     for insert_data in insert_list:
 
-        data += '<a href="javascript:void(0);" onclick="insert_data(\'content\', \'' + insert_data[0] + '\');">(' + insert_data[1] + ')</a> '
 
+        data += '<a href="javascript:insert_data(\'content\', \'' + insert_data[0] + '\')">(' + insert_data[1] + ')</a> '
 
 
 
     return data + '<hr class=\"main_hr\">'
 
     return data + '<hr class=\"main_hr\">'

+ 11 - 0
version.json
Просмотреть файл 

@@ -0,0 +1,11 @@
 
+{
 
+    "master" : {
 
+        "r_ver" : "v3.1.0-stable-05",
 
+        "c_ver" : "400001",
 
+        "s_ver" : "2"
 
+    }, "stable" : {
 
+        "r_ver" : "v3.1.0-stable-05",
 
+        "c_ver" : "400001",
 
+        "s_ver" : "2"
 
+    }
 
+}