diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 0ca194927a..773bff0622 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -2691,33 +2691,31 @@ EOF $oAjaxRenderController->GetMenusCount($oPage); break; - //-------------------------------- - // WelcomePopupMenu - //-------------------------------- - case 'welcome_popup.acknowledge_message': - $oPage = new JsonPage(); - try { - $oController = new WelcomePopupController(); - $oController->AcknowledgeMessage(); - $aResult = ['success' => true]; - } - catch (Exception $oException) { - $aResult = [ - 'success' => false, - 'error_message' => $oException->getMessage(), - ]; - } - $oPage->SetData($aResult); - break; + //-------------------------------- + // WelcomePopupMenu + //-------------------------------- + case 'welcome_popup_acknowledge_message': + $oPage = new JsonPage(); + try { + $oController = new WelcomePopupController(); + $oController->AcknowledgeMessage(); + $aResult = ['success' => true]; + } + catch (Exception $oException) { + $aResult = [ + 'success' => false, + 'error_message' => $oException->getMessage(), + ]; + } + $oPage->SetData($aResult); + break; - default: - $oPage->p("Invalid query."); - } + default: + $oPage->p("Invalid query."); } $oKPI->ComputeAndReport('Data fetch and format'); $oPage->output(); -} catch (Exception $e) -{ +} catch (Exception $e) { // note: transform to cope with XSS attacks echo htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8'); IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString()); diff --git a/sources/Controller/WelcomePopupController.php b/sources/Controller/WelcomePopupController.php index cb7989203b..1919b30924 100644 --- a/sources/Controller/WelcomePopupController.php +++ b/sources/Controller/WelcomePopupController.php @@ -9,7 +9,7 @@ use utils; * @since 3.1.0 * */ -class WelcomePopupController extends AbstractController +class WelcomePopupController { /** * Operation: welcome_popup.acknowledge_message diff --git a/templates/pages/backoffice/welcome_popup/welcome_popup.ready.js.twig b/templates/pages/backoffice/welcome_popup/welcome_popup.ready.js.twig index 6be19799db..35959ec5f3 100644 --- a/templates/pages/backoffice/welcome_popup/welcome_popup.ready.js.twig +++ b/templates/pages/backoffice/welcome_popup/welcome_popup.ready.js.twig @@ -20,7 +20,7 @@ $('.ibo-welcome-popup--indicator').click(function() { }); $('.ibo-welcome-popup--button').click('button', function() { const id = $(this).attr('data-message-uuid'); - $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'welcome_popup.acknowledge_message', message_uuid: id}); + $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'welcome_popup_acknowledge_message', message_uuid: id}); const escaped_id = id.replace(/\\/g, '\\\\');; // All backslashes must be doubled in a jQuery selector $('.ibo-welcome-popup--message[data-message-uuid="'+escaped_id+'"]').remove(); if($('.ibo-welcome-popup--message').length == 0) {