Add linkToRoute functionality

2 files changed, 37 insertions, 6 deletions

diff --git a/lib/helper.php b/lib/helper.php
index ed4bf53250a..269327b531d 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -29,6 +29,20 @@ class OC_Helper {
 	private static $tmpFiles=array();
 
 	/**
+	 * @brief Creates an url using a defined route
+	 * @param $route
+	 * @param $parameters
+	 * @param $args array with param=>value, will be appended to the returned url
+	 * @returns the url
+	 *
+	 * Returns a url to the given app and file.
+	 */
+	public static function linkToRoute( $route, $parameters = array() ) {
+		$urlLinkTo = OC::getRouter()->generate($route, $parameters);
+		return $urlLinkTo;
+	}
+
+	/**
 	 * @brief Creates an url
 	 * @param $app app
 	 * @param $file file
diff --git a/lib/router.php b/lib/router.php
index 65fc51aff2c..da491e217fc 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -7,6 +7,7 @@
  */
 
 use Symfony\Component\Routing\Matcher\UrlMatcher;
+use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;
 //use Symfony\Component\Routing\Route;
@@ -16,7 +17,14 @@ class OC_Router {
 	protected $collection = null;
 	protected $root = null;
 
+	protected $generator= null;
+
 	public function __construct() {
+		$baseUrl = OC_Helper::linkTo('', 'index.php');
+		$method = $_SERVER['REQUEST_METHOD'];
+		$host = OC_Request::serverHost();
+		$schema = OC_Request::serverProtocol();
+		$this->context = new RequestContext($baseUrl, $method, $host, $schema);
 		// TODO cache
 		$this->root = $this->getCollection('root');
 	}
@@ -56,12 +64,7 @@ class OC_Router {
 	}
 
     	public function match($url) {
-		$baseUrl = OC_Helper::linkTo('', 'index.php');
-		$method = $_SERVER['REQUEST_METHOD'];
-		$host = OC_Request::serverHost();
-		$schema = OC_Request::serverProtocol();
-		$context = new RequestContext($baseUrl, $method, $host, $schema);
-		$matcher = new UrlMatcher($this->root, $context);
+		$matcher = new UrlMatcher($this->root, $this->context);
 		$parameters = $matcher->match($url);
 		if (isset($parameters['action'])) {
 			$action = $parameters['action'];
@@ -77,4 +80,18 @@ class OC_Router {
 			throw new Exception('no action available');
 		}
 	}
+
+	public function getGenerator()
+	{
+		if (null !== $this->generator) {
+			return $this->generator;
+		}
+
+		return $this->generator = new UrlGenerator($this->root, $this->context);
+	}
+
+	public function generate($name, $parameters = array(), $absolute = false)
+	{
+		return $this->getGenerator()->generate($name, $parameters, $absolute);
+	}
 }