Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into club

Browse Source
This commit is contained in:
Fabian Berg
2024-12-13 11:02:22 +01:00
committed by GitHub
parent 6628e30bd5 147c4039a0
commit 15a2980ece
4 changed files with 47 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
application/locale/es_ES/LC_MESSAGES/messages.po
View File

@@ -10,10 +10,10 @@ msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-12-12 17:07+0000\n"
"PO-Revision-Date: 2024-12-11 17:54+0000\n"
"PO-Revision-Date: 2024-12-13 06:56+0000\n"
"Last-Translator: David Quental <ct1drb72@gmail.com>\n"
"Language-Team: Spanish <https://translate.wavelog.org/projects/wavelog/main-"
"translation/es/>\n"
"Language-Team: Spanish <https://translate.wavelog.org/projects/wavelog/"
"main-translation/es/>\n"
"Language: es_ES\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -2353,7 +2353,7 @@ msgstr "Prefijos DXCC:"
#: application/controllers/Update.php:401
msgid "LoTW SAT Update"
msgstr ""
msgstr "Actualización de LoTW SAT"
#: application/controllers/User.php:36
#: application/views/interface_assets/header.php:276
@@ -2715,35 +2715,35 @@ msgstr "Estás ejecutando la última versión."
#: application/models/Update_model.php:383
msgid "cURL error:"
msgstr ""
msgstr "Error de cURL:"
#: application/models/Update_model.php:418
msgid "SAT already existing. LoTW status updated."
msgstr ""
msgstr "SAT ya existente. Estado de LoTW actualizado."
#: application/models/Update_model.php:420
msgid "SAT already existing. Updating LoTW status failed."
msgstr ""
msgstr "SAT ya existe. La actualización del estado de LoTW falló."
#: application/models/Update_model.php:423
msgid "SAT already existing. Ignored."
msgstr ""
msgstr "SAT ya existente. Ignorado."
#: application/models/Update_model.php:430
msgid "SAT already existing. Display name updated."
msgstr ""
msgstr "SAT ya existente. Nombre de usuario actualizado."
#: application/models/Update_model.php:432
msgid "SAT already existing. Updating display name failed."
msgstr ""
msgstr "SAT ya existe. La actualización del nombre para mostrar falló."
#: application/models/Update_model.php:442
msgid "New SAT. Inserted."
msgstr ""
msgstr "Nuevo SAT. Insertado."
#: application/models/Update_model.php:444
msgid "New SAT. Insert failed."
msgstr ""
msgstr "Nuevo SAT. Inserción fallida."
#: application/views/accumulate/index.php:2
msgid "Accumulated number of DXCCs worked"
@@ -10715,7 +10715,7 @@ msgstr "Agregar un satélite"
#: application/views/satellite/index.php:16
msgid "Sync Satellites from LoTW"
msgstr ""
msgstr "Sincronizar satélites desde LoTW"
#: application/views/satellite/index.php:27
msgid "TLE"
@@ -12481,7 +12481,7 @@ msgstr "No mostrar"
#: application/views/user/edit.php:488
msgid "Not displayed"
msgstr ""
msgstr "No mostrado"
#: application/views/user/edit.php:497
msgid "QSO (by default)"

36
application/locale/pt_PT/LC_MESSAGES/messages.po
View File

@@ -9,9 +9,9 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-12-12 17:07+0000\n"
"PO-Revision-Date: 2024-12-11 17:54+0000\n"
"Last-Translator: \"Francisco (F4VSE)\" <kikosgc@users.noreply.github.com>\n"
"POT-Creation-Date: 2024-12-12 13:41+0000\n"
"PO-Revision-Date: 2024-12-13 06:56+0000\n"
"Last-Translator: David Quental <ct1drb72@gmail.com>\n"
"Language-Team: Portuguese (Portugal) <https://translate.wavelog.org/projects/"
"wavelog/main-translation/pt_PT/>\n"
"Language: pt_PT\n"
@@ -2353,7 +2353,7 @@ msgstr "Prefixos DXCC:"
#: application/controllers/Update.php:401
msgid "LoTW SAT Update"
msgstr ""
msgstr "Atualização SAT LoTW"
#: application/controllers/User.php:36
#: application/views/interface_assets/header.php:276
@@ -2713,35 +2713,35 @@ msgstr "Está a usar a versão mais recente."
#: application/models/Update_model.php:383
msgid "cURL error:"
msgstr ""
msgstr "erro cURL:"
#: application/models/Update_model.php:418
msgid "SAT already existing. LoTW status updated."
msgstr ""
msgstr "SAT já existente. Status do LoTW atualizado."
#: application/models/Update_model.php:420
msgid "SAT already existing. Updating LoTW status failed."
msgstr ""
msgstr "SAT já existente. Atualização do status do LoTW falhou."
#: application/models/Update_model.php:423
msgid "SAT already existing. Ignored."
msgstr ""
msgstr "SAT já existente. Ignorado."
#: application/models/Update_model.php:430
msgid "SAT already existing. Display name updated."
msgstr ""
msgstr "SAT já existente. Nome de exibição atualizado."
#: application/models/Update_model.php:432
msgid "SAT already existing. Updating display name failed."
msgstr ""
msgstr "SAT já existe. Falha ao atualizar o nome de exibição."
#: application/models/Update_model.php:442
msgid "New SAT. Inserted."
msgstr ""
msgstr "Novo SAT. Inserido."
#: application/models/Update_model.php:444
msgid "New SAT. Insert failed."
msgstr ""
msgstr "Novo SAT. Inserção falhou."
#: application/views/accumulate/index.php:2
msgid "Accumulated number of DXCCs worked"
@@ -10687,7 +10687,7 @@ msgstr "Adicionar um satélite"
#: application/views/satellite/index.php:16
msgid "Sync Satellites from LoTW"
msgstr ""
msgstr "Sincronizar Satélites via LoTW"
#: application/views/satellite/index.php:27
msgid "TLE"
@@ -12440,14 +12440,10 @@ msgstr "Configurações do mapa"
msgid "Icon"
msgstr "Ícone"
#: application/views/user/edit.php:484
#: application/views/user/edit.php:484 application/views/user/edit.php:488
msgid "Not display"
msgstr "Não exibir"
#: application/views/user/edit.php:488
msgid "Not displayed"
msgstr ""
#: application/views/user/edit.php:497
msgid "QSO (by default)"
msgstr "Contacto (por defeito)"
@@ -13043,6 +13039,10 @@ msgstr "O seu indicativo:"
msgid "Submit Request"
msgstr "Submeter pedido"
#: application/views/user/edit.php:488
msgid "Not displayed"
msgstr "Não exibido"
#~ msgid "AOS Az"
#~ msgstr "AOS Az"

