From fc50485d082782b6817d55c9638f5c1ac40b28db Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Sep 2010 16:07:27 +0000 Subject: [PATCH] Fix: Too many problems with triggers outside of standard dir. Only external module triggers must be in module dir. --- ...nterface_modPhenix_Phenixsynchro.class.php | 427 ++++++++++++++++++ ...ace_modWebcalendar_Webcalsynchro.class.php | 404 +++++++++++++++++ htdocs/install/upgrade2.php | 4 +- 3 files changed, 833 insertions(+), 2 deletions(-) create mode 100644 htdocs/includes/triggers/interface_modPhenix_Phenixsynchro.class.php create mode 100644 htdocs/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php diff --git a/htdocs/includes/triggers/interface_modPhenix_Phenixsynchro.class.php b/htdocs/includes/triggers/interface_modPhenix_Phenixsynchro.class.php new file mode 100644 index 00000000000..6318198b7f5 --- /dev/null +++ b/htdocs/includes/triggers/interface_modPhenix_Phenixsynchro.class.php @@ -0,0 +1,427 @@ + + * Copyright (C) 2005-2010 Regis Houssin + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/** + \file htdocs/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php + \ingroup phenix + \brief Fichier de gestion des triggers phenix + \version $Id$ +*/ + +include_once(DOL_DOCUMENT_ROOT.'/phenix/class/phenix.class.php'); + + +/** + \class InterfacePhenixsynchro + \brief Classe des fonctions triggers des actions phenix +*/ + +class InterfacePhenixsynchro +{ + var $db; + var $error; + + var $date; + var $duree; + var $texte; + var $desc; + + /** + * \brief Constructeur. + * \param DB Handler d'acces base + */ + function InterfacePhenixsynchro($DB) + { + $this->db = $DB ; + + $this->name = preg_replace('/^Interface/i','',get_class($this)); + $this->family = "phenix"; + $this->description = "Triggers of this module allows to add an event inside Phenix calendar for each Dolibarr business event."; + $this->version = 'experimental'; // 'experimental' or 'dolibarr' or version + } + + /** + * \brief Renvoi nom du lot de triggers + * \return string Nom du lot de triggers + */ + function getName() + { + return $this->name; + } + + /** + * \brief Renvoi descriptif du lot de triggers + * \return string Descriptif du lot de triggers + */ + function getDesc() + { + return $this->description; + } + + /** + * \brief Renvoi version du lot de triggers + * \return string Version du lot de triggers + */ + function getVersion() + { + global $langs; + $langs->load("admin"); + + if ($this->version == 'experimental') return $langs->trans("Experimental"); + elseif ($this->version == 'dolibarr') return DOL_VERSION; + elseif ($this->version) return $this->version; + else return $langs->trans("Unknown"); + } + + /** + * \brief Fonction appelee lors du declenchement d'un evenement Dolibarr. + * D'autres fonctions run_trigger peuvent etre presentes dans includes/triggers + * \param action Code de l'evenement + * \param object Objet concerne + * \param user Objet user + * \param lang Objet lang + * \param conf Objet conf + * \return int <0 si ko, 0 si aucune action faite, >0 si ok + */ + function run_trigger($action,$object,$user,$langs,$conf) + { + // Mettre ici le code a executer en reaction de l'action + // Les donnees de l'action sont stockees dans $object + + if (! $conf->phenix->enabled) return 0; // Module non actif + if (! $object->use_phenix) return 0; // Option syncro phenix non active + + // Actions + if ($action == 'ACTION_CREATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + // Initialisation donnees (date,duree,texte,desc) + if ($object->type_id == 5 && $object->contact->getFullName($langs)) + { + $libellecal =$langs->transnoentities("TaskRDVWith",$object->contact->getFullName($langs))."\n"; + $libellecal.=$object->note; + } + else + { + $libellecal=""; + if ($langs->transnoentities("Action".$object->type_code) != "Action".$object->type_code) + { + $libellecal.=$langs->transnoentities("Action".$object->type_code)."\n"; + } + $libellecal.=($object->label!=$libellecal?$object->label."\n":""); + $libellecal.=($object->note?$object->note:""); + } + + $this->date=$object->date ? $object->date : $object->datep; + $this->duree=$object->duree; + $this->texte=$object->societe->nom; + $this->desc=$libellecal; + } + + // Third parties + elseif ($action == 'COMPANY_CREATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + // Initialisation donnees (date,duree,texte,desc) + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("NewCompanyToDolibarr",$object->nom); + $this->desc=$langs->transnoentities("NewCompanyToDolibarr",$object->nom); + if ($object->prefix) $this->desc.=" (".$object->prefix.")"; + //$this->desc.="\n".$langs->transnoentities("Customer").': '.yn($object->client); + //$this->desc.="\n".$langs->transnoentities("Supplier").': '.yn($object->fournisseur); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Contracts + elseif ($action == 'CONTRACT_VALIDATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + // Initialisation donnees (date,duree,texte,desc) + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'CONTRACT_CANCEL') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("ContractCanceledInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("ContractCanceledInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'CONTRACT_CLOSE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("ContractClosedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("ContractClosedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Proposals + elseif ($action == 'PROPAL_VALIDATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'PROPAL_CLOSE_SIGNED') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'PROPAL_CLOSE_REFUSED') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Invoices + elseif ($action == 'BILL_VALIDATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'BILL_PAYED') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'BILL_CANCEL') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Payments + elseif ($action == 'PAYMENT_CUSTOMER_CREATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("CustomerPaymentDoneInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("CustomerPaymentDoneInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("AmountTTC").': '.$object->total; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'PAYMENT_SUPPLIER_CREATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("SupplierPaymentDoneInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("SupplierPaymentDoneInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("AmountTTC").': '.$object->total; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Members + elseif ($action == 'MEMBER_CREATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("NewMemberCreated",$object->ref); + $this->desc=$langs->transnoentities("NewMemberCreated",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'MEMBER_VALIDATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("MemberValidatedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("MemberValidatedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'MEMBER_SUBSCRIPTION') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount; + $this->desc.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day'); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'MEMBER_MODIFY') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("MemberModifiedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("MemberModifiedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'MEMBER_RESILIATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'MEMBER_DELETE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // If not found +/* + else + { + dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action."); + return 0; + } +*/ + + // Ajoute entree dans phenix + if ($this->date) + { + + // Cree objet phenix et connexion avec params $conf->phenix->db->xxx + $phenix = new Phenix(); + if (! $phenix->localdb->ok) + { + // Si la creation de l'objet n'as pu se connecter + $error ="Dolibarr n'a pu se connecter a la base Phenix avec les identifiants definis (host=".$conf->phenix->db->host." dbname=".$conf->phenix->db->name." user=".$conf->phenix->db->user."). "; + $error.="La mise a jour Webcalendar a ete ignoree."; + $this->error=$error; + + //dol_syslog("interface_phenix.class.php: ".$this->error, LOG_ERR); + return -1; + } + + $phenix->date=$this->date; + $phenix->duree=$this->duree; + $phenix->texte=$this->texte; + $phenix->desc=$this->desc; + + $result=$phenix->add($user); + if ($result > 0) + { + return 1; + } + else + { + $error ="Echec insertion dans phenix: ".$phenix->error." "; + $error.="La mise a jour Phenix a ete ignoree."; + $this->error=$error; + + //dol_syslog("interface_phenix.class.php: ".$this->error, LOG_ERR); + return -2; + } + } + + return 0; + } + +} +?> diff --git a/htdocs/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php b/htdocs/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php new file mode 100644 index 00000000000..dc2b9feb78f --- /dev/null +++ b/htdocs/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php @@ -0,0 +1,404 @@ + + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/** + \file htdocs/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php + \ingroup webcalendar + \brief Fichier de gestion des triggers webcalendar + \version $Id$ +*/ + +include_once(DOL_DOCUMENT_ROOT.'/webcalendar/class/webcal.class.php'); + + +/** + \class InterfaceWebcalsynchro + \brief Classe des fonctions triggers des actions webcalendar +*/ + +class InterfaceWebcalsynchro +{ + var $db; + var $error; + + var $date; + var $duree; + var $texte; + var $desc; + + /** + * \brief Constructeur. + * \param DB Handler d'acces base + */ + function InterfaceWebcalsynchro($DB) + { + $this->db = $DB ; + + $this->name = preg_replace('/^Interface/i','',get_class($this)); + $this->family = "webcal"; + $this->description = "Triggers of this module allows to add an event inside Webcalendar for each Dolibarr business event."; + $this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version + } + + /** + * \brief Renvoi nom du lot de triggers + * \return string Nom du lot de triggers + */ + function getName() + { + return $this->name; + } + + /** + * \brief Renvoi descriptif du lot de triggers + * \return string Descriptif du lot de triggers + */ + function getDesc() + { + return $this->description; + } + + /** + * \brief Renvoi version du lot de triggers + * \return string Version du lot de triggers + */ + function getVersion() + { + global $langs; + $langs->load("admin"); + + if ($this->version == 'experimental') return $langs->trans("Experimental"); + elseif ($this->version == 'dolibarr') return DOL_VERSION; + elseif ($this->version) return $this->version; + else return $langs->trans("Unknown"); + } + + /** + * \brief Fonction appelee lors du declenchement d'un evenement Dolibarr. + * D'autres fonctions run_trigger peuvent etre presentes dans includes/triggers + * \param action Code de l'evenement + * \param object Objet concerne + * \param user Objet user + * \param lang Objet lang + * \param conf Objet conf + * \return int <0 si ko, 0 si aucune action faite, >0 si ok + */ + function run_trigger($action,$object,$user,$langs,$conf) + { + // Mettre ici le code a executer en reaction de l'action + // Les donnees de l'action sont stockees dans $object + + if (! $conf->webcal->enabled) return 0; // Module non actif + if (! $object->use_webcal) return 0; // Option syncro webcal non active + + // Actions + if ($action == 'ACTION_CREATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + // Initialisation donnees (date,duree,texte,desc) + if ($object->type_id == 5 && $object->contact->getFullName($langs)) + { + $libellecal =$langs->transnoentities("TaskRDVWith",$object->contact->getFullName($langs))."\n"; + $libellecal.=$object->note; + } + else + { + $libellecal=""; + if ($langs->transnoentities("Action".$object->type_code) != "Action".$object->type_code) + { + $libellecal.=$langs->transnoentities("Action".$object->type_code)."\n"; + } + $libellecal.=($object->label!=$libellecal?$object->label."\n":""); + $libellecal.=($object->note?$object->note:""); + } + + $this->date=$object->date ? $object->date : $object->datep; + $this->duree=$object->duree; + $this->texte=$object->societe->nom; + $this->desc=$libellecal; + } + + // Third parties + elseif ($action == 'COMPANY_CREATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + // Initialisation donnees (date,duree,texte,desc) + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("NewCompanyToDolibarr",$object->nom); + $this->desc=$langs->transnoentities("NewCompanyToDolibarr",$object->nom); + if ($object->prefix) $this->desc.=" (".$object->prefix.")"; + //$this->desc.="\n".$langs->transnoentities("Customer").': '.yn($object->client); + //$this->desc.="\n".$langs->transnoentities("Supplier").': '.yn($object->fournisseur); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Contracts + elseif ($action == 'CONTRACT_VALIDATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + // Initialisation donnees (date,duree,texte,desc) + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Proposals + elseif ($action == 'PROPAL_VALIDATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'PROPAL_CLOSE_SIGNED') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'PROPAL_CLOSE_REFUSED') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Invoices + elseif ($action == 'BILL_VALIDATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'BILL_PAYED') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'BILL_CANCEL') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Payments + elseif ($action == 'PAYMENT_CUSTOMER_CREATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("CustomerPaymentDoneInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("CustomerPaymentDoneInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("AmountTTC").': '.$object->total; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'PAYMENT_SUPPLIER_CREATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("SupplierPaymentDoneInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("SupplierPaymentDoneInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("AmountTTC").': '.$object->total; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Members + elseif ($action == 'MEMBER_CREATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("NewMemberCreated",$object->ref); + $this->desc=$langs->transnoentities("NewMemberCreated",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'MEMBER_VALIDATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("MemberValidatedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("MemberValidatedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'MEMBER_SUBSCRIPTION') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount; + $this->desc.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day'); + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'MEMBER_MODIFY') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("MemberModifiedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("MemberModifiedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'MEMBER_RESILIATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + elseif ($action == 'MEMBER_DELETE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("members"); + + $this->date=time(); + $this->duree=0; + $this->texte=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref); + $this->desc=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref); + $this->desc.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs); + $this->desc.="\n".$langs->transnoentities("Type").': '.$object->type; + $this->desc.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // If not found +/* + else + { + dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action."); + return 0; + } +*/ + + // Ajoute entree dans webcal + if ($this->date) + { + + // Cree objet webcal et connexion avec params $conf->webcal->db->xxx + $webcal = new Webcal(); + if (! $webcal->localdb->ok) + { + // Si la creation de l'objet n'as pu se connecter + $error ="Dolibarr n'a pu se connecter a la base Webcalendar avec les identifiants definis (host=".$conf->webcal->db->host." dbname=".$conf->webcal->db->name." user=".$conf->webcal->db->user."). "; + $error.="La mise a jour Webcalendar a ete ignoree."; + $this->error=$error; + + //dol_syslog("interface_webcal.class.php: ".$this->error, LOG_ERR); + return -1; + } + + $webcal->date=$this->date; + $webcal->duree=$this->duree; + $webcal->texte=$this->texte; + $webcal->desc=$this->desc; + + $result=$webcal->add($user); + if ($result > 0) + { + return 1; + } + else + { + $error ="Echec insertion dans webcal: ".$webcal->error." "; + $error.="La mise a jour Webcalendar a ete ignoree."; + $this->error=$error; + + //dol_syslog("interface_webcal.class.php: ".$this->error, LOG_ERR); + return -2; + } + } + + return 0; + } + +} +?> diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 891a8923a28..cef5f8b67e7 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -3062,8 +3062,8 @@ function migrate_delete_old_files($db,$langs,$conf) DOL_DOCUMENT_ROOT.'/includes/menus/barre_top/default.php', DOL_DOCUMENT_ROOT.'/includes/modules/modComptabiliteExpert.class.php', DOL_DOCUMENT_ROOT.'/includes/modules/modProduit.class.php', - DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modPhenix_Phenixsynchro.class.php', - DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modWebcalendar_webcalsynchro.class.php', + DOL_DOCUMENT_ROOT.'/includes/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php', + DOL_DOCUMENT_ROOT.'/includes/webcal/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php', DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_Ecotax.class.php', );