7 files changed, 121 insertions, 43 deletions
diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php
index 874889015a..f18ee0fd73 100644
--- a/phpBB/phpbb/content_visibility.php
+++ b/phpBB/phpbb/content_visibility.php
@@ -528,16 +528,16 @@ class content_visibility
 		if (!$force_update_all && $original_topic_data['topic_delete_time'] && $original_topic_data['topic_visibility'] == ITEM_DELETED && $visibility == ITEM_APPROVED)
 		{
 			// If we're restoring a topic we only restore posts, that were soft deleted through the topic soft deletion.
-			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true, $original_topic_data['topic_visibility'], $original_topic_data['topic_delete_time']);
+			$this->set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true, $original_topic_data['topic_visibility'], $original_topic_data['topic_delete_time']);
 		}
 		else if (!$force_update_all && $original_topic_data['topic_visibility'] == ITEM_APPROVED && $visibility == ITEM_DELETED)
 		{
 			// If we're soft deleting a topic we only approved posts are soft deleted.
-			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true, $original_topic_data['topic_visibility']);
+			$this->set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true, $original_topic_data['topic_visibility']);
 		}
 		else
 		{
-			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true);
+			$this->set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true);
 		}
 
 		return $data;
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index 05a05d1e57..10fdbb1375 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -10,6 +10,8 @@
 namespace phpbb\controller;
 
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Generator\UrlGenerator;
+use Symfony\Component\Routing\RequestContext;
 
 /**
 * Controller helper class, contains methods that do things for controllers
@@ -51,18 +53,20 @@ class helper
 	* Constructor
 	*
 	* @param \phpbb\template\template $template Template object
-    * @param \phpbb\user $user User object
-    * @param \phpbb\config\config $config Config object
+	* @param \phpbb\user $user User object
+	* @param \phpbb\config\config $config Config object
+	* @param \phpbb\controller\provider $provider Path provider
 	* @param string $phpbb_root_path phpBB root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, $phpbb_root_path, $php_ext)
+	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, $phpbb_root_path, $php_ext)
 	{
 		$this->template = $template;
 		$this->user = $user;
 		$this->config = $config;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
+		$this->route_collection = $provider->get_routes();
 	}
 
 	/**
@@ -87,21 +91,33 @@ class helper
 	}
 
 	/**
-	* Generate a URL
+	* Generate a URL to a route
 	*
-	* @param string	$route		The route to travel
-	* @param mixed	$params		String or array of additional url parameters
+	* @param string	$route		Name of the route to travel
+	* @param array	$params		String or array of additional url parameters
 	* @param bool	$is_amp		Is url using &amp; (true) or & (false)
 	* @param string	$session_id	Possibility to use a custom session id instead of the global one
 	* @return string The URL already passed through append_sid()
 	*/
-	public function url($route, $params = false, $is_amp = true, $session_id = false)
+	public function route($route, array $params = array(), $is_amp = true, $session_id = false)
 	{
-		$route_params = '';
-		if (($route_delim = strpos($route, '?')) !== false)
+		$anchor = '';
+		if (isset($params['#']))
 		{
-			$route_params = substr($route, $route_delim);
-			$route = substr($route, 0, $route_delim);
+			$anchor = '#' . $params['#'];
+			unset($params['#']);
+		}
+		$url_generator = new UrlGenerator($this->route_collection, new RequestContext());
+		$route_url = $url_generator->generate($route, $params);
+
+		if (strpos($route_url, '/') === 0)
+		{
+			$route_url = substr($route_url, 1);
+		}
+
+		if ($is_amp)
+		{
+			$route_url = str_replace(array('&amp;', '&'), array('&', '&amp;'), $route_url);
 		}
 
 		// If enable_mod_rewrite is false, we need to include app.php
@@ -111,7 +127,7 @@ class helper
 			$route_prefix .= 'app.' . $this->php_ext . '/';
 		}
 
-		return append_sid($route_prefix . "$route" . $route_params, $params, $is_amp, $session_id);
+		return append_sid($route_prefix . $route_url . $anchor, false, $is_amp, $session_id);
 	}
 
 	/**
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
index fde51696e8..9df8130210 100644
--- a/phpBB/phpbb/controller/provider.php
+++ b/phpBB/phpbb/controller/provider.php
@@ -26,50 +26,58 @@ class provider
 	protected $routing_files;
 
 	/**
+	* Collection of the routes in phpBB and all found extensions
+	* @var RouteCollection
+	*/
+	protected $routes;
+
+	/**
 	* Construct method
 	*
 	* @param array() $routing_files Array of strings containing paths
 	*							to YAML files holding route information
 	*/
-	public function __construct($routing_files = array())
+	public function __construct(\phpbb\extension\finder $finder = null, $routing_files = array())
 	{
 		$this->routing_files = $routing_files;
-	}
-
-	/**
-	* Locate paths containing routing files
-	* This sets an internal property but does not return the paths.
-	*
-	* @return The current instance of this object for method chaining
-	*/
-	public function import_paths_from_finder(\phpbb\extension\finder $finder)
-	{
-		// We hardcode the path to the core config directory
-		// because the finder cannot find it
-		$this->routing_files = array_merge(array('config/routing.yml'), array_keys($finder
-			->directory('config')
-			->suffix('routing.yml')
-			->find()
-		));
 
-		return $this;
+		if ($finder)
+		{
+			// We hardcode the path to the core config directory
+			// because the finder cannot find it
+			$this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder
+					->directory('config')
+					->suffix('routing.yml')
+					->find()
+			));
+		}
 	}
 
 	/**
-	* Get a list of controllers and return it
+	* Find a list of controllers and return it
 	*
 	* @param string $base_path Base path to prepend to file paths
-	* @return array Array of controllers and their route information
+	* @return null
 	*/
 	public function find($base_path = '')
 	{
-		$routes = new RouteCollection;
+		$this->routes = new RouteCollection;
 		foreach ($this->routing_files as $file_path)
 		{
 			$loader = new YamlFileLoader(new FileLocator($base_path));
-			$routes->addCollection($loader->load($file_path));
+			$this->routes->addCollection($loader->load($file_path));
 		}
 
-		return $routes;
+		return $this;
+	}
+
+	/**
+	* Get the list of routes
+	*
+	* @return RouteCollection Get the route collection
+	*/
+	public function get_routes()
+	{
+		return $this->routes;
 	}
 }
