phpBB

Code Changes

File: phpbb/controller/helper.php

  Unmodified   Added   Modified   Removed
Line 15Line 15

use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;


use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;

use Symfony\Component\Routing\Generator\UrlGenerator;

 
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;

use Symfony\Component\Routing\Generator\UrlGeneratorInterface;

use Symfony\Component\Routing\RequestContext;

 

/**
* Controller helper class, contains methods that do things for controllers


/**
* Controller helper class, contains methods that do things for controllers

Line 49Line 47
	protected $request;

/**

	protected $request;

/**

	* @var \phpbb\filesystem The filesystem object

	 * @var \phpbb\routing\helper

	*/

	*/

	protected $filesystem;

/**
* phpBB root path
* @var string
*/
protected $phpbb_root_path;

/**
* PHP file extension
* @var string
*/
protected $php_ext;

	protected $routing_helper;














/**
* Constructor


/**
* Constructor

Line 71Line 57
	* @param \phpbb\template\template $template Template object
* @param \phpbb\user $user User object
* @param \phpbb\config\config $config Config object

	* @param \phpbb\template\template $template Template object
* @param \phpbb\user $user User object
* @param \phpbb\config\config $config Config object

	* @param \phpbb\controller\provider $provider Path provider
* @param \phpbb\extension\manager $manager Extension manager object

 
	* @param \phpbb\symfony_request $symfony_request Symfony Request object
* @param \phpbb\request\request_interface $request phpBB request object

	* @param \phpbb\symfony_request $symfony_request Symfony Request object
* @param \phpbb\request\request_interface $request phpBB request object

	* @param \phpbb\filesystem $filesystem The filesystem object
* @param string $phpbb_root_path phpBB root path
* @param string $php_ext PHP file extension

	 * @param \phpbb\routing\helper $routing_helper Helper to generate the routes



	*/

	*/

	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, \phpbb\request\request_interface $request, \phpbb\filesystem $filesystem, $phpbb_root_path, $php_ext)

	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\symfony_request $symfony_request, \phpbb\request\request_interface $request, \phpbb\routing\helper $routing_helper)

	{
$this->template = $template;
$this->user = $user;
$this->config = $config;
$this->symfony_request = $symfony_request;
$this->request = $request;

	{
$this->template = $template;
$this->user = $user;
$this->config = $config;
$this->symfony_request = $symfony_request;
$this->request = $request;

		$this->filesystem = $filesystem;
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
$provider->find_routing_files($manager->get_finder());
$this->route_collection = $provider->find($phpbb_root_path)->get_routes();

		$this->routing_helper = $routing_helper;





	}

/**

	}

/**

Line 102Line 80
	* @param bool $display_online_list Do we display online users list
* @param int $item_id Restrict online users to item id
* @param string $item Restrict online users to a certain session item, e.g. forum for session_forum_id

	* @param bool $display_online_list Do we display online users list
* @param int $item_id Restrict online users to item id
* @param string $item Restrict online users to a certain session item, e.g. forum for session_forum_id

 
	* @param bool $send_headers Whether headers should be sent by page_header(). Defaults to false for controllers.

	*
* @return Response object containing rendered page
*/

	*
* @return Response object containing rendered page
*/

	public function render($template_file, $page_title = '', $status_code = 200, $display_online_list = false, $item_id = 0, $item = 'forum')

	public function render($template_file, $page_title = '', $status_code = 200, $display_online_list = false, $item_id = 0, $item = 'forum', $send_headers = false)

	{

	{

		page_header($page_title, $display_online_list, $item_id, $item);

		page_header($page_title, $display_online_list, $item_id, $item, $send_headers);


$this->template->set_filenames(array(
'body' => $template_file,


$this->template->set_filenames(array(
'body' => $template_file,

Line 115Line 94

page_footer(true, false, false);



page_footer(true, false, false);


		return new Response($this->template->assign_display('body'), $status_code);



		$headers = !empty($this->user->data['is_bot']) ? array('X-PHPBB-IS-BOT' => 'yes') : array();

return new Response($this->template->assign_display('body'), $status_code, $headers);

	}

/**

	}

/**

Line 130Line 111
	*/
public function route($route, array $params = array(), $is_amp = true, $session_id = false, $reference_type = UrlGeneratorInterface::ABSOLUTE_PATH)
{

	*/
public function route($route, array $params = array(), $is_amp = true, $session_id = false, $reference_type = UrlGeneratorInterface::ABSOLUTE_PATH)
{

		$anchor = '';
if (isset($params['#']))
{
$anchor = '#' . $params['#'];
unset($params['#']);
}

$context = new RequestContext();
$context->fromRequest($this->symfony_request);

$script_name = $this->symfony_request->getScriptName();
$page_name = substr($script_name, -1, 1) == '/' ? '' : utf8_basename($script_name);

$base_url = $context->getBaseUrl();

// Append page name if base URL does not contain it
if (!empty($page_name) && strpos($base_url, '/' . $page_name) === false)
{
$base_url .= '/' . $page_name;
}

// If enable_mod_rewrite is false we need to replace the current front-end by app.php, otherwise we need to remove it.
$base_url = str_replace('/' . $page_name, empty($this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '', $base_url);

// We need to update the base url to move to the directory of the app.php file if the current script is not app.php
if ($page_name !== 'app.php')
{
if (empty($this->config['enable_mod_rewrite']))
{
$base_url = str_replace('/app.' . $this->php_ext, '/' . $this->phpbb_root_path . 'app.' . $this->php_ext, $base_url);
}
else
{
$base_url .= preg_replace(get_preg_expression('path_remove_dot_trailing_slash'), '$2', $this->phpbb_root_path);
}
}

$base_url = $this->request->escape($this->filesystem->clean_path($base_url), true);

$context->setBaseUrl($base_url);

$url_generator = new UrlGenerator($this->route_collection, $context);
$route_url = $url_generator->generate($route, $params, $reference_type);

if ($is_amp)
{
$route_url = str_replace(array('&', '&'), array('&', '&'), $route_url);
}

if ($reference_type === UrlGeneratorInterface::RELATIVE_PATH && empty($this->config['enable_mod_rewrite']))
{
$route_url = 'app.' . $this->php_ext . '/' . $route_url;
}

return append_sid($route_url . $anchor, false, $is_amp, $session_id, true);

		return $this->routing_helper->route($route, $params, $is_amp, $session_id, $reference_type);























































	}

/**

	}

/**

Line 240Line 167
		));

return $this->render('message_body.html', $message_title, $code);

		));

return $this->render('message_body.html', $message_title, $code);

 
	}

/**
* Assigns automatic refresh time meta tag in template
*
* @param int $time time in seconds, when redirection should occur
* @param string $url the URL where the user should be redirected
* @return null
*/
public function assign_meta_refresh_var($time, $url)
{
$this->template->assign_vars(array(
'META' => '<meta http-equiv="refresh" content="' . $time . '; url=' . $url . '" />',
));

	}

/**

	}

/**