커스텀 가능한 에디터 도구바

route/go_api_user_setting_editor.py

@@ -17,14 +17,14 @@ def api_user_setting_editor(db_set):
 
         if platform.system() == 'Linux':
             if platform.machine() in ["AMD64", "x86_64"]:
-                data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.amd64.bin"), sys._getframe().f_code.co_name, db_set, other_set], stdout = subprocess.PIPE).communicate()[0]
+                data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.amd64.bin"), func_name, db_set, other_set], stdout = subprocess.PIPE).communicate()[0]
             else:
-                data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.arm64.bin"), sys._getframe().f_code.co_name, db_set, other_set], stdout = subprocess.PIPE).communicate()[0]
+                data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.arm64.bin"), func_name, db_set, other_set], stdout = subprocess.PIPE).communicate()[0]
         else:
             if platform.machine() in ["AMD64", "x86_64"]:
-                data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.amd64.exe"), sys._getframe().f_code.co_name, db_set, other_set], stdout = subprocess.PIPE).communicate()[0]
+                data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.amd64.exe"), func_name, db_set, other_set], stdout = subprocess.PIPE).communicate()[0]
             else:
-                data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.arm64.exe"), sys._getframe().f_code.co_name, db_set, other_set], stdout = subprocess.PIPE).communicate()[0]
+                data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.arm64.exe"), func_name, db_set, other_set], stdout = subprocess.PIPE).communicate()[0]
 
         data = data.decode('utf8')
 

route/main_tool_redirect.py

@@ -22,6 +22,9 @@ def main_tool_redirect(num = 1, add_2 = ''):
             16 : [0, '/auth/give/fix', get_lang(conn, 'user_fix')],
         }
         
+        if num == 1:
+            return redirect(conn, '/manager')
+        
         # 이전 버전 잔재로 -2부터 시작
         num -= 2
         if not num - 2 in title_list:

route/tool/func.py

@@ -1069,7 +1069,7 @@ def skin_check(conn, set_n = 0):
         return skin
     
 def cache_v():
-    return '.cache_v247'
+    return '.cache_v248'
 
 def wiki_css(data):
     global global_wiki_set

route_go/route/api_user_setting_editor.go

@@ -45,7 +45,7 @@ func Api_user_setting_editor(call_arg []string) string {
 
 		return_data := make(map[string]interface{})
 		return_data["response"] = "ok"
-		
+
 		if len(data_list) == 0 {
 			return_data["data"] = map[string]string{}
 		} else {
@@ -64,4 +64,4 @@ func Api_user_setting_editor(call_arg []string) string {
 		json_data, _ := json.Marshal(return_data)
 		return string(json_data)
 	}
-}
+}

route_go/route/api_user_setting_editor_delele.go

@@ -18,7 +18,7 @@ func Api_user_setting_editor_delete(call_arg []string) string {
 
 	ip := other_set["ip"]
 	if !tool.IP_or_user(ip) {
-		stmt, err := db.Prepare(tool.DB_change(db_set, "delete from user_set where id = ? and user_editor_top = ?"))
+		stmt, err := db.Prepare(tool.DB_change(db_set, "delete from user_set where id = ? and name = 'user_editor_top' and data = ?"))
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -47,4 +47,4 @@ func Api_user_setting_editor_delete(call_arg []string) string {
 		json_data, _ := json.Marshal(return_data)
 		return string(json_data)
 	}
-}
+}

route_go/route/api_user_setting_editor_insert.go

@@ -17,9 +17,6 @@ func Api_user_setting_editor_insert(call_arg []string) string {
 	defer db.Close()
 
 	ip := other_set["ip"]
-	
-	log.Fatal(tool.IP_or_user(ip))
-	log.Fatal(ip)
 
 	if !tool.IP_or_user(ip) {
 		stmt, err := db.Prepare(tool.DB_change(db_set, "insert into user_set (id, name, data) values (?, 'user_editor_top', ?)"))
@@ -51,4 +48,4 @@ func Api_user_setting_editor_insert(call_arg []string) string {
 		json_data, _ := json.Marshal(return_data)
 		return string(json_data)
 	}
-}
+}

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev107",
+        "r_ver" : "v3.5.0-dev108",
         "c_ver" : "20240426",
         "s_ver" : "20240426"
     }

views/main_css/js/func/editor.js

@@ -325,11 +325,22 @@ function opennamu_do_user_editor_insert() {
         fetch('/api/v2/user/setting/editor', {
             method : 'post',
             body : form_data,
-        }).then(function(res) {
-            return res.json();
-        }).then(function(data) {
-            console.log(data);
-            
+        }).then(function() {
+            opennnamu_do_user_editor();
+        });
+    }
+}
+
+function opennamu_do_user_editor_delete() {
+    let data = prompt();
+    if(data !== null && data !== "") {
+        let form_data = new FormData();
+        form_data.append('data', data);
+
+        fetch('/api/v2/user/setting/editor', {
+            method : 'delete',
+            body : form_data,
+        }).then(function() {
             opennnamu_do_user_editor();
         });
     }
@@ -346,7 +357,8 @@ function opennnamu_do_user_editor() {
                 data_html += '<a href="javascript:do_insert_data(\'' + opennamu_xss_filter(data["data"][for_a]) + '\');">(' + opennamu_xss_filter(data["data"][for_a]) + ')</a> ';
             }
 
-            data_html += '<a href="javascript:opennamu_do_user_editor_insert();">(+)</a>';
+            data_html += '<a href="javascript:opennamu_do_user_editor_insert();">(+)</a> ';
+            data_html += '<a href="javascript:opennamu_do_user_editor_delete();">(-)</a>';
             data_html += '<hr class="main_hr">';
 
             document.getElementById("opennamu_editor_user_button").innerHTML = data_html;