Fix permissions
This commit is contained in:
Laurent Destailleur
parent
ddd0848acc
commit
a2e814b079
@ -378,6 +378,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
|
|||||||
$nbko++;
|
$nbko++;
|
||||||
}
|
}
|
||||||
} elseif (!empty($feature) && ($feature != 'user' && $feature != 'usergroup')) { // This is permissions on 1 level
|
} elseif (!empty($feature) && ($feature != 'user' && $feature != 'usergroup')) { // This is permissions on 1 level
|
||||||
|
var_dump($user->rights);
|
||||||
if (empty($user->rights->$feature->lire)
|
if (empty($user->rights->$feature->lire)
|
||||||
&& empty($user->rights->$feature->read)
|
&& empty($user->rights->$feature->read)
|
||||||
&& empty($user->rights->$feature->run)) {
|
&& empty($user->rights->$feature->run)) {
|
||||||
|
|||||||
@ -52,9 +52,6 @@ if ($user->socid) {
|
|||||||
}
|
}
|
||||||
$userid = $user->id;
|
$userid = $user->id;
|
||||||
|
|
||||||
// Security check
|
|
||||||
$result = restrictedArea($user, 'ticket', 0, '', '', '', '');
|
|
||||||
|
|
||||||
$nowarray = dol_getdate(dol_now(), true);
|
$nowarray = dol_getdate(dol_now(), true);
|
||||||
$nowyear = $nowarray['year'];
|
$nowyear = $nowarray['year'];
|
||||||
$year = GETPOST('year', 'int') > 0 ? GETPOST('year', 'int') : $nowyear;
|
$year = GETPOST('year', 'int') > 0 ? GETPOST('year', 'int') : $nowyear;
|
||||||
@ -63,6 +60,12 @@ $endyear = $year;
|
|||||||
|
|
||||||
$object = new Ticket($db);
|
$object = new Ticket($db);
|
||||||
|
|
||||||
|
// Security check
|
||||||
|
//$result = restrictedArea($user, 'ticket|knowledgemanagement', 0, '', '', '', '');
|
||||||
|
if (empty($user->rights->ticket->read) && empty($user->rights->knowledgemanagement->knowledgerecord->read)) {
|
||||||
|
accessforbidden('Not enought permissions');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Actions
|
* Actions
|
||||||
@ -240,63 +243,67 @@ $stringtoshow .= '<input type="image" alt="'.$langs->trans("Refresh").'" src="'.
|
|||||||
$stringtoshow .= '</form>';
|
$stringtoshow .= '</form>';
|
||||||
$stringtoshow .= '</div>';
|
$stringtoshow .= '</div>';
|
||||||
|
|
||||||
print '<div class="div-table-responsive-no-min">';
|
if (!empty($user->rights->ticket->read)) {
|
||||||
print '<table class="noborder centpercent">';
|
print '<div class="div-table-responsive-no-min">';
|
||||||
print '<tr class="liste_titre"><th >'.$langs->trans("Statistics").' '.$endyear.' '.img_picto('', 'filter.png', 'id="idsubimgDOLUSERCOOKIE_ticket_by_status" class="linkobject"').'</th></tr>';
|
print '<table class="noborder centpercent">';
|
||||||
|
print '<tr class="liste_titre"><th >'.$langs->trans("Statistics").' '.$endyear.' '.img_picto('', 'filter.png', 'id="idsubimgDOLUSERCOOKIE_ticket_by_status" class="linkobject"').'</th></tr>';
|
||||||
|
|
||||||
print '<tr><td class="center">';
|
print '<tr><td class="center">';
|
||||||
print $stringtoshow;
|
print $stringtoshow;
|
||||||
|
|
||||||
// don't display graph if no series
|
// don't display graph if no series
|
||||||
if (!empty($dataseries) && count($dataseries) > 1) {
|
if (!empty($dataseries) && count($dataseries) > 1) {
|
||||||
$totalnb = 0;
|
$totalnb = 0;
|
||||||
foreach ($dataseries as $key => $value) {
|
foreach ($dataseries as $key => $value) {
|
||||||
$totalnb += $value['data'];
|
$totalnb += $value['data'];
|
||||||
}
|
|
||||||
|
|
||||||
$data = array();
|
|
||||||
foreach ($dataseries as $key => $value) {
|
|
||||||
$data[] = array($value['label'], $value['data']);
|
|
||||||
}
|
|
||||||
$px1 = new DolGraph();
|
|
||||||
$mesg = $px1->isGraphKo();
|
|
||||||
if (!$mesg) {
|
|
||||||
$px1->SetData($data);
|
|
||||||
$px1->SetDataColor(array_values($colorseries));
|
|
||||||
|
|
||||||
unset($data1);
|
|
||||||
$i = $startyear;
|
|
||||||
$legend = array();
|
|
||||||
while ($i <= $endyear) {
|
|
||||||
$legend[] = $i;
|
|
||||||
$i++;
|
|
||||||
}
|
}
|
||||||
$px1->setShowLegend(2);
|
|
||||||
$px1->SetType(array('pie'));
|
|
||||||
$px1->SetLegend($legend);
|
|
||||||
$px1->SetMaxValue($px1->GetCeilMaxValue());
|
|
||||||
//$px1->SetWidth($WIDTH);
|
|
||||||
$px1->SetHeight($HEIGHT);
|
|
||||||
$px1->SetYLabel($langs->trans("TicketStatByStatus"));
|
|
||||||
$px1->SetShading(3);
|
|
||||||
$px1->SetHorizTickIncrement(1);
|
|
||||||
$px1->SetCssPrefix("cssboxes");
|
|
||||||
$px1->mode = 'depth';
|
|
||||||
//$px1->SetTitle($langs->trans("TicketStatByStatus"));
|
|
||||||
|
|
||||||
$px1->draw($filenamenb, $fileurlnb);
|
$data = array();
|
||||||
print $px1->show($totalnb ? 0 : 1);
|
foreach ($dataseries as $key => $value) {
|
||||||
|
$data[] = array($value['label'], $value['data']);
|
||||||
|
}
|
||||||
|
$px1 = new DolGraph();
|
||||||
|
$mesg = $px1->isGraphKo();
|
||||||
|
if (!$mesg) {
|
||||||
|
$px1->SetData($data);
|
||||||
|
$px1->SetDataColor(array_values($colorseries));
|
||||||
|
|
||||||
|
unset($data1);
|
||||||
|
$i = $startyear;
|
||||||
|
$legend = array();
|
||||||
|
while ($i <= $endyear) {
|
||||||
|
$legend[] = $i;
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
$px1->setShowLegend(2);
|
||||||
|
$px1->SetType(array('pie'));
|
||||||
|
$px1->SetLegend($legend);
|
||||||
|
$px1->SetMaxValue($px1->GetCeilMaxValue());
|
||||||
|
//$px1->SetWidth($WIDTH);
|
||||||
|
$px1->SetHeight($HEIGHT);
|
||||||
|
$px1->SetYLabel($langs->trans("TicketStatByStatus"));
|
||||||
|
$px1->SetShading(3);
|
||||||
|
$px1->SetHorizTickIncrement(1);
|
||||||
|
$px1->SetCssPrefix("cssboxes");
|
||||||
|
$px1->mode = 'depth';
|
||||||
|
//$px1->SetTitle($langs->trans("TicketStatByStatus"));
|
||||||
|
|
||||||
|
$px1->draw($filenamenb, $fileurlnb);
|
||||||
|
print $px1->show($totalnb ? 0 : 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
print '</td></tr>';
|
||||||
|
|
||||||
|
print '</table>';
|
||||||
|
print '</div>';
|
||||||
}
|
}
|
||||||
print '</td></tr>';
|
|
||||||
|
|
||||||
print '</table>';
|
if (!empty($user->rights->ticket->read)) {
|
||||||
print '</div>';
|
// Build graphic number of object
|
||||||
|
$data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
|
||||||
|
|
||||||
// Build graphic number of object
|
print '<br>'."\n";
|
||||||
$data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
|
}
|
||||||
|
|
||||||
print '<br>'."\n";
|
|
||||||
|
|
||||||
print $resultboxes['boxlista'];
|
print $resultboxes['boxlista'];
|
||||||
|
|
||||||
@ -304,127 +311,128 @@ print '</div>'."\n";
|
|||||||
|
|
||||||
print '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
|
print '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
|
||||||
|
|
||||||
/*
|
if (!empty($user->rights->ticket->read)) {
|
||||||
* Latest unread tickets
|
/*
|
||||||
*/
|
* Latest unread tickets
|
||||||
|
*/
|
||||||
|
|
||||||
$max = 10;
|
$max = 10;
|
||||||
|
|
||||||
$sql = "SELECT t.rowid, t.ref, t.track_id, t.datec, t.subject, t.type_code, t.category_code, t.severity_code, t.fk_statut, t.progress,";
|
$sql = "SELECT t.rowid, t.ref, t.track_id, t.datec, t.subject, t.type_code, t.category_code, t.severity_code, t.fk_statut, t.progress,";
|
||||||
$sql .= " type.code as type_code, type.label as type_label,";
|
$sql .= " type.code as type_code, type.label as type_label,";
|
||||||
$sql .= " category.code as category_code, category.label as category_label,";
|
$sql .= " category.code as category_code, category.label as category_label,";
|
||||||
$sql .= " severity.code as severity_code, severity.label as severity_label";
|
$sql .= " severity.code as severity_code, severity.label as severity_label";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
|
$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
|
||||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
|
||||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
|
||||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
|
||||||
if (empty($user->rights->societe->client->voir) && !$socid) {
|
if (empty($user->rights->societe->client->voir) && !$socid) {
|
||||||
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
|
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
|
||||||
}
|
|
||||||
|
|
||||||
$sql .= ' WHERE t.entity IN ('.getEntity('ticket').')';
|
|
||||||
$sql .= " AND t.fk_statut=0";
|
|
||||||
if (empty($user->rights->societe->client->voir) && !$socid) {
|
|
||||||
$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($user->socid > 0) {
|
|
||||||
$sql .= " AND t.fk_soc= ".((int) $user->socid);
|
|
||||||
} else {
|
|
||||||
// Restricted to assigned user only
|
|
||||||
if (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->rights->ticket->manage) {
|
|
||||||
$sql .= " AND t.fk_user_assign = ".((int) $user->id);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
$sql .= $db->order("t.datec", "DESC");
|
|
||||||
$sql .= $db->plimit($max, 0);
|
|
||||||
|
|
||||||
//print $sql;
|
$sql .= ' WHERE t.entity IN ('.getEntity('ticket').')';
|
||||||
$result = $db->query($sql);
|
$sql .= " AND t.fk_statut=0";
|
||||||
if ($result) {
|
if (empty($user->rights->societe->client->voir) && !$socid) {
|
||||||
$num = $db->num_rows($result);
|
$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
|
||||||
|
}
|
||||||
|
|
||||||
$i = 0;
|
if ($user->socid > 0) {
|
||||||
|
$sql .= " AND t.fk_soc= ".((int) $user->socid);
|
||||||
|
} else {
|
||||||
|
// Restricted to assigned user only
|
||||||
|
if (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->rights->ticket->manage) {
|
||||||
|
$sql .= " AND t.fk_user_assign = ".((int) $user->id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$sql .= $db->order("t.datec", "DESC");
|
||||||
|
$sql .= $db->plimit($max, 0);
|
||||||
|
|
||||||
$transRecordedType = $langs->trans("LatestNewTickets", $max);
|
//print $sql;
|
||||||
|
$result = $db->query($sql);
|
||||||
|
if ($result) {
|
||||||
|
$num = $db->num_rows($result);
|
||||||
|
|
||||||
print '<div class="div-table-responsive-no-min">';
|
$i = 0;
|
||||||
print '<table class="noborder centpercent">';
|
|
||||||
print '<tr class="liste_titre"><th colspan="5">'.$transRecordedType.'</th>';
|
|
||||||
print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/ticket/list.php?search_fk_statut[]='.Ticket::STATUS_NOT_READ.'">'.$langs->trans("FullList").'</th>';
|
|
||||||
print '</tr>';
|
|
||||||
if ($num > 0) {
|
|
||||||
while ($i < $num) {
|
|
||||||
$objp = $db->fetch_object($result);
|
|
||||||
|
|
||||||
$object->id = $objp->rowid;
|
$transRecordedType = $langs->trans("LatestNewTickets", $max);
|
||||||
$object->ref = $objp->ref;
|
|
||||||
$object->track_id = $objp->track_id;
|
|
||||||
$object->fk_statut = $objp->fk_statut;
|
|
||||||
$object->progress = $objp->progress;
|
|
||||||
$object->subject = $objp->subject;
|
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<div class="div-table-responsive-no-min">';
|
||||||
|
print '<table class="noborder centpercent">';
|
||||||
|
print '<tr class="liste_titre"><th colspan="5">'.$transRecordedType.'</th>';
|
||||||
|
print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/ticket/list.php?search_fk_statut[]='.Ticket::STATUS_NOT_READ.'">'.$langs->trans("FullList").'</th>';
|
||||||
|
print '</tr>';
|
||||||
|
if ($num > 0) {
|
||||||
|
while ($i < $num) {
|
||||||
|
$objp = $db->fetch_object($result);
|
||||||
|
|
||||||
// Ref
|
$object->id = $objp->rowid;
|
||||||
print '<td class="nowraponall">';
|
$object->ref = $objp->ref;
|
||||||
print $object->getNomUrl(1);
|
$object->track_id = $objp->track_id;
|
||||||
print "</td>\n";
|
$object->fk_statut = $objp->fk_statut;
|
||||||
|
$object->progress = $objp->progress;
|
||||||
|
$object->subject = $objp->subject;
|
||||||
|
|
||||||
// Creation date
|
print '<tr class="oddeven">';
|
||||||
print '<td class="left">';
|
|
||||||
print dol_print_date($db->jdate($objp->datec), 'dayhour');
|
|
||||||
print "</td>";
|
|
||||||
|
|
||||||
// Subject
|
// Ref
|
||||||
print '<td class="nowrap">';
|
print '<td class="nowraponall">';
|
||||||
print '<a href="card.php?track_id='.$objp->track_id.'">'.dol_trunc($objp->subject, 30).'</a>';
|
print $object->getNomUrl(1);
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
|
|
||||||
// Type
|
// Creation date
|
||||||
print '<td class="nowrap tdoverflowmax100">';
|
print '<td class="left">';
|
||||||
$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$objp->type_code, 'c_ticket_type', 'code', 'label', $objp->type_code);
|
print dol_print_date($db->jdate($objp->datec), 'dayhour');
|
||||||
print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
|
print "</td>";
|
||||||
print '</td>';
|
|
||||||
|
|
||||||
// Category
|
// Subject
|
||||||
print '<td class="nowrap">';
|
print '<td class="nowrap">';
|
||||||
if (!empty($obp->category_code)) {
|
print '<a href="card.php?track_id='.$objp->track_id.'">'.dol_trunc($objp->subject, 30).'</a>';
|
||||||
$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$objp->category_code, 'c_ticket_category', 'code', 'label', $objp->category_code);
|
print "</td>\n";
|
||||||
|
|
||||||
|
// Type
|
||||||
|
print '<td class="nowrap tdoverflowmax100">';
|
||||||
|
$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$objp->type_code, 'c_ticket_type', 'code', 'label', $objp->type_code);
|
||||||
print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
|
print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
|
||||||
|
print '</td>';
|
||||||
|
|
||||||
|
// Category
|
||||||
|
print '<td class="nowrap">';
|
||||||
|
if (!empty($obp->category_code)) {
|
||||||
|
$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$objp->category_code, 'c_ticket_category', 'code', 'label', $objp->category_code);
|
||||||
|
print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
|
||||||
|
}
|
||||||
|
//print $objp->category_label;
|
||||||
|
print "</td>";
|
||||||
|
|
||||||
|
// Severity
|
||||||
|
print '<td class="nowrap">';
|
||||||
|
$s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$objp->severity_code, 'c_ticket_severity', 'code', 'label', $objp->severity_code);
|
||||||
|
print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
|
||||||
|
//print $objp->severity_label;
|
||||||
|
print "</td>";
|
||||||
|
|
||||||
|
print '<td class="nowraponall right">';
|
||||||
|
print $object->getLibStatut(5);
|
||||||
|
print "</td>";
|
||||||
|
|
||||||
|
print "</tr>\n";
|
||||||
|
$i++;
|
||||||
}
|
}
|
||||||
//print $objp->category_label;
|
|
||||||
print "</td>";
|
|
||||||
|
|
||||||
// Severity
|
$db->free($result);
|
||||||
print '<td class="nowrap">';
|
} else {
|
||||||
$s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$objp->severity_code, 'c_ticket_severity', 'code', 'label', $objp->severity_code);
|
print '<tr><td colspan="6"><span class="opacitymedium">'.$langs->trans('NoUnreadTicketsFound').'</span></td></tr>';
|
||||||
print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
|
|
||||||
//print $objp->severity_label;
|
|
||||||
print "</td>";
|
|
||||||
|
|
||||||
print '<td class="nowraponall right">';
|
|
||||||
print $object->getLibStatut(5);
|
|
||||||
print "</td>";
|
|
||||||
|
|
||||||
print "</tr>\n";
|
|
||||||
$i++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$db->free($result);
|
print "</table>";
|
||||||
|
print '</div>';
|
||||||
|
|
||||||
|
print '<br>';
|
||||||
} else {
|
} else {
|
||||||
print '<tr><td colspan="6"><span class="opacitymedium">'.$langs->trans('NoUnreadTicketsFound').'</span></td></tr>';
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
print "</table>";
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
print '<br>';
|
|
||||||
} else {
|
|
||||||
dol_print_error($db);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
print $resultboxes['boxlistb'];
|
print $resultboxes['boxlistb'];
|
||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user