From 685b7b23adfc6d4225be147042ccd3a50e84d7bc Mon Sep 17 00:00:00 2001
From: KreizIT <KreizIT@users.noreply.github.com>
Date: Thu, 3 Jul 2014 15:09:46 +0200
Subject: [PATCH] FIX: Member's trigger problem

---
 ChangeLog                                 |  1 +
 htdocs/adherents/class/adherent.class.php | 75 ++++++++++-------------
 2 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3cf736d8edf..20ac8a3dff5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ For users:
 - Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
 - Fix: [ bug #1470, #1472, #1473] User trigger problem
 - Fix: [ bug #1489, #1491 ] Intervention trigger problem
+- Fix: [ bug #1492, #1493 ] Member trigger problem
 
 For translators:
 - Update language files.
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index b03bff940dd..99b4e7df1f4 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -347,12 +347,10 @@ class Adherent extends CommonObject
 
                 if (! $notrigger)
                 {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('MEMBER_CREATE',$this,$user,$langs,$conf);
-                    if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                    // Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('MEMBER_CREATE',$user);
+                    if ($result < 0) { $error++; }            
+                    // End call triggers
                 }
 
                 if (count($this->errors))
@@ -599,12 +597,10 @@ class Adherent extends CommonObject
 
                 if (! $error && ! $notrigger)
                 {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('MEMBER_MODIFY',$this,$user,$langs,$conf);
-                    if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                    // Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('MEMBER_MODIFY',$user);
+                    if ($result < 0) { $error++; }            
+                    // End call triggers
                 }
             }
 
@@ -782,12 +778,10 @@ class Adherent extends CommonObject
 
         if (! $error)
         {
-        	// Appel des triggers
-       		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-        	$interface=new Interfaces($this->db);
-        	$result=$interface->run_triggers('MEMBER_DELETE',$this,$user,$langs,$conf);
-        	if ($result < 0) {$error++; $this->errors=$interface->errors;}
-        	// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('MEMBER_DELETE',$user);
+            if ($result < 0) { $error++; }            
+            // End call triggers
         }
 
 
@@ -841,6 +835,8 @@ class Adherent extends CommonObject
             $password_indatabase = $password;
         }
 
+        $this->db->begin();
+        
         // Mise a jour
         $sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET pass = '".$this->db->escape($password_indatabase)."'";
         $sql.= " WHERE rowid = ".$this->id;
@@ -885,23 +881,24 @@ class Adherent extends CommonObject
 
                 if (! $error && ! $notrigger)
                 {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('MEMBER_NEW_PASSWORD',$this,$user,$langs,$conf);
-                    if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                    // Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('MEMBER_NEW_PASSWORD',$user);
+                    if ($result < 0) { $error++; $this->db->rollback(); return -1; }            
+                    // End call triggers
                 }
 
+                $this->db->commit();
                 return $this->pass;
             }
             else
             {
+                $this->db->rollback();
                 return 0;
             }
         }
         else
         {
+            $this->db->rollback();
             dol_print_error($this->db);
             return -1;
         }
@@ -1301,12 +1298,10 @@ class Adherent extends CommonObject
                 $this->last_subscription_date_start=$date;
                 $this->last_subscription_date_end=$datefin;
 
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('MEMBER_SUBSCRIPTION',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('MEMBER_SUBSCRIPTION',$user);
+                if ($result < 0) { $error++; }            
+                // End call triggers
             }
 
             if (! $error)
@@ -1362,12 +1357,10 @@ class Adherent extends CommonObject
         {
             $this->statut=1;
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('MEMBER_VALIDATE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('MEMBER_VALIDATE',$user);
+            if ($result < 0) { $error++; $this->db->rollback(); return -1; }            
+            // End call triggers
 
             $this->db->commit();
             return 1;
@@ -1412,12 +1405,10 @@ class Adherent extends CommonObject
         {
             $this->statut=0;
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('MEMBER_RESILIATE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('MEMBER_RESILIATE',$user);
+            if ($result < 0) { $error++; $this->db->rollback(); return -1; }            
+            // End call triggers
 
             $this->db->commit();
             return 1;