diff --git a/inc/abstractitiltarget.class.php b/inc/abstractitiltarget.class.php index ed6e8639e..bac839568 100644 --- a/inc/abstractitiltarget.class.php +++ b/inc/abstractitiltarget.class.php @@ -1044,8 +1044,7 @@ protected function showUrgencySettings($rand) { protected function showPluginTagsSettings($rand) { global $DB; - $plugin = new Plugin(); - if ($plugin->isInstalled('tag') && $plugin->isActivated('tag')) { + if (Plugin::isPluginActive('tag')) { echo ''; echo '' . __('Ticket tags', 'formcreator') . ''; echo ''; @@ -1695,8 +1694,7 @@ protected function saveTags(PluginFormcreatorFormanswer $formanswer, $targetId) global $DB; // Add tag if presents - $plugin = new Plugin(); - if (!$plugin->isActivated('tag')) { + if (!Plugin::isPluginActive('tag')) { return; } diff --git a/inc/field/fieldsfield.class.php b/inc/field/fieldsfield.class.php index 7c51f28fe..755f4ec51 100644 --- a/inc/field/fieldsfield.class.php +++ b/inc/field/fieldsfield.class.php @@ -72,7 +72,7 @@ public function getField(): ?PluginFieldsField { } public function isPrerequisites(): bool { - return (new Plugin())->isActivated('fields'); + return Plugin::isPluginActive('fields'); } public static function getFieldsFromBlock($block_id): array { @@ -149,7 +149,7 @@ public function getBlocks(): array { } public function showForm(array $options): void { - if (!\Plugin::isPluginActive('fields')) { + if (!Plugin::isPluginActive('fields')) { $options['error'] = __('Warning: Additional Fields plugin is disabled or missing', 'formcreator'); $template = '@formcreator/field/undefinedfield.html.twig'; TemplateRenderer::getInstance()->display($template, [ @@ -177,7 +177,7 @@ public function showForm(array $options): void { public function getRenderedHtml($domain, $canEdit = true): string { // Plugin field not available - if (!(new Plugin())->isActivated('fields')) { + if (!Plugin::isPluginActive('fields')) { return ''; } diff --git a/inc/field/tagfield.class.php b/inc/field/tagfield.class.php index dae7af710..7125138df 100644 --- a/inc/field/tagfield.class.php +++ b/inc/field/tagfield.class.php @@ -33,6 +33,7 @@ namespace GlpiPlugin\Formcreator\Field; use Dropdown; +use Plugin; use PluginTagTag; use Session; use GlpiPlugin\Formcreator\Exception\ComparisonException; @@ -46,7 +47,7 @@ public function isPrerequisites(): bool { } public function showForm(array $options): void { - if (!\Plugin::isPluginActive('tag')) { + if (!Plugin::isPluginActive('tag')) { $options['error'] = __('Warning: Tag plugin is disabled or missing', 'formcreator'); $template = '@formcreator/field/undefinedfield.html.twig'; TemplateRenderer::getInstance()->display($template, [ diff --git a/inc/question.class.php b/inc/question.class.php index 419ddde8f..d2224cc31 100644 --- a/inc/question.class.php +++ b/inc/question.class.php @@ -1323,10 +1323,10 @@ public static function dropdownObjectSubType(string $name, array $options = []): Profile::class => Profile::getTypeName(2) ], ]; - if ((new Plugin())->isActivated('appliances')) { + if (Plugin::isPluginActive('appliances')) { $optgroup[__("Assets")][PluginAppliancesAppliance::class] = PluginAppliancesAppliance::getTypeName(2) . ' (' . _n('Plugin', 'Plugins', 1) . ')'; } - if ((new Plugin())->isActivated('databases')) { + if (Plugin::isPluginActive('databases')) { $optgroup[__("Assets")][PluginDatabasesDatabase::class] = PluginDatabasesDatabase::getTypeName(2) . ' (' . _n('Plugin', 'Plugins', 1) . ')'; } diff --git a/inc/targetchange.class.php b/inc/targetchange.class.php index 06227c6c1..d6025ebff 100644 --- a/inc/targetchange.class.php +++ b/inc/targetchange.class.php @@ -105,7 +105,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { 2 => __('Actors', 'formcreator'), 3 => __('Condition', 'formcreator'), ]; - // if ((new Plugin)->isActivated('fields')) { + // if (Plugin::isPluginActive('fields')) { // $tab[4] = __('Fields plugin', 'formcreator'); // } return $tab; @@ -584,8 +584,7 @@ public function prepareInputForUpdate($input) { } } - $plugin = new Plugin(); - if ($plugin->isInstalled('tag') && $plugin->isActivated('tag')) { + if (Plugin::isPluginActive('tag')) { if (isset($input['tag_questions'])) { $input['tag_questions'] = (!empty($input['_tag_questions'])) ? implode(',', $input['_tag_questions']) diff --git a/inc/targetproblem.class.php b/inc/targetproblem.class.php index 4b0f381f8..190e96fc5 100644 --- a/inc/targetproblem.class.php +++ b/inc/targetproblem.class.php @@ -309,8 +309,7 @@ public function prepareInputForUpdate($input) { } } - $plugin = new Plugin(); - if ($plugin->isInstalled('tag') && $plugin->isActivated('tag')) { + if (Plugin::isPluginActive('tag')) { $input['tag_questions'] = (!empty($input['_tag_questions'])) ? implode(',', $input['_tag_questions']) : ''; @@ -581,7 +580,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { 2 => __('Actors', 'formcreator'), 3 => __('Condition', 'formcreator'), ]; - // if ((new Plugin)->isActivated('fields')) { + // if (Plugin::isPluginActive('fields')) { // $tab[4] = __('Fields plugin', 'formcreator'); // } return $tab; diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php index 0af68f10e..b7dbe8064 100644 --- a/inc/targetticket.class.php +++ b/inc/targetticket.class.php @@ -135,7 +135,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { 2 => __('Actors', 'formcreator'), 3 => __('Condition', 'formcreator'), ]; - // if ((new Plugin)->isActivated('fields')) { + // if (Plugin::isPluginActive('fields')) { // $tab[4] = __('Fields plugin', 'formcreator'); // } return $tab; @@ -689,7 +689,7 @@ public function prepareInputForUpdate($input) { } $plugin = new Plugin(); - if ($plugin->isActivated('tag')) { + if (Plugin::isPluginActive('tag')) { if (isset($input['tag_questions'])) { $input['tag_questions'] = (!empty($input['_tag_questions'])) ? implode(',', $input['_tag_questions'])