diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 2fcce8e468e..7652b2bfd0f 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -228,7 +228,7 @@ class Evaluation extends CommonObject
if ($resultcreate > 0) {
require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
$skillRank = new SkillRank($this->db);
- $TRequiredRanks = $skillRank->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object='.$this->fk_job.' AND objecttype="job"'));
+ $TRequiredRanks = $skillRank->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object='.$this->fk_job." AND objecttype='job'"));
if (is_array($TRequiredRanks) && !empty($TRequiredRanks)) {
$this->lines = array();
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index b6242527178..c2a09936199 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -217,7 +217,7 @@ class SkillRank extends CommonObject
{
global $langs;
- $sqlfilter = 'fk_object='.$this->fk_object.' AND objecttype="'.$this->objecttype.'" AND fk_skill = '.$this->fk_skill;
+ $sqlfilter = 'fk_object='.$this->fk_object." AND objecttype='".$this->objecttype."' AND fk_skill = ".$this->fk_skill;
$alreadyLinked = $this->fetchAll('ASC', 'rowid', 0, 0, array('customsql' => $sqlfilter));
if (!empty($alreadyLinked)) {
$this->error = $langs->trans('ErrSkillAlreadyAdded');
diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index af41e1bdca1..a42a0e158b5 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -401,13 +401,11 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list
$sql = "SELECT DISTINCT u.rowid FROM " . MAIN_DB_PREFIX . "user u
- LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user ugu ON (u.rowid = ugu.fk_user)
- WHERE 1
- AND u.statut > 0
- AND ugu.fk_usergroup=" . $fk_usergroup;
+ LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON (u.rowid = ugu.fk_user)
+ WHERE u.statut > 0
+ AND ugu.fk_usergroup=" . ((int)$fk_usergroup);
$res = $db->query($sql);
-
$out .= '
';
$TExcludedId = explode(',', $excludedIdsList);
@@ -476,12 +474,12 @@ function getSkillForUsers($TUser)
if (empty($TUser)) return array();
$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
- $sql.= " MAX(sr.rank) as rank";
- $sql.=' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
- $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
- $sql.=' WHERE sr.objecttype = "'.SkillRank::SKILLRANK_TYPE_USER.'"';
- $sql.=' AND sr.fk_object IN ('.implode(',', $TUser).')';
- $sql.=" GROUP BY sk.rowid "; // group par competence
+ $sql.= ' MAX(sr.rank) as "rank"';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
+ $sql.= " WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_USER."'";
+ $sql.= ' AND sr.fk_object IN ('.implode(',', $TUser).')';
+ $sql.= " GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill "; // group par competence
$resql = $db->query($sql);
$Tab = array();
@@ -531,12 +529,12 @@ function getSkillForJob($fk_job)
if (empty($fk_job)) return array();
$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
- $sql.= " MAX(sr.rank) as rank";
+ $sql.= ' MAX(sr.rank) as "rank"';
$sql.=' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
- $sql.=' WHERE sr.objecttype = "'.SkillRank::SKILLRANK_TYPE_JOB.'"';
+ $sql.=" WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_JOB."'";
$sql.=' AND sr.fk_object IN ('.$fk_job.')';
- $sql.=' GROUP BY sk.rowid '; // group par competence*/
+ $sql.=' GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill '; // group par competence*/
$resql = $db->query($sql);
$Tab = array();
diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php
index 172956fc379..05e5af86b8f 100644
--- a/htdocs/hrm/evaluation_card.php
+++ b/htdocs/hrm/evaluation_card.php
@@ -610,17 +610,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$sql .= ' e.ref,';
$sql .= ' e.date_creation,';
$sql .= ' e.fk_job,';
- $sql .= ' j.label as refjob,';
+ $sql .= ' j.label as "refjob",';
$sql .= ' ed.fk_skill,';
- $sql .= ' sk.label as skilllabel,';
+ $sql .= ' sk.label as "skilllabel",';
$sql .= ' sk.skill_type,';
$sql .= ' sk.description,';
$sql .= ' ed.rank,';
$sql .= ' ed.required_rank,';
- $sql .= ' ed.rank as userRankForSkill,';
- $sql .= ' skdet_user.description as userRankForSkillDesc,';
- $sql .= ' skdet_required.description as required_rank_desc';
+ $sql .= ' ed.rank as "userRankForSkill",';
+ $sql .= ' skdet_user.description as "userRankForSkillDesc",';
+ $sql .= ' skdet_required.description as "required_rank_desc"';
$sql .= ' FROM ' . MAIN_DB_PREFIX . 'hrm_evaluation as e';
$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_evaluationdet as ed ON e.rowid = ed.fk_evaluation';
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index 4ecbc6439be..5e4b33345b7 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -178,7 +178,7 @@ if (empty($reshook)) {
} else if ($action == 'saveSkill') {
if (!empty($TNote)) {
foreach ($TNote as $skillId => $rank) {
- $TSkills = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . $id . ' AND objecttype="' . $objecttype . '" AND fk_skill = ' . $skillId));
+ $TSkills = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . $id . " AND objecttype='" . $objecttype . "' AND fk_skill = " . $skillId));
if (is_array($TSkills) && !empty($TSkills)) {
foreach ($TSkills as $tmpObj) {
$tmpObj->rank = $rank;
@@ -283,7 +283,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
// table of skillRank linked to current object
- $TSkillsJob = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . $id . ' AND objecttype="' . $objecttype . '"'));
+ $TSkillsJob = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . $id . " AND objecttype='" . $objecttype . "'"));
$TAlreadyUsedSkill = array();
if (is_array($TSkillsJob) && !empty($TSkillsJob)) {