Fix permissions in module workstation
This commit is contained in:
parent
7cba3f8a0a
commit
f03190e23b
@ -82,13 +82,11 @@ if ($id > 0 || !empty($ref)) {
|
|||||||
$upload_dir = $conf->workstation->multidir_output[$object->entity]."/".$object->id;
|
$upload_dir = $conf->workstation->multidir_output[$object->entity]."/".$object->id;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Security check - Protection if external user
|
|
||||||
//if ($user->socid > 0) accessforbidden();
|
|
||||||
//if ($user->socid > 0) $socid = $user->socid;
|
|
||||||
//$result = restrictedArea($user, 'workstation', $object->id);
|
|
||||||
|
|
||||||
$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
|
$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
|
||||||
|
|
||||||
|
// Security check
|
||||||
|
restrictedArea($user, $object->element, $object->id);
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Actions
|
* Actions
|
||||||
|
|||||||
@ -82,15 +82,8 @@ $permissionnote = $user->rights->workstation->workstation->write; // Used by the
|
|||||||
$permissiondellink = $user->rights->workstation->workstation->write; // Used by the include of actions_dellink.inc.php
|
$permissiondellink = $user->rights->workstation->workstation->write; // Used by the include of actions_dellink.inc.php
|
||||||
$upload_dir = $conf->workstation->multidir_output[isset($object->entity) ? $object->entity : 1];
|
$upload_dir = $conf->workstation->multidir_output[isset($object->entity) ? $object->entity : 1];
|
||||||
|
|
||||||
// Security check - Protection if external user
|
// Security check
|
||||||
//if ($user->socid > 0) accessforbidden();
|
restrictedArea($user, $object->element, $object->id);
|
||||||
//if ($user->socid > 0) $socid = $user->socid;
|
|
||||||
//$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
|
|
||||||
//$result = restrictedArea($user, 'workstation', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
|
|
||||||
|
|
||||||
if (!$permissiontoread) {
|
|
||||||
accessforbidden();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -343,7 +336,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
|
|||||||
|
|
||||||
// Object card
|
// Object card
|
||||||
// ------------------------------------------------------------
|
// ------------------------------------------------------------
|
||||||
$linkback = '<a href="'.dol_buildpath('/workstation/workstation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
|
$linkback = '<a href="'.dol_buildpath('/workstation/workstation_list.php', 1).'?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
|
||||||
|
|
||||||
$morehtmlref = '<div class="refidno">';
|
$morehtmlref = '<div class="refidno">';
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -74,13 +74,10 @@ if ($id > 0 || !empty($ref)) {
|
|||||||
$upload_dir = $conf->workstation->multidir_output[$object->entity ? $object->entity : $conf->entity]."/workstation/".get_exdir(0, 0, 0, 1, $object);
|
$upload_dir = $conf->workstation->multidir_output[$object->entity ? $object->entity : $conf->entity]."/workstation/".get_exdir(0, 0, 0, 1, $object);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Security check - Protection if external user
|
|
||||||
//if ($user->socid > 0) accessforbidden();
|
|
||||||
//if ($user->socid > 0) $socid = $user->socid;
|
|
||||||
//$result = restrictedArea($user, 'workstation', $object->id);
|
|
||||||
|
|
||||||
$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
|
$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
|
||||||
|
|
||||||
|
// Security check
|
||||||
|
restrictedArea($user, $object->element, $object->id);
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -146,18 +146,7 @@ $permissiontoadd = $user->rights->workstation->workstation->write;
|
|||||||
$permissiontodelete = $user->rights->workstation->workstation->delete;
|
$permissiontodelete = $user->rights->workstation->workstation->delete;
|
||||||
|
|
||||||
// Security check
|
// Security check
|
||||||
if (empty($conf->workstation->enabled)) {
|
restrictedArea($user, $object->element, 0);
|
||||||
accessforbidden('Module not enabled');
|
|
||||||
}
|
|
||||||
$socid = 0;
|
|
||||||
if ($user->socid > 0) {
|
|
||||||
// Protection if external user
|
|
||||||
//$socid = $user->socid;
|
|
||||||
accessforbidden();
|
|
||||||
}
|
|
||||||
//$result = restrictedArea($user, 'workstation', $id, '');
|
|
||||||
//if (!$permissiontoread) accessforbidden();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -60,6 +60,8 @@ if ($id > 0 || !empty($ref)) {
|
|||||||
$permissionnote = $user->rights->workstation->workstation->write; // Used by the include of actions_setnotes.inc.php
|
$permissionnote = $user->rights->workstation->workstation->write; // Used by the include of actions_setnotes.inc.php
|
||||||
$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
|
$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
|
||||||
|
|
||||||
|
// Security check
|
||||||
|
restrictedArea($user, $object->element, $object->id);
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user