8 files changed, 107 insertions, 53 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 735626810f..2cf9dbed3e 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -94,6 +94,7 @@ services:
             - @template
             - @user
             - @config
+            - @controller.provider
             - %core.root_path%
             - %core.php_ext%
 
@@ -104,6 +105,13 @@ services:
             - @service_container
             - @template
 
+    controller.provider:
+        class: phpbb\controller\provider
+        arguments:
+            - @ext.finder
+        calls:
+            - [find, [%core.root_path%]]
+
     cron.task_collection:
         class: phpbb\di\service_collection
         arguments:
@@ -262,6 +270,7 @@ services:
         arguments:
             - @template
             - @user
+            - @controller.helper
 
     path_helper:
         class: phpbb\path_helper
diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php
index c5d6815119..8e5ae20f93 100644
--- a/phpBB/includes/functions_url_matcher.php
+++ b/phpBB/includes/functions_url_matcher.php
@@ -53,8 +53,8 @@ function phpbb_get_url_matcher(\phpbb\extension\finder $finder, RequestContext $
 */
 function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_path, $php_ext)
 {
-	$provider = new \phpbb\controller\provider();
-	$routes = $provider->import_paths_from_finder($finder)->find($root_path);
+	$provider = new \phpbb\controller\provider($finder);
+	$routes = $provider->find($root_path)->get_routes();
 	$dumper = new PhpMatcherDumper($routes);
 	$cached_url_matcher_dump = $dumper->dump(array(
 		'class'			=> 'phpbb_url_matcher',
@@ -72,8 +72,8 @@ function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_
 */
 function phpbb_create_url_matcher(\phpbb\extension\finder $finder, RequestContext $context, $root_path)
 {
-	$provider = new \phpbb\controller\provider();
-	$routes = $provider->import_paths_from_finder($finder)->find($root_path);
+	$provider = new \phpbb\controller\provider($finder);
+	$routes = $provider->find($root_path)->get_routes();
 	return new UrlMatcher($routes, $context);
 }
 
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/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 408c9b9b8c..de51b54e9b 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -37,17 +37,14 @@ function jumpto(item) {
 		on_page = item.attr('data-on-page'),
 		per_page = item.attr('data-per-page'),
 		base_url = item.attr('data-base-url'),
+		start_name = item.attr('data-start-name'),
 		page = prompt(jump_page, on_page);
 
 	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) {
-		if (base_url.indexOf('%d') === -1) {
-			if (base_url.indexOf('?') === -1) {
-				document.location.href = base_url + '?start=' + ((page - 1) * per_page);
-			} else {
-				document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
-			}
+		if (base_url.indexOf('?') === -1) {
+			document.location.href = base_url + '?' + start_name + '=' + ((page - 1) * per_page);
 		} else {
-			document.location.href = base_url.replace('%d', page);
+			document.location.href = base_url.replace(/&amp;/g, '&') + '&' + start_name + '=' + ((page - 1) * per_page);
 		}
 	}
 }
diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html
index cb54193c3f..e27a90900a 100644
--- a/phpBB/styles/prosilver/template/pagination.html
+++ b/phpBB/styles/prosilver/template/pagination.html
@@ -1,4 +1,8 @@
-					<a href="#" class="pagination-trigger" title="{L_JUMP_TO_PAGE}" data-lang-jump-page="{L_JUMP_PAGE|e('html_attr')}{L_COLON}" data-on-page="{CURRENT_PAGE}" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}">{PAGE_NUMBER}</a> &bull;
+					<!-- IF BASE_URL -->
+					<a href="#" class="pagination-trigger" title="{L_JUMP_TO_PAGE}" data-lang-jump-page="{L_JUMP_PAGE|e('html_attr')}{L_COLON}" data-on-page="{CURRENT_PAGE}" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-base-is-route="{BASE_IS_ROUTE}" data-start-name="{START_NAME}">{PAGE_NUMBER}</a> &bull;
+					<!-- ELSE -->
+					{PAGE_NUMBER} &bull;
+					<!-- ENDIF -->
 					<ul>
 					<!-- BEGIN pagination -->
 						<!-- IF pagination.S_IS_PREV -->
diff --git a/phpBB/styles/subsilver2/template/pagination.html b/phpBB/styles/subsilver2/template/pagination.html
index a2e023ac22..550b28d305 100644
--- a/phpBB/styles/subsilver2/template/pagination.html
+++ b/phpBB/styles/subsilver2/template/pagination.html
@@ -1,5 +1,5 @@
 <!-- IF .pagination -->
-	<b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> 
+	<!-- IF BASE_URL --><b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a></b><!-- ENDIF -->
 	<!-- BEGIN pagination -->
 		<!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a>
 		<!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong>