Stripping basePath from route url, only adding it when appropriate. F…

…ixes #38 and #20.

Fixes #38 and #20.

AltoRouter.php

@@ -25,10 +25,6 @@ public function setBasePath($basePath) {
 	 */
 	public function map($method, $route, $target, $name = null) {
 
-		if($route != '*') {
-			$route = $this->basePath . $route;
-		}
-
 		$this->routes[] = array($method, $route, $target, $name);
 
 		if($name) {
@@ -61,7 +57,9 @@ public function generate($routeName, array $params = array()) {
 
 		// Replace named parameters
 		$route = $this->namedRoutes[$routeName];
-		$url = $route;
+
+		// prepend base path to route url again
+		$url = $this->basePath . $route;
 
 		if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
 
@@ -101,6 +99,9 @@ public function match($requestUrl = null, $requestMethod = null) {
 			$requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
 		}
 
+		// strip base path from request url
+		$requestUrl = substr($requestUrl, strlen($this->basePath));
+
 		// Strip query string (?a=b) from Request Url
 		if (($strpos = strpos($requestUrl, '?')) !== false) {
 			$requestUrl = substr($requestUrl, 0, $strpos);