From 7fea2bc557e84f26e54964d01aa4e46bb624da35 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 15 Apr 2020 08:44:29 +0200 Subject: [PATCH] Update changelog + trigger name change for class UserGroup --- ChangeLog | 2 +- htdocs/core/class/events.class.php | 6 +++--- htdocs/core/triggers/interface_20_all_Logevents.class.php | 6 +++--- .../triggers/interface_50_modLdap_Ldapsynchro.class.php | 6 +++--- .../interface_99_modZapier_ZapierTriggers.class.php | 6 +++--- .../interface_99_modMyModule_MyModuleTriggers.class.php | 6 +++--- htdocs/user/class/usergroup.class.php | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0de59b03184..68cd7695057 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,7 @@ For Developers or integrators: - replace $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); - remove input field in form '';' - add parameter $pagenavastextinput to value 1 when calling print_barre_liste - +* UserGroup class has been refactored with new architecture. Triggers of class UserGroup are now USERGROUP_CREATE, USERGROUP_MODIFY, USERGROUP_DELETE WARNING: diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php index c32fe1d77f2..9c2e5b145dd 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.class.php @@ -100,9 +100,9 @@ class Events // extends CommonObject array('id'=>'USER_NEW_PASSWORD', 'test'=>1), array('id'=>'USER_ENABLEDISABLE', 'test'=>1), array('id'=>'USER_DELETE', 'test'=>1), - array('id'=>'GROUP_CREATE', 'test'=>1), - array('id'=>'GROUP_MODIFY', 'test'=>1), - array('id'=>'GROUP_DELETE', 'test'=>1), + array('id'=>'USERGROUP_CREATE', 'test'=>1), + array('id'=>'USERGROUP_MODIFY', 'test'=>1), + array('id'=>'USERGROUP_DELETE', 'test'=>1), ); diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index 7acd977e714..fceb1552f0b 100644 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -151,7 +151,7 @@ class InterfaceLogevents extends DolibarrTriggers } // Groupes - elseif ($action == 'GROUP_CREATE') + elseif ($action == 'USERGROUP_CREATE') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $langs->load("users"); @@ -159,7 +159,7 @@ class InterfaceLogevents extends DolibarrTriggers $text = $langs->transnoentities("NewGroupCreated", $object->name); $desc = $langs->transnoentities("NewGroupCreated", $object->name); } - elseif ($action == 'GROUP_MODIFY') + elseif ($action == 'USERGROUP_MODIFY') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $langs->load("users"); @@ -167,7 +167,7 @@ class InterfaceLogevents extends DolibarrTriggers $text = $langs->transnoentities("GroupModified", $object->name); $desc = $langs->transnoentities("GroupModified", $object->name); } - elseif ($action == 'GROUP_DELETE') + elseif ($action == 'USERGROUP_DELETE') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $langs->load("users"); diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php index 2febdacff91..8b8c392615a 100644 --- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php +++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php @@ -269,7 +269,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers } // Groupes - elseif ($action == 'GROUP_CREATE') + elseif ($action == 'USERGROUP_CREATE') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') @@ -293,7 +293,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error; } } - elseif ($action == 'GROUP_MODIFY') + elseif ($action == 'USERGROUP_MODIFY') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') @@ -330,7 +330,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error; } } - elseif ($action == 'GROUP_DELETE') + elseif ($action == 'USERGROUP_DELETE') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php index dc9ca6448a9..1091b5ee198 100644 --- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php +++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php @@ -147,9 +147,9 @@ class InterfaceZapierTriggers extends DolibarrTriggers break; // Groups - //case 'GROUP_CREATE': - //case 'GROUP_MODIFY': - //case 'GROUP_DELETE': + //case 'USERGROUP_CREATE': + //case 'USERGROUP_MODIFY': + //case 'USERGROUP_DELETE': // Companies case 'COMPANY_CREATE': diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php index e0dd34cf180..dcee9eeaea5 100644 --- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php +++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php @@ -118,9 +118,9 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers //case 'ACTION_DELETE': // Groups - //case 'GROUP_CREATE': - //case 'GROUP_MODIFY': - //case 'GROUP_DELETE': + //case 'USERGROUP_CREATE': + //case 'USERGROUP_MODIFY': + //case 'USERGROUP_DELETE': // Companies //case 'COMPANY_CREATE': diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 269089c73f2..aaa631fdf36 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -404,7 +404,7 @@ class UserGroup extends CommonObject $this->context = array('audit'=>$langs->trans("PermissionsAdd").($rid ? ' (id='.$rid.')' : '')); // Call trigger - $result = $this->call_trigger('GROUP_MODIFY', $user); + $result = $this->call_trigger('USERGROUP_MODIFY', $user); if ($result < 0) { $error++; } // End call triggers } @@ -528,7 +528,7 @@ class UserGroup extends CommonObject $this->context = array('audit'=>$langs->trans("PermissionsDelete").($rid ? ' (id='.$rid.')' : '')); // Call trigger - $result = $this->call_trigger('GROUP_MODIFY', $user); + $result = $this->call_trigger('USERGROUP_MODIFY', $user); if ($result < 0) { $error++; } // End call triggers }