fix bug 2

route/api_w.py

@@ -80,6 +80,7 @@ def api_w_2(conn, name):
             else:
                 return flask.jsonify({})
         else:
+            data_arg_include = flask.request.args.get('include', '')
             if acl_check(name, 'render') == 1:
                 return flask.jsonify({})
             else:
@@ -92,6 +93,41 @@ def api_w_2(conn, name):
                 sql_data = curs.fetchall()
                 if not sql_data:
                     return flask.jsonify({})
+                elif data_arg_include != '':
+                    name_org = flask.request.args.get('name_org', '')
+                    name_org = name if name_org == '' else name_org
+
+                    json_data = sql_data[0][0]
+
+                    get_all_change_1 = []
+                    find_replace_moment = re.findall(r'(@([^=@]+)=([^=@]+)@|@([^=@]+)@)', json_data)
+                    for i in find_replace_moment:
+                        if i[1] != '':
+                            get_all_change_1 += [['@' + i[1] + '@', i[2]]]
+
+                            json_data = json_data.replace(i[0], '@' + i[1] + '@', 1)
+                        else:
+                            json_data = json_data.replace(i[0], '@' + i[3] + '@', 1)
+
+                    get_all_change_2 = re.findall(r'(@(?:[^@]*)@),([^,]*),', flask.request.args.get('change', '')) + get_all_change_1
+                    for i in get_all_change_2:
+                        json_data = json_data.replace(
+                            i[0].replace('<amp>', '&'), 
+                            i[1].replace('<amp>', '&').replace('<comma>', ','), 
+                            1
+                        )
+
+                    data_pas = render_set(
+                        doc_name = name_org, 
+                        doc_data = json_data, 
+                        data_type = 'api_view',
+                        data_in = data_arg_include
+                    )
+
+                    return flask.jsonify({
+                        "data" : data_pas[0], 
+                        "js_data" : data_pas[1]
+                    })
                 else:
                     data_pas = render_set(
                         doc_name = name, 

route/login.py

@@ -35,8 +35,8 @@ def login_2(conn):
 
         pw_check_d = pw_check(
             flask.request.form.get('pw', ''),
-            user[0][0],
-            user[0][1],
+            user_data['pw'],
+            user_data['encode'],
             user_id
         )
         if pw_check_d != 1:

route/main_setting.py

@@ -719,7 +719,7 @@ def main_setting_2(conn, num, db_set):
 
             admin_check(None, 'edit_set (' + str(num) + ')')
 
-            return redirect('/setting/10')
+            return redirect('/setting/9')
         else:
             d_list = []
             for i in i_list:

route/tool/func.py

@@ -1618,9 +1618,11 @@ def re_error(data):
             if flask.request.path != '/main_skin_set':
                 title = load_lang('skin_set')
                 tool = [['main_skin_set', load_lang('main_skin_set')]]
+                load_skin_set = '<script>main_css_skin_set();</script>'
             else:
                 title = load_lang('main_skin_set')
                 tool = [['skin_set', load_lang('skin_set')]]
+                load_skin_set = ''
         
             return easy_minify(flask.render_template(skin_check(),
                 imp = [title, wiki_set(1), wiki_custom(), wiki_css([0, 0])],
@@ -1631,7 +1633,7 @@ def re_error(data):
                             '<li>' + data + ' <a href="/main_skin_set">(' + load_lang('main_skin_set') + ')</a></li>' + \
                         '</ul>' + \
                     '</div>' + \
-                    ('<script>main_css_skin_set();</script>' if get_url == '/main_skin_set' else ''),
+                    load_skin_set,
                 menu = tool
             ))
         else:

test.sql

@@ -1,10 +0,0 @@
-PRAGMA foreign_keys=OFF;
-BEGIN TRANSACTION;
-/****** CORRUPTION ERROR *******/
-/****** database disk image is malformed ******/
-/****** ERROR: database disk image is malformed ******/
-/****** CORRUPTION ERROR *******/
-/****** database disk image is malformed ******/
-/****** ERROR: database disk image is malformed ******/
-/**** ERROR: (11) database disk image is malformed *****/
-COMMIT;

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.0-stable-01b (beta-01b) (dev-2021-06-30-01)",
+        "r_ver" : "v3.4.0-stable-01b (beta-01b) (dev-2021-07-03-01)",
         "c_ver" : "3400101",
         "s_ver" : "12"
     }