diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-16 10:18:56 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-16 10:18:56 +0100 |
| commit | 4a73ce0933c8bfecf37cf760d3fd96bb7a7f48ca (patch) | |
| tree | 9ff4a74a99cab79322a2fe8cc728f0dc283d77df /phpBB/includes | |
| parent | 8da2f349fe39a46fcd70e59ff087071927edbc34 (diff) | |
| parent | c42bd28d172a9ae7439cc3868ebfda87e93f3490 (diff) | |
| download | forums-4a73ce0933c8bfecf37cf760d3fd96bb7a7f48ca.tar forums-4a73ce0933c8bfecf37cf760d3fd96bb7a7f48ca.tar.gz forums-4a73ce0933c8bfecf37cf760d3fd96bb7a7f48ca.tar.bz2 forums-4a73ce0933c8bfecf37cf760d3fd96bb7a7f48ca.tar.xz forums-4a73ce0933c8bfecf37cf760d3fd96bb7a7f48ca.zip | |
Merge remote-tracking branch 'prototech/ticket/12009' into develop
* prototech/ticket/12009:
[ticket/12009] Prevent user from enabling invalid extension through direct URL
[ticket/12009] Update functional test to check for invalid extensions.
[ticket/12009] Fix functional tests.
[ticket/12009] Move valid extensions in tests to correct dir structure.
[ticket/12009] Do not allow incorrectly structured extensions to be installed.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index c21c9f4e9d..2ff479d824 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -88,6 +88,11 @@ class acp_extensions break; case 'enable_pre': + if (!$md_manager->validate_dir()) + { + trigger_error($user->lang['EXTENSION_DIR_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); + } + if (!$md_manager->validate_enable()) { trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING); @@ -108,6 +113,11 @@ class acp_extensions break; case 'enable': + if (!$md_manager->validate_dir()) + { + trigger_error($user->lang['EXTENSION_DIR_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); + } + if (!$md_manager->validate_enable()) { trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING); |