Merge pull request #6270 from christianbeeznest/rna-22587

Plugin: Fix 500 error on course homepage and config form for Positioning tool - refs BT#22587

Author: christianbeeznest

public/main/inc/lib/plugin.class.php

@@ -908,41 +908,24 @@ public function renderRegion($region)
      *
      * @return bool True if plugin is installed/enabled, false otherwise
      */
-    public function isEnabled($checkEnabled = false)
+    public function isEnabled(bool $checkEnabled = false): bool
     {
-        $settings = api_get_settings_params_simple(
-            [
-                "subkey = ? AND category = ? AND type = ? AND variable = 'status' " => [
-                    $this->get_name(),
-                    'Plugins',
-                    'setting',
-                ],
-            ]
-        );
-        if (is_array($settings) && isset($settings['selected_value']) && 'installed' == $settings['selected_value']) {
-            // The plugin is installed
-            // If we need a check on whether it is enabled, also check for
-            // *plugin*_tool_enable and make sure it is *NOT* false
-            if ($checkEnabled) {
-                $enabled = api_get_settings_params_simple(
-                    [
-                        "variable = ? AND subkey = ? AND category = 'Plugins' " => [
-                            $this->get_name().'_tool_enable',
-                            $this->get_name(),
-                        ],
-                    ]
-                );
-                if (is_array($enabled) && isset($enabled['selected_value']) && 'false' == $enabled['selected_value']) {
-                    // Only return false if the setting exists and it is
-                    // *specifically* set to false
-                    return false;
-                }
-            }
+        $settings = $this->get_settings();
 
-            return true;
+        if (empty($settings)) {
+            return false;
         }
 
-        return false;
+        if ($checkEnabled) {
+            if (
+                isset($settings['tool_enable']) &&
+                strtolower($settings['tool_enable']) === 'false'
+            ) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     /**

public/main/inc/lib/plugin.lib.php

@@ -451,32 +451,41 @@ public function getAllPluginContentsByRegion($plugin_name, $region, $template, $
      */
     public function getPluginInfo($pluginName, $forced = false)
     {
-        //$pluginData = Session::read('plugin_data');
-        if (0) {
-            //if (isset($pluginData[$pluginName]) && $forced == false) {
-            return $pluginData[$pluginName];
-        } else {
-            $plugin_file = api_get_path(SYS_PLUGIN_PATH)."$pluginName/plugin.php";
-
-            $plugin_info = [];
-            if (file_exists($plugin_file)) {
-                require $plugin_file;
-            }
+        $plugin_info = [];
+        $pluginPath = api_get_path(SYS_PLUGIN_PATH);
+        $pluginDirs = [
+            $pluginName,
+            strtolower($pluginName),
+            ucfirst(strtolower($pluginName)),
+        ];
 
-            $plugin = Container::getPluginRepository()->findOneByTitle($pluginName);
+        $plugin_file = null;
 
-            if (!$plugin) {
-                return [];
+        foreach ($pluginDirs as $dir) {
+            $path = $pluginPath . "$dir/plugin.php";
+            if (file_exists($path)) {
+                $plugin_file = $path;
+                break;
             }
+        }
 
-            $configByUrl = $plugin->getConfigurationsByAccessUrl(
-                Container::getAccessUrlHelper()->getCurrent()
-            );
+        if ($plugin_file) {
+            require $plugin_file;
+        }
 
-            $plugin_info['settings'] = $configByUrl?->getConfiguration() ?? [];
+        $plugin = Container::getPluginRepository()->findOneByTitle($pluginName);
 
-            return $plugin_info;
+        if (!$plugin) {
+            return [];
         }
+
+        $configByUrl = $plugin->getConfigurationsByAccessUrl(
+            Container::getAccessUrlHelper()->getCurrent()
+        );
+
+        $plugin_info['settings'] = $configByUrl?->getConfiguration() ?? [];
+
+        return $plugin_info;
     }
 
     /**

public/plugin/Positioning/start.php

@@ -2,6 +2,8 @@
 
 /* For license terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 require_once __DIR__.'/../../main/inc/global.inc.php';
 
 api_protect_course_script(true);
@@ -72,7 +74,7 @@
     return $actions;
 };
 
-$table = Exercise::exerciseGrid(
+$table = Exercise::exerciseGridResource(
     0,
     null,
     null,
@@ -142,7 +144,7 @@
 
 $template->assign(
     'positioning_introduction',
-    Display::return_message($plugin->get_lang('PositioningIntroduction'))
+    Display::return_message($plugin->get_lang('PositioningIntroduction'), false)
 );
 $template->assign('table', $exercisesToString);
 $template->assign('radars', $radars);

public/plugin/Positioning/view/start.tpl

@@ -1,10 +1,9 @@
+{{ positioning_introduction|raw }}
 
-{{ positioning_introduction }}
-
-{{ table }}
+{{ table|raw }}
 
 {% if radars %}
-    {{ radars }}
-    <br>
-    {{ "ChartShowsAverageForAllStudentsUsingZeroForIncompleteTests"| get_plugin_lang('Positioning') }}
+{{ radars|raw }}
+<br>
+{{ "ChartShowsAverageForAllStudentsUsingZeroForIncompleteTests"|get_plugin_lang('Positioning') }}
 {% endif %}