Works on enhancement of project tasks
Fix: security check
This commit is contained in:
parent
cd46758cc0
commit
1f71ab2e39
@ -121,7 +121,7 @@ class modProjet extends DolibarrModules
|
|||||||
$this->rights[$r][0] = 141; // id de la permission
|
$this->rights[$r][0] = 141; // id de la permission
|
||||||
$this->rights[$r][1] = "Lire tous les projets et taches (y compris prives qui ne me sont pas affectes)"; // libelle de la permission
|
$this->rights[$r][1] = "Lire tous les projets et taches (y compris prives qui ne me sont pas affectes)"; // libelle de la permission
|
||||||
$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
|
$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
|
||||||
$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
|
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
|
||||||
$this->rights[$r][4] = 'all';
|
$this->rights[$r][4] = 'all';
|
||||||
$this->rights[$r][5] = 'lire';
|
$this->rights[$r][5] = 'lire';
|
||||||
|
|
||||||
|
|||||||
@ -113,6 +113,7 @@ if ($mesg) print $mesg;
|
|||||||
$tasksarray=$task->getTasksArray(0,0,$project->id,0);
|
$tasksarray=$task->getTasksArray(0,0,$project->id,0);
|
||||||
$tasksrole=$task->getUserRolesForProjectsOrTasks($user,0,$project->id,0);
|
$tasksrole=$task->getUserRolesForProjectsOrTasks($user,0,$project->id,0);
|
||||||
//var_dump($tasksarray);
|
//var_dump($tasksarray);
|
||||||
|
var_dump($tasksrole);
|
||||||
|
|
||||||
print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$project->id.'">';
|
print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$project->id.'">';
|
||||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||||
|
|||||||
@ -127,7 +127,7 @@ $sql.= ", s.nom, s.rowid as socid";
|
|||||||
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
|
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
|
||||||
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
|
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
|
||||||
$sql.= " WHERE p.entity = ".$conf->entity;
|
$sql.= " WHERE p.entity = ".$conf->entity;
|
||||||
$sql.= " AND p.rowid IN (".$projectsListId.")";
|
if (!$user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
|
||||||
if ($socid) $sql.= " AND s.rowid = ".$socid;
|
if ($socid) $sql.= " AND s.rowid = ".$socid;
|
||||||
$sql.= " GROUP BY s.nom, s.rowid";
|
$sql.= " GROUP BY s.nom, s.rowid";
|
||||||
|
|
||||||
|
|||||||
@ -612,7 +612,7 @@ class Project extends CommonObject
|
|||||||
{
|
{
|
||||||
// To verify role of users
|
// To verify role of users
|
||||||
$userAccess = 0;
|
$userAccess = 0;
|
||||||
if (!empty($this->user_author_id) && $this->user_author_id == $user->id)
|
if ((!empty($this->user_author_id) && $this->user_author_id == $user->id) || $user->rights->projet->all->lire)
|
||||||
{
|
{
|
||||||
$userAccess = 1;
|
$userAccess = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user