Using for routing decisions

Author: technicalguru

src/WebApp/Router.php

@@ -82,15 +82,25 @@ public function getCanonicalPath($pagePath = NULL, $language = NULL) {
 		}
 		if (($pagePath == NULL) && ($language != NULL)) $pagePath = $this->request->pagePath;
 		if ($pagePath != NULL) {
-			if ($language == NULL) $language = $this->request->language;
-			if (!$this->request->useLanguagePath || ($language == NULL)) $language = '';
-			else $language = '/'.$language;
-
-			return $this->getAbsolutePath($language.$pagePath);
+			return $this->computeCanonicalPath($pagePath, $language);
 		}
 		return $this->request->canonicalPath;
 	}
 
+	/** 
+	 * Computes the absolute canonical URI path for a page path from the app root.
+	 * @param string $pagePath - a page path
+	 * @param string $language - the language to be used
+	 * @return string the absolute, canonical path for the page with this language.
+	 */
+	protected function computeCanonicalPath($pagePath, $language) {
+		if ($language == NULL) $language = $this->request->language;
+		if (!$this->request->useLanguagePath || ($language == NULL)) $language = '';
+		else $language = '/'.$language;
+
+		return $this->getAbsolutePath($language.$pagePath);
+	}
+
 	public function getPagePath() {
 		if (!isset($this->request->pagePath)) {
 			$this->initPagePath();

src/WebApp/Service.php

@@ -40,7 +40,8 @@ protected function createPage() {
 
 		// Check the path info
 		$canonical = $this->app->router->getCanonicalPath();
-		if ($request->path != $canonical) {
+		$requested = $request->originalPath;
+		if ($requested != $canonical) {
 			$params  = $request->params;
 			if ($params) $params = '?'.$params;
 			header('Location: '.$canonical.$params);