Update ko_KR.txt (#2025)

[Ventoy.git] / Plugson / src / Web / ventoy_http.c

diff --git a/Plugson/src/Web/ventoy_http.c b/Plugson/src/Web/ventoy_http.c
index be9639192c54897020d52da157ae3dbc6f5b8cd0..6de2159a0a4f932e6a4ac9db03b350f22bae554e 100644 (file)
--- a/Plugson/src/Web/ventoy_http.c
+++ b/Plugson/src/Web/ventoy_http.c
@@ -71,7 +71,7 @@ static const char *g_plugin_name[plugin_type_max] =
     "auto_memdisk", "dud"
 };
 
     "auto_memdisk", "dud"
 };
 

-static char g_ventoy_help_lang[MAX_LANGUAGE][8];
+static char g_ventoy_menu_lang[MAX_LANGUAGE][8];

 
 static char g_pub_path[2 * MAX_PATH];
 static data_control g_data_control[bios_max + 1];
 
 static char g_pub_path[2 * MAX_PATH];
 static data_control g_data_control[bios_max + 1];


@@ -513,6 +513,7 @@ void ventoy_data_default_control(data_control *data)
 {
     memset(data, 0, sizeof(data_control));
 
 {
     memset(data, 0, sizeof(data_control));
 

+    data->password_asterisk = 1;

     data->secondary_menu = 1;
     data->filter_dot_underscore = 1;
     data->max_search_level = -1;
     data->secondary_menu = 1;
     data->filter_dot_underscore = 1;
     data->max_search_level = -1;


@@ -520,7 +521,7 @@ void ventoy_data_default_control(data_control *data)
     data->secondary_menu_timeout = 0;
     
     strlcpy(data->default_kbd_layout, "QWERTY_USA");
     data->secondary_menu_timeout = 0;
     
     strlcpy(data->default_kbd_layout, "QWERTY_USA");

-    strlcpy(data->help_text_language, "en_US");
+    strlcpy(data->menu_language, "en_US");

 }
 
 int ventoy_data_cmp_control(data_control *data1, data_control *data2)
 }
 
 int ventoy_data_cmp_control(data_control *data1, data_control *data2)


@@ -539,6 +540,7 @@ int ventoy_data_cmp_control(data_control *data1, data_control *data2)
         data1->filter_vtoy != data2->filter_vtoy ||
         data1->win11_bypass_check != data2->win11_bypass_check ||
         data1->linux_remount != data2->linux_remount ||
         data1->filter_vtoy != data2->filter_vtoy ||
         data1->win11_bypass_check != data2->win11_bypass_check ||
         data1->linux_remount != data2->linux_remount ||

+        data1->password_asterisk != data2->password_asterisk ||

         data1->secondary_menu != data2->secondary_menu ||
         data1->menu_timeout != data2->menu_timeout ||
         data1->secondary_menu_timeout != data2->secondary_menu_timeout)
         data1->secondary_menu != data2->secondary_menu ||
         data1->menu_timeout != data2->menu_timeout ||
         data1->secondary_menu_timeout != data2->secondary_menu_timeout)


@@ -549,7 +551,7 @@ int ventoy_data_cmp_control(data_control *data1, data_control *data2)
     if (strcmp(data1->default_search_root, data2->default_search_root) ||
         strcmp(data1->default_image, data2->default_image) ||
         strcmp(data1->default_kbd_layout, data2->default_kbd_layout) ||
     if (strcmp(data1->default_search_root, data2->default_search_root) ||
         strcmp(data1->default_image, data2->default_image) ||
         strcmp(data1->default_kbd_layout, data2->default_kbd_layout) ||

-        strcmp(data1->help_text_language, data2->help_text_language))
+        strcmp(data1->menu_language, data2->menu_language))

     {
         return 1;
     }
     {
         return 1;
     }


