vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean code

Browse source
This commit is contained in:
Laurent Destailleur 2026-04-07 12:38:57 +02:00
parent 607083235a
commit ca3ecce771
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
htdocs/core/ajax/ajaxextrafield.php
View file

@ -40,13 +40,13 @@ if (!defined('NOHEADERNOFOOTER')) {
}
include '../../main.inc.php';
include_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
/**
* @var Conf $conf
* @var DoliDB $db
* @var Translate $langs
* @var User $user
*/
include_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
// object id
$objectid = GETPOST('objectid', 'aZ09');
@ -166,9 +166,9 @@ if ($object instanceof CommonObject) {
}
if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
if (strpos($InfoFieldList[4], 'extra.') !== false) {
$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
$keyList = 'main.' . $db->sanitize($InfoFieldList[2]) . ' as rowid';
} else {
$keyList = $InfoFieldList[2] . ' as rowid';
$keyList = $db->sanitize($InfoFieldList[2]) . ' as rowid';
}
}
@ -187,8 +187,8 @@ if ($object instanceof CommonObject) {
}
$sqlwhere = '';
$sql = "SELECT " . $keyList;
$sql .= ' FROM ' . $db->prefix() . $InfoFieldList[0];
$sql = "SELECT " . $db->sanitize($keyList, 0, 0, 1);
$sql .= ' FROM ' . $db->prefix() . $db->sanitize($InfoFieldList[0]);
// Add filter from 4th field
if (!empty($InfoFieldList[4])) {

10
htdocs/core/class/extrafields.class.php
View file

@ -533,7 +533,7 @@ class ExtraFields
$sql .= " '".$this->db->escape($type)."',";
$sql .= " ".((int) $pos).",";
$sql .= " '".$this->db->escape($size)."',";
$sql .= " ".($entity === '' ? $conf->entity : $entity).",";
$sql .= " ".((int) ($entity === '' ? $conf->entity : $entity)).",";
$sql .= " '".$this->db->escape($elementtype)."',";
$sql .= " ".((int) $unique).",";
$sql .= " ".((int) $required).",";
@ -1563,9 +1563,9 @@ class ExtraFields
}
if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
if (strpos($InfoFieldList[4], 'extra.') !== false) {
$keyList = 'main.'.$InfoFieldList[2].' as rowid';
$keyList = 'main.'.$this->db->sanitize($InfoFieldList[2]).' as rowid';
} else {
$keyList = $InfoFieldList[2].' as rowid';
$keyList = $this->db->sanitize($InfoFieldList[2]).' as rowid';
}
}
@ -1586,8 +1586,8 @@ class ExtraFields
// WARNING!! This code is duplicated into core/ajax/ajaxextrafield.php
$sqlwhere = '';
$sql = "SELECT ".$keyList;
$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
$sql = "SELECT ".$this->db->sanitize($keyList, 0, 0, 1);
$sql .= ' FROM '.$this->db->prefix().$this->db->sanitize($InfoFieldList[0]);
// Add filter from 4th field
if (!empty($InfoFieldList[4])) {