diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 22679ca697bdb5d1e7e137087ab2f93d91d785d6..a30ebad47030a32548e6070fc5d4b271dbe8e017 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -33,6 +33,7 @@ if (!$user->admin)
$langs->load("admin");
$langs->load("other");
+$langs->load("agenda");
$action = GETPOST('action','alpha');
$cancel = GETPOST('cancel','alpha');
@@ -172,7 +173,7 @@ if (! empty($triggers))
if ($trigger['code'] == 'FICHINTER_CLASSIFY_BILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
if ($trigger['code'] == 'FICHINTER_CLASSIFY_UNBILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
-
+
print '<tr class="oddeven">';
print '<td>'.$trigger['code'].'</td>';
print '<td>'.$trigger['label'].'</td>';
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 44ec3ade8895a028f83b7ba3b2a01107c7acacc5..31bcf1077e6b83d61fa18fc60dc3ae7c1fcbab94 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -36,6 +36,7 @@ if (!$user->admin)
$langs->load("admin");
$langs->load("other");
+$langs->load("agenda");
$action = GETPOST('action','alpha');
$value = GETPOST('value','alpha');
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index f32c721a826543943077b7c5eebff3b4649a148e..a607998cfa8c06d12f48e4a93d8477afb1c6035b 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -63,20 +63,20 @@ class AgendaEvents extends DolibarrApi
*/
function get($id)
{
- if(! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+ if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
throw new RestException(401, "Insuffisant rights to read an event");
}
$result = $this->actioncomm->fetch($id);
- if( ! $result ) {
+ if ( ! $result ) {
throw new RestException(404, 'Agenda Events not found');
}
- if(! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
+ if (! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
throw new RestException(401, "Insuffisant rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
}
- if( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
+ if ( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
@@ -102,6 +102,10 @@ class AgendaEvents extends DolibarrApi
$obj_ret = array();
+ if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+ throw new RestException(401, "Insuffisant rights to read events");
+ }
+
// case of external user
$socid = 0;
if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
@@ -111,8 +115,11 @@ class AgendaEvents extends DolibarrApi
if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
$sql = "SELECT t.id as rowid";
+ if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
+ if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
$sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
+ if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
// Insert sale filter
@@ -152,7 +159,7 @@ class AgendaEvents extends DolibarrApi
{
$obj = $db->fetch_object($result);
$actioncomm_static = new ActionComm($db);
- if($actioncomm_static->fetch($obj->rowid)) {
+ if ($actioncomm_static->fetch($obj->rowid)) {
$obj_ret[] = $this->_cleanObjectDatas($actioncomm_static);
}
$i++;
@@ -161,7 +168,7 @@ class AgendaEvents extends DolibarrApi
else {
throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
}
- if( ! count($obj_ret)) {
+ if ( ! count($obj_ret)) {
throw new RestException(404, 'No Agenda Event found');
}
return $obj_ret;
@@ -175,10 +182,10 @@ class AgendaEvents extends DolibarrApi
*/
function post($request_data = NULL)
{
- if(! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+ if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
throw new RestException(401, "Insuffisant rights to create your Agenda Event");
}
- if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+ if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
}
@@ -213,19 +220,19 @@ class AgendaEvents extends DolibarrApi
*/
/*
function put($id, $request_data = NULL) {
- if(! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+ if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
throw new RestException(401, "Insuffisant rights to create your Agenda Event");
}
- if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+ if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
}
$result = $this->expensereport->fetch($id);
- if( ! $result ) {
+ if ( ! $result ) {
throw new RestException(404, 'expensereport not found');
}
- if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+ if ( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
foreach($request_data as $field => $value) {
@@ -233,7 +240,7 @@ class AgendaEvents extends DolibarrApi
$this->expensereport->$field = $value;
}
- if($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
+ if ($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
return $this->get($id);
return false;
@@ -298,4 +305,59 @@ class AgendaEvents extends DolibarrApi
}
return $event;
}
+
+ /**
+ * Clean sensible object datas
+ *
+ * @param object $object Object to clean
+ * @return array Array of cleaned object properties
+ */
+ function _cleanObjectDatas($object) {
+
+ $object = parent::_cleanObjectDatas($object);
+
+ unset($object->usermod);
+ unset($object->libelle);
+ unset($object->import_key);
+ unset($object->array_options);
+ unset($object->context);
+ unset($object->canvas);
+ unset($object->contact);
+ unset($object->contact_id);
+ unset($object->thirdparty);
+ unset($object->user);
+ unset($object->origin);
+ unset($object->origin_id);
+ unset($object->ref_ext);
+ unset($object->statut);
+ unset($object->country);
+ unset($object->country_id);
+ unset($object->country_code);
+ unset($object->barcode_type);
+ unset($object->barcode_type_code);
+ unset($object->barcode_type_label);
+ unset($object->barcode_type_coder);
+ unset($object->mode_reglement_id);
+ unset($object->cond_reglement_id);
+ unset($object->cond_reglement);
+ unset($object->fk_delivery_address);
+ unset($object->shipping_method_id);
+ unset($object->fk_account);
+ unset($object->total_ht);
+ unset($object->total_tva);
+ unset($object->total_localtax1);
+ unset($object->total_localtax2);
+ unset($object->total_ttc);
+ unset($object->fk_incoterms);
+ unset($object->libelle_incoterms);
+ unset($object->location_incoterms);
+ unset($object->name);
+ unset($object->lastname);
+ unset($object->firstname);
+ unset($object->civility_id);
+ unset($object->contact);
+ unset($object->societe);
+
+ return $object;
+ }
}
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 9a9e78513c39dd409e106e507f761e06de1d9b7e..d3250263a6f38b3d9c64435076df284449fe228e 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -403,9 +403,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
else if (in_array($feature,$checksoc)) // We check feature = checksoc
{
// If external user: Check permission for external users
- if ($user->societe_id > 0)
+ if ($user->socid > 0)
{
- if ($user->societe_id <> $objectid) return false;
+ if ($user->socid <> $objectid) return false;
}
// If internal user: Check permission for internal users that are restricted on their objects
else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 58fe15cf28207173e29bc423707196e70a1e25cb..f136d6895b231102eb6b5d1602ed921c13c56598 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -43,7 +43,8 @@ class Contacts extends DolibarrApi
/**
* Constructor
*/
- function __construct() {
+ function __construct()
+ {
global $db, $conf;
$this->db = $db;
$this->contact = new Contact($this->db);
@@ -59,7 +60,8 @@ class Contacts extends DolibarrApi
*
* @throws RestException
*/
- function get($id) {
+ function get($id)
+ {
if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
{
throw new RestException(401, 'No permission to read contacts');
@@ -105,7 +107,7 @@ class Contacts extends DolibarrApi
}
// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
- $socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
+ $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
// If the internal user must only see his customers, force searching by him
$search_sale = 0;
@@ -171,7 +173,7 @@ class Contacts extends DolibarrApi
}
}
else {
- throw new RestException(503, 'Error when retreive contacts : ' . $sql);
+ throw new RestException(503, 'Error when retrieve contacts : ' . $sql);
}
if (!count($obj_ret))
{