diff --git a/phpBB/phpbb/pagination.php b/phpBB/phpbb/pagination.php
index 57e7932341..6a7631c89d 100644
--- a/phpBB/phpbb/pagination.php
+++ b/phpBB/phpbb/pagination.php
@@ -22,11 +22,13 @@ class pagination
 	*
 	* @param	\phpbb\template\template	$template
 	* @param	\phpbb\user					$user
+	* @param	\phpbb\controller\helper	$helper
 	*/
-	public function __construct(\phpbb\template\template $template, \phpbb\user $user)
+	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper)
 	{
 		$this->template = $template;
 		$this->user = $user;
+		$this->helper = $helper;
 	}
 
 	/**
@@ -44,9 +46,26 @@ class pagination
 	*/
 	protected function generate_page_link($base_url, $on_page, $start_name, $per_page)
 	{
-		if (strpos($start_name, '%d') !== false)
+		if (!is_string($base_url))
 		{
-			return ($on_page > 1) ? sprintf($base_url, (int) $on_page) : str_replace($start_name, '', $base_url);
+			if (is_array($base_url['routes']))
+			{
+				$route = ($on_page > 1) ? $base_url['routes'][1] : $base_url['routes'][0];
+			}
+			else
+			{
+				$route = $base_url['routes'];
+			}
+			$params = (isset($base_url['params'])) ? $base_url['params'] : array();
+			$is_amp = (isset($base_url['is_amp'])) ? $base_url['is_amp'] : true;
+			$session_id = (isset($base_url['session_id'])) ? $base_url['session_id'] : false;
+
+			if ($on_page > 1 || !is_array($base_url['routes']))
+			{
+				$params[$start_name] = (int) $on_page;
+			}
+
+			return $this->helper->route($route, $params, $is_amp, $session_id);
 		}
 		else
 		{
@@ -194,7 +213,8 @@ class pagination
 		$tpl_prefix = ($tpl_prefix == 'PAGINATION') ? '' : $tpl_prefix . '_';
 
 		$template_array = array(
-			$tpl_prefix . 'BASE_URL'		=> $base_url,
+			$tpl_prefix . 'BASE_URL'		=> is_string($base_url) ? $base_url : '',//@todo: Fix this for routes
+			$tpl_prefix . 'START_NAME'		=> $start_name,
 			$tpl_prefix . 'PER_PAGE'		=> $per_page,
 			'U_' . $tpl_prefix . 'PREVIOUS_PAGE'	=> ($on_page != 1) ? $u_previous_page : '',
 			'U_' . $tpl_prefix . 'NEXT_PAGE'		=> ($on_page != $total_pages) ? $u_next_page : '',
diff --git a/phpBB/phpbb/template/base.php b/phpBB/phpbb/template/base.php
index 6044effa1f..5bce79fd85 100644
--- a/phpBB/phpbb/template/base.php
+++ b/phpBB/phpbb/template/base.php
@@ -113,6 +113,16 @@ abstract class base implements template
 	/**
 	* {@inheritdoc}
 	*/
+	public function assign_block_vars_array($blockname, array $block_vars_array)
+	{
+		$this->context->assign_block_vars_array($blockname, $block_vars_array);
+
+		return $this;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
 	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
 	{
 		return $this->context->alter_block_array($blockname, $vararray, $key, $mode);
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index 0b929f4934..a222fbb69e 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -200,6 +200,22 @@ class context
 	}
 
 	/**
+	* Assign key variable pairs from an array to a whole specified block loop
+	*
+	* @param string $blockname Name of block to assign $block_vars_array to
+	* @param array $block_vars_array An array of hashes of variable name => value pairs
+	*/
+	public function assign_block_vars_array($blockname, array $block_vars_array)
+	{
+		foreach ($block_vars_array as $vararray)
+		{
+			$this->assign_block_vars($blockname, $vararray);
+		}
+
+		return true;
+	}
+
+	/**
 	* Change already assigned key variable pair (one-dimensional - single loop entry)
 	*
 	* An example of how to use this function:
diff --git a/phpBB/phpbb/template/template.php b/phpBB/phpbb/template/template.php
index d95b0a822c..87ae7a9766 100644
--- a/phpBB/phpbb/template/template.php
+++ b/phpBB/phpbb/template/template.php
@@ -132,6 +132,14 @@ interface template
 	public function assign_block_vars($blockname, array $vararray);
 
 	/**
+	* Assign key variable pairs from an array to a whole specified block loop
+	* @param string $blockname Name of block to assign $block_vars_array to
+	* @param array $block_vars_array An array of hashes of variable name => value pairs
+	* @return \phpbb\template\template $this
+	*/
+	public function assign_block_vars_array($blockname, array $block_vars_array);
+
+	/**
 	* Change already assigned key variable pair (one-dimensional - single loop entry)
 	*
 	* An example of how to use this function: