Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: multi language tool fixes #6391

Merged
merged 1 commit into from Apr 23, 2023
Merged

fix: multi language tool fixes #6391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion interface/language/lang_definition.php
View file
Open in desktop
Expand Up @@ -151,7 +151,7 @@
$value = trim($value);

// only continue if the definition is new
$sql = "SELECT * FROM lang_definitions WHERE def_id=? AND definition=? " . $case_sensitive_collation;
$sql = "SELECT * FROM lang_definitions WHERE def_id=? AND definition " . $case_sensitive_collation . " =?";
$res_test = SqlStatement($sql, array($key, $value));
if (!SqlFetchArray($res_test)) {
// insert into the main language tables
Expand Down
8 changes: 4 additions & 4 deletions interface/language/lang_manage.php
View file
Open in desktop
Expand Up @@ -77,7 +77,7 @@
echo xlt('Following is a new custom language:') . " " . text($var) . "<br>";
if (!$checkOnly) {
// add the new language (first collect the language code)
$sql = "SELECT lang_code FROM lang_custom WHERE constant_name='' AND lang_description=? " . $case_sensitive_collation . " LIMIT 1";
$sql = "SELECT lang_code FROM lang_custom WHERE constant_name='' AND lang_description " . $case_sensitive_collation . " =? LIMIT 1";
$res = SqlStatement($sql, array($var));
$row = SqlFetchArray($res);
$sql = "INSERT INTO lang_languages SET lang_code=?, lang_description=?";
Expand Down Expand Up @@ -129,13 +129,13 @@
$res = SqlStatement($sql);
while ($row = SqlFetchArray($res)) {
// collect language id
$sql = "SELECT lang_id FROM lang_languages WHERE lang_description=? " . $case_sensitive_collation . " LIMIT 1";
$sql = "SELECT lang_id FROM lang_languages WHERE lang_description " . $case_sensitive_collation . " =? LIMIT 1";
$res2 = SqlStatement($sql, array($row['lang_description']));
$row2 = SqlFetchArray($res2);
$language_id = $row2['lang_id'];

// collect constant id
$sql = "SELECT cons_id FROM lang_constants WHERE constant_name=? " . $case_sensitive_collation . " LIMIT 1";
$sql = "SELECT cons_id FROM lang_constants WHERE constant_name " . $case_sensitive_collation . " =? LIMIT 1";
$res2 = SqlStatement($sql, array($row['constant_name']));
$row2 = SqlFetchArray($res2);
$constant_id = $row2['cons_id'];
Expand All @@ -148,7 +148,7 @@

if ($def_id) {
//definition exist, so check to see if different
$sql = "SELECT * FROM lang_definitions WHERE def_id=? AND definition=? " . $case_sensitive_collation;
$sql = "SELECT * FROM lang_definitions WHERE def_id=? AND definition " . $case_sensitive_collation . " =?";
$res_test = SqlStatement($sql, array($def_id, $row['definition']));
if (SqlFetchArray($res_test)) {
//definition not different
Expand Down
10 changes: 5 additions & 5 deletions interface/language/language.inc.php
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@ function insert_language_log($lang_desc, $lang_code, $cons_name, $def)
if ($cons_name == '') {
// NEW LANGUAGE
// (ensure not a repeat log entry)
$sql = "SELECT * FROM lang_custom WHERE constant_name='' AND lang_description=? " . $case_sensitive_collation;
$sql = "SELECT * FROM lang_custom WHERE constant_name='' AND lang_description " . $case_sensitive_collation . " =?";
$res_test = SqlStatement($sql, array($lang_desc));
if (!SqlFetchArray($res_test)) {
$sql = "INSERT INTO lang_custom SET lang_code=?, lang_description=?";
Expand All @@ -49,7 +49,7 @@ function insert_language_log($lang_desc, $lang_code, $cons_name, $def)
} elseif ($lang_desc == '') {
// NEW CONSTANT
// (ensure not a repeat entry)
$sql = "SELECT * FROM lang_custom WHERE lang_description='' AND constant_name=? " . $case_sensitive_collation;
$sql = "SELECT * FROM lang_custom WHERE lang_description='' AND constant_name " . $case_sensitive_collation . " =?";
$res_test = SqlStatement($sql, array($cons_name));
if (!SqlFetchArray($res_test)) {
$sql = "INSERT INTO lang_custom SET constant_name=?";
Expand All @@ -58,15 +58,15 @@ function insert_language_log($lang_desc, $lang_code, $cons_name, $def)
} else {
// FULL ENTRY
// (ensure not a repeat log entry)
$sql = "SELECT * FROM lang_custom WHERE lang_description=? " . $case_sensitive_collation . " AND constant_name=? " . $case_sensitive_collation . " AND definition=? " . $case_sensitive_collation;
$sql = "SELECT * FROM lang_custom WHERE lang_description " . $case_sensitive_collation . " =? AND constant_name " . $case_sensitive_collation . " =? AND definition " . $case_sensitive_collation . " =?";
$res_test = SqlStatement($sql, array($lang_desc, $cons_name, $def));
if (!SqlFetchArray($res_test)) {
// either modify already existing log entry or create a new one
$sql = "SELECT * FROM lang_custom WHERE lang_description=? " . $case_sensitive_collation . " AND constant_name=? " . $case_sensitive_collation;
$sql = "SELECT * FROM lang_custom WHERE lang_description " . $case_sensitive_collation . " =? AND constant_name " . $case_sensitive_collation . " =?";
$res_test2 = SqlStatement($sql, array($lang_desc, $cons_name));
if (SqlFetchArray($res_test2)) {
// modify existing log entry(s)
$sql = "UPDATE lang_custom SET definition=? WHERE lang_description=? " . $case_sensitive_collation . " AND constant_name=? " . $case_sensitive_collation;
$sql = "UPDATE lang_custom SET definition=? WHERE lang_description " . $case_sensitive_collation . " =? AND constant_name " . $case_sensitive_collation . " =?";
SqlStatement($sql, array($def, $lang_desc, $cons_name));
} else {
// create new log entry
Expand Down