Changeset 293

Timestamp:

12/25/06 15:16:36 (2 years ago)

Author:

scorfield

Message:

Fixes #54 by adding the optional FUSEBOX_CALLER_PATH variable.

Location:

framework/trunk

Files:

• fusebox5.cfm (modified) (2 diffs)
• fuseboxApplication.cfc (modified) (2 diffs)
• myFusebox.cfc (modified) (1 diff)

framework/trunk/fusebox5.cfm

@@ -20 +20 @@
 <!--- FB5: application key - FB41 always uses 'fusebox': --->
 <cfparam name="variables.FUSEBOX_APPLICATION_KEY" default="fusebox" />
+<!--- FB5.1: allow application to be included from other directories: --->
+<cfparam name="variables.FUSEBOX_CALLER_PATH" default="#replace(getDirectoryFromPath(getBaseTemplatePath()),"\","/","all")#" />
 
 <cfparam name="variables.attributes" default="#structNew()#" />
@@ -46 +48 @@
                                 <cfset myFusebox.trace("Fusebox","Creating Fusebox application object") />
                                 <cfset _fba = createObject("component","fuseboxApplication") />
-                                <cfset application[FUSEBOX_APPLICATION_KEY] = _fba.init(FUSEBOX_APPLICATION_KEY,FUSEBOX_APPLICATION_PATH,myFusebox) />
+                                <cfset application[FUSEBOX_APPLICATION_KEY] = _fba.init(FUSEBOX_APPLICATION_KEY,FUSEBOX_APPLICATION_PATH,myFusebox,FUSEBOX_CALLER_PATH) />
                         <cfelse>
                                 <!--- can't be conditional: we don't know the state of the debug flag yet --->

framework/trunk/fuseboxApplication.cfc

@@ -57 +57 @@
                 <cfargument name="myFusebox" type="myFusebox" required="true" 
                                         hint="I am the myFusebox data structure." />
-                
-                <!--- fixes ticket 169 --->
+                <cfargument name="callerPath" type="string" required="true" 
+                                        hint="I am FUSEBOX_CALLER_PATH." />
+                
+                <!--- fixes ticket 54 --->
                 <cfset var myVersion = "5.0.1.#REReplace('$LastChangedRevision$','[^0-9]','','all')#" />
 
@@ -73 +75 @@
                 <cfset variables.coreRoot = replace(getDirectoryFromPath(getCurrentTemplatePath()),"\","/","all") />
 
-                <cfset this.approotdirectory = normalizePartialPath(this.webrootdirectory & arguments.appPath) />
+                <cfset this.approotdirectory = normalizePartialPath(arguments.callerPath) & normalizePartialPath(arguments.appPath) />
                 <!--- remove pairs of directory/../ to form canonical path: --->
                 <cfloop condition="find('/../',this.approotdirectory) gt 0">

framework/trunk/myFusebox.cfc

@@ -16 +16 @@
 <cfcomponent hint="I provide the per-request myFusebox data structure and some convenience methods.">
         <cfscript>
-        // fixes ticket 169
+        // fixes ticket 54
         this.version.runtime     = "5.0.1.#REReplace('$LastChangedRevision$','[^0-9]','','all')#";