@@ -587,11 +589,12 @@ int ventoy_data_save_control(data_control *data, const char *title, char *buf, i
     VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_WIN11_BYPASS_CHECK",  win11_bypass_check);
     VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_LINUX_REMOUNT",  linux_remount);
     VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_SECONDARY_BOOT_MENU",  secondary_menu);
     VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_WIN11_BYPASS_CHECK",  win11_bypass_check);
     VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_LINUX_REMOUNT",  linux_remount);
     VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_SECONDARY_BOOT_MENU",  secondary_menu);

+    VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_SHOW_PASSWORD_ASTERISK",  password_asterisk);

     VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_MENU_TIMEOUT",  menu_timeout);
     VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_SECONDARY_TIMEOUT",  secondary_menu_timeout);
 
     VTOY_JSON_FMT_CTRL_STRN(L2, "VTOY_DEFAULT_KBD_LAYOUT", default_kbd_layout);        
     VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_MENU_TIMEOUT",  menu_timeout);
     VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_SECONDARY_TIMEOUT",  secondary_menu_timeout);
 
     VTOY_JSON_FMT_CTRL_STRN(L2, "VTOY_DEFAULT_KBD_LAYOUT", default_kbd_layout);        

-    VTOY_JSON_FMT_CTRL_STRN(L2, "VTOY_HELP_TXT_LANGUAGE", help_text_language);  
+    VTOY_JSON_FMT_CTRL_STRN(L2, "VTOY_MENU_LANGUAGE", menu_language);  

 
     if (strcmp(def->default_search_root, data->default_search_root))
     {
 
     if (strcmp(def->default_search_root, data->default_search_root))
     {


@@ -634,10 +637,11 @@ int ventoy_data_json_control(data_control *ctrl, char *buf, int buflen)
     VTOY_JSON_FMT_SINT("win11_bypass_check",  ctrl->win11_bypass_check);
     VTOY_JSON_FMT_SINT("linux_remount",  ctrl->linux_remount);
     VTOY_JSON_FMT_SINT("secondary_menu",  ctrl->secondary_menu);
     VTOY_JSON_FMT_SINT("win11_bypass_check",  ctrl->win11_bypass_check);
     VTOY_JSON_FMT_SINT("linux_remount",  ctrl->linux_remount);
     VTOY_JSON_FMT_SINT("secondary_menu",  ctrl->secondary_menu);

+    VTOY_JSON_FMT_SINT("password_asterisk",  ctrl->password_asterisk);

     VTOY_JSON_FMT_SINT("menu_timeout",  ctrl->menu_timeout);
     VTOY_JSON_FMT_SINT("secondary_menu_timeout",  ctrl->secondary_menu_timeout);
     VTOY_JSON_FMT_STRN("default_kbd_layout",  ctrl->default_kbd_layout);
     VTOY_JSON_FMT_SINT("menu_timeout",  ctrl->menu_timeout);
     VTOY_JSON_FMT_SINT("secondary_menu_timeout",  ctrl->secondary_menu_timeout);
     VTOY_JSON_FMT_STRN("default_kbd_layout",  ctrl->default_kbd_layout);

-    VTOY_JSON_FMT_STRN("help_text_language",  ctrl->help_text_language);
+    VTOY_JSON_FMT_STRN("menu_language",  ctrl->menu_language);

 
     valid = 0;
     if (ctrl->default_search_root[0] && ventoy_is_directory_exist("%s%s", g_cur_dir, ctrl->default_search_root))
 
     valid = 0;
     if (ctrl->default_search_root[0] && ventoy_is_directory_exist("%s%s", g_cur_dir, ctrl->default_search_root))


@@ -656,16 +660,15 @@ int ventoy_data_json_control(data_control *ctrl, char *buf, int buflen)
     VTOY_JSON_FMT_STRN("default_image", ctrl->default_image);
     VTOY_JSON_FMT_SINT("default_image_valid", valid);
 
     VTOY_JSON_FMT_STRN("default_image", ctrl->default_image);
     VTOY_JSON_FMT_SINT("default_image_valid", valid);
 

-    VTOY_JSON_FMT_KEY("help_list");
+    VTOY_JSON_FMT_KEY("menu_list");

     VTOY_JSON_FMT_ARY_BEGIN();
 
     VTOY_JSON_FMT_ARY_BEGIN();
 

-    for (i = 0; g_ventoy_help_lang[i][0]; i++)
+    for (i = 0; g_ventoy_menu_lang[i][0]; i++)

     {
     {

-        VTOY_JSON_FMT_ITEM(g_ventoy_help_lang[i]);        
+        VTOY_JSON_FMT_ITEM(g_ventoy_menu_lang[i]);        

     }
     VTOY_JSON_FMT_ARY_ENDEX();
     }
     VTOY_JSON_FMT_ARY_ENDEX();

-
-
+    

     VTOY_JSON_FMT_OBJ_END();
     VTOY_JSON_FMT_END(pos);
 
     VTOY_JSON_FMT_OBJ_END();
     VTOY_JSON_FMT_END(pos);
 


@@ -702,12 +705,13 @@ static int ventoy_api_save_control(struct mg_connection *conn, VTOY_JSON *json)
     VTOY_JSON_INT("win11_bypass_check", ctrl->win11_bypass_check);
     VTOY_JSON_INT("linux_remount", ctrl->linux_remount);
     VTOY_JSON_INT("secondary_menu", ctrl->secondary_menu);
     VTOY_JSON_INT("win11_bypass_check", ctrl->win11_bypass_check);
     VTOY_JSON_INT("linux_remount", ctrl->linux_remount);
     VTOY_JSON_INT("secondary_menu", ctrl->secondary_menu);

+    VTOY_JSON_INT("password_asterisk", ctrl->password_asterisk);

     VTOY_JSON_INT("menu_timeout", ctrl->menu_timeout);
     VTOY_JSON_INT("secondary_menu_timeout", ctrl->secondary_menu_timeout);
 
     VTOY_JSON_STR("default_image", ctrl->default_image);
     VTOY_JSON_STR("default_search_root", ctrl->default_search_root);
     VTOY_JSON_INT("menu_timeout", ctrl->menu_timeout);
     VTOY_JSON_INT("secondary_menu_timeout", ctrl->secondary_menu_timeout);
 
     VTOY_JSON_STR("default_image", ctrl->default_image);
     VTOY_JSON_STR("default_search_root", ctrl->default_search_root);

-    VTOY_JSON_STR("help_text_language", ctrl->help_text_language);
+    VTOY_JSON_STR("menu_language", ctrl->menu_language);

     VTOY_JSON_STR("default_kbd_layout", ctrl->default_kbd_layout);
     
     ret = ventoy_data_save_all();
     VTOY_JSON_STR("default_kbd_layout", ctrl->default_kbd_layout);
     
     ret = ventoy_data_save_all();


@@ -3668,24 +3672,47 @@ static int ventoy_api_injection_del(struct mg_connection *conn, VTOY_JSON *json)
 
 static int ventoy_api_preview_json(struct mg_connection *conn, VTOY_JSON *json)
 {
 
 static int ventoy_api_preview_json(struct mg_connection *conn, VTOY_JSON *json)
 {

+    int i = 0;

     int pos = 0;
     int len = 0;
     int pos = 0;
     int len = 0;

-    int encodelen = 0;
+    int utf16enclen = 0;

     char *encodebuf = NULL;
     char *encodebuf = NULL;

+    unsigned short *utf16buf = NULL;

     
     (void)json;
 
     
     (void)json;
 

+    /* We can not use json directly, because it will be formated in the JS. */
+

     len = ventoy_data_real_save_all(0);
     len = ventoy_data_real_save_all(0);

-    encodebuf = ventoy_base64_encode(JSON_SAVE_BUFFER, len, &encodelen);
-    encodebuf[encodelen] = 0;

 
 

+    utf16buf = (unsigned short *)malloc(2 * len + 16);    
+    if (!utf16buf)
+    {
+        goto json;
+    }
+
+    utf16enclen = (int)utf8_to_utf16((unsigned char *)JSON_SAVE_BUFFER, len, utf16buf, len + 2);
+
+    encodebuf = (char *)malloc(utf16enclen * 4 + 16);
+    if (!encodebuf)
+    {
+        goto json;
+    }
+
+    for (i = 0; i < utf16enclen; i++)
+    {
+        scnprintf(encodebuf + i * 4, 5, "%04X", utf16buf[i]);
+    }
+
+json:

     VTOY_JSON_FMT_BEGIN(pos, JSON_BUFFER, JSON_BUF_MAX);
     VTOY_JSON_FMT_OBJ_BEGIN();
     VTOY_JSON_FMT_BEGIN(pos, JSON_BUFFER, JSON_BUF_MAX);
     VTOY_JSON_FMT_OBJ_BEGIN();

-    VTOY_JSON_FMT_STRN("json", encodebuf);
+    VTOY_JSON_FMT_STRN("json", (encodebuf ? encodebuf : ""));

     VTOY_JSON_FMT_OBJ_END();
     VTOY_JSON_FMT_END(pos);
 
     VTOY_JSON_FMT_OBJ_END();
     VTOY_JSON_FMT_END(pos);
 

-    free(encodebuf);
+    CHECK_FREE(encodebuf);
+    CHECK_FREE(utf16buf);

 
     ventoy_json_buffer(conn, JSON_BUFFER, pos);
     return 0;
 
     ventoy_json_buffer(conn, JSON_BUFFER, pos);
     return 0;


@@ -3978,34 +4005,43 @@ static int ventoy_parse_control(VTOY_JSON *json, void *p)
         if (node->enDataType == JSON_TYPE_OBJECT)
         {
             child = node->pstChild;
         if (node->enDataType == JSON_TYPE_OBJECT)
         {
             child = node->pstChild;

+            
+            if (child->enDataType != JSON_TYPE_STRING)
+            {
+                continue;
+            }

 
             if (strcmp(child->pcName, "VTOY_DEFAULT_MENU_MODE") == 0)
             {
 
             if (strcmp(child->pcName, "VTOY_DEFAULT_MENU_MODE") == 0)
             {

-                CONTROL_PARSE_INT(child, data->default_menu_mode);
+                CONTROL_PARSE_INT_DEF_0(child, data->default_menu_mode);

             }
             else if (strcmp(child->pcName, "VTOY_WIN11_BYPASS_CHECK") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_WIN11_BYPASS_CHECK") == 0)
             {

-                CONTROL_PARSE_INT(child, data->win11_bypass_check);
+                CONTROL_PARSE_INT_DEF_0(child, data->win11_bypass_check);

             }
             else if (strcmp(child->pcName, "VTOY_LINUX_REMOUNT") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_LINUX_REMOUNT") == 0)
             {

-                CONTROL_PARSE_INT(child, data->linux_remount);
+                CONTROL_PARSE_INT_DEF_0(child, data->linux_remount);

             }
             else if (strcmp(child->pcName, "VTOY_SECONDARY_BOOT_MENU") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_SECONDARY_BOOT_MENU") == 0)
             {

-                CONTROL_PARSE_INT(child, data->secondary_menu);
+                CONTROL_PARSE_INT_DEF_1(child, data->secondary_menu);
+            }
+            else if (strcmp(child->pcName, "VTOY_SHOW_PASSWORD_ASTERISK") == 0)
+            {
+                CONTROL_PARSE_INT_DEF_1(child, data->password_asterisk);

             }
             else if (strcmp(child->pcName, "VTOY_TREE_VIEW_MENU_STYLE") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_TREE_VIEW_MENU_STYLE") == 0)
             {

-                CONTROL_PARSE_INT(child, data->treeview_style);
+                CONTROL_PARSE_INT_DEF_0(child, data->treeview_style);

             }
             else if (strcmp(child->pcName, "VTOY_FILT_DOT_UNDERSCORE_FILE") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_FILT_DOT_UNDERSCORE_FILE") == 0)
             {

-                CONTROL_PARSE_INT(child, data->filter_dot_underscore);
+                CONTROL_PARSE_INT_DEF_1(child, data->filter_dot_underscore);

             }
             else if (strcmp(child->pcName, "VTOY_SORT_CASE_SENSITIVE") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_SORT_CASE_SENSITIVE") == 0)
             {

-                CONTROL_PARSE_INT(child, data->sort_casesensitive);
+                CONTROL_PARSE_INT_DEF_0(child, data->sort_casesensitive);

             }
             else if (strcmp(child->pcName, "VTOY_MAX_SEARCH_LEVEL") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_MAX_SEARCH_LEVEL") == 0)
             {


@@ -4037,13 +4073,13 @@ static int ventoy_parse_control(VTOY_JSON *json, void *p)
                     }
                 }
             }
                     }
                 }
             }

-            else if (strcmp(child->pcName, "VTOY_HELP_TXT_LANGUAGE") == 0)
+            else if (strcmp(child->pcName, "VTOY_MENU_LANGUAGE") == 0)

             {
             {

-                for (i = 0; g_ventoy_help_lang[i][0]; i++)
+                for (i = 0; g_ventoy_menu_lang[i][0]; i++)

                 {
                 {

-                    if (strcmp(child->unData.pcStrVal, g_ventoy_help_lang[i]) == 0)
+                    if (strcmp(child->unData.pcStrVal, g_ventoy_menu_lang[i]) == 0)

                     {
                     {

-                        strlcpy(data->help_text_language, child->unData.pcStrVal);
+                        strlcpy(data->menu_language, child->unData.pcStrVal);

                         break;
                     }
                 }
                         break;
                     }
                 }


@@ -4058,31 +4094,31 @@ static int ventoy_parse_control(VTOY_JSON *json, void *p)
             }
             else if (strcmp(child->pcName, "VTOY_VHD_NO_WARNING") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_VHD_NO_WARNING") == 0)
             {

-                CONTROL_PARSE_INT(child, data->vhd_no_warning);
+                CONTROL_PARSE_INT_DEF_0(child, data->vhd_no_warning);

             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_ISO") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_ISO") == 0)
             {

-                CONTROL_PARSE_INT(child, data->filter_iso);
+                CONTROL_PARSE_INT_DEF_0(child, data->filter_iso);

             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_IMG") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_IMG") == 0)
             {

-                CONTROL_PARSE_INT(child, data->filter_img);
+                CONTROL_PARSE_INT_DEF_0(child, data->filter_img);

             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_EFI") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_EFI") == 0)
             {

-                CONTROL_PARSE_INT(child, data->filter_efi);
+                CONTROL_PARSE_INT_DEF_0(child, data->filter_efi);

             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_WIM") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_WIM") == 0)
             {

-                CONTROL_PARSE_INT(child, data->filter_wim);
+                CONTROL_PARSE_INT_DEF_0(child, data->filter_wim);

             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_VHD") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_VHD") == 0)
             {

-                CONTROL_PARSE_INT(child, data->filter_vhd);
+                CONTROL_PARSE_INT_DEF_0(child, data->filter_vhd);

             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_VTOY") == 0)
             {
             }
             else if (strcmp(child->pcName, "VTOY_FILE_FLT_VTOY") == 0)
             {

-                CONTROL_PARSE_INT(child, data->filter_vtoy);
+                CONTROL_PARSE_INT_DEF_0(child, data->filter_vtoy);

             }
             
         }
             }
             
         }


@@ -5279,25 +5315,26 @@ int ventoy_http_init(void)
     char *Buffer = NULL;
     int BufLen = 0;
 
     char *Buffer = NULL;
     int BufLen = 0;
 

-    ventoy_read_file_to_buf("www/helplist", 4, (void **)&Buffer, &BufLen);
+    ventoy_read_file_to_buf("www/menulist", 4, (void **)&Buffer, &BufLen);

     if (Buffer)
     {
         for (i = 0; i < BufLen / 5; i++)
         {
     if (Buffer)
     {
         for (i = 0; i < BufLen / 5; i++)
         {

-            memcpy(g_ventoy_help_lang[i], Buffer + i * 5, 5);
-            g_ventoy_help_lang[i][5] = 0;
+            memcpy(g_ventoy_menu_lang[i], Buffer + i * 5, 5);
+            g_ventoy_menu_lang[i][5] = 0;

         }
         free(Buffer);
     }
 #else
     ventoy_file *file;
         }
         free(Buffer);
     }
 #else
     ventoy_file *file;

-    file = ventoy_tar_find_file("www/helplist");
+    
+    file = ventoy_tar_find_file("www/menulist");

     if (file)
     {
         for (i = 0; i < file->size / 5; i++)
         {
     if (file)
     {
         for (i = 0; i < file->size / 5; i++)
         {

-            memcpy(g_ventoy_help_lang[i], (char *)(file->addr) + i * 5, 5);
-            g_ventoy_help_lang[i][5] = 0;
+            memcpy(g_ventoy_menu_lang[i], (char *)(file->addr) + i * 5, 5);
+            g_ventoy_menu_lang[i][5] = 0;

         }
     }
 #endif
         }
     }
 #endif