Create AddonHelper::getEnabledAddonsWithAdminSettings()

This commit is contained in:
Art4 2025-02-04 12:18:08 +00:00
parent a678f41ca7
commit fda70f3fe3
4 changed files with 27 additions and 9 deletions

View file

@ -66,6 +66,8 @@ class Addon
* Returns a list of addons that can be configured at the node level. * Returns a list of addons that can be configured at the node level.
* The list is formatted for display in the admin panel aside. * The list is formatted for display in the admin panel aside.
* *
* @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::getEnabledAddonsWithAdminSettings()` instead
*
* @return array * @return array
* @throws \Exception * @throws \Exception
*/ */

View file

@ -30,7 +30,7 @@ interface AddonHelper
* *
* @return bool true on success or false on failure * @return bool true on success or false on failure
*/ */
public function installAdodn(string $addonId): bool; public function installAddon(string $addonId): bool;
/** /**
* Uninstalls an addon. * Uninstalls an addon.
@ -66,5 +66,12 @@ interface AddonHelper
* *
* @return string[] * @return string[]
*/ */
public static function getVisibleEnabledAddons(): array; public function getVisibleEnabledAddons(): array;
/**
* Returns a list with the IDs of the enabled addons that provides admin settings.
*
* @return string[]
*/
public function getEnabledAddonsWithAdminSettings(): array;
} }

View file

@ -37,7 +37,7 @@ final class AddonProxy implements AddonHelper
* *
* @return bool true on success or false on failure * @return bool true on success or false on failure
*/ */
public function installAdodn(string $addonId): bool public function installAddon(string $addonId): bool
{ {
return Addon::install($addonId); return Addon::install($addonId);
} }
@ -96,8 +96,18 @@ final class AddonProxy implements AddonHelper
* *
* @return string[] * @return string[]
*/ */
public static function getVisibleEnabledAddons(): array public function getVisibleEnabledAddons(): array
{ {
return Addon::getVisibleList(); return Addon::getVisibleList();
} }
/**
* Returns a list with the IDs of the enabled addons that provides admin settings.
*
* @return string[]
*/
public function getEnabledAddonsWithAdminSettings(): array
{
return array_keys(Addon::getAdminList());
}
} }

View file

@ -8,7 +8,6 @@
namespace Friendica\Module\Admin\Addons; namespace Friendica\Module\Admin\Addons;
use Friendica\Content\Text\Markdown; use Friendica\Content\Text\Markdown;
use Friendica\Core\Addon;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Module\BaseAdmin; use Friendica\Module\BaseAdmin;
@ -44,8 +43,6 @@ class Details extends BaseAdmin
$addonHelper = DI::addonHelper(); $addonHelper = DI::addonHelper();
$addons_admin = Addon::getAdminList();
$addon = Strings::sanitizeFilePathItem($this->parameters['addon']); $addon = Strings::sanitizeFilePathItem($this->parameters['addon']);
if (!is_file("addon/$addon/$addon.php")) { if (!is_file("addon/$addon/$addon.php")) {
DI::sysmsg()->addNotice(DI::l10n()->t('Addon not found.')); DI::sysmsg()->addNotice(DI::l10n()->t('Addon not found.'));
@ -61,7 +58,7 @@ class Details extends BaseAdmin
$addonHelper->uninstallAddon($addon); $addonHelper->uninstallAddon($addon);
DI::sysmsg()->addInfo(DI::l10n()->t('Addon %s disabled.', $addon)); DI::sysmsg()->addInfo(DI::l10n()->t('Addon %s disabled.', $addon));
} else { } else {
$addonHelper->installAdodn($addon); $addonHelper->installAddon($addon);
DI::sysmsg()->addInfo(DI::l10n()->t('Addon %s enabled.', $addon)); DI::sysmsg()->addInfo(DI::l10n()->t('Addon %s enabled.', $addon));
} }
@ -84,8 +81,10 @@ class Details extends BaseAdmin
$readme = '<pre>' . file_get_contents("addon/$addon/README") . '</pre>'; $readme = '<pre>' . file_get_contents("addon/$addon/README") . '</pre>';
} }
$addons_admin = $addonHelper->getEnabledAddonsWithAdminSettings();
$admin_form = ''; $admin_form = '';
if (array_key_exists($addon, $addons_admin)) { if (in_array($addon, $addons_admin)) {
require_once "addon/$addon/$addon.php"; require_once "addon/$addon/$addon.php";
$func = $addon . '_addon_admin'; $func = $addon . '_addon_admin';
$func($admin_form); $func($admin_form);