[+] A function can be specified a redirection handler.

[+] An external link can be added as 'Refresh' Meta-Tag

[+] A function can be specified a redirection handler.
[+] An external link can be added as 'Refresh' Meta-Tag
Cédric RICARD
1 parent 4e7c11f0
Showing 3 changed files with 19 additions and 19 deletions Show diff stats
calexium_lib/web/CXM_common.anubis
calexium_lib/web/CXM_making_a_web_site.anubis
calexium_lib/web/CXM_multihost_http_server.anubis
@@ -130,8 +130,11 @@ public type Redirection:
    redirect(String required_uri,        // URI required by the client
             String required_host,       // value of 'Host' HTTP header sent by the client
             String corresponding_uri).  // URI which will be served to the client
-   
+public type Redirections:
+  redirection_list(List(Redirection) redirections),
+  redirection_fn((String input_uri,      // URI required by the client
+                  String host)   -> String f).        // value of 'Host' HTTP header sent by the client
    Now, you  may also  want to  recover web argument  values which  have been  encoded (by
@@ -1391,6 +1391,7 @@ public type HTML_Meta:
                   Actioner_Target target,
                   String action_name, 
                   Int32 delay), // in seconds
+   refresh       (String url, Int32 delay), // in seconds
    meta          (String name, String content),
    http_equiv    (String name, String content),
    generic_meta  (List((String,String))),
@@ -2143,17 +2144,6 @@ define Printable_tree
        percentage(x)   then ["\"",x,"%\""]
      }. 
-define Printable_tree
-   top_redirection_page
-     (
-       String common_name
-     ) =
-   [ doctype_w3c_header, 
-     "<html><head>",
-       "<meta http-equiv=\"Refresh\" content=\"0; URL=javascript:void window.open('/?t=','_top')\" />",
-     "</head><body></body></html>"
-   ].  
-   
 public define Web_Site
    make_web_site_description
      (
@@ -2176,7 +2166,7 @@ public define Web_Site
        List(Web_Action($SessionTicket, $State))    actions, 
        (Maybe($SessionTicket), Maybe($State)) -> HTML_Page                             compute_page,
        Int32                       timeout,
-       List(Redirection)           redirections, 
+       Redirections                redirections,
        String                      charset, 
        List(String)                journal_extensions,
        List(String)                journal_headers, 
@@ -3982,6 +3972,8 @@ define Printable_tree
        refresh(co,ta,an,delay)  then 
                                ["<meta http-equiv=\"Refresh\" content=\"",delay,"; URL=",
                                     make_actioner_url(cinfo,co,ta,state_name,an,[],is_https),"\" />\n"], 
+       refresh(url,delay) then 
+                               ["<meta http-equiv=\"Refresh\" content=\"",delay,"; URL=",url,"\" />\n"], 
        meta(n,c)          then ["<meta name=\"",n,"\" content=\"",c,"\" />\n"], 
        http_equiv(n,c)    then ["<meta http-equiv=\"",n,"\" content=\"",c,"\" />\n"],
        generic_meta(l)    then ["<meta ",
@@ -195,7 +195,7 @@ public type Web_Site_Description:
    web_site_description(
      List(String)                                       common_names,         
      String                                             site_directory, 
-     List(Redirection)                                  redirections, 
+     Redirections                                       redirections, 
      String                                             charset, 
      List(String)                                       journal_extensions, 
      List(String)                                       journal_headers, 
@@ -2800,7 +2800,7 @@ define String
 define String 
    handle_redirection                  // returns the redirected URI
      (
-       List(Redirection)      redirections, 
+       Redirections           redirections, 
        String                 uri,     // original URI
        List(HTTP_header)      headers
      ) =
@@ -2808,12 +2808,17 @@ define String
      {
        [ ] then uri,
        [h . t] then if h is http_header(name,value) then 
-         if name = "host"
-         then handle_redirection(uri,strip_port(value,0),redirections)
-         else handle_redirection(redirections,uri,t)
+         if redirections is
+         {
+            redirection_list(l) then 
+               if name = "host"
+               then handle_redirection(uri, strip_port(value,0), l)
+               else handle_redirection(redirections,uri,t)
+            redirection_fn(f)   then f(uri, strip_port(value,0))
+         }
      }.
-   
+