fix: fix more PHP issues

This commit is contained in:
Emmanuel BENOîT 2024-12-31 11:40:11 +01:00
parent a4b45ddaa4
commit dcec07be8a
Signed by: Emmanuel BENOîT
SSH key fingerprint: SHA256:l7PFUUF5TCDsvYeQC9OnTNz08dFY7Fvf4Hv3neIqYpg
4 changed files with 17 additions and 17 deletions

View file

@ -25,7 +25,7 @@ class main_links_library {
function getCategory($id) {
$q = $this->db->query("SELECT * FROM lk_category WHERE id=$id");
if (!($q && count($q))) {
if (!$q) {
return null;
}
return dbFetchHash($q);

View file

@ -79,7 +79,7 @@ class main_manual_readXMLFile {
$nFile = $node->getAttribute('file');
if ($nFile != '') {
// This subsection must be read from another file
if ($nFile{0} != "/")
if ($nFile[0] != "/")
$nFile = dirname($path) . "/$nFile";
$a = $this->run($nFile);
if (!is_array($a)) {

View file

@ -11,11 +11,11 @@ class main_manual_updateSections {
$versions = array();
foreach ($sections as $sName => $sData) {
if (is_null($versions[$sData['version']])) {
$versions[$sData['version']] = "'" . addslashes($sData['version']) . "'";
$versions[$sData['version']] = "'" . pg_escape_string($sData['version']) . "'";
}
$this->db->query("DELETE FROM man_section WHERE name='" . addslashes($sName)
$this->db->query("DELETE FROM man_section WHERE name='" . pg_escape_string($sName)
. "' AND version=" . $versions[$sData['version']]
. " AND lang='" . addslashes($sData['language']) . "'");
. " AND lang='" . pg_escape_string($sData['language']) . "'");
}
// Insert the data itself
@ -25,13 +25,13 @@ class main_manual_updateSections {
continue;
}
$this->db->query("INSERT INTO man_section (version,lang,name,last_update,is_page,in_menu,title,contents) VALUES("
. $versions[$sData['version']] . ",'" . addslashes($sData['language']) . "','"
. addslashes($sName) . "',$now," . dbBool($sData['is_page']) . ","
. dbBool($sData['in_menu']) . ",'" . addslashes($sData['title'])
. "','" . addslashes($sData['contents']) . "')");
$q = $this->db->query("SELECT id FROM man_section WHERE name='" . addslashes($sName)
. $versions[$sData['version']] . ",'" . pg_escape_string($sData['language']) . "','"
. pg_escape_string($sName) . "',$now," . dbBool($sData['is_page']) . ","
. dbBool($sData['in_menu']) . ",'" . pg_escape_string($sData['title'])
. "','" . pg_escape_string($sData['contents']) . "')");
$q = $this->db->query("SELECT id FROM man_section WHERE name='" . pg_escape_string($sName)
. "' AND version=" . $versions[$sData['version']]
. " AND lang='" . addslashes($sData['language']) . "'");
. " AND lang='" . pg_escape_string($sData['language']) . "'");
list($sections[$sName]['dbid']) = dbFetchArray($q);
}
@ -61,8 +61,8 @@ class main_manual_updateSections {
if (is_array($sections[$sData['linkto']])) {
$this->db->query("UPDATE man_section SET link_to={$sections[$sData['linkto']]['dbid']} WHERE id={$sData['dbid']}");
} else {
$q = $this->db->query("SELECT id FROM man_section WHERE name='" . addslashes($sData['linkto']) . "' AND version="
. $versions[$sData['version']] . " AND lang='" . addslashes($sData['language']) . "'");
$q = $this->db->query("SELECT id FROM man_section WHERE name='" . pg_escape_string($sData['linkto']) . "' AND version="
. $versions[$sData['version']] . " AND lang='" . pg_escape_string($sData['language']) . "'");
if ($q && dbCount($q) == 1) {
list($toid) = dbFetchArray($q);
$this->db->query("UPDATE man_section SET link_to=$toid WHERE id={$sData['dbid']}");
@ -77,7 +77,7 @@ class main_manual_updateSections {
if (!is_array($banwords[$sData['language']])) {
$ban = array();
$q = $this->db->query("SELECT word FROM man_index_ban WHERE lang='" . addslashes($sData['language']) . "'");
$q = $this->db->query("SELECT word FROM man_index_ban WHERE lang='" . pg_escape_string($sData['language']) . "'");
while ($r = dbFetchArray($q)) {
array_push($ban, $r[0]);
}
@ -97,8 +97,8 @@ class main_manual_updateSections {
}
}
foreach ($rtl as $word => $count) {
$this->db->query("INSERT INTO man_index(word,wcount,lang,section) VALUES ('" . addslashes($word)
. "',$count,'" . addslashes($sData['language']) . "',{$sData['dbid']})");
$this->db->query("INSERT INTO man_index(word,wcount,lang,section) VALUES ('" . pg_escape_string($word)
. "',$count,'" . pg_escape_string($sData['language']) . "',{$sData['dbid']})");
}
}
}

View file

@ -153,7 +153,7 @@ class main_ticks_deathofrats_library {
// Start with open proxies
l::debug("Checking for open proxies ...");
$this->checkOpenProxies();
if (count($this->proxiedAccounts)) {
if ($this->proxiedAccounts) {
l::info("Logging " . count($this->proxiedAccounts) . " account(s) using open proxies");
$this->db->safeTransaction(array($this, 'logOpenProxies'));
}