{{ lang('EXTMGRPLUS_ORDER_AND_IGNORE') ~ lang('COLON') }} {{ lang('EXTENSIONS_ADMIN') }}
{{ _self.button(
- 'disable',
+ 'disable',
(EXTMGRPLUS_COUNT_ENABLED_CLEAN > 0) && EXTMGRPLUS_ENABLE_CHECKBOXES_ALL_SET
) }}
{{ _self.checkbox_all(
- 'enabled',
- (EXTMGRPLUS_COUNT_ENABLED_CLEAN > 0),
+ 'enabled',
+ (EXTMGRPLUS_COUNT_ENABLED_CLEAN > 0),
EXTMGRPLUS_ENABLE_CHECKBOXES_ALL_SET
) }}
@@ -264,16 +264,16 @@ {{ lang('EXTENSIONS_ADMIN') }}
{{ _self.checkbox_select(
- 'enabled',
- enabled,
- (enabled.NAME != 'lukewcs/extmgrplus' || EXTMGRPLUS_ENABLE_SELF_DISABLE) && (EXTMGRPLUS_IGNORE[enabled.NAME] is not defined || !EXTMGRPLUS_ENABLE_ORDER_AND_IGNORE),
+ 'enabled',
+ enabled,
+ (enabled.NAME != 'lukewcs/extmgrplus' || EXTMGRPLUS_ENABLE_SELF_DISABLE) && (EXTMGRPLUS_IGNORE[enabled.NAME] is not defined || !EXTMGRPLUS_ENABLE_ORDER_AND_IGNORE),
EXTMGRPLUS_ENABLE_CHECKBOXES_ALL_SET
) }}
{% if enabled.NAME != 'lukewcs/extmgrplus' %}
{{ _self.inputbox(
- enabled,
+ enabled,
EXTMGRPLUS_ORDER,
EXTMGRPLUS_IGNORE[enabled.NAME] is defined
) }}
@@ -282,7 +282,7 @@ {{ lang('EXTENSIONS_ADMIN') }}
{% if enabled.NAME != 'lukewcs/extmgrplus' %}
{{ _self.checkbox_ignore(
- enabled,
+ enabled,
EXTMGRPLUS_IGNORE[enabled.NAME] is defined
) }}
{% endif %}
@@ -299,14 +299,14 @@ {{ lang('EXTENSIONS_ADMIN') }}
{{ _self.button(
- 'enable',
+ 'enable',
(EXTMGRPLUS_COUNT_DISABLED_CLEAN > 0) && EXTMGRPLUS_ENABLE_CHECKBOXES_ALL_SET
) }}
{{ _self.checkbox_all(
- 'disabled',
- (EXTMGRPLUS_COUNT_DISABLED_CLEAN > 0),
+ 'disabled',
+ (EXTMGRPLUS_COUNT_DISABLED_CLEAN > 0),
EXTMGRPLUS_ENABLE_CHECKBOXES_ALL_SET
) }}
@@ -347,13 +347,13 @@ {{ lang('EXTENSIONS_ADMIN') }}
{{ _self.details(disabled) }}
- {{ _self.actions(disabled) }}
+ {{ _self.actions(disabled) }}
{% if disabled.actions|length == 2 %}
{{ _self.checkbox_select(
- 'disabled',
- disabled,
+ 'disabled',
+ disabled,
(EXTMGRPLUS_MIGRATION_EXTS[disabled.NAME] is not defined || EXTMGRPLUS_ALLOW_MIGRATIONS) && (EXTMGRPLUS_IGNORE[disabled.NAME] is not defined || !EXTMGRPLUS_ENABLE_ORDER_AND_IGNORE),
EXTMGRPLUS_ENABLE_CHECKBOXES_ALL_SET
) }}
@@ -361,14 +361,14 @@ {{ lang('EXTENSIONS_ADMIN') }}
{{ _self.inputbox(
- disabled,
+ disabled,
EXTMGRPLUS_ORDER,
EXTMGRPLUS_IGNORE[disabled.NAME] is defined
) }}
{{ _self.checkbox_ignore(
- disabled,
+ disabled,
EXTMGRPLUS_IGNORE[disabled.NAME] is defined
) }}
diff --git a/lukewcs/extmgrplus/adm/style/acp_ext_mgr_plus_confirm_body.html b/lukewcs/extmgrplus/adm/style/acp_ext_mgr_plus_confirm_body.html
index dfc5e61..772033e 100644
--- a/lukewcs/extmgrplus/adm/style/acp_ext_mgr_plus_confirm_body.html
+++ b/lukewcs/extmgrplus/adm/style/acp_ext_mgr_plus_confirm_body.html
@@ -4,6 +4,8 @@ {{ lang('EXTENSIONS_ADMIN') }}
{{ lang('EXTENSIONS_EXPLAIN') }}
+{{ EXTMGRPLUS_ACTION_EXPLAIN }}
+
{% INCLUDE 'overall_footer.html' %}
diff --git a/lukewcs/extmgrplus/composer.json b/lukewcs/extmgrplus/composer.json
index d8bf1c6..8720688 100644
--- a/lukewcs/extmgrplus/composer.json
+++ b/lukewcs/extmgrplus/composer.json
@@ -3,8 +3,8 @@
"type": "phpbb-extension",
"description": "Extends the Extension Manager with the ability to disable and re-enable all installed extensions at once. An individual selection can also be made using checkboxes. Furthermore, sequence groups can be defined or extensions can be ignored. Additional information is also displayed in the Extension Manager.",
"homepage": "https://github.com/LukeWCS/ext-mgr-plus",
- "version": "1.0.8-b2",
- "time": "2023-01-28",
+ "version": "1.0.8",
+ "time": "2023-02-01",
"license": "GPL-2.0-only",
"authors": [
{
diff --git a/lukewcs/extmgrplus/core/ext_mgr_plus.php b/lukewcs/extmgrplus/core/ext_mgr_plus.php
index c665eb0..624cc1c 100644
--- a/lukewcs/extmgrplus/core/ext_mgr_plus.php
+++ b/lukewcs/extmgrplus/core/ext_mgr_plus.php
@@ -97,7 +97,7 @@ public function todo(): void
public function ext_manager_before($event): void
{
- if ($event['action'] != 'list' || $this->ext_manager->is_disabled('lukewcs/extmgrplus'))
+ if ($this->ext_manager->is_disabled('lukewcs/extmgrplus') || $event['action'] != 'list')
{
return;
}
@@ -114,7 +114,7 @@ public function ext_manager_before($event): void
trigger_error($this->language->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
}
- $this->enable_disable_confirm();
+ $this->exts_switch_confirm();
}
else if ($this->request->is_set_post('extmgrplus_save_settings'))
{
@@ -155,15 +155,19 @@ public function ext_manager_before($event): void
public function ext_manager_after($event): void
{
- if (($event['action'] != 'list' && $event['action'] != 'details') || $this->ext_manager->is_disabled('lukewcs/extmgrplus'))
+ if ($this->ext_manager->is_disabled('lukewcs/extmgrplus'))
{
return;
}
- if ($event['action'] == 'details')
+ else if ($event['action'] == 'details')
{
$this->versioncheck_save($event['ext_name']);
return;
}
+ else if ($event['action'] != 'list')
+ {
+ return;
+ }
$event['tpl_name'] = '@lukewcs_extmgrplus/acp_ext_mgr_plus_acp_ext_list';
@@ -228,7 +232,7 @@ public function ext_manager_after($event): void
$ext_lang_min_ver = $this_meta['extra']['lang-min-ver'];
$ext_lang_ver = $this->get_lang_ver('EXTMGRPLUS_LANG_EXT_VER');
- $lang_outdated_msg = $this->check_lang_ver($ext_display_name, $ext_lang_ver, $ext_lang_min_ver, 'EXTMGRPLUS_MSG_LANGUAGEPACK_OUTDATED');
+ $lang_outdated_msg = $this->lang_ver_check_msg($ext_display_name, $ext_lang_ver, $ext_lang_min_ver, 'EXTMGRPLUS_MSG_LANGUAGEPACK_OUTDATED');
if ($lang_outdated_msg)
{
$notes[] = $lang_outdated_msg;
@@ -268,12 +272,12 @@ public function catch_message(): void
{
return;
}
+
$ext_name = $this->template->retrieve_var('EXTMGRPLUS_LAST_EXT_NAME');
$ext_display_name = $this->template->retrieve_var('EXTMGRPLUS_LAST_EXT_DISPLAY_NAME');
$message_text = $this->template->retrieve_var('MESSAGE_TEXT');
$s_user_notice = $this->template->retrieve_var('S_USER_NOTICE');
$s_user_warning = $this->template->retrieve_var('S_USER_WARNING');
-
if (
$ext_name != ''
&& $ext_display_name != ''
@@ -295,7 +299,7 @@ public function catch_message(): void
}
}
- private function enable_disable_confirm(): void
+ private function exts_switch_confirm(): void
{
if ($this->request->is_set_post('extmgrplus_disable_all'))
{
@@ -306,10 +310,13 @@ private function enable_disable_confirm(): void
{
if (confirm_box(true))
{
- $this->enable_disable("disable");
+ $this->exts_disable();
}
else
{
+ $this->template->assign_vars([
+ 'EXTMGRPLUS_ACTION_EXPLAIN' => $this->language->lang('EXTENSION_DISABLE_EXPLAIN'),
+ ]);
confirm_box(
false,
$this->language->lang('EXTMGRPLUS_MSG_CONFIRM_DISABLE', $this->language->lang('EXTMGRPLUS_EXTENSION_PLURAL', $ext_count_enabled)) .
@@ -325,7 +332,7 @@ private function enable_disable_confirm(): void
}
else
{
- $this->enable_disable("disable");
+ $this->exts_disable();
}
}
else if ($this->request->is_set_post('extmgrplus_enable_all'))
@@ -337,10 +344,13 @@ private function enable_disable_confirm(): void
{
if (confirm_box(true))
{
- $this->enable_disable("enable");
+ $this->exts_enable();
}
else
{
+ $this->template->assign_vars([
+ 'EXTMGRPLUS_ACTION_EXPLAIN' => $this->language->lang('EXTENSION_ENABLE_EXPLAIN'),
+ ]);
confirm_box(
false,
$this->language->lang('EXTMGRPLUS_MSG_CONFIRM_ENABLE', $this->language->lang('EXTMGRPLUS_EXTENSION_PLURAL', $ext_count_disabled)),
@@ -355,220 +365,221 @@ private function enable_disable_confirm(): void
}
else
{
- $this->enable_disable("enable");
+ $this->exts_enable();
}
}
redirect($this->request->variable('u_action', ''));
}
- private function enable_disable(string $action): void
+ private function exts_disable(): void
{
$safe_time_limit = round(ini_get('max_execution_time') / 2);
$start_time = time();
$safe_time_exceeded = false;
- if ($action == "disable")
+ $ext_list_marked = $this->request->variable('ext_mark_enabled', ['']);
+ $ext_list_enabled = array_flip($ext_list_marked);
+ $ext_count_enabled = count($ext_list_enabled);
+ $ext_count_success = 0;
+
+ if (phpbb_version_compare(PHPBB_VERSION, '3.3.8', '<'))
{
- $ext_list_marked = $this->request->variable('ext_mark_enabled', ['']);
- $ext_list_enabled = array_flip($ext_list_marked);
- $ext_count_enabled = count($ext_list_enabled);
- $ext_count_success = 0;
+ $this->config_text_set('extmgrplus_todo_list', 'purge_cache', true);
+ }
- if (phpbb_version_compare(PHPBB_VERSION, '3.3.8', '<'))
- {
- $this->config_text_set('extmgrplus_todo_list', 'purge_cache', true);
- }
+ foreach ($ext_list_enabled as $ext_name => $value)
+ {
+ $ext_display_name = $this->ext_manager->create_extension_metadata_manager($ext_name)->get_metadata('display-name');
+ $this->set_last_ext_template_vars('EXTMGRPLUS_ALL_DISABLE', $ext_name, $ext_display_name);
- foreach ($ext_list_enabled as $ext_name => $value)
+ if ($this->ext_manager->is_enabled($ext_name))
{
- $ext_display_name = $this->ext_manager->create_extension_metadata_manager($ext_name)->get_metadata('display-name');
- $this->set_last_ext_template_vars('EXTMGRPLUS_ALL_DISABLE', $ext_name, $ext_display_name);
-
- if ($this->ext_manager->is_enabled($ext_name))
+ if ($ext_name != 'lukewcs/extmgrplus')
{
- if ($ext_name != 'lukewcs/extmgrplus')
- {
- while ($this->ext_manager->disable_step($ext_name))
- {
- }
- }
- else if ($this->config['extmgrplus_enable_self_disable'])
+ while ($this->ext_manager->disable_step($ext_name))
{
- $this->config_text_set('extmgrplus_todo_list', 'self_disable', true);
- $ext_count_success++;
}
}
-
- if ($this->ext_manager->is_disabled($ext_name))
+ else if ($this->config['extmgrplus_enable_self_disable'])
{
+ $this->config_text_set('extmgrplus_todo_list', 'self_disable', true);
$ext_count_success++;
}
-
- if ($this->config['extmgrplus_enable_log'])
- {
- $this->config_text_set('extmgrplus_todo_list', 'add_log', $this->get_log_data(
- 'EXTMGRPLUS_LOG_EXT_DISABLE_ALL',
- $ext_count_success,
- $ext_count_enabled
- ));
- }
-
- if ((time() - $start_time) >= $safe_time_limit)
- {
- $safe_time_exceeded = true;
- break;
- }
}
- $this->set_last_ext_template_vars('', '', '');
+ if ($this->ext_manager->is_disabled($ext_name))
+ {
+ $ext_count_success++;
+ }
- if ($safe_time_exceeded)
+ if ($this->config['extmgrplus_enable_log'])
{
- trigger_error(sprintf('%1$s%2$s %2$s %1$s (%2$s) %3$s ',
- /* 1 */ $display_name,
- /* 2 */ $ext_name,
- /* 3 */ $message
- );
- };
+ private function exts_enable(): void
+ {
+ $safe_time_limit = round(ini_get('max_execution_time') / 2);
+ $start_time = time();
+ $safe_time_exceeded = false;
- if ($this->config['extmgrplus_enable_order_and_ignore'])
- {
- $ext_list_order = $this->config_text_get('extmgrplus_order_and_ignore_list', 'order');
- }
- if (isset($ext_list_order) && is_array($ext_list_order))
- {
- $ext_list_order = array_intersect_key($ext_list_order, $ext_list_disabled);
- asort($ext_list_order, SORT_NUMERIC);
- }
- else
- {
- $ext_list_order = [];
- }
- $ext_list_disabled = array_merge($ext_list_order, $ext_list_disabled);
+ $ext_list_marked = $this->request->variable('ext_mark_disabled', ['']);
+ $ext_list_disabled = array_flip($ext_list_marked);
+ $ext_count_disabled = count($ext_list_disabled);
+ $ext_count_success = 0;
- $ext_count_disabled = count($ext_list_disabled);
- $ext_count_success = 0;
+ if (phpbb_version_compare(PHPBB_VERSION, '3.3.8', '<'))
+ {
+ $this->config_text_set('extmgrplus_todo_list', 'purge_cache', true);
+ }
- if (phpbb_version_compare(PHPBB_VERSION, '3.3.8', '<'))
- {
- $this->config_text_set('extmgrplus_todo_list', 'purge_cache', true);
- }
+ $ext_list_failed_activation = [];
+ $msg_failed = '';
+ $get_failed_msg = function ($display_name, $ext_name, $message)
+ {
+ return sprintf('%1$s (%2$s) %3$s ',
+ /* 1 */ $display_name,
+ /* 2 */ $ext_name,
+ /* 3 */ $message
+ );
+ };
- foreach ($ext_list_disabled as $ext_name => $value)
- {
- $ext_display_name = $this->ext_manager->create_extension_metadata_manager($ext_name)->get_metadata('display-name');
- $this->set_last_ext_template_vars('EXTMGRPLUS_ALL_ENABLE', $ext_name, $ext_display_name);
+ if ($this->config['extmgrplus_enable_order_and_ignore'])
+ {
+ $ext_list_order = $this->config_text_get('extmgrplus_order_and_ignore_list', 'order');
+ }
+ if (isset($ext_list_order) && is_array($ext_list_order))
+ {
+ $ext_list_order = array_intersect_key($ext_list_order, $ext_list_disabled);
+ asort($ext_list_order, SORT_NUMERIC);
+ }
+ else
+ {
+ $ext_list_order = [];
+ }
+ $ext_list_disabled = array_merge($ext_list_order, $ext_list_disabled);
- $is_enableable = $this->ext_manager->get_extension($ext_name)->is_enableable();
- if ($this->ext_manager->is_disabled($ext_name) && $is_enableable === true)
+ foreach ($ext_list_disabled as $ext_name => $value)
+ {
+ $ext_display_name = $this->ext_manager->create_extension_metadata_manager($ext_name)->get_metadata('display-name');
+ $this->set_last_ext_template_vars('EXTMGRPLUS_ALL_ENABLE', $ext_name, $ext_display_name);
+
+ $is_enableable = $this->ext_manager->get_extension($ext_name)->is_enableable();
+ if ($this->ext_manager->is_disabled($ext_name) && $is_enableable === true)
+ {
+ try
{
- try
+ while ($this->ext_manager->enable_step($ext_name))
{
- while ($this->ext_manager->enable_step($ext_name))
- {
- }
- }
- catch (\phpbb\db\migration\exception $e)
- {
- $msg_failed = $get_failed_msg($ext_display_name, $ext_name, $e->getLocalisedMessage($this->user));
- trigger_error($this->language->lang('EXTMGRPLUS_MSG_PROCESS_ABORTED', $this->language->lang('EXTMGRPLUS_ALL_ENABLE')) . $msg_failed . '%2$s %2$s