From 3d9045271130969a8c81c3e2924e6bdf7aa1bdc9 Mon Sep 17 00:00:00 2001
From: Cedric RICARD <cedric.ricard@calexium.com>
Date: Tue, 8 Jul 2008 15:14:31 +0000
Subject: [PATCH] Removing Prefix (o, p, f) on input and form names

---
 calexium_lib/web/CXM_making_a_web_site.anubis | 82 +++++++++++++++++++++++++++++++++-------------------------------------------------
 1 file changed, 33 insertions(+), 49 deletions(-)

diff --git a/calexium_lib/web/CXM_making_a_web_site.anubis b/calexium_lib/web/CXM_making_a_web_site.anubis
index a78edee..a29502e 100644
--- a/calexium_lib/web/CXM_making_a_web_site.anubis
+++ b/calexium_lib/web/CXM_making_a_web_site.anubis
@@ -1974,21 +1974,9 @@ define Int
    
       *** [3.1] Prefixing web arguments names.
    
-   We want  to assign different  roles to web  arguments, and we also  want to be  able to
-   recognize its role directly from the name  of a web argument.  The name "s" is reserved
-   for the  web argument whose  value is the  name of the current  state. The name  "a" is
-   reserved  for  the  web  argument  whose  value  is  the  name  of  the  action  to  be
-   performed. Other web arguments receive arbitrary  names, and in order to avoid clashes,
-   these names are prefixed by:
-   
-      "p" for names of password inputs,
-      "o" for other web arguments
-
-   The reason why password input names have a distinct prefix is that this allows the HTTP
-   server to hide the passwords on the console of the server and in the journal.
+   CR 2008-07-08 Prefixing Removed
+   
    
-
-     
    
       *** [3.2] Separating web arguments. 
    
@@ -2047,23 +2035,19 @@ define (List(Web_arg) lwa) -> Separated_Web_Args($State)
               then 
          if wa_1 is
            {
-             web_arg(n,v)    then 
-               with prefix = if substr(n,0,4) = "amp;" then substr(n,4,1) else substr(n,0,1), 
-                name_start = (Int)(if substr(n,0,4) = "amp;" then 5 else 1), 
-                 if prefix = "s" then 
-                   swa(success(retrieve_state(v)),an1,op1) else
-                 if prefix = "a" then 
-                   swa(ps1,success(v),op1) else
-                 if prefix = "t" then 
-                   swa(ps1,an1,[web_arg("target",v) . op1]) else
-                 if prefix = "p" then 
-                   swa(ps1,an1,[web_arg(substr(n,name_start,length(n)-name_start),v) . op1]) else
-                 if prefix = "o" then 
-                   swa(ps1,an1,[web_arg(substr(n,name_start,length(n)-name_start),v) . op1]) else
-                 swa(ps1,an1,op1), 
+             web_arg(n, value)    then 
+                with name = if substr(n,0,4) = "amp;" then substr(n, 4, length(n) - 4) else n, 
+                 if name = "s" then 
+                   swa(success(retrieve_state(value)),an1,op1) 
+                 else if name = "a" then 
+                   swa(ps1,success(value),op1) 
+                 else if name = "t" then 
+                   swa(ps1,an1,[web_arg("target",value) . op1]) 
+                 else
+                  swa(ps1,an1,[wa_1 . op1]), 
    
              upload(n,v,t)   then 
-               swa(ps1,an1,[upload(substr(n,1,length(n)-1),v,t) . op1])
+               swa(ps1,an1,[wa_1 . op1])
            }}
      }.
 
@@ -2716,7 +2700,7 @@ define String
      {
        [ ] then "", 
        [h . t] then if h is (n,v) then  
-         "&amp;o"+n+"="+v+format_extra_operands(t)
+         "&amp;"+n+"="+v+format_extra_operands(t)
      }.
 
    
@@ -2910,7 +2894,7 @@ define URL_or_JavaScript
            [
              "<script type=\"text/javascript\" language =\"JavaScript\">\n", 
                "function ", fn_name, "() {\n",
-               "  var fa = document.forms.f",form_name,";\n", 
+               "  var fa = document.forms.",form_name,";\n", 
                "  var u = \"",the_url,"\";\n",
                "  fa.action = u;",
                if aspect is submit(_, _) then " }\n"
@@ -3315,7 +3299,7 @@ define Printable_tree
                url(u)           then ["<select href=\"",u]
                javascript(s,h)  then [s,"<select onchange=\"",h]
              },
-             "\" name=\"o",name,"\" size=\"",size,"\"", format_attrs(options), ">",
+             "\" name=\"",name,"\" size=\"",size,"\"", format_attrs(options), ">",
               format_choices(choices),"</select>"
          ],
        immediate_selector(options,name,size,choices,selected) then          
@@ -3324,7 +3308,7 @@ define Printable_tree
                url(u)           then ["<select href=\"",u]
                javascript(s,h)  then [s,"<select onchange=\"",h]
              },
-             "\" name=\"o",name,"\" size=\"",size,"\"", format_attrs(options), ">",
+             "\" name=\"",name,"\" size=\"",size,"\"", format_attrs(options), ">",
               format_choices(choices, selected),"</select>"
          ],
      }. 
@@ -3857,49 +3841,49 @@ define Printable_tree
          format(cinfo,sn,ic_v,any_private_download(url,name,extra,action),format_element,is_https),    
        text_input(options, label_text, id, name, i, w)           then 
          [ maybe_label(label_text, id), 
-           "<input type=\"text\" name=\"o",name,"\" id=\"",id,"\" size=\"",w,"\" value=\"",i,"\"",format_attrs(options)," />"],
+           "<input type=\"text\" name=\"",name,"\" id=\"",id,"\" size=\"",w,"\" value=\"",i,"\"",format_attrs(options)," />"],
        text_input_ro(options, label_text, id, name,i,w)           then 
          [ maybe_label(label_text, id), 
-           "<input readonly=\"readonly\" type=\"text\" name=\"o",name,"\" id=\"",id,"\" size=\"",w,"\" value=\"",i,"\"",format_attrs(options)," />"],
+           "<input readonly=\"readonly\" type=\"text\" name=\"",name,"\" id=\"",id,"\" size=\"",w,"\" value=\"",i,"\"",format_attrs(options)," />"],
        password_input(options, label_text, id, name,i,w)         then 
          [ maybe_label(label_text, id), 
-           "<input type=\"password\" name=\"p",name,"\" id=\"",id,"\" size=\"",w,"\" value=\"",i,"\"",format_attrs(options)," />"],
+           "<input type=\"password\" name=\"",name,"\" id=\"",id,"\" size=\"",w,"\" value=\"",i,"\"",format_attrs(options)," />"],
        text_area(opts,label_text, id, n,i,w,h)          then
-         [ maybe_label(label_text, id), "<textarea ",format(opts)," id=\"",id,"\" name=\"o",n,"\" cols=\"",w,"\" rows=\"",h,"\">",i,"</textarea>"],
+         [ maybe_label(label_text, id), "<textarea ",format(opts)," id=\"",id,"\" name=\"",n,"\" cols=\"",w,"\" rows=\"",h,"\">",i,"</textarea>"],
        file_upload(options, label, id, n, w)            then 
          [ maybe_label(label, id), 
-           "<input type=\"file\" id=\"",id,"\" size=\"",w,"\" name=\"o",n,"\"",format_attrs(options)," />"],
+           "<input type=\"file\" id=\"",id,"\" size=\"",w,"\" name=\"",n,"\"",format_attrs(options)," />"],
        selector(opts, label, id, n,s,cs)            then 
          [ maybe_label(label, id), 
-          "<select id=\"",id,"\" name=\"o",n,"\" size=\"",s,"\" ",format_attrs(opts),">",format_choices(cs),"</select>"],
+          "<select id=\"",id,"\" name=\"",n,"\" size=\"",s,"\" ",format_attrs(opts),">",format_choices(cs),"</select>"],
        selector(opts, label, id, n,s,cs,sd)         then 
          [ maybe_label(label, id), 
-          "<select id=\"",id,"\" name=\"o",n,"\" size=\"",s,"\" ",format_attrs(opts),">",format_choices(cs,sd),"</select>"],
+          "<select id=\"",id,"\" name=\"",n,"\" size=\"",s,"\" ",format_attrs(opts),">",format_choices(cs,sd),"</select>"],
        selector_c(opts, label, id, n,s,cs)            then 
          [ maybe_label(label, id), 
-          "<select id=\"",id,"\" name=\"o",n,"\" size=\"",s,"\" ",format_attrs(opts),">",format_choices(cs),"</select>"],
+          "<select id=\"",id,"\" name=\"",n,"\" size=\"",s,"\" ",format_attrs(opts),">",format_choices(cs),"</select>"],
        selector_c(opts, label, id, n,s,cs,sd)         then 
          [ maybe_label(label, id), 
-          "<select id=\"",id,"\" name=\"o",n,"\" size=\"",s,"\" ",format_attrs(opts),">",format_choices(cs,sd),"</select>"],
+          "<select id=\"",id,"\" name=\"",n,"\" size=\"",s,"\" ",format_attrs(opts),">",format_choices(cs,sd),"</select>"],
    
        radio_button(options, label_text, id, n, v, c)         then  
          [ maybe_label(label_text, id), 
-           "<input type=\"radio\" name=\"o",n,"\" id=\"",id,"\" value=\"",v,"\"",(if c then " checked=\"checked\"" else ""),format_attrs(options)," />"],
+           "<input type=\"radio\" name=\"",n,"\" id=\"",id,"\" value=\"",v,"\"",(if c then " checked=\"checked\"" else ""),format_attrs(options)," />"],
        radio_button_r(options, label_text, id, n, v, c)         then  
