Improve error message on modules tab

mikopbx · Oct 9, 2024 · 9794d49 · 9794d49
1 parent 01c1aca
commit 9794d49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/AdminCabinet/Controllers/PbxExtensionModulesController.php b/src/AdminCabinet/Controllers/PbxExtensionModulesController.php
@@ -58,14 +58,12 @@ public function indexAction(): void
             if ($module['disabled'] === '1') {
                 $moduleRecord['status'] = 'disabled';
                 $moduleRecord['disableReason'] = $module['disableReason'];
-                $moduleRecord['disableReasonText'] = $module['disableReasonText'];
+                $moduleRecord['disableReasonText'] = htmlspecialchars($module['disableReasonText']);
                 // Translate the license message
-                if (
-                    $moduleRecord['disableReason'] === PbxExtensionState::DISABLED_BY_LICENSE
-                    && isset($moduleRecord['disableReasonText'])
-                ) {
+                if ($moduleRecord['disableReason'] === PbxExtensionState::DISABLED_BY_LICENSE) {
                     $lic = $this->di->getShared(MarketPlaceProvider::SERVICE_NAME);
-                    $moduleRecord['disableReasonText'] = $lic->translateLicenseErrorMessage((string)$moduleRecord['disableReasonText']);
+                    $moduleRecord['disableReasonText']
+                        = $lic->translateLicenseErrorMessage((string)$moduleRecord['disableReasonText']);
                 }
             }
             $moduleList[] = $moduleRecord;

diff --git a/src/AdminCabinet/Views/PbxExtensionModules/indexTabs/installedTab.volt b/src/AdminCabinet/Views/PbxExtensionModules/indexTabs/installedTab.volt
@@ -24,12 +24,12 @@
             </div>
             {% if module['disableReason']=='DisabledByException' %}
                 <i class="bug red icon wide popup-on-click vertically-aligned"
-                   data-html="<div class='header'>{{ t._('ext_DisableReasonHeader') }}</div><div class='content'>{{ t._('ext_ModuleExecutionProblem') }}:<br>{{ module['disableReasonText'] }}</div></div>"
+                   data-html="<div class='header'>{{ t._('ext_DisableReasonHeader') }}</div><div class='content'>{{ t._('ext_ModuleExecutionProblem') }}<br>{{ module['disableReasonText'] }}</div></div>"
                 >
                 </i>
             {% elseif module['disableReason']=='DisabledByLicense' %}
                 <i class="ui icons vertically-aligned popup-on-click"
-                   data-html="<div class='header'>{{ t._('ext_DisableReasonHeader') }}</div><div class='content'>{{ t._('ext_ModuleLicenseProblem') }}:<br>{{ module['disableReasonText'] }}</div></div>"
+                   data-html="<div class='header'>{{ t._('ext_DisableReasonHeader') }}</div><div class='content'>{{ t._('ext_ModuleLicenseProblem') }}<br>{{ module['disableReasonText'] }}</div></div>"
                 >
                     <i class="big red dont icon"></i>
                     <i class="key icon"></i>