From fa82cbceb9a661af0bbea51baf2a814f5d3587e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 5 Jul 2014 08:59:41 +0200 Subject: [PATCH] Qual: Removed useless function --- htdocs/core/class/commonobject.class.php | 37 +++++++++-------- htdocs/user/class/user.class.php | 51 ++++++++---------------- 2 files changed, 34 insertions(+), 54 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 0a5a1e1ee90..c06c43eb4a4 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3383,9 +3383,8 @@ abstract class CommonObject /** * Call trigger based on this instance - * - * NB: Error from trigger are stacked in errors - * NB2: if trigger fail, action should be canceled. + * NB: Error from trigger are stacked in interface->errors + * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction. * * @param string $trigger_name trigger's name to execute * @param User $user Object user @@ -3393,23 +3392,23 @@ abstract class CommonObject */ function call_trigger($trigger_name, $user) { - global $langs,$conf; - - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($this->db); - $result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf); - if ($result < 0) { - if (!empty($this->errors)) - { - $this->errors=array_merge($this->errors,$interface->errors); - } - else - { - $this->errors=$interface->errors; - } - } - return $result; + global $langs,$conf; + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; + $interface=new Interfaces($this->db); + $result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf); + if ($result < 0) + { + if (!empty($this->errors)) + { + $this->errors=array_merge($this->errors,$interface->errors); + } + else + { + $this->errors=$interface->errors; + } + } + return $result; } } diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 1ecfefc6d82..9e8b5539c20 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -667,7 +667,7 @@ class User extends CommonObject { // Call trigger $result=$this->call_trigger('USER_ENABLEDISABLE',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } @@ -756,14 +756,14 @@ class User extends CommonObject { // Call trigger $result=$this->call_trigger('USER_DELETE',$user); - if ($result < 0) - { + if ($result < 0) + { $error++; $this->db->rollback(); - return -1; - } + return -1; + } // End call triggers - + $this->db->commit(); return 1; } @@ -866,7 +866,7 @@ class User extends CommonObject { // Call trigger $result=$this->call_trigger('USER_CREATE',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } @@ -949,9 +949,9 @@ class User extends CommonObject { // Call trigger $result=$this->call_trigger('USER_CREATE_FROM_CONTACT',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } + if ($result < 0) { $error++; $this->db->rollback(); return -1; } // End call triggers - + $this->db->commit(); return $this->id; } @@ -1261,7 +1261,7 @@ class User extends CommonObject { // Call trigger $result=$this->call_trigger('USER_MODIFY',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } @@ -1352,7 +1352,7 @@ class User extends CommonObject if (! is_object($this->oldcopy)) $this->oldcopy=dol_clone($this); $this->db->begin(); - + $sql = "UPDATE ".MAIN_DB_PREFIX."user"; $sql.= " SET pass_crypted = '".$this->db->escape($password_crypted)."',"; $sql.= " pass_temp = null"; @@ -1408,10 +1408,10 @@ class User extends CommonObject { // Call trigger $result=$this->call_trigger('USER_NEW_PASSWORD',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } + if ($result < 0) { $error++; $this->db->rollback(); return -1; } // End call triggers } - + $this->db->commit(); return $this->pass; } @@ -1666,7 +1666,7 @@ class User extends CommonObject // Call trigger $result=$this->call_trigger('USER_SETINGROUP',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } @@ -1720,7 +1720,7 @@ class User extends CommonObject // Call trigger $result=$this->call_trigger('USER_REMOVEFROMGROUP',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } @@ -2281,7 +2281,7 @@ class User extends CommonObject dol_syslog(get_class($this)."::get_full_tree dol_sort_array", LOG_DEBUG); $this->users=dol_sort_array($this->users, 'fullname', 'asc', true, false); - //$this->debug_users(); + //var_dump($this->users); return $this->users; } @@ -2322,24 +2322,5 @@ class User extends CommonObject return; } - /** - * Affiche contenu de $this->users - * - * @return void - */ - function debug_users() - { - // Affiche $this->users - foreach($this->users as $key => $val) - { - print 'id: '.$this->users[$key]['id']; - print ' name: '.$this->users[$key]['name']; - print ' parent: '.$this->users[$key]['fk_user']; - print ' fullpath: '.$this->users[$key]['fullpath']; - print ' fullname: '.$this->users[$key]['fullname']; - print "
\n"; - } - } - }