L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-73726 dataformat: obey sort order when returning enabled plugins.

Browse Source
This commit is contained in:
Paul Holden
2022-06-06 09:32:36 +01:00
parent 5500d143f4
commit 473ac1285e
2 changed files with 118 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/plugininfo/dataformat.php
+24 -13
View File
@@ -47,6 +47,25 @@ class dataformat extends base {
}
}
/**
* Given a list of dataformat types, return them sorted according to site configuration (if set)
*
* @param string[] $formats List of formats, ['csv', 'pdf', etc]
* @return string[] List of formats according to configured sort, ['csv', 'odf', etc]
*/
private static function get_plugins_sortorder(array $formats): array {
global $CFG;
if (!empty($CFG->dataformat_plugins_sortorder)) {
$order = explode(',', $CFG->dataformat_plugins_sortorder);
$order = array_merge(array_intersect($order, $formats), array_diff($formats, $order));
} else {
$order = $formats;
}
return $order;
}
/**
* Gathers and returns the information about all plugins of the given type
*
@@ -57,16 +76,9 @@ class dataformat extends base {
* @return array of plugintype classes, indexed by the plugin name
*/
public static function get_plugins($type, $typerootdir, $typeclass, $pluginman) {
global $CFG;
$formats = parent::get_plugins($type, $typerootdir, $typeclass, $pluginman);
if (!empty($CFG->dataformat_plugins_sortorder)) {
$order = explode(',', $CFG->dataformat_plugins_sortorder);
$order = array_merge(array_intersect($order, array_keys($formats)),
array_diff(array_keys($formats), $order));
} else {
$order = array_keys($formats);
}
$order = static::get_plugins_sortorder(array_keys($formats));
$sortedformats = array();
foreach ($order as $formatname) {
$sortedformats[$formatname] = $formats[$formatname];
@@ -79,18 +91,17 @@ class dataformat extends base {
* @return array|null of enabled plugins $pluginname=>$pluginname, null means unknown
*/
public static function get_enabled_plugins() {
$enabled = array();
$plugins = core_plugin_manager::instance()->get_installed_plugins('dataformat');
if (!$plugins) {
return array();
}
$order = static::get_plugins_sortorder(array_keys($plugins));
$enabled = array();
foreach ($plugins as $plugin => $version) {
$disabled = get_config('dataformat_' . $plugin, 'disabled');
foreach ($order as $formatname) {
$disabled = get_config('dataformat_' . $formatname, 'disabled');
if (empty($disabled)) {
$enabled[$plugin] = $plugin;
$enabled[$formatname] = $formatname;
}
}
return $enabled;