Strona główna Odkrywaj Pomoc
Zaloguj się
wiki
/
openNAMU__openNAMU
kopia lustrzana https://github.com/openNAMU/openNAMU.git
2
0
Forkuj 0
Pliki Problemy 0 Wiki
Przeglądaj źródła

Merge pull request #1003 from 2du/dev

Dev
잉여개발기 (SPDV) 5 lat temu
rodzic
3d4ef5114b cdd0602578
commit
1c3359435a
10 zmienionych plików z 47 dodań i 29 usunięć
Zunifikowany widok Pokaż statystyki zmian
  1. 1 4
      app.py
  2. 4 4
      language/en-US.json
  3. 3 3
      route/inter_wiki.py
  4. 2 2
      route/inter_wiki_del.py
  5. 11 8
      route/inter_wiki_plus.py
  6. 21 2
      route/tool/func.py
  7. 0 1
      route/tool/mark.py
  8. 1 1
      route/tool/set_mark/namumark.py
  9. 2 2
      route/view_read.py
  10. 2 2
      version.json

+ 1 - 4
app.py
Wyświetl plik 

@@ -141,13 +141,10 @@ create_data['alist'] = ['name', 'acl']
 
 create_data['re_admin'] = ['who', 'what', 'time']
 
 create_data['re_admin'] = ['who', 'what', 'time']
 
 create_data['alarm'] = ['name', 'data', 'date']
 
 create_data['alarm'] = ['name', 'data', 'date']
 
 create_data['ua_d'] = ['name', 'ip', 'ua', 'today', 'sub']
 
 create_data['ua_d'] = ['name', 'ip', 'ua', 'today', 'sub']
 
-create_data['filter'] = ['name', 'regex', 'sub']
 
 create_data['scan'] = ['user', 'title', 'type']
 
 create_data['scan'] = ['user', 'title', 'type']
 
 create_data['acl'] = ['title', 'decu', 'dis', 'view', 'why']
 
 create_data['acl'] = ['title', 'decu', 'dis', 'view', 'why']
 
-create_data['inter'] = ['title', 'link', 'icon']
 
-create_data['html_filter'] = ['html', 'kind', 'plus']
 
+create_data['html_filter'] = ['html', 'kind', 'plus', 'plus_t']
 
 create_data['vote'] = ['name', 'id', 'subject', 'data', 'user', 'type', 'acl']
 
 create_data['vote'] = ['name', 'id', 'subject', 'data', 'user', 'type', 'acl']
 
-# create_data['oauth_conn'] = ['provider', 'wiki_id', 'sns_id', 'name', 'picture']
 
 for i in create_data:
 
 for i in create_data:
 
     try:
 
     try:
 
         curs.execute(db_change('select test from ' + i + ' limit 1'))
 
         curs.execute(db_change('select test from ' + i + ' limit 1'))

+ 4 - 4
language/en-US.json
Wyświetl plik 

@@ -152,15 +152,15 @@
 
         "user_setting" : "User settings",
 
         "user_setting" : "User settings",
 
         "now_password" : "Current password",
 
         "now_password" : "Current password",
 
         "new_password" : "New password",
 
         "new_password" : "New password",
 
-        "password_confirm" : "Password confirm",
 
-        "oauth_connection" : "Oauth Connection",
 
+        "password_confirm" : "Confirm password",
 
+        "oauth_connection" : "OAuth Connection",
 
         "password_search" : "Password finder",
 
         "password_search" : "Password finder",
 
         "login_able" : "Loginable",
 
         "login_able" : "Loginable",
 
         "band_ban" : "Range block",
 
         "band_ban" : "Range block",
 
         "band_blocked" : "Range blocked",
 
         "band_blocked" : "Range blocked",
 
         "under_category" : "Sub-category",
 
         "under_category" : "Sub-category",
 
         "count" : "Number of Contributions",
 
         "count" : "Number of Contributions",
 
-        "alarm" : "Notice(s)",
 
+        "alarm" : "Notifications(s)",
 
         "user_document" : "User document",
 
         "user_document" : "User document",
 
         "user_head" : "Custom <HEAD>",
 
         "user_head" : "Custom <HEAD>",
 
         "encryption_method" : "Encryption method",
 
         "encryption_method" : "Encryption method",
 
@@ -192,7 +192,7 @@
 
         "accept_edit_request" : "Accept edit request",
 
         "accept_edit_request" : "Accept edit request",
 
         "history_add" : "Add history",
 
         "history_add" : "Add history",
 
         "all_register_num" : "The number of application forms",
 
         "all_register_num" : "The number of application forms",
 
-        "replace_move" : "Reversing documents",
 
