mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 11:44:08 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4046 from CHItA/ticket/14269

Browse Source 
[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()
This commit is contained in:
Tristan Darricau
2015-12-07 00:28:20 +01:00
parent d0779e6fda 44a90c9812
commit a740befb02
5 changed files with 147 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/install/controller/install.php
View File

@@ -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(

7
phpBB/phpbb/install/controller/update.php
View File

@@ -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(