fix bug

route/api_w.py

@@ -46,7 +46,6 @@ def api_w_2(conn, name):
                         json_data = json_data.replace(i[0], '@' + i[3] + '@', 1)
 
                 get_all_change_2 = include_list + get_all_change_1
-                print(get_all_change_2)
                 for i in get_all_change_2:
                     json_data = json_data.replace('@' + i[0] + '@', i[1])
 

route/inter_wiki.py

@@ -29,7 +29,7 @@ def inter_wiki_2(conn, tools):
         curs.execute(db_change("select html from html_filter where kind = 'name'"))
     elif tools == 'edit_filter':
         del_link = 'del_edit_filter'
-        plus_link = 'manager/9'
+        plus_link = 'plus_edit_filter'
         title = load_lang('edit_filter_list')
         div = ''
 
@@ -75,29 +75,26 @@ def inter_wiki_2(conn, tools):
         div += '<ul class="inside_ul">'
 
         for data in db_data:
-            if tools == 'inter_wiki':
-                div += '<li>' + data[0] + ' : <a id="out_link" href="' + data[1] + '">' + data[1] + '</a>'
-            elif tools == 'edit_filter':
-                div += '<li><a href="/plus_edit_filter/' + url_pas(data[0]) + '">' + data[0] + '</a>'
-            else:
-                div += '<li>' + data[0]
+            div += '<li>' + data[0]
 
-                if tools == 'edit_top':
-                    div += ' : ' + data[1]
+            if tools == 'edit_top':
+                div += ' : ' + data[1]
+            elif tools == 'inter_wiki':
+                div += ' : <a id="out_link" href="' + data[1] + '">' + data[1] + '</a>'
 
             if admin == 1:
                 div += ' <a href="/' + plus_link + '/' + url_pas(data[0]) + '">(' + load_lang('edit') + ')</a>'
                 div += ' <a href="/' + del_link + '/' + url_pas(data[0]) + '">(' + load_lang('delete') + ')</a>'
-
+                
             div += '</li>'
 
         div += '</ul>'
 
         if admin == 1:
-            div += '<hr class=\"main_hr\"><a href="/' + plus_link + '">(' + load_lang('add') + ')</a>'
-    else:
-        if admin == 1:
-            div += '<a href="/' + plus_link + '">(' + load_lang('add') + ')</a>'
+            div += '<hr class="main_hr">'
+            
+    if admin == 1:    
+        div += '<a href="/' + plus_link + '">(' + load_lang('add') + ')</a>'
 
     return easy_minify(flask.render_template(skin_check(),
         imp = [title, wiki_set(), wiki_custom(), wiki_css([0, 0])],

route/inter_wiki_plus.py

@@ -2,6 +2,10 @@ from .tool.func import *
 
 def inter_wiki_plus_2(conn, tools, name):
     curs = conn.cursor()
+    
+    if not name:
+        if tools == 'plus_edit_filter':
+            return redirect('/manager/9')
 
     if flask.request.method == 'POST':
         if tools == 'plus_inter_wiki':
@@ -124,10 +128,7 @@ def inter_wiki_plus_2(conn, tools, name):
                 <hr class="main_hr">
                 <input value="''' + html.escape(value[2]) + '''" type="text" name="icon">
             '''
-        elif tools == 'plus_edit_filter':
-            if not name:
-                name = 'test'
-            
+        elif tools == 'plus_edit_filter':            
             curs.execute(db_change("select plus, plus_t from html_filter where html = ? and kind = 'regex_filter'"), [name])
             exist = curs.fetchall()
             if exist:

route/tool/func.py

@@ -84,7 +84,7 @@ if sys.version_info < (3, 6):
 global_lang = {}
 global_wiki_set = {}
 
-data_css_ver = '104'
+data_css_ver = '105'
 data_css = ''
 
 conn = ''
@@ -1050,6 +1050,7 @@ def ip_or_user(data = ''):
 def admin_check(num = None, what = None, name = ''):
     ip = ip_check() if name == '' else name
     time_data = get_time()
+    pass_ok = 0
 
     if ip_or_user(ip) == 0:
         curs.execute(db_change(
@@ -1080,7 +1081,7 @@ def admin_check(num = None, what = None, name = ''):
                 'select name from alist where name = ? and acl = "owner"'
             ), [user_auth])
             if curs.fetchall():
-                return 1
+                pass_ok = 1
             else:
                 if num == 'all':                    
                     curs.execute(db_change(
@@ -1092,13 +1093,17 @@ def admin_check(num = None, what = None, name = ''):
                     ), [user_auth, check])
                     
                 if curs.fetchall():
-                    if what:
-                        curs.execute(db_change(
-                            "insert into re_admin (who, what, time) values (?, ?, ?)"
-                        ), [ip, what, time_data])
-                        conn.commit()
+                    pass_ok = 1
 
-                    return 1
+                
+            if pass_ok == 1:
+                if what:
+                    curs.execute(db_change(
+                        "insert into re_admin (who, what, time) values (?, ?, ?)"
+                    ), [ip, what, time_data])
+                    conn.commit()
+
+                return 1
 
     return 0
 

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.0 (stable-01b) (beta-01) (dev-12)",
+        "r_ver" : "v3.4.0 (stable-01b) (beta-02) (dev-13)",
         "c_ver" : "3400101",
         "s_ver" : "12"
     }

views/main_css/js/render_namumark.js

@@ -237,11 +237,11 @@ function load_include(name_doc, name_ob, data_include, name_org = '') {
     xhr.open("POST", "/api/w/" + encodeURI(name_doc) + "?v=include&include=" + name_ob + "&name_org=" + name_org);
     xhr.send(data_form);
 
+    document.getElementsByClassName(name_ob)[0].href = "/w/" + do_url_change(name_doc);
     xhr.onreadystatechange = function() {
         if(this.readyState === 4 && this.status === 200) {
             if(this.responseText === "{}\n") {
                 document.getElementById(name_ob).innerHTML = "";
-                document.getElementsByClassName(name_ob)[0].href = "/w/" + do_url_change(name_doc); 
                 document.getElementsByClassName(name_ob)[0].id = "not_thing";
             } else {
                 var data_load = JSON.parse(this.responseText);