+        "replace_move" : "Swaping documents",
 
         "merge_move" : "Merging documents",
 
         "merge_move" : "Merging documents",
 
         "add_admin_group" : "Add administrator groups",
 
         "add_admin_group" : "Add administrator groups",
 
         "add_watchlist" : "Add watchlist",
 
         "add_watchlist" : "Add watchlist",

+ 3 - 3
route/inter_wiki.py
Wyświetl plik 

@@ -12,7 +12,7 @@ def inter_wiki_2(conn, tools):
 
         title = load_lang('interwiki_list')
 
         title = load_lang('interwiki_list')
 
         div = ''
 
         div = ''
 
 
 
-        curs.execute(db_change('select title, link from inter'))
 
+        curs.execute(db_change("select html, plus from html_filter where kind = 'inter_wiki'"))
 
     elif tools == 'email_filter':
 
     elif tools == 'email_filter':
 
         del_link = 'del_email_filter'
 
         del_link = 'del_email_filter'
 
         plus_link = 'plus_email_filter'
 
         plus_link = 'plus_email_filter'
 
@@ -29,11 +29,11 @@ def inter_wiki_2(conn, tools):
 
         curs.execute(db_change("select html from html_filter where kind = 'name'"))
 
         curs.execute(db_change("select html from html_filter where kind = 'name'"))
 
     elif tools == 'edit_filter':
 
     elif tools == 'edit_filter':
 
         del_link = 'del_edit_filter'
 
         del_link = 'del_edit_filter'
 
-        plus_link = 'manager/9'
 
+        plus_link = 'plus_edit_filter'
 
         title = load_lang('edit_filter_list')
 
         title = load_lang('edit_filter_list')
 
         div = ''
 
         div = ''
 
 
 
-        curs.execute(db_change("select name from filter"))
 
+        curs.execute(db_change("select html from html_filter where kind = 'regex_filter'"))
 
     elif tools == 'file_filter':
 
     elif tools == 'file_filter':
 
         del_link = 'del_file_filter'
 
         del_link = 'del_file_filter'
 
         plus_link = 'plus_file_filter'
 
         plus_link = 'plus_file_filter'

+ 2 - 2
route/inter_wiki_del.py
Wyświetl plik 

@@ -5,9 +5,9 @@ def inter_wiki_del_2(conn, tools, name):
 
 
 
     if admin_check(None, tools) == 1:
 
     if admin_check(None, tools) == 1:
 
         if tools == 'del_inter_wiki':
 
         if tools == 'del_inter_wiki':
 
-            curs.execute(db_change("delete from inter where title = ?"), [name])
 
+            curs.execute(db_change("delete from html_filter where html = ? and kind = 'inter_wiki'"), [name])
 
         elif tools == 'del_edit_filter':
 
         elif tools == 'del_edit_filter':
 
-            curs.execute(db_change("delete from filter where name = ?"), [name])
 
+            curs.execute(db_change("delete from html_filter where html = ? and kind = 'regex_filter'"), [name])
 
         elif tools == 'del_name_filter':
 
         elif tools == 'del_name_filter':
 
             curs.execute(db_change("delete from html_filter where html = ? and kind = 'name'"), [name])
 
             curs.execute(db_change("delete from html_filter where html = ? and kind = 'name'"), [name])
 
         elif tools == 'del_file_filter':
 
         elif tools == 'del_file_filter':

+ 11 - 8
route/inter_wiki_plus.py
Wyświetl plik 

@@ -6,9 +6,12 @@ def inter_wiki_plus_2(conn, tools, name):
 
     if flask.request.method == 'POST':
 
     if flask.request.method == 'POST':
 
         if tools == 'plus_inter_wiki':
 
         if tools == 'plus_inter_wiki':
 
             if name:
 
             if name:
 
-                curs.execute(db_change("delete from inter where title = ?"), [name])
 
+                curs.execute(db_change("delete from html_filter where html = ? and kind = 'inter_wiki'"), [name])
 
 
 
