From 17dcb219e5e24445c438da76976c45931a757d4a Mon Sep 17 00:00:00 2001 From: mrdude2478 Date: Wed, 6 Sep 2023 03:20:58 +0100 Subject: [PATCH] rename some functions (before replacement code gets added) --- include/util/config.hpp | 4 ++-- romfs/lang/de.json | 4 ++-- romfs/lang/en.json | 4 ++-- romfs/lang/es.json | 4 ++-- romfs/lang/fr.json | 4 ++-- romfs/lang/it.json | 4 ++-- romfs/lang/jp.json | 4 ++-- romfs/lang/ru.json | 4 ++-- romfs/lang/tw.json | 4 ++-- source/netInstall.cpp | 6 +++--- source/ui/optionsPage.cpp | 28 ++++++++++++++-------------- source/util/config.cpp | 16 ++++++++-------- 12 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/util/config.hpp b/include/util/config.hpp index b64133b..d844b74 100644 --- a/include/util/config.hpp +++ b/include/util/config.hpp @@ -21,8 +21,8 @@ namespace inst::config { extern bool usbAck; extern bool gayMode; extern bool useSound; - extern bool useoldphp; - extern bool streamhtmls; + extern bool encodeurl; + extern bool add_baseurl; extern bool fixticket; extern bool httpkeyboard; diff --git a/romfs/lang/de.json b/romfs/lang/de.json index b07e84e..b37d1f6 100644 --- a/romfs/lang/de.json +++ b/romfs/lang/de.json @@ -176,8 +176,8 @@ "auto_update": "Suche automatisch nach Updates für TinWoo", "gay_option": "Design verwenden", "useSound": "Nutzen von Benachrichtungstönen während Installation", - "useoldphp": "Auto encode urls for http server installs", - "streamhtmls": "Auto add server base url for http server installs", + "encodeurl": "Auto encode urls for http server installs", + "add_baseurl": "Auto add server base url for http server installs", "fixticket": "Convert temporary tickets to permanent", "usehttpkeyboard": "Use keyboard during http server installs", "sig_url": "Signatur Patches URL: ", diff --git a/romfs/lang/en.json b/romfs/lang/en.json index c5bcee8..ac08215 100644 --- a/romfs/lang/en.json +++ b/romfs/lang/en.json @@ -176,8 +176,8 @@ "auto_update": "Check for updates to TinWoo Installer automatically", "gay_option": "Use Theme", "useSound": "Use sound notifications during installs", - "useoldphp": "Auto encode urls for http server installs", - "streamhtmls": "Auto add server base url for http server installs", + "encodeurl": "Auto encode urls for http server installs", + "add_baseurl": "Auto add server base url for http server installs", "fixticket": "Convert temporary tickets to permanent", "usehttpkeyboard": "Use keyboard during http server installs", "sig_url": "Signature patches source URL: ", diff --git a/romfs/lang/es.json b/romfs/lang/es.json index 1faad92..302aee9 100644 --- a/romfs/lang/es.json +++ b/romfs/lang/es.json @@ -176,8 +176,8 @@ "auto_update": "Busca actualizaciones para el instalador de TinWoo automáticamente", "gay_option": "Usar tema", "useSound": "Usar notificaciones de sonido durante las instalaciones", - "useoldphp": "Usar archivos php antiguos para instalaciones de servidor http", - "streamhtmls": "Auto add server base url for http server installs", + "encodeurl": "Usar archivos php antiguos para instalaciones de servidor http", + "add_baseurl": "Auto add server base url for http server installs", "fixticket": "Convert temporary tickets to permanent", "usehttpkeyboard": "Use keyboard during http server installs", "sig_url": "URL de origen de parches de firma: ", diff --git a/romfs/lang/fr.json b/romfs/lang/fr.json index 9ba29f7..5bdac63 100644 --- a/romfs/lang/fr.json +++ b/romfs/lang/fr.json @@ -176,8 +176,8 @@ "auto_update": "Vérifier les mises à jour de l'installateur TinWoo automatiquement", "gay_option": "Utiliser le thème", "useSound": "Utiliser les notifications sonores lors des installations", - "useoldphp": "Encodage automatique des URL pour les installations de serveur http", - "streamhtmls": "Ajout automatique de l'URL de base du serveur pour les installations de serveur http", + "encodeurl": "Encodage automatique des URL pour les installations de serveur http", + "add_baseurl": "Ajout automatique de l'URL de base du serveur pour les installations de serveur http", "fixticket": "Convertir des billets temporaires en billets permanents", "usehttpkeyboard": "Utiliser le clavier lors des installations du serveur http", "sig_url": "Patchs de signatures URL: ", diff --git a/romfs/lang/it.json b/romfs/lang/it.json index a4e9abb..26b7b8a 100644 --- a/romfs/lang/it.json +++ b/romfs/lang/it.json @@ -176,8 +176,8 @@ "auto_update": "Controlla aggiornamenti di TinWoo Installer automaticamente", "gay_option": "Usa tema", "useSound": "Use sound notifications during installs", - "useoldphp": "Auto encode urls for http server installs", - "streamhtmls": "Auto add server base url for http server installs", + "encodeurl": "Auto encode urls for http server installs", + "add_baseurl": "Auto add server base url for http server installs", "fixticket": "Convert temporary tickets to permanent", "usehttpkeyboard": "Use keyboard during http server installs", "sig_url": "Fonte URL SigPatches: ", diff --git a/romfs/lang/jp.json b/romfs/lang/jp.json index 12e6533..ab4c8d5 100644 --- a/romfs/lang/jp.json +++ b/romfs/lang/jp.json @@ -176,8 +176,8 @@ "auto_update": "TinWooのアップデートを自動的に確認する", "gay_option": "テーマを使用する", "useSound": "インストール時にサウンドで通知する", - "useoldphp": "Auto encode urls for http server installs", - "streamhtmls": "Auto add server base url for http server installs", + "encodeurl": "Auto encode urls for http server installs", + "add_baseurl": "Auto add server base url for http server installs", "fixticket": "Convert temporary tickets to permanent", "usehttpkeyboard": "Use keyboard during http server installs", "sig_url": "署名パッチのソースURL: ", diff --git a/romfs/lang/ru.json b/romfs/lang/ru.json index cc1894f..bf8ee23 100644 --- a/romfs/lang/ru.json +++ b/romfs/lang/ru.json @@ -176,8 +176,8 @@ "auto_update": "Автоматически проверять наличие обновлений", "gay_option": "Использовать тему", "useSound": "Use sound notifications during installs", - "useoldphp": "Auto encode urls for http server installs", - "streamhtmls": "Auto add server base url for http server installs", + "encodeurl": "Auto encode urls for http server installs", + "add_baseurl": "Auto add server base url for http server installs", "fixticket": "Convert temporary tickets to permanent", "usehttpkeyboard": "Use keyboard during http server installs", "sig_url": "URL для скачивания Signature patches: ", diff --git a/romfs/lang/tw.json b/romfs/lang/tw.json index d9a15bd..b8e8c29 100644 --- a/romfs/lang/tw.json +++ b/romfs/lang/tw.json @@ -176,8 +176,8 @@ "auto_update": "自動檢查Tinwoo Installer的更新版本", "gay_option": "套用主題", "useSound": "在安裝過程中使用音效提醒進度", - "useoldphp": "Auto encode urls for http server installs", - "streamhtmls": "Auto add server base url for http server installs", + "encodeurl": "Auto encode urls for http server installs", + "add_baseurl": "Auto add server base url for http server installs", "fixticket": "Convert temporary tickets to permanent", "usehttpkeyboard": "Use keyboard during http server installs", "sig_url": "簽名修補程式來源URL: ", diff --git a/source/netInstall.cpp b/source/netInstall.cpp index 38bb8d6..5f695de 100644 --- a/source/netInstall.cpp +++ b/source/netInstall.cpp @@ -458,9 +458,9 @@ namespace netInstStuff { if (response[index] == '"') { if (link.find("../") == std::string::npos) if (findCaseInsensitive(link, ".nsp") != std::string::npos || findCaseInsensitive(link, ".nsz") != std::string::npos || findCaseInsensitive(link, ".xci") != std::string::npos || findCaseInsensitive(link, ".xcz") != std::string::npos) { - if (inst::config::useoldphp) { + if (inst::config::encodeurl) { link = urlencode(link); - if (inst::config::streamhtmls) { + if (inst::config::add_baseurl) { std::string before_strip = stripfilename(url); urls.push_back(before_strip + "/" + link); } @@ -469,7 +469,7 @@ namespace netInstStuff { } } else { - if (inst::config::streamhtmls) { + if (inst::config::add_baseurl) { std::string before_strip = stripfilename(url); urls.push_back(before_strip + "/" + link); } diff --git a/source/ui/optionsPage.cpp b/source/ui/optionsPage.cpp index a357b80..a13487f 100644 --- a/source/ui/optionsPage.cpp +++ b/source/ui/optionsPage.cpp @@ -152,14 +152,14 @@ namespace inst::ui { useSoundOption->SetColor(COLOR("#FFFFFFFF")); useSoundOption->SetIcon(this->getMenuOptionIcon(inst::config::useSound)); this->menu->AddItem(useSoundOption); - auto useoldphp = pu::ui::elm::MenuItem::New("options.menu_items.useoldphp"_lang); - useoldphp->SetColor(COLOR("#FFFFFFFF")); - useoldphp->SetIcon(this->getMenuOptionIcon(inst::config::useoldphp)); - this->menu->AddItem(useoldphp); - auto streamhtmls = pu::ui::elm::MenuItem::New("options.menu_items.streamhtmls"_lang); - streamhtmls->SetColor(COLOR("#FFFFFFFF")); - streamhtmls->SetIcon(this->getMenuOptionIcon(inst::config::streamhtmls)); - this->menu->AddItem(streamhtmls); + auto encodeurl = pu::ui::elm::MenuItem::New("options.menu_items.encodeurl"_lang); + encodeurl->SetColor(COLOR("#FFFFFFFF")); + encodeurl->SetIcon(this->getMenuOptionIcon(inst::config::encodeurl)); + this->menu->AddItem(encodeurl); + auto add_baseurl = pu::ui::elm::MenuItem::New("options.menu_items.add_baseurl"_lang); + add_baseurl->SetColor(COLOR("#FFFFFFFF")); + add_baseurl->SetIcon(this->getMenuOptionIcon(inst::config::add_baseurl)); + this->menu->AddItem(add_baseurl); auto fixticket = pu::ui::elm::MenuItem::New("options.menu_items.fixticket"_lang); fixticket->SetColor(COLOR("#FFFFFFFF")); fixticket->SetIcon(this->getMenuOptionIcon(inst::config::fixticket)); @@ -291,11 +291,11 @@ namespace inst::ui { break; case 7: - if (inst::config::useoldphp) { - inst::config::useoldphp = false; + if (inst::config::encodeurl) { + inst::config::encodeurl = false; } else { - inst::config::useoldphp = true; + inst::config::encodeurl = true; } this->setMenuText(); this->menu->SetSelectedIndex(index); @@ -303,11 +303,11 @@ namespace inst::ui { break; case 8: - if (inst::config::streamhtmls) { - inst::config::streamhtmls = false; + if (inst::config::add_baseurl) { + inst::config::add_baseurl = false; } else { - inst::config::streamhtmls = true; + inst::config::add_baseurl = true; } this->setMenuText(); this->menu->SetSelectedIndex(index); diff --git a/source/util/config.cpp b/source/util/config.cpp index cbb1289..fe4972f 100644 --- a/source/util/config.cpp +++ b/source/util/config.cpp @@ -18,8 +18,8 @@ namespace inst::config { bool useSound; bool usbAck; bool validateNCAs; - bool useoldphp; - bool streamhtmls; + bool encodeurl; + bool add_baseurl; bool fixticket; bool httpkeyboard; @@ -38,8 +38,8 @@ namespace inst::config { {"validateNCAs", validateNCAs}, {"httpIndexUrl", httpIndexUrl}, {"httplastUrl", httplastUrl}, - {"httpoldphp", useoldphp}, - {"streamhtmls", streamhtmls}, + {"httpoldphp", encodeurl}, + {"add_baseurl", add_baseurl}, {"fixticket", fixticket}, {"httpkeyboard", httpkeyboard} }; @@ -53,8 +53,8 @@ namespace inst::config { nlohmann::json j; file >> j; autoUpdate = j["autoUpdate"].get(); - useoldphp = j["httpoldphp"].get(); - streamhtmls = j["streamhtmls"].get(); + encodeurl = j["httpoldphp"].get(); + add_baseurl = j["add_baseurl"].get(); fixticket = j["fixticket"].get(); httpkeyboard = j["httpkeyboard"].get(); deletePrompt = j["deletePrompt"].get(); @@ -81,8 +81,8 @@ namespace inst::config { deletePrompt = true; gayMode = false; useSound = true; - useoldphp = false; - streamhtmls = true; + encodeurl = false; + add_baseurl = true; fixticket = true; httpkeyboard = false; ignoreReqVers = true;