From 8d5fcc8d4ca85c2752771ba7c808ed4e19c3c773 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 1 Nov 2013 15:33:31 +0100
Subject: [ticket/11994] Make extension manager UI less misleading
Enable and Install were split into two different expressions.
Purge was renamed to uninstall to make clearer what is going to happen.
PHPBB3-11994
---
phpBB/includes/acp/acp_extensions.php | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
(limited to 'phpBB/includes/acp/acp_extensions.php')
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index b41f4d4e81..896c911859 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -83,6 +83,7 @@ class acp_extensions
break;
case 'enable_pre':
+ case 'install_pre':
if (!$md_manager->validate_enable())
{
trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -96,12 +97,15 @@ class acp_extensions
$this->tpl_name = 'acp_ext_enable';
$template->assign_vars(array(
- 'PRE' => true,
- 'U_ENABLE' => $this->u_action . '&action=enable&ext_name=' . urlencode($ext_name),
+ 'PRE' => true,
+ 'IS_ENABLING' => $action == 'enable_pre',
+ 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_' . (($action == 'enable_pre') ? 'ENABLE' : 'INSTALL') . '_CONFIRM', $ext_name),
+ 'U_ENABLE' => $this->u_action . '&action=' . (($action == 'enable_pre') ? 'enable' : 'install') . '&ext_name=' . urlencode($ext_name),
));
break;
case 'enable':
+ case 'install':
if (!$md_manager->validate_enable())
{
trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -116,7 +120,7 @@ class acp_extensions
{
$template->assign_var('S_NEXT_STEP', true);
- meta_refresh(0, $this->u_action . '&action=enable&ext_name=' . urlencode($ext_name));
+ meta_refresh(0, $this->u_action . '&action=' . $action . '&ext_name=' . urlencode($ext_name));
}
}
}
@@ -128,7 +132,8 @@ class acp_extensions
$this->tpl_name = 'acp_ext_enable';
$template->assign_vars(array(
- 'U_RETURN' => $this->u_action . '&action=list',
+ 'IS_ENABLING' => $action == 'enable',
+ 'U_RETURN' => $this->u_action . '&action=list',
));
break;
@@ -141,8 +146,9 @@ class acp_extensions
$this->tpl_name = 'acp_ext_disable';
$template->assign_vars(array(
- 'PRE' => true,
- 'U_DISABLE' => $this->u_action . '&action=disable&ext_name=' . urlencode($ext_name),
+ 'PRE' => true,
+ 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_DISABLE_CONFIRM', $ext_name),
+ 'U_DISABLE' => $this->u_action . '&action=disable&ext_name=' . urlencode($ext_name),
));
break;
@@ -169,8 +175,9 @@ class acp_extensions
$this->tpl_name = 'acp_ext_purge';
$template->assign_vars(array(
- 'PRE' => true,
- 'U_PURGE' => $this->u_action . '&action=purge&ext_name=' . urlencode($ext_name),
+ 'PRE' => true,
+ 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_UNINSTALL_CONFIRM', $ext_name),
+ 'U_PURGE' => $this->u_action . '&action=purge&ext_name=' . urlencode($ext_name),
));
break;
@@ -233,7 +240,7 @@ class acp_extensions
$this->output_actions('enabled', array(
'DISABLE' => $this->u_action . '&action=disable_pre&ext_name=' . urlencode($name),
- 'PURGE' => $this->u_action . '&action=purge_pre&ext_name=' . urlencode($name),
+ 'UNINSTALL' => $this->u_action . '&action=purge_pre&ext_name=' . urlencode($name),
));
}
catch(\phpbb\extension\exception $e)
@@ -267,7 +274,7 @@ class acp_extensions
$this->output_actions('disabled', array(
'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
- 'PURGE' => $this->u_action . '&action=purge_pre&ext_name=' . urlencode($name),
+ 'UNINSTALL' => $this->u_action . '&action=purge_pre&ext_name=' . urlencode($name),
));
}
catch(\phpbb\extension\exception $e)
@@ -302,7 +309,7 @@ class acp_extensions
));
$this->output_actions('disabled', array(
- 'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
+ 'INSTALL' => $this->u_action . '&action=install_pre&ext_name=' . urlencode($name),
));
}
catch(\phpbb\extension\exception $e)
@@ -325,8 +332,9 @@ class acp_extensions
foreach ($actions as $lang => $url)
{
$this->template->assign_block_vars($block . '.actions', array(
- 'L_ACTION' => $this->user->lang($lang),
- 'U_ACTION' => $url,
+ 'L_ACTION' => $this->user->lang('EXTENSION_' . $lang),
+ 'L_ACTION_EXPLAIN' => (isset($this->user->lang['EXTENSION_' . $lang . '_EXPLAIN'])) ? $this->user->lang('EXTENSION_' . $lang . '_EXPLAIN') : '',
+ 'U_ACTION' => $url,
));
}
}
--
cgit v1.2.1
From 473402c77bc173aa78e5355586dd09ee2c57c70c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 2 Nov 2013 14:50:13 +0100
Subject: [ticket/11994] Use display name on confirmation screen
PHPBB3-11994
---
phpBB/includes/acp/acp_extensions.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'phpBB/includes/acp/acp_extensions.php')
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 896c911859..da5a58c7d6 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -99,7 +99,7 @@ class acp_extensions
$template->assign_vars(array(
'PRE' => true,
'IS_ENABLING' => $action == 'enable_pre',
- 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_' . (($action == 'enable_pre') ? 'ENABLE' : 'INSTALL') . '_CONFIRM', $ext_name),
+ 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_' . (($action == 'enable_pre') ? 'ENABLE' : 'INSTALL') . '_CONFIRM', $md_manager->get_metadata('display-name')),
'U_ENABLE' => $this->u_action . '&action=' . (($action == 'enable_pre') ? 'enable' : 'install') . '&ext_name=' . urlencode($ext_name),
));
break;
@@ -147,7 +147,7 @@ class acp_extensions
$template->assign_vars(array(
'PRE' => true,
- 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_DISABLE_CONFIRM', $ext_name),
+ 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_DISABLE_CONFIRM', $md_manager->get_metadata('display-name')),
'U_DISABLE' => $this->u_action . '&action=disable&ext_name=' . urlencode($ext_name),
));
break;
@@ -176,7 +176,7 @@ class acp_extensions
$template->assign_vars(array(
'PRE' => true,
- 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_UNINSTALL_CONFIRM', $ext_name),
+ 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_UNINSTALL_CONFIRM', $md_manager->get_metadata('display-name')),
'U_PURGE' => $this->u_action . '&action=purge&ext_name=' . urlencode($ext_name),
));
break;
--
cgit v1.2.1
From 7e1a02b3a192771043009078630e8e2b9b8026a1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 2 Nov 2013 23:23:48 +0100
Subject: [ticket/11994] Make install/enable just one UI thing
PHPBB3-11994
---
phpBB/includes/acp/acp_extensions.php | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
(limited to 'phpBB/includes/acp/acp_extensions.php')
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index da5a58c7d6..7ca98221c0 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -83,7 +83,6 @@ class acp_extensions
break;
case 'enable_pre':
- case 'install_pre':
if (!$md_manager->validate_enable())
{
trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -98,14 +97,12 @@ class acp_extensions
$template->assign_vars(array(
'PRE' => true,
- 'IS_ENABLING' => $action == 'enable_pre',
- 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_' . (($action == 'enable_pre') ? 'ENABLE' : 'INSTALL') . '_CONFIRM', $md_manager->get_metadata('display-name')),
- 'U_ENABLE' => $this->u_action . '&action=' . (($action == 'enable_pre') ? 'enable' : 'install') . '&ext_name=' . urlencode($ext_name),
+ 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_ENABLE_CONFIRM', $md_manager->get_metadata('display-name')),
+ 'U_ENABLE' => $this->u_action . '&action=enable&ext_name=' . urlencode($ext_name),
));
break;
case 'enable':
- case 'install':
if (!$md_manager->validate_enable())
{
trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -120,7 +117,7 @@ class acp_extensions
{
$template->assign_var('S_NEXT_STEP', true);
- meta_refresh(0, $this->u_action . '&action=' . $action . '&ext_name=' . urlencode($ext_name));
+ meta_refresh(0, $this->u_action . '&action=enable&ext_name=' . urlencode($ext_name));
}
}
}
@@ -132,7 +129,6 @@ class acp_extensions
$this->tpl_name = 'acp_ext_enable';
$template->assign_vars(array(
- 'IS_ENABLING' => $action == 'enable',
'U_RETURN' => $this->u_action . '&action=list',
));
break;
@@ -309,7 +305,7 @@ class acp_extensions
));
$this->output_actions('disabled', array(
- 'INSTALL' => $this->u_action . '&action=install_pre&ext_name=' . urlencode($name),
+ 'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
));
}
catch(\phpbb\extension\exception $e)
--
cgit v1.2.1
From f8e92efc3f213f966a4faa1966ff8e64270328f4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 2 Nov 2013 23:40:56 +0100
Subject: [ticket/11994] Rename "uninstall" to "delete data"
PHPBB3-11994
---
phpBB/includes/acp/acp_extensions.php | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
(limited to 'phpBB/includes/acp/acp_extensions.php')
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 7ca98221c0..29b29f7ad6 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -167,17 +167,21 @@ class acp_extensions
));
break;
- case 'purge_pre':
- $this->tpl_name = 'acp_ext_purge';
+ case 'delete_data_pre':
+ if ($phpbb_extension_manager->enabled($ext_name))
+ {
+ redirect($this->u_action);
+ }
+ $this->tpl_name = 'acp_ext_delete_data';
$template->assign_vars(array(
'PRE' => true,
- 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_UNINSTALL_CONFIRM', $md_manager->get_metadata('display-name')),
- 'U_PURGE' => $this->u_action . '&action=purge&ext_name=' . urlencode($ext_name),
+ 'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_DELETE_DATA_CONFIRM', $md_manager->get_metadata('display-name')),
+ 'U_PURGE' => $this->u_action . '&action=delete_data&ext_name=' . urlencode($ext_name),
));
break;
- case 'purge':
+ case 'delete_data':
try
{
while ($phpbb_extension_manager->purge_step($ext_name))
@@ -187,7 +191,7 @@ class acp_extensions
{
$template->assign_var('S_NEXT_STEP', true);
- meta_refresh(0, $this->u_action . '&action=purge&ext_name=' . urlencode($ext_name));
+ meta_refresh(0, $this->u_action . '&action=delete_data&ext_name=' . urlencode($ext_name));
}
}
}
@@ -196,7 +200,7 @@ class acp_extensions
$template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($user));
}
- $this->tpl_name = 'acp_ext_purge';
+ $this->tpl_name = 'acp_ext_delete_data';
$template->assign_vars(array(
'U_RETURN' => $this->u_action . '&action=list',
@@ -236,7 +240,6 @@ class acp_extensions
$this->output_actions('enabled', array(
'DISABLE' => $this->u_action . '&action=disable_pre&ext_name=' . urlencode($name),
- 'UNINSTALL' => $this->u_action . '&action=purge_pre&ext_name=' . urlencode($name),
));
}
catch(\phpbb\extension\exception $e)
@@ -270,7 +273,7 @@ class acp_extensions
$this->output_actions('disabled', array(
'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
- 'UNINSTALL' => $this->u_action . '&action=purge_pre&ext_name=' . urlencode($name),
+ 'DELETE_DATA' => $this->u_action . '&action=delete_data_pre&ext_name=' . urlencode($name),
));
}
catch(\phpbb\extension\exception $e)
--
cgit v1.2.1
From bb0ff715f8371619e29b1b07b17feceefdb10cdb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 3 Nov 2013 20:27:59 +0100
Subject: [ticket/11994] Change error level for missing .json file
PHPBB3-11994
---
phpBB/includes/acp/acp_extensions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/includes/acp/acp_extensions.php')
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 29b29f7ad6..c5c17cb559 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -66,7 +66,7 @@ class acp_extensions
}
catch(\phpbb\extension\exception $e)
{
- trigger_error($e);
+ trigger_error($e, E_USER_WARNING);
}
}
--
cgit v1.2.1
From a6c73ea0c8ca3b0d147c31543c2655ec822dd0f8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 8 Nov 2013 14:08:02 +0100
Subject: [ticket/12002] Add link hash to extension manager links
PHPBB3-12002
---
phpBB/includes/acp/acp_extensions.php | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
(limited to 'phpBB/includes/acp/acp_extensions.php')
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index c5c17cb559..c21c9f4e9d 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -55,6 +55,11 @@ class acp_extensions
$ext_name = '';
}
+ if (in_array($action, array('enable', 'disable', 'delete_data')) && !check_link_hash($request->variable('hash', ''), $action . '.' . $ext_name))
+ {
+ trigger_error('FORM_INVALID', E_USER_WARNING);
+ }
+
// If they've specified an extension, let's load the metadata manager and validate it.
if ($ext_name)
{
@@ -98,7 +103,7 @@ class acp_extensions
$template->assign_vars(array(
'PRE' => true,
'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_ENABLE_CONFIRM', $md_manager->get_metadata('display-name')),
- 'U_ENABLE' => $this->u_action . '&action=enable&ext_name=' . urlencode($ext_name),
+ 'U_ENABLE' => $this->u_action . '&action=enable&ext_name=' . urlencode($ext_name) . '&hash=' . generate_link_hash('enable.' . $ext_name),
));
break;
@@ -117,7 +122,7 @@ class acp_extensions
{
$template->assign_var('S_NEXT_STEP', true);
- meta_refresh(0, $this->u_action . '&action=enable&ext_name=' . urlencode($ext_name));
+ meta_refresh(0, $this->u_action . '&action=enable&ext_name=' . urlencode($ext_name) . '&hash=' . generate_link_hash('enable.' . $ext_name));
}
}
}
@@ -144,7 +149,7 @@ class acp_extensions
$template->assign_vars(array(
'PRE' => true,
'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_DISABLE_CONFIRM', $md_manager->get_metadata('display-name')),
- 'U_DISABLE' => $this->u_action . '&action=disable&ext_name=' . urlencode($ext_name),
+ 'U_DISABLE' => $this->u_action . '&action=disable&ext_name=' . urlencode($ext_name) . '&hash=' . generate_link_hash('disable.' . $ext_name),
));
break;
@@ -156,7 +161,7 @@ class acp_extensions
{
$template->assign_var('S_NEXT_STEP', true);
- meta_refresh(0, $this->u_action . '&action=disable&ext_name=' . urlencode($ext_name));
+ meta_refresh(0, $this->u_action . '&action=disable&ext_name=' . urlencode($ext_name) . '&hash=' . generate_link_hash('disable.' . $ext_name));
}
}
@@ -177,7 +182,7 @@ class acp_extensions
$template->assign_vars(array(
'PRE' => true,
'L_CONFIRM_MESSAGE' => $this->user->lang('EXTENSION_DELETE_DATA_CONFIRM', $md_manager->get_metadata('display-name')),
- 'U_PURGE' => $this->u_action . '&action=delete_data&ext_name=' . urlencode($ext_name),
+ 'U_PURGE' => $this->u_action . '&action=delete_data&ext_name=' . urlencode($ext_name) . '&hash=' . generate_link_hash('delete_data.' . $ext_name),
));
break;
@@ -191,7 +196,7 @@ class acp_extensions
{
$template->assign_var('S_NEXT_STEP', true);
- meta_refresh(0, $this->u_action . '&action=delete_data&ext_name=' . urlencode($ext_name));
+ meta_refresh(0, $this->u_action . '&action=delete_data&ext_name=' . urlencode($ext_name) . '&hash=' . generate_link_hash('delete_data.' . $ext_name));
}
}
}
--
cgit v1.2.1