-         [ "<input type=\"radio\" name=\"o",n,"\" id=\"",id,"\" value=\"",v,"\"",(if c then " checked=\"checked\"" else ""),format_attrs(options)," />",
+         [ "<input type=\"radio\" name=\"",n,"\" id=\"",id,"\" value=\"",v,"\"",(if c then " checked=\"checked\"" else ""),format_attrs(options)," />",
            maybe_label(label_text, id)],
        check_box(options, label_text, id, n, v, c)              then 
          [ maybe_label(label_text, id), 
-           "<input type=\"checkbox\" name=\"o",n,"\" id=\"",id,"\" value=\"",v,"\"",(if c then " checked=\"checked\" " else ""),format_attrs(options)," />"]
+           "<input type=\"checkbox\" name=\"",n,"\" id=\"",id,"\" value=\"",v,"\"",(if c then " checked=\"checked\" " else ""),format_attrs(options)," />"]
        check_box_r(options, label_text, id, n, v, c)              then 
-         [ "<input type=\"checkbox\" name=\"o",n,"\" id=\"",id,"\" value=\"",v,"\"",(if c then " checked=\"checked\" " else ""),format_attrs(options)," />",
+         [ "<input type=\"checkbox\" name=\"",n,"\" id=\"",id,"\" value=\"",v,"\"",(if c then " checked=\"checked\" " else ""),format_attrs(options)," />",
            maybe_label(label_text, id)]
        div(options, e)              then
         format(cinfo,sn,ic_v,any_div(options, e),format_element,is_https),    
        div_empty(options)           then
         format(cinfo,sn,ic_v,any_div_empty(options),format_element,is_https),
        hidden(name, value)          then
-         ["<input type=\"hidden\" name=\"o",name,"\" value=\"",value,"\" />"],
+         ["<input type=\"hidden\" name=\"",name,"\" value=\"",value,"\" />"],
 
      }. 
 
@@ -4047,7 +4031,7 @@ define Printable_tree
        label(n)                     then ["<a name=\"",n,"\">"],
        form(fn,attributs, c)        then
          [
-           "<form id=\"f",fn,"\"",
+           "<form id=\"",fn,"\"",
            format(cinfo,sn,ic_v,any_coreattrs(attributs),format_element,is_https),
            " method=\"post\"",
               enctype(c),
@@ -4064,7 +4048,7 @@ define Printable_tree
          with url = make_actioner_url(cinfo, same, same,
                                       sn, action_name, extra_ops, is_https), 
          [
-           "<form id=\"f",fn,"\"",
+           "<form id=\"",fn,"\"",
            format(cinfo,sn,ic_v,any_coreattrs(attributs),format_element,is_https),
            " method=\"post\"",
               enctype(c),
--
libgit2 0.21.4