24
application/locale/zh_CN/LC_MESSAGES/messages.po
View File

@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-12-12 17:07+0000\n"
"PO-Revision-Date: 2024-12-12 11:07+0000\n"
"PO-Revision-Date: 2024-12-13 06:56+0000\n"
"Last-Translator: Karuru <karuru@aerodefense.co.uk>\n"
"Language-Team: Chinese (Simplified Han script) <https://translate.wavelog."
"org/projects/wavelog/main-translation/zh_Hans/>\n"
@@ -2326,7 +2326,7 @@ msgstr "DXCC 前缀："
#: application/controllers/Update.php:401
msgid "LoTW SAT Update"
msgstr ""
msgstr "LoTW 卫星数据更新"
#: application/controllers/User.php:36
#: application/views/interface_assets/header.php:276
@@ -2665,35 +2665,35 @@ msgstr "您运行的已经是最新版本。"
#: application/models/Update_model.php:383
msgid "cURL error:"
msgstr ""
msgstr "cURL 错误："
#: application/models/Update_model.php:418
msgid "SAT already existing. LoTW status updated."
msgstr ""
msgstr "卫星已存在，LoTW 状态已更新。"
#: application/models/Update_model.php:420
msgid "SAT already existing. Updating LoTW status failed."
msgstr ""
msgstr "卫星已存在，LoTW 状态更新失败。"
#: application/models/Update_model.php:423
msgid "SAT already existing. Ignored."
msgstr ""
msgstr "卫星已存在，忽略。"
#: application/models/Update_model.php:430
msgid "SAT already existing. Display name updated."
msgstr ""
msgstr "卫星已存在，已更新名称。"
#: application/models/Update_model.php:432
msgid "SAT already existing. Updating display name failed."
msgstr ""
msgstr "卫星已存在，更新名称失败。"
#: application/models/Update_model.php:442
msgid "New SAT. Inserted."
msgstr ""
msgstr "新卫星已添加。"
#: application/models/Update_model.php:444
msgid "New SAT. Insert failed."
msgstr ""
msgstr "新卫星添加失败。"
#: application/views/accumulate/index.php:2
msgid "Accumulated number of DXCCs worked"
@@ -10330,7 +10330,7 @@ msgstr "添加卫星"
#: application/views/satellite/index.php:16
msgid "Sync Satellites from LoTW"
msgstr ""
msgstr "从 LoTW 同步卫星"
#: application/views/satellite/index.php:27
msgid "TLE"
@@ -11994,7 +11994,7 @@ msgstr "不显示"
#: application/views/user/edit.php:488
msgid "Not displayed"
msgstr ""
msgstr "未显示"
#: application/views/user/edit.php:497
msgid "QSO (by default)"

13
install/includes/core/core_class.php
View File

@@ -24,13 +24,6 @@ class Core
$errors[] = "DB Username is missing.";
}
// Validate the password
if (isset($data['db_password']) and !empty($data['db_password'])) {
$counter++;
} else {
$errors[] = "DB Password is missing.";
}
// Validate the database
if (isset($data['db_name']) and !empty($data['db_name'])) {
$counter++;
@@ -119,7 +112,7 @@ class Core
}
// Check if all the required fields have been entered
if ($counter == '14') {
if ($counter == 13) {
log_message('info', 'Data validation passed.');
return true;
} else {
@@ -157,8 +150,8 @@ class Core
log_message('info', 'database.php template file read successfully.');
// Sanitize DB Password from single quotes
$sanitized_db_pwd = preg_replace("/\\\\/i",'\\\\\\\\',$data['db_password']); // Escape the Escape char ( '\' becomes '\\' )
$sanitized_db_pwd = preg_replace("/\'/i",'\\\\\'',$sanitized_db_pwd); // Escape the ' ( ' becomes \' )
$sanitized_db_pwd = preg_replace("/\\\\/i",'\\\\\\\\',$data['db_password'] ?? ''); // Escape the Escape char ( '\' becomes '\\' )
$sanitized_db_pwd = preg_replace("/\'/i",'\\\\\'',$sanitized_db_pwd); // Escape the ' ( ' becomes \' )
$new = str_replace("%HOSTNAME%", $data['db_hostname'], $database_file);
$new = str_replace("%USERNAME%", $data['db_username'], $new);