From cab9c81ce24a1a6f674e837406fbc7893f197b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 15 Oct 2018 21:53:54 +0200 Subject: [PATCH] Update actioncomm.class.php --- htdocs/comm/action/class/actioncomm.class.php | 116 ++++++++++-------- 1 file changed, 64 insertions(+), 52 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index c175ad900ea..969cb705bac 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -1,10 +1,11 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2011-2017 Juanjo Menent - * Copyright (C) 2015 Marcos García - * Copyright (C) 2018 Nicolas ZABOURI +/* Copyright (C) 2002-2004 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2011-2017 Juanjo Menent + * Copyright (C) 2015 Marcos García + * Copyright (C) 2018 Nicolas ZABOURI + * Copyright (C) 2018 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -67,7 +68,7 @@ class ActionComm extends CommonObject * Id of the event * @var int */ - public $id; + public $id; /** * Id of the event. Use $id as possible @@ -75,11 +76,12 @@ class ActionComm extends CommonObject */ public $ref; - var $type_id; // Id into parent table llx_c_actioncomm (used only if option to use type is set) - var $type_code; // Code into parent table llx_c_actioncomm (used only if option to use type is set). With default setup, should be AC_OTH_AUTO or AC_OTH. - var $type; // Label into parent table llx_c_actioncomm (used only if option to use type is set) - var $type_color; // Color into parent table llx_c_actioncomm (used only if option to use type is set) - var $code; // Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...) + public $type_id; // Id into parent table llx_c_actioncomm (used only if option to use type is set) + public $type_code; // Code into parent table llx_c_actioncomm (used only if option to use type is set). With default setup, should be AC_OTH_AUTO or AC_OTH. + public $type_label; + public $type; // Label into parent table llx_c_actioncomm (used only if option to use type is set) + public $type_color; // Color into parent table llx_c_actioncomm (used only if option to use type is set) + public $code; // Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...) /** * @var string Agenda event label @@ -93,8 +95,8 @@ class ActionComm extends CommonObject */ public $libelle; - var $datec; // Date creation record (datec) - var $datem; // Date modification record (tms) + public $datec; // Date creation record (datec) + public $datem; // Date modification record (tms) /** * Object user that create action @@ -102,7 +104,7 @@ class ActionComm extends CommonObject * @deprecated * @see authorid */ - var $author; + public $author; /** * Object user that modified action @@ -110,39 +112,49 @@ class ActionComm extends CommonObject * @deprecated * @see usermodid */ - var $usermod; - var $authorid; // Id user that create action - var $usermodid; // Id user that modified action + public $usermod; - var $datep; // Date action start (datep) - var $datef; // Date action end (datep2) + /** + * Id user that create action + * @var int + */ + public $authorid; + + /** + * Id user that modified action + * @var int + */ + public $usermodid; + + public $datep; // Date action start (datep) + public $datef; // Date action end (datep2) /** * @var int -1=Unkown duration * @deprecated */ - var $durationp = -1; - var $fulldayevent = 0; // 1=Event on full day + public $durationp = -1; + public $fulldayevent = 0; // 1=Event on full day /** * Milestone * @var int * @deprecated Milestone is already event with end date = start date */ - var $punctual = 1; - var $percentage; // Percentage - var $location; // Location + public $punctual = 1; + public $percentage; // Percentage + public $location; // Location - var $transparency; // Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events) - var $priority; // Small int (0 By default) + public $transparency; // Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events) + public $priority; // Small int (0 By default) - var $userassigned = array(); // Array of user ids - var $userownerid; // Id of user owner = fk_user_action into table - var $userdoneid; // Id of user done (deprecated) + public $userassigned = array(); // Array of user ids + public $userownerid; // Id of user owner = fk_user_action into table + public $userdoneid; // Id of user done (deprecated) - var $socpeopleassigned = array(); // Array of contact ids + public $socpeopleassigned = array(); // Array of contact ids - var $otherassigned = array(); // Array of other contact emails (not user, not contact) + public $otherassigned = array(); // Array of other contact emails (not user, not contact) /** @@ -151,7 +163,7 @@ class ActionComm extends CommonObject * @deprecated * @see userownerid */ - var $usertodo; + public $usertodo; /** * Object user that did action @@ -159,10 +171,10 @@ class ActionComm extends CommonObject * @deprecated * @see userdoneid */ - var $userdone; + public $userdone; - var $socid; - var $contactid; + public $socid; + public $contactid; /** * Company linked to action (optional) @@ -170,7 +182,7 @@ class ActionComm extends CommonObject * @deprecated * @see socid */ - var $societe; + public $societe; /** * Contact linked to action (optional) @@ -178,28 +190,28 @@ class ActionComm extends CommonObject * @deprecated * @see contactid */ - var $contact; + public $contact; // Properties for links to other objects - var $fk_element; // Id of record - var $elementid; // Id of record alternative for API - var $elementtype; // Type of record. This if property ->element of object linked to. + public $fk_element; // Id of record + public $elementid; // Id of record alternative for API + public $elementtype; // Type of record. This if property ->element of object linked to. // Ical - var $icalname; - var $icalcolor; + public $icalname; + public $icalcolor; - var $actions=array(); + public $actions=array(); // Fields for emails - var $email_msgid; - var $email_from; - var $email_sender; - var $email_to; - var $email_tocc; - var $email_tobcc; - var $email_subject; - var $errors_to; + public $email_msgid; + public $email_from; + public $email_sender; + public $email_to; + public $email_tocc; + public $email_tobcc; + public $email_subject; + public $errors_to; /**