diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-07 00:28:20 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-07 00:28:20 +0100 |
| commit | a740befb029cdf7dfc97b1339b69805e211ac572 (patch) | |
| tree | 6ca4a905e3edfecf81532b4ccde834e980cc9595 /phpBB/phpbb/install/controller | |
| parent | d0779e6fdaf651ab15055e80ae78d21e17578768 (diff) | |
| parent | 44a90c9812c4eff73051e75647362859f9407a5f (diff) | |
| download | forums-a740befb029cdf7dfc97b1339b69805e211ac572.tar forums-a740befb029cdf7dfc97b1339b69805e211ac572.tar.gz forums-a740befb029cdf7dfc97b1339b69805e211ac572.tar.bz2 forums-a740befb029cdf7dfc97b1339b69805e211ac572.tar.xz forums-a740befb029cdf7dfc97b1339b69805e211ac572.zip | |
Merge pull request #4046 from CHItA/ticket/14269
[ticket/14269] Use http_exceptions in the installer instead of die()
* CHItA/ticket/14269:
[ticket/14269] Change HTTP status codes to 403
[ticket/14269] Fix comments and language var names
[ticket/14269] Use http_exceptions in the installer instead of die()
Diffstat (limited to 'phpBB/phpbb/install/controller')
| -rw-r--r-- | phpBB/phpbb/install/controller/install.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/install/controller/update.php | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/phpbb/install/controller/install.php b/phpBB/phpbb/install/controller/install.php index 8d5ff95958..8bf9062b08 100644 --- a/phpBB/phpbb/install/controller/install.php +++ b/phpBB/phpbb/install/controller/install.php @@ -13,6 +13,7 @@ namespace phpbb\install\controller; +use phpbb\exception\http_exception; use phpbb\install\helper\install_helper; use phpbb\install\helper\navigation\navigation_provider; use Symfony\Component\HttpFoundation\StreamedResponse; @@ -97,12 +98,14 @@ class install * Controller logic * * @return Response|StreamedResponse + * + * @throws http_exception When phpBB is already installed */ public function handle() { if ($this->install_helper->is_phpbb_installed()) { - die ('phpBB is already installed'); + throw new http_exception(403, 'INSTALL_PHPBB_INSTALLED'); } $this->template->assign_vars(array( diff --git a/phpBB/phpbb/install/controller/update.php b/phpBB/phpbb/install/controller/update.php index 5212ba7f26..9fff11cae8 100644 --- a/phpBB/phpbb/install/controller/update.php +++ b/phpBB/phpbb/install/controller/update.php @@ -13,6 +13,7 @@ namespace phpbb\install\controller; +use phpbb\exception\http_exception; use phpbb\install\helper\install_helper; use phpbb\install\helper\iohandler\factory; use phpbb\install\helper\navigation\navigation_provider; @@ -93,12 +94,16 @@ class update /** * Controller entry point + * + * @return Response|StreamedResponse + * + * @throws http_exception When phpBB is not installed */ public function handle() { if (!$this->install_helper->is_phpbb_installed()) { - die ('phpBB is not installed'); + throw new http_exception(403, 'INSTALL_PHPBB_NOT_INSTALLED'); } $this->template->assign_vars(array( |