diff --git a/htdocs/comm/action/contact.php b/htdocs/comm/action/contact.php index 6baafcaf036..642842ac568 100644 --- a/htdocs/comm/action/contact.php +++ b/htdocs/comm/action/contact.php @@ -43,23 +43,24 @@ $confirm = GETPOST('confirm'); $lineid = GETPOST('lineid','int'); // Security check +$socid = GETPOST('socid','int'); +if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id > 0) { unset($_GET["action"]); $action=''; - $socid = $user->societe_id; } +$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions&allactions', 'fk_soc', 'id'); + $object = new ActionComm($db); + /* * Actions */ -/* - * Ajout d'un nouveau contact - */ - +// Add new nouveau contact if ($action == 'addcontact') { $result = $object->fetch($id); diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 2bb710b310f..b42a66dd212 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -44,14 +44,14 @@ $objectid = GETPOST('id','int'); $action=GETPOST('action','alpha'); // Security check +$socid = GETPOST('socid','int'); +if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id > 0) { unset($_GET["action"]); $action=''; - $socid = $user->societe_id; } - -$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions&allactions', '', 'id'); +$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions&allactions', 'fk_soc', 'id'); $act = new ActionComm($db); diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php index 66dc178d4b8..de41dc04483 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -40,7 +40,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id; } -$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions&allactions', '', 'id'); +$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions&allactions', 'fk_soc', 'id'); /* diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php index b0b9ad39317..2e0b41f9451 100644 --- a/htdocs/core/boxes/box_members.php +++ b/htdocs/core/boxes/box_members.php @@ -79,7 +79,7 @@ class box_members extends ModeleBoxes $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers",$max)); - if ($user->rights->societe->lire) + if ($user->rights->adherent->lire) { $sql = "SELECT a.rowid, a.lastname, a.firstname, a.societe as company, a.fk_soc,"; $sql.= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";