From 59d6d0865d05df7b11cb847848bbcd30496f325a Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Thu, 29 Apr 2021 18:25:45 +0200 Subject: [PATCH] LSformElement::password: fix using LSldapobject getDisplayFData method instead of getFData --- src/includes/class/class.LSformElement_password.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/includes/class/class.LSformElement_password.php b/src/includes/class/class.LSformElement_password.php index f91f87fe..a056cc19 100644 --- a/src/includes/class/class.LSformElement_password.php +++ b/src/includes/class/class.LSformElement_password.php @@ -193,12 +193,18 @@ class LSformElement_password extends LSformElement { if ($params['confirmChange']) { $defaultConfirmChangeQuestion = ___('%{label}: Do you confirm the password change?'); - $params['confirmChangeQuestion'] = getFData(__($this -> getParam('html_options.confirmChangeQuestion', $defaultConfirmChangeQuestion)), $this -> label); + $params['confirmChangeQuestion'] = $this -> attr_html -> attribute -> ldapObject -> getDisplayFData( + __($this -> getParam('html_options.confirmChangeQuestion', $defaultConfirmChangeQuestion)), + $this -> label + ); } if ($params['confirmInput']) { $defaultConfirmInputError = ___('Passwords entered did not match.'); - $params['confirmInputError'] = getFData(__($this -> getParam('html_options.confirmInputError', $defaultConfirmInputError)), $this -> label); + $params['confirmInputError'] = $this -> attr_html -> attribute -> ldapObject -> getDisplayFData( + __($this -> getParam('html_options.confirmInputError', $defaultConfirmInputError)), + $this -> label + ); } if ($this -> getParam('html_options.mail')) { @@ -309,7 +315,7 @@ class LSformElement_password extends LSformElement { self :: log_info($this -> attr_html -> attribute -> ldapObject -> getDn().": send new '".$this -> name."' to '$mail'."); $this -> attr_html -> attribute -> ldapObject -> registerOtherValue('password', $this -> sendMail['pwd']); - $msg = $this -> attr_html -> attribute -> ldapObject -> getFData($this -> sendMail['msg']); + $msg = $this -> attr_html -> attribute -> ldapObject -> getDisplayFData($this -> sendMail['msg']); $headers = $this -> getParam('html_options.mail.headers', array()); $bcc = $this -> getParam('html_options.mail.bcc'); if ($bcc)