COLDBOX-1187 #resolve

Removal of uniqueUrls boolean indicator for URL routing, since Pretty URLs are now the standard. This rerouting feature needs to be removed.

Author: lmajano

system/web/routing/Router.cfc

@@ -22,12 +22,12 @@ component
 	 ****************************************************************/
 
 	property
-		name    ="cachebox"  
+		name    ="cachebox"
 		inject  ="cachebox"
 		delegate="getCache";
 	property
 		name    ="controller"
-		inject  ="coldbox" 
+		inject  ="coldbox"
 		delegate="relocate,runEvent,runRoute";
 	property name="flash"  inject="coldbox:flash";
 	property name="logBox" inject="logbox";
@@ -56,14 +56,6 @@ component
 	 */
 	property name="namespaceRoutingTable" type="struct";
 
-	/**
-	 * Flag to enable unique or not URLs
-	 */
-	property
-		name   ="uniqueURLS"
-		type   ="boolean"
-		default="false";
-
 	/**
 	 * Flag to enable/disable routing
 	 */
@@ -172,8 +164,6 @@ component
 		variables.namespaceRoutingTable   = {};
 		// Loose matching flag for regex matches
 		variables.looseMatching           = false;
-		// Flag to enable unique or not URLs
-		variables.uniqueURLs              = false;
 		// Enable the interceptor by default
 		variables.enabled                 = true;
 		// Detect extensions flag, so it can place a 'format' variable on the rc

system/web/services/RoutingService.cfc

@@ -157,15 +157,6 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
 			arguments.event.setSESBaseURL( variables.router.composeRoutingUrl() );
 		}
 
-		// Check for invalid URLs if in strict mode via unique URLs
-		if ( variables.router.getUniqueURLs() ) {
-			checkForInvalidURL(
-				cleanedPaths[ "pathInfo" ],
-				cleanedPaths[ "scriptName" ],
-				arguments.event
-			);
-		}
-
 		// Extension detection if enabled, so we can do cool extension formats
 		if ( variables.router.getExtensionDetection() ) {
 			cleanedPaths[ "pathInfo" ] = detectExtension( cleanedPaths[ "pathInfo" ], arguments.event );
@@ -888,98 +879,6 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
 		return returnString;
 	}
 
-	/**
-	 * Check for invalid URL's
-	 *
-	 * @route       The incoming route
-	 * @script_name The cgi script name
-	 * @event       The event object
-	 */
-	private function checkForInvalidURL(
-		required route,
-		required script_name,
-		required event
-	){
-		var handler = "";
-		var action  = "";
-		var newpath = "";
-		var rc      = event.getCollection();
-
-		/**
-		Verify we have uniqueURLs ON, the event var exists, route is empty or index.cfm
-		AND
-		if the incoming event is not the default OR it is the default via the URL.
-		**/
-		if (
-			structKeyExists( rc, variables.eventName )
-			AND
-			( arguments.route EQ "/index.cfm" or arguments.route eq "" )
-			AND
-			(
-				rc[ variables.eventName ] NEQ variables.defaultEvent
-				OR
-				( structKeyExists( url, variables.eventName ) AND rc[ variables.eventName ] EQ variables.defaultEvent )
-			)
-		) {
-			//  New Pathing Calculations if not the default event. If default, relocate to the domain.
-			if ( rc[ variables.eventName ] != variables.defaultEvent ) {
-				//  Clean for handler & Action
-				if ( structKeyExists( rc, variables.eventName ) ) {
-					handler = reReplace( rc[ variables.eventName ], "\.[^.]*$", "" );
-					action  = listLast( rc[ variables.eventName ], "." );
-				}
-				//  route a handler
-				if ( len( handler ) ) {
-					newpath = "/" & handler;
-				}
-				//  route path with handler + action if not the default event action
-				if ( len( handler ) && len( action ) ) {
-					newpath = newpath & "/" & action;
-				}
-			}
-
-			// Debugging
-			if ( variables.log.canDebug() ) {
-				variables.log.debug(
-					"SES Invalid URL detected. Route: #arguments.route#, script_name: #arguments.script_name#"
-				);
-			}
-
-			// Setup Relocation
-			var httpRequestData = getHTTPRequestData();
-			var relocationUrl   = "#arguments.event.getSESbaseURL()##newpath##serializeURL( httpRequestData.content, arguments.event )#";
-
-			if ( httpRequestData.method eq "GET" ) {
-				cflocation( url = relocationUrl, statusCode = 301 );
-			} else {
-				cflocation( url = relocationUrl, statusCode = 303 );
-			}
-		}
-	}
-
-	/**
-	 * Serialize a URL when invalid
-	 *
-	 * @formVars The incoming form variables
-	 * @event    The event object
-	 */
-	private function serializeURL( formVars = "", required event ){
-		var vars = arguments.formVars;
-		var rc   = arguments.event.getCollection();
-
-		for ( var key in rc ) {
-			if ( NOT listFindNoCase( "route,handler,action,#variables.eventName#", key ) ) {
-				vars = listAppend( vars, "#lCase( key )#=#rc[ key ]#", "&" );
-			}
-		}
-
-		if ( len( vars ) eq 0 ) {
-			return "";
-		}
-
-		return "?" & vars;
-	}
-
 	/**
 	 * Clean up some IIS funkyness where query string is found in the path info. We basically clean it up and add the query string into the RC scope
 	 *

test-harness/config/Router.cfc

@@ -1,7 +1,6 @@
 component {
 
 	function configure(){
-		setUniqueURLs( false );
 		// setFullRewrites( false );
 
 		route( "/bar" ).toModuleRouting( "resourcesTest" );

tests/suites/eventCachingCollisions/config/routes.cfm

@@ -23,26 +23,6 @@ NOTE: The interceptor will create a new setting called: sesBaseURL with this val
 <cfset setEnabled(true)>
 
 <!---
-	This determines if non-ses urls should be routed back to ses.
-	In other words, if someone goes to http://localhost/index.cfm?event=home.main
-	should we redirect (301, permanently moved) to the ses url:
-	http://localhost/index.cfm/home/main ?
-
-	This will also make sure that any trailing index pages get redirected as well, so
-	if you go to http://localhost/home/index it would redirect to http://localhost/home
-	if index is your framework action default.
-
-	For SEO purposes it's always best to have one URL for everything, not 3!
---->
-<cfset setUniqueURLs(false)>
-
-<!---
-	The Base URL for your site. This will only be used for forwarding requests if
-	UniqueURLs is enabled and for creating the new Application settings:
-
-	- sesBaseURL
-	- htmlBaseURL
-
     If you want your URLs to look like http://localhost/handler/action then you should
     put "http://localhost" here. For this option you'll need .htaccess or isapi rewrite support.
 
@@ -128,4 +108,4 @@ NOTE: The interceptor will create a new setting called: sesBaseURL with this val
 
 
 <!--- STANDARD COLDBOX COURSES, DO NOT MODIFY UNLESS YOU DON'T LIKE THEM --->
-<cfset addRoute(":handler/:action?")>
+<cfset addRoute(":handler/:action?")>