-            curs.execute(db_change('insert into inter (title, link, icon) values (?, ?, ?)'), [
 
+            curs.execute(db_change("delete from html_filter where html = ? and kind = 'inter_wiki'"), [
 
+                flask.request.form.get('title', 'test')
 
+            ])
 
+            curs.execute(db_change('insert into html_filter (html, plus, plus_t, kind) values (?, ?, ?, "inter_wiki")'), [
 
                 flask.request.form.get('title', 'test'),
 
                 flask.request.form.get('title', 'test'),
 
                 flask.request.form.get('link', 'test'),
 
                 flask.request.form.get('link', 'test'),
 
                 flask.request.form.get('icon', '')
 
                 flask.request.form.get('icon', '')
 
@@ -16,7 +19,7 @@ def inter_wiki_plus_2(conn, tools, name):
 
 
 
             admin_check(None, 'inter_wiki_plus')
 
             admin_check(None, 'inter_wiki_plus')
 
         elif tools == 'plus_edit_filter':
 
         elif tools == 'plus_edit_filter':
 
-            if admin_check(1, 'edit_filter edit') != 1:
 
+            if admin_check(None, 'edit_filter edit') != 1:
 
                 return re_error('/error/3')
 
                 return re_error('/error/3')
 
 
 
             if flask.request.form.get('second', '0') == '0':
 
             if flask.request.form.get('second', '0') == '0':
 
@@ -27,8 +30,8 @@ def inter_wiki_plus_2(conn, tools, name):
 
             try:
 
             try:
 
                 re.compile(flask.request.form.get('content', 'test'))
 
                 re.compile(flask.request.form.get('content', 'test'))
 
 
 
-                curs.execute(db_change("delete from filter where name = ?"), [name])
 
-                curs.execute(db_change("insert into filter (name, regex, sub) values (?, ?, ?)"), [
 
+                curs.execute(db_change("delete from html_filter where html = ? and kind = 'regex_filter'"), [name])
 
+                curs.execute(db_change("insert into html_filter (html, plus, plus_t, kind) values (?, ?, ?, 'regex_filter')"), [
 
                     name,
 
                     name,
 
                     flask.request.form.get('content', 'test'),
 
                     flask.request.form.get('content', 'test'),
 
                     end
 
                     end
 
@@ -91,14 +94,14 @@ def inter_wiki_plus_2(conn, tools, name):
 
         return redirect('/' + re.sub(r'^plus_', '', tools))
 
         return redirect('/' + re.sub(r'^plus_', '', tools))
 
     else:
 
     else:
 
         get_sub = 0
 
         get_sub = 0
 
-        if admin_check(1) != 1:
 
+        if admin_check() != 1:
 
             stat = 'disabled'
 
             stat = 'disabled'
 
         else:
 
         else:
 
             stat = ''
 
             stat = ''
 
 
 
         if tools == 'plus_inter_wiki':
 
         if tools == 'plus_inter_wiki':
 
             if name:
 
             if name:
 
-                curs.execute(db_change("select title, link, icon from inter where title = ?"), [name])
 
+                curs.execute(db_change("select html, plus, plus_t from html_filter where html = ? and kind = 'inter_wiki'"), [name])
 
                 exist = curs.fetchall()
 
                 exist = curs.fetchall()
 
                 if exist:
 
                 if exist:
 
                     value = exist[0]
 
                     value = exist[0]
 
@@ -122,7 +125,7 @@ def inter_wiki_plus_2(conn, tools, name):
 
                 <input value="''' + html.escape(value[2]) + '''" type="text" name="icon">
 
                 <input value="''' + html.escape(value[2]) + '''" type="text" name="icon">
 
             '''
 
             '''
 
         elif tools == 'plus_edit_filter':
 
         elif tools == 'plus_edit_filter':
 
-            curs.execute(db_change("select regex, sub from filter where name = ?"), [name])
 
+            curs.execute(db_change("select plus, plus_t from html_filter where html = ? and kind = 'regex_filter'"), [name])
 
             exist = curs.fetchall()
 
             exist = curs.fetchall()
 
             if exist:
 
             if exist:
 
                 textarea = exist[0][0]
 
                 textarea = exist[0][0]

+ 21 - 2
route/tool/func.py
Wyświetl plik 

@@ -273,6 +273,23 @@ def update(ver_num, set_data):
 
     if ver_num < 3202500:
 
     if ver_num < 3202500:
 
         curs.execute(db_change('delete from cache_data'))
 
         curs.execute(db_change('delete from cache_data'))
 
 
 
+    if ver_num < 3202600:
 
+        curs.execute(db_change("select name, regex, sub from filter"))
 
+        for i in curs.fetchall():
 
+            curs.execute(db_change("insert into html_filter (html, kind, plus, plus_t) values (?, 'regex_filter', ?, ?)"), [
 
+                i[0], 
+                i[1],
 
+                i[2]
 
+            ])
 
+
 
+        curs.execute(db_change("select title, link, icon from inter"))
 
+        for i in curs.fetchall():
 
+            curs.execute(db_change("insert into html_filter (html, kind, plus, plus_t) values (?, 'inter_wiki', ?, ?)"), [
 
+                i[0], 
+                i[1],
 
+                i[2]
 
+            ])
 
+
 
     conn.commit()
 
     conn.commit()
 
 
 
     print('Update pass')
 
     print('Update pass')
 
@@ -941,7 +958,9 @@ def acl_check(name = 'test', tool = '', topic_num = '1'):
 
             num = 5
 
             num = 5
 
 
 
         acl_data = curs.fetchall()
 
         acl_data = curs.fetchall()
 
-        if (not acl_data and i == (end - 1)) and get_ban == 1 and tool != 'render':
 
+        if  (i == (end - 1) and (not acl_data or acl_data[0][0] == '' or acl_data[0][0] == 'normal')) and \
 
+            get_ban == 1 and \
 
+            tool != 'render':
 
             return 1
 
             return 1
 
         elif acl_data and acl_data[0][0] != 'normal' and acl_data[0][0] != '':
 
         elif acl_data and acl_data[0][0] != 'normal' and acl_data[0][0] != '':
 
             if acl_data[0][0] != 'ban' and get_ban == 1 and tool != 'render':
 
             if acl_data[0][0] != 'ban' and get_ban == 1 and tool != 'render':
 
@@ -1174,7 +1193,7 @@ def number_check(data):
 
 
 
 def edit_filter_do(data):
 
 def edit_filter_do(data):
 
     if admin_check(1) != 1:
 
     if admin_check(1) != 1:
 
-        curs.execute(db_change("select regex, sub from filter where regex != ''"))
 
+        curs.execute(db_change("select plus, plus_t from html_filter where kind = 'regex_filter' and plus != ''"))
 
         for data_list in curs.fetchall():
 
         for data_list in curs.fetchall():
 
             match = re.compile(data_list[0], re.I)
 
             match = re.compile(data_list[0], re.I)
 
             if match.search(data):
 
             if match.search(data):

+ 0 - 1
route/tool/mark.py
Wyświetl plik 

@@ -10,7 +10,6 @@ import sqlite3
 
 import asyncio
 
 import asyncio
 
 import threading
 
 import threading
 
 import urllib.parse
 
 import urllib.parse
 
-import multiprocessing
 
 
 
 if os.path.exists('route/tool/set_mark/custom.py'):
 
 if os.path.exists('route/tool/set_mark/custom.py'):
 
     from .set_mark.custom import custom_mark
 
     from .set_mark.custom import custom_mark

+ 1 - 1
route/tool/set_mark/namumark.py
Wyświetl plik 

@@ -1052,7 +1052,7 @@ def namumark(conn, data, title, include_num):
 
                 inter_data = re.search(r'^inter:((?:(?!:).)+):((?:(?!\]\]).)+)', main_link)
 
                 inter_data = re.search(r'^inter:((?:(?!:).)+):((?:(?!\]\]).)+)', main_link)
 
                 inter_data = inter_data.groups()
 
                 inter_data = inter_data.groups()
 
 
 
-                curs.execute(tool.db_change('select link, icon from inter where title = ?'), [inter_data[0]])
 
+                curs.execute(tool.db_change('select plus, plus_t from html_filter where html = ? and kind = "inter_wiki"'), [inter_data[0]])
 
                 inter = curs.fetchall()
 
                 inter = curs.fetchall()
 
                 if inter:
 
                 if inter:
 
                     return_link = link_fix(inter_data[1], 1)
 
                     return_link = link_fix(inter_data[1], 1)

+ 2 - 2
route/view_read.py
Wyświetl plik 

@@ -121,7 +121,7 @@ def view_read_2(conn, name):
 
 
 
         curs.execute(db_change('' + \
 
         curs.execute(db_change('' + \
 
             'select ip, date, leng, send, id from history ' + \
 
             'select ip, date, leng, send, id from history ' + \
 
-            'where title = ? and hide != "O" and type = "" order by id desc limit 3' + \
 
+            'where title = ? and hide != "O" and type = "" order by id + 0 desc limit 3' + \
 
         ''), [name])
 
         ''), [name])
 
         sql_d = curs.fetchall()
 
         sql_d = curs.fetchall()
 
         if sql_d:
 
         if sql_d:
 
@@ -207,4 +207,4 @@ def view_read_2(conn, name):
 
         imp = [flask.request.args.get('show', name), wiki_set(), custom(), other2([sub, r_date, watch_list])],
 
         imp = [flask.request.args.get('show', name), wiki_set(), custom(), other2([sub, r_date, watch_list])],
 
         data = div,
 
         data = div,
 
         menu = menu
 
         menu = menu
 
-    )), response_data
 
+    )), response_data

+ 2 - 2
version.json
Wyświetl plik 

@@ -1,7 +1,7 @@
 
 {
 
 {
 
     "beta" : {
 
     "beta" : {
 
-        "r_ver" : "v3.2.0-beta-26 (v3.2.0-dev-2020-08-20-01)",
 
-        "c_ver" : "3202500",
 
+        "r_ver" : "v3.2.0-beta-27 (v3.2.0-dev-2020-08-24-02)",
 
+        "c_ver" : "3202600",
 
         "s_ver" : "9"
 
         "s_ver" : "9"
 
     }
 
     }
 
 }
 
 }