Changeset 273

Timestamp:

12/15/06 19:07:21 (2 years ago)

Author:

scorfield

Message:

Fixes #89 and #128 by adding two new types: moved and javascript.

Files:

• framework/trunk/verbs/relocate.cfm (modified) (2 diffs)

framework/trunk/verbs/relocate.cfm

@@ -70 +70 @@
                 // type - server|client - default client
                 if (structKeyExists(fb_.verbInfo.attributes,"type")) {
-                        if (listFind("server,client",fb_.verbInfo.attributes.type) eq 0) {
+                        // FB51: adds moved and javascript types:
+                        if (listFind("server,client,moved,javascript",fb_.verbInfo.attributes.type) eq 0) {
                                 fb_throw("fusebox.badGrammar.invalidAttributeValue",
                                                         "Attribute has invalid value",
-                                                        "The attribute 'type' must either be ""server"" or ""client"", for a 'relocate' verb in fuseaction #fb_.verbInfo.circuit#.#fb_.verbInfo.fuseaction#.");
+                                                        "The attribute 'type' must either be ""server"", ""client"", ""moved"" or ""javascript"", for a 'relocate' verb in fuseaction #fb_.verbInfo.circuit#.#fb_.verbInfo.fuseaction#.");
                         }
                 } else {
@@ -88 +89 @@
                 
                 // compile <relocate>
-                if (fb_.verbInfo.attributes.type is "server") {
+                switch (fb_.verbInfo.attributes.type) {
+
+                case "server":
                         fb_appendLine('<cfset getPageContext().forward("#fb_.verbInfo.attributes.url#")>');
-                } else {
+                        break;
+
+                case "client":
                         fb_appendLine('<cflocation url="#fb_.verbInfo.attributes.url#" addtoken="#fb_.verbInfo.attributes.addtoken#">');
+                        break;
+
+                case "moved":
+                        fb_appendLine('<cfheader statuscode="301" statustext="Moved Permanently">');
+                        fb_appendLine('<cfheader name="Location" value="#fb_.verbInfo.attributes.url#">');
+                        break;
+
+                case "javascript":
+                        fb_appendLine('<cfoutput><script type="text/javascript">( document.location.replace ) ? ' &
+                                                        'document.location.replace("#fb_verbInfo.attributes.url#") : ' &
+                                                        'document.location.href = "#fb_.verbInfo.attributes.url#";</script></cfoutput>');
+                        break;
+
                 }
                 fb_appendLine('<cfabort>');