diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php index a7ecd12fb9..5c5cb6eaf1 100644 --- a/application/loginwebpage.class.inc.php +++ b/application/loginwebpage.class.inc.php @@ -82,7 +82,7 @@ public static function NewLoginWebPage() } protected static $m_sLoginFailedMessage = ''; - + public function __construct($sTitle = null) { if ($sTitle === null) { @@ -101,6 +101,15 @@ public function SetStyleSheet() $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css'); } + /** + * @inheritDoc + * @since 3.2.0 + */ + protected function GetFaviconAbsoluteUrl() + { + return Branding::GetLoginFavIconAbsoluteUrl(); + } + public static function SetLoginFailedMessage($sMessage) { self::$m_sLoginFailedMessage = $sMessage; diff --git a/core/action.class.inc.php b/core/action.class.inc.php index 4054e2107a..5bcb163187 100644 --- a/core/action.class.inc.php +++ b/core/action.class.inc.php @@ -41,12 +41,6 @@ */ abstract class Action extends cmdbAbstractObject { - /** - * @var $oCallingTrigger Trigger|null The trigger that called this action {@see DoExecute} - * @since 3.2.0 - */ - protected ?Trigger $oCallingTrigger = null; - /** * @throws \CoreException * @throws \Exception @@ -276,14 +270,6 @@ public static function Init() // MetaModel::Init_SetZListItems('default_search', array('name')); } - /** - * @inheritDoc - */ - public function DoExecute($oTrigger, $aContextArgs) - { - $this->oCallingTrigger = $oTrigger; - } - /** * @param $sLanguage * @param $sLanguageCode @@ -447,7 +433,7 @@ public static function Init() */ protected function FindRecipients($sRecipAttCode, $aArgs) { - $oTrigger = $this->oCallingTrigger; + $oTrigger = $aArgs['trigger->object()'] ?? null; $sOQL = $this->Get($sRecipAttCode); if (utils::IsNullOrEmptyString($sOQL)) return ''; @@ -523,7 +509,6 @@ protected function FindRecipients($sRecipAttCode, $aArgs) */ public function DoExecute($oTrigger, $aContextArgs) { - parent::DoExecute($oTrigger, $aContextArgs); if (MetaModel::IsLogEnabledNotification()) { $oLog = new EventNotificationEmail(); diff --git a/core/config.class.inc.php b/core/config.class.inc.php index 4b1ad7e4cb..e7a32ab109 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -447,14 +447,14 @@ class Config 'show_in_conf_sample' => true, ], 'export_pdf_font' => [ // @since 2.7.0 PR #49 / N°1947 - 'type' => 'string', - 'description' => 'Font used when generating a PDF file', - 'default' => 'DejaVuSans', // DejaVuSans is a UTF-8 Unicode font, embedded in the TCPPDF lib we're using - // Standard PDF fonts like helvetica or times newroman are NOT Unicode - // A new DroidSansFallback can be used to improve CJK support (se PR #49) - 'value' => '', - 'source_of_value' => '', - 'show_in_conf_sample' => false, + 'type' => 'string', + 'description' => 'Font used when generating a PDF file', + 'default' => 'DejaVuSans', // DejaVuSans is a UTF-8 Unicode font, embedded in the TCPPDF lib we're using + // Standard PDF fonts like helvetica or times newroman are NOT Unicode + // A new DroidSansFallback can be used to improve CJK support (se PR #49) + 'value' => '', + 'source_of_value' => '', + 'show_in_conf_sample' => false, ], 'access_mode' => [ 'type' => 'integer', @@ -1119,6 +1119,14 @@ class Config 'source_of_value' => '', 'show_in_conf_sample' => false, ], + 'purge_data.max_chunk_size' => [ + 'type' => 'integer', + 'description' => 'Maximum number of items deleted per loop. Used in function MetaModel::PurgeData', + 'default' => 1000, + 'value' => 1000, + 'source_of_value' => '', + 'show_in_conf_sample' => false, + ], 'max_history_length' => [ 'type' => 'integer', 'description' => 'Maximum length of the history table (in the "History" tab on each object) before it gets truncated. Latest modifications are displayed first.', @@ -1324,9 +1332,9 @@ class Config 'draft_attachments_lifetime' => [ 'type' => 'integer', 'description' => 'Lifetime (in seconds) of drafts\' attachments and inline images: after this duration, the garbage collector will delete them.', - 'default' => 86400, - 'value' => '', - 'source_of_value' => '', + 'default' => 86400, + 'value' => '', + 'source_of_value' => '', 'show_in_conf_sample' => false, ], 'date_and_time_format' => [ @@ -1882,6 +1890,7 @@ public function IsCustomValue(string $sPropCode): bool * @var integer Number of seconds between two reloads of the display (standard) */ protected $m_iStandardReloadInterval; + /** * @var integer Number of seconds between two reloads of the display (fast) */ @@ -2553,9 +2562,9 @@ public function WriteToFile($sFileName = '') // Old fashioned integer settings $aIntValues = array( - 'fast_reload_interval' => $this->m_iFastReloadInterval, - 'max_display_limit' => $this->m_iMaxDisplayLimit, - 'min_display_limit' => $this->m_iMinDisplayLimit, + 'fast_reload_interval' => $this->m_iFastReloadInterval, + 'max_display_limit' => $this->m_iMaxDisplayLimit, + 'min_display_limit' => $this->m_iMinDisplayLimit, 'standard_reload_interval' => $this->m_iStandardReloadInterval, ); foreach ($aIntValues as $sKey => $iValue) diff --git a/core/datamodel.core.xml b/core/datamodel.core.xml index 059a3d6273..9a971a5978 100644 --- a/core/datamodel.core.xml +++ b/core/datamodel.core.xml @@ -106,7 +106,7 @@ - +