Mirror/TinWoo
1
0
Fork 0
mirror of https://github.com/hax4dazy/TinWoo.git synced 2025-02-09 19:25:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename some functions (before replacement code gets added)

Browse Source
This commit is contained in:
mrdude2478 2023-09-06 03:20:58 +01:00
parent 077d573984
commit 17dcb219e5
12 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/util/config.hpp
View File

@ -21,8 +21,8 @@ namespace inst::config {
extern bool usbAck; extern bool usbAck;
extern bool gayMode; extern bool gayMode;
extern bool useSound; extern bool useSound;
extern bool useoldphp; extern bool encodeurl;
extern bool streamhtmls; extern bool add_baseurl;
extern bool fixticket; extern bool fixticket;
extern bool httpkeyboard; extern bool httpkeyboard;

4
romfs/lang/de.json
View File

@ -176,8 +176,8 @@
"auto_update": "Suche automatisch nach Updates für TinWoo", "auto_update": "Suche automatisch nach Updates für TinWoo",
"gay_option": "Design verwenden", "gay_option": "Design verwenden",
"useSound": "Nutzen von Benachrichtungstönen während Installation", "useSound": "Nutzen von Benachrichtungstönen während Installation",
"useoldphp": "Auto encode urls for http server installs", "encodeurl": "Auto encode urls for http server installs",
"streamhtmls": "Auto add server base url for http server installs", "add_baseurl": "Auto add server base url for http server installs",
"fixticket": "Convert temporary tickets to permanent", "fixticket": "Convert temporary tickets to permanent",
"usehttpkeyboard": "Use keyboard during http server installs", "usehttpkeyboard": "Use keyboard during http server installs",
"sig_url": "Signatur Patches URL: ", "sig_url": "Signatur Patches URL: ",

4
romfs/lang/en.json
View File

@ -176,8 +176,8 @@
"auto_update": "Check for updates to TinWoo Installer automatically", "auto_update": "Check for updates to TinWoo Installer automatically",
"gay_option": "Use Theme", "gay_option": "Use Theme",
"useSound": "Use sound notifications during installs", "useSound": "Use sound notifications during installs",
"useoldphp": "Auto encode urls for http server installs", "encodeurl": "Auto encode urls for http server installs",
"streamhtmls": "Auto add server base url for http server installs", "add_baseurl": "Auto add server base url for http server installs",
"fixticket": "Convert temporary tickets to permanent", "fixticket": "Convert temporary tickets to permanent",
"usehttpkeyboard": "Use keyboard during http server installs", "usehttpkeyboard": "Use keyboard during http server installs",
"sig_url": "Signature patches source URL: ", "sig_url": "Signature patches source URL: ",

4
romfs/lang/es.json
View File

@ -176,8 +176,8 @@
"auto_update": "Busca actualizaciones para el instalador de TinWoo automáticamente", "auto_update": "Busca actualizaciones para el instalador de TinWoo automáticamente",
"gay_option": "Usar tema", "gay_option": "Usar tema",
"useSound": "Usar notificaciones de sonido durante las instalaciones", "useSound": "Usar notificaciones de sonido durante las instalaciones",
"useoldphp": "Usar archivos php antiguos para instalaciones de servidor http", "encodeurl": "Usar archivos php antiguos para instalaciones de servidor http",
"streamhtmls": "Auto add server base url for http server installs", "add_baseurl": "Auto add server base url for http server installs",
"fixticket": "Convert temporary tickets to permanent", "fixticket": "Convert temporary tickets to permanent",
"usehttpkeyboard": "Use keyboard during http server installs", "usehttpkeyboard": "Use keyboard during http server installs",
"sig_url": "URL de origen de parches de firma: ", "sig_url": "URL de origen de parches de firma: ",

4
romfs/lang/fr.json
View File

@ -176,8 +176,8 @@
"auto_update": "Vérifier les mises à jour de l'installateur TinWoo automatiquement", "auto_update": "Vérifier les mises à jour de l'installateur TinWoo automatiquement",
"gay_option": "Utiliser le thème", "gay_option": "Utiliser le thème",
"useSound": "Utiliser les notifications sonores lors des installations", "useSound": "Utiliser les notifications sonores lors des installations",
"useoldphp": "Encodage automatique des URL pour les installations de serveur http", "encodeurl": "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", "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", "fixticket": "Convertir des billets temporaires en billets permanents",
"usehttpkeyboard": "Utiliser le clavier lors des installations du serveur http", "usehttpkeyboard": "Utiliser le clavier lors des installations du serveur http",
"sig_url": "Patchs de signatures URL: ", "sig_url": "Patchs de signatures URL: ",

4
romfs/lang/it.json
View File

@ -176,8 +176,8 @@
"auto_update": "Controlla aggiornamenti di TinWoo Installer automaticamente", "auto_update": "Controlla aggiornamenti di TinWoo Installer automaticamente",
"gay_option": "Usa tema", "gay_option": "Usa tema",
"useSound": "Use sound notifications during installs", "useSound": "Use sound notifications during installs",
"useoldphp": "Auto encode urls for http server installs", "encodeurl": "Auto encode urls for http server installs",
"streamhtmls": "Auto add server base url for http server installs", "add_baseurl": "Auto add server base url for http server installs",
"fixticket": "Convert temporary tickets to permanent", "fixticket": "Convert temporary tickets to permanent",
"usehttpkeyboard": "Use keyboard during http server installs", "usehttpkeyboard": "Use keyboard during http server installs",
"sig_url": "Fonte URL SigPatches: ", "sig_url": "Fonte URL SigPatches: ",

4
romfs/lang/jp.json
View File

@ -176,8 +176,8 @@
"auto_update": "TinWooのアップデートを自動的に確認する", "auto_update": "TinWooのアップデートを自動的に確認する",
"gay_option": "テーマを使用する", "gay_option": "テーマを使用する",
"useSound": "インストール時にサウンドで通知する", "useSound": "インストール時にサウンドで通知する",
"useoldphp": "Auto encode urls for http server installs", "encodeurl": "Auto encode urls for http server installs",
"streamhtmls": "Auto add server base url for http server installs", "add_baseurl": "Auto add server base url for http server installs",
"fixticket": "Convert temporary tickets to permanent", "fixticket": "Convert temporary tickets to permanent",
"usehttpkeyboard": "Use keyboard during http server installs", "usehttpkeyboard": "Use keyboard during http server installs",
"sig_url": "署名パッチのソースURL: ", "sig_url": "署名パッチのソースURL: ",

4
romfs/lang/ru.json
View File

@ -176,8 +176,8 @@
"auto_update": "Автоматически проверять наличие обновлений", "auto_update": "Автоматически проверять наличие обновлений",
"gay_option": "Использовать тему", "gay_option": "Использовать тему",
"useSound": "Use sound notifications during installs", "useSound": "Use sound notifications during installs",
"useoldphp": "Auto encode urls for http server installs", "encodeurl": "Auto encode urls for http server installs",
"streamhtmls": "Auto add server base url for http server installs", "add_baseurl": "Auto add server base url for http server installs",
"fixticket": "Convert temporary tickets to permanent", "fixticket": "Convert temporary tickets to permanent",
"usehttpkeyboard": "Use keyboard during http server installs", "usehttpkeyboard": "Use keyboard during http server installs",
"sig_url": "URL для скачивания Signature patches: ", "sig_url": "URL для скачивания Signature patches: ",

4
romfs/lang/tw.json
View File

@ -176,8 +176,8 @@
"auto_update": "自動檢查Tinwoo Installer的更新版本", "auto_update": "自動檢查Tinwoo Installer的更新版本",
"gay_option": "套用主題", "gay_option": "套用主題",
"useSound": "在安裝過程中使用音效提醒進度", "useSound": "在安裝過程中使用音效提醒進度",
"useoldphp": "Auto encode urls for http server installs", "encodeurl": "Auto encode urls for http server installs",
"streamhtmls": "Auto add server base url for http server installs", "add_baseurl": "Auto add server base url for http server installs",
"fixticket": "Convert temporary tickets to permanent", "fixticket": "Convert temporary tickets to permanent",
"usehttpkeyboard": "Use keyboard during http server installs", "usehttpkeyboard": "Use keyboard during http server installs",
"sig_url": "簽名修補程式來源URL: ", "sig_url": "簽名修補程式來源URL: ",

6
source/netInstall.cpp
View File

@ -458,9 +458,9 @@ namespace netInstStuff {
if (response[index] == '"') { if (response[index] == '"') {
if (link.find("../") == std::string::npos) 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 (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); link = urlencode(link);
if (inst::config::streamhtmls) { if (inst::config::add_baseurl) {
std::string before_strip = stripfilename(url); std::string before_strip = stripfilename(url);
urls.push_back(before_strip + "/" + link); urls.push_back(before_strip + "/" + link);
} }
@ -469,7 +469,7 @@ namespace netInstStuff {
} }
} }
else { else {
if (inst::config::streamhtmls) { if (inst::config::add_baseurl) {
std::string before_strip = stripfilename(url); std::string before_strip = stripfilename(url);
urls.push_back(before_strip + "/" + link); urls.push_back(before_strip + "/" + link);
} }

28
source/ui/optionsPage.cpp
View File

@ -152,14 +152,14 @@ namespace inst::ui {
useSoundOption->SetColor(COLOR("#FFFFFFFF")); useSoundOption->SetColor(COLOR("#FFFFFFFF"));
useSoundOption->SetIcon(this->getMenuOptionIcon(inst::config::useSound)); useSoundOption->SetIcon(this->getMenuOptionIcon(inst::config::useSound));
this->menu->AddItem(useSoundOption); this->menu->AddItem(useSoundOption);
auto useoldphp = pu::ui::elm::MenuItem::New("options.menu_items.useoldphp"_lang); auto encodeurl = pu::ui::elm::MenuItem::New("options.menu_items.encodeurl"_lang);
useoldphp->SetColor(COLOR("#FFFFFFFF")); encodeurl->SetColor(COLOR("#FFFFFFFF"));
useoldphp->SetIcon(this->getMenuOptionIcon(inst::config::useoldphp)); encodeurl->SetIcon(this->getMenuOptionIcon(inst::config::encodeurl));
this->menu->AddItem(useoldphp); this->menu->AddItem(encodeurl);
auto streamhtmls = pu::ui::elm::MenuItem::New("options.menu_items.streamhtmls"_lang); auto add_baseurl = pu::ui::elm::MenuItem::New("options.menu_items.add_baseurl"_lang);
streamhtmls->SetColor(COLOR("#FFFFFFFF")); add_baseurl->SetColor(COLOR("#FFFFFFFF"));
streamhtmls->SetIcon(this->getMenuOptionIcon(inst::config::streamhtmls)); add_baseurl->SetIcon(this->getMenuOptionIcon(inst::config::add_baseurl));
this->menu->AddItem(streamhtmls); this->menu->AddItem(add_baseurl);
auto fixticket = pu::ui::elm::MenuItem::New("options.menu_items.fixticket"_lang); auto fixticket = pu::ui::elm::MenuItem::New("options.menu_items.fixticket"_lang);
fixticket->SetColor(COLOR("#FFFFFFFF")); fixticket->SetColor(COLOR("#FFFFFFFF"));
fixticket->SetIcon(this->getMenuOptionIcon(inst::config::fixticket)); fixticket->SetIcon(this->getMenuOptionIcon(inst::config::fixticket));
@ -291,11 +291,11 @@ namespace inst::ui {
break; break;
case 7: case 7:
if (inst::config::useoldphp) { if (inst::config::encodeurl) {
inst::config::useoldphp = false; inst::config::encodeurl = false;
} }
else { else {
inst::config::useoldphp = true; inst::config::encodeurl = true;
} }
this->setMenuText(); this->setMenuText();
this->menu->SetSelectedIndex(index); this->menu->SetSelectedIndex(index);
@ -303,11 +303,11 @@ namespace inst::ui {
break; break;
case 8: case 8:
if (inst::config::streamhtmls) { if (inst::config::add_baseurl) {
inst::config::streamhtmls = false; inst::config::add_baseurl = false;
} }
else { else {
inst::config::streamhtmls = true; inst::config::add_baseurl = true;
} }
this->setMenuText(); this->setMenuText();
this->menu->SetSelectedIndex(index); this->menu->SetSelectedIndex(index);

16
source/util/config.cpp
View File

@ -18,8 +18,8 @@ namespace inst::config {
bool useSound; bool useSound;
bool usbAck; bool usbAck;
bool validateNCAs; bool validateNCAs;
bool useoldphp; bool encodeurl;
bool streamhtmls; bool add_baseurl;
bool fixticket; bool fixticket;
bool httpkeyboard; bool httpkeyboard;
@ -38,8 +38,8 @@ namespace inst::config {
{"validateNCAs", validateNCAs}, {"validateNCAs", validateNCAs},
{"httpIndexUrl", httpIndexUrl}, {"httpIndexUrl", httpIndexUrl},
{"httplastUrl", httplastUrl}, {"httplastUrl", httplastUrl},
{"httpoldphp", useoldphp}, {"httpoldphp", encodeurl},
{"streamhtmls", streamhtmls}, {"add_baseurl", add_baseurl},
{"fixticket", fixticket}, {"fixticket", fixticket},
{"httpkeyboard", httpkeyboard} {"httpkeyboard", httpkeyboard}
}; };
@ -53,8 +53,8 @@ namespace inst::config {
nlohmann::json j; nlohmann::json j;
file >> j; file >> j;
autoUpdate = j["autoUpdate"].get<bool>(); autoUpdate = j["autoUpdate"].get<bool>();
useoldphp = j["httpoldphp"].get<bool>(); encodeurl = j["httpoldphp"].get<bool>();
streamhtmls = j["streamhtmls"].get<bool>(); add_baseurl = j["add_baseurl"].get<bool>();
fixticket = j["fixticket"].get<bool>(); fixticket = j["fixticket"].get<bool>();
httpkeyboard = j["httpkeyboard"].get<bool>(); httpkeyboard = j["httpkeyboard"].get<bool>();
deletePrompt = j["deletePrompt"].get<bool>(); deletePrompt = j["deletePrompt"].get<bool>();
@ -81,8 +81,8 @@ namespace inst::config {
deletePrompt = true; deletePrompt = true;
gayMode = false; gayMode = false;
useSound = true; useSound = true;
useoldphp = false; encodeurl = false;
streamhtmls = true; add_baseurl = true;
fixticket = true; fixticket = true;
httpkeyboard = false; httpkeyboard = false;
ignoreReqVers = true; ignoreReqVers = true;