From eaeb114754fd4d31e62ff47ac01f7f182aa69c89 Mon Sep 17 00:00:00 2001 From: jf-cbd Date: Fri, 3 Nov 2023 17:30:27 +0100 Subject: [PATCH 1/2] =?UTF-8?q?N=C2=B06852=20-=20Use=20"email=5Fdefault=5F?= =?UTF-8?q?sender=5Faddress"=20when=20"forgot=5Fpassword=5Ffrom"=20config?= =?UTF-8?q?=20param=20is=20empty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/loginwebpage.class.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php index 51eafd8d6f..f7cf9ce79b 100644 --- a/application/loginwebpage.class.inc.php +++ b/application/loginwebpage.class.inc.php @@ -248,6 +248,7 @@ class LoginWebPage extends NiceWebPage $oEmail = new Email(); $oEmail->SetRecipientTO($sTo); $sFrom = MetaModel::GetConfig()->Get('forgot_password_from'); + $sFrom = utils::IsNullOrEmptyString($sFrom) ? MetaModel::GetConfig()->Get('email_default_sender_address') : $sFrom; $oEmail->SetRecipientFrom($sFrom); $oEmail->SetSubject(Dict::S('UI:ResetPwd-EmailSubject', $oUser->Get('login'))); $sResetUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?loginop=reset_pwd&auth_user='.urlencode($oUser->Get('login')).'&token='.urlencode($sToken); From d5a8a3bb09e87b8a0c3092e75aac85a4b0a3837e Mon Sep 17 00:00:00 2001 From: Molkobain Date: Tue, 7 Nov 2023 12:00:19 +0100 Subject: [PATCH 2/2] =?UTF-8?q?N=C2=B04756=20-=20Fix=20PHPDoc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/applicationextension.inc.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/application/applicationextension.inc.php b/application/applicationextension.inc.php index e6eb024070..14f2712588 100644 --- a/application/applicationextension.inc.php +++ b/application/applicationextension.inc.php @@ -335,7 +335,6 @@ abstract class AbstractPreferencesExtension implements iPreferencesExtension * A recommended pattern is to cache data by the mean of static members. * * @api - * @deprecated 3.1.0 N°4756 use the new event service instead, see {@see DBObject::FireEvent()} method * @package UIExtensibilityAPI */ interface iApplicationUIExtension @@ -487,7 +486,6 @@ interface iApplicationUIExtension * @api * @package UIExtensibilityAPI * @since 2.7.0 - * @deprecated */ abstract class AbstractApplicationUIExtension implements iApplicationUIExtension { @@ -560,6 +558,7 @@ abstract class AbstractApplicationUIExtension implements iApplicationUIExtension * or through the GUI. * * @api + * @deprecated 3.1.0 N°4756 use the new event service instead, see {@see DBObject::FireEvent()} method. More details on each method PHPDoc. * @package ORMExtensibilityAPI */ interface iApplicationObjectExtension @@ -574,6 +573,7 @@ interface iApplicationObjectExtension * Otherwise, the answer is definitively "yes, the object has changed". * * @api + * @deprecated 3.1.0 N°4756 No alternative available, this API was unstable and is abandoned * @param \cmdbAbstractObject $oObject The target object * * @return boolean True if something has changed for the target object @@ -587,6 +587,7 @@ interface iApplicationObjectExtension * Anyhow, this API can be called in other contexts such as the CSV import tool. * * @api + * @deprecated 3.1.0 N°4756 Use EVENT_DB_CHECK_TO_WRITE event instead * @param \cmdbAbstractObject $oObject The target object * * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user. @@ -601,6 +602,7 @@ interface iApplicationObjectExtension * Please not that it is not possible to cascade deletion by this mean: only stopper issues can be handled. * * @api + * @deprecated 3.1.0 N°4756 Use EVENT_DB_CHECK_TO_DELETE event instead * @param \cmdbAbstractObject $oObject The target object * * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user. @@ -617,6 +619,7 @@ interface iApplicationObjectExtension * * {@see DBObject::Get()} : for a given attribute the new value that was persisted * * @api + * @deprecated 3.1.0 N°4756 Use EVENT_DB_AFTER_WRITE event instead * @param \cmdbAbstractObject $oObject The target object * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information * once for all the changes made within the current page @@ -633,6 +636,7 @@ interface iApplicationObjectExtension * The method is called right after the object has been written to the database. * * @api + * @deprecated 3.1.0 N°4756 Use EVENT_DB_AFTER_WRITE event instead * @param \cmdbAbstractObject $oObject The target object * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information * once for all the changes made within the current page @@ -647,6 +651,7 @@ interface iApplicationObjectExtension * The method is called right before the object will be deleted from the database. * * @api + * @deprecated 3.1.0 N°4756 Use EVENT_DB_AFTER_DELETE event instead * @param \cmdbAbstractObject $oObject The target object * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information * once for all the changes made within the current page @@ -660,6 +665,7 @@ interface iApplicationObjectExtension * Extend this class instead of iApplicationObjectExtension if you don't need to overload all methods * * @api + * @deprecated 3.1.0 N°4756 use the new event service instead, see {@see DBObject::FireEvent()} method * @package ORMExtensibilityAPI * @since 2.7.0 */