no message

David RENÉ
1 parent 6e17837a
Showing 56 changed files with 307 additions and 243 deletions Show diff stats
database/csv_import_status.anubis
database/csv_tools.anubis
database/db_binds.anubis
database/db_update_fields.anubis
database/db_version.anubis
database/migration_sqlite3.anubis
database/model/db_model.anubis
database/types/db_migration.anubis
densaku_types.anubis
ds_files/ds_messages.anubis
ds_files/ds_types.anubis
examples/minimal_web_site.anubis
examples/minimal_web_site_vc.anubis
extensions/json.anubis
file_processor_io/yaml/yaml.anubis
file_processor_io/yaml/yaml_parser.anubis
file_processor_io/yaml/yaml_type.anubis
mail/compose_email.anubis
mail/decode_mail.anubis
mail/encode_mail.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 09/05/2017
  * Time: 23:01
- * © Calexium 
+ * © David RENÉ
  */
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 06/05/2017
  * Time: 17:33
- * © Calexium 
+ * © David RENÉ
  */
 read tools/basis.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 17/03/2017
  * Time: 00:14
- * © Calexium 
+ * © David RENÉ
  */
 transmit calexium_lib/database/types/db_id.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 17/03/2017
  * Time: 00:11
- * © Calexium 
+ * © David RENÉ
  */
 read tools/basis.anubis
 read system/string.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 09/07/2017
  * Time: 00:52
- * © Calexium 
+ * © David RENÉ
  */
 transmit tools/basis.anubis
@@ -250,11 +250,11 @@ define Maybe(One)
         equal_but_sign then
           logInfo(logger, "Database migration found from version " + db_ver + " to version " + migration_version+ " by hash difference ");
-          if do_table_indexes(db, logger, h, update_db_version) is success(_) then
+          if migrate_to(db, logger) is failure then
+            failure
+          else
             update_db_version(migration_version);
             do_migration_loop(db, logger, migration_version, t, update_db_version)
-          else
-            failure
       }
   }.
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 01/01/2016
  * Time: 1:34
- * © Calexium 
+ * © David RENÉ
  */
                                   The HayamiKi (早見木) project
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 09/07/2017
  * Time: 00:25
- * © Calexium 
+ * © David RENÉ
  */
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 07/02/2017
  * Time: 23:01
- * © Calexium 
+ * © David RENÉ
  */
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 07/02/2017
  * Time: 23:05
- * © Calexium 
+ * © David RENÉ
  */
@@ -3,12 +3,13 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 07/02/2017
  * Time: 23:05
- * © Calexium 
+ * © David RENÉ
  */
 read densaku_lib/types/densaku.anubis
-public define List(DS_Type)  calexium_lib_types_description =
+public define List(DS_Type_File)  calexium_lib_types_description =
+  [ds_type_file( auto, auto,
   [
 //  public type DB_id:
 //    none,
@@ -80,7 +81,45 @@ public define List(DS_Type)  calexium_lib_types_description =
       alternative("url", comment("url is raw action, hence we will only copy that url in final link"), [
         component(string,  "url_name", )
       ])
-    ])  
+    ]),
+// public type Email_Address:
+//  email_address(String name, String address).
+// 
+    ds_type("Email_Address", [
+      alternative("email_address", [
+        component(string, "name"),
+        component(string, "address")
+      ])
+    ]),
+   
+//public type Email_to_send :
+//  data_to_send(
+//    Email_Address         from, 
+//    List(Email_Address)   to, 
+//    List(Email_Address)   cc, 
+//    List(Email_Address)   bcc, 
+//    String                subject,
+//    String                content,
+//    List(File_Attached)   files,
+//    Bool                  send_copy,  //send copy to sender by bcc (useful when the email is sent by an automat)
+//    String                       from, 
+//    String                reply_to
+//  ).
+  
+    ds_type("Email_to_send", [
+      alternative("data_to_send", [
+        component(ds_type("Email_Address"),       "from", comment("email sent from that sender")),
+        component(list, ds_type("Email_Address"), "to",   comment("email sent to that list of recipients")),
+        component(list, ds_type("Email_Address"), "cc",   comment("email sent as copy to that list of recipients")),
+        component(list, ds_type("Email_Address"), "bcc",  comment("email sent as blank carbon copy to that list of recipients")),
+        component(string,                         "subject",  comment("subject of email. Supposed to be UTF8")),
+        component(string,                         "content",  comment("content of the email")),
+        component(list, string,                   "files",    comment("list of files")),
+        component(bool,                           "send_copy",comment("send copy to sender by bcc (useful when the email is sent by an automat)")),
+        component(string,                         "reply_to", comment("reply to !!"))
+      ])
+    ])
   ]
+  )]
 .
@@ -4,7 +4,7 @@
  *Title*                               A minimal web site. 
- *Copyright*                     Copyright © Calexium www.calexium.com. 
+ *Copyright*                     Copyright © David RENÉwww.calexium.com. 
  *Released*
@@ -4,7 +4,7 @@
  *Title*                               A minimal web site. 
- *Copyright*                     Copyright © Calexium www.calexium.com. 
+ *Copyright*                     Copyright © David RENÉwww.calexium.com. 
  *Released*
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 12/12/2015
  * Time: 21:48
- * © Calexium 
+ * © David RENÉ
  */
 read tools/basis.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 07/06/2016
  * Time: 23:15
- * © Calexium 
+ * © David RENÉ
  */
 read tools/basis.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 07/06/2016
  * Time: 23:15
- * © Calexium 
+ * © David RENÉ
  */
 /*
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 01/06/2016
  * Time: 21:01
- * © Calexium 
+ * © David RENÉ
  */
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 12/07/2017
  * Time: 01:28
- * © Calexium 
+ * © David RENÉ
  */
 read cipher/base64.anubis
@@ -15,10 +15,12 @@ read system/logger.anubis
 read system/data_io.anubis
 read web/mime.anubis
 read calexium_lib/net_services_protocols/logger_service.anubis
+read calexium_lib/mail/tools.anubis
 read calexium_lib/mail/decode_mail.anubis
 read calexium_lib/mail/encode_mail.anubis
 read calexium_lib/mail/lexers/fqa.anubis
-
+transmit calexium_lib/mail/types/generated/email_address.anubis
+transmit calexium_lib/mail/types/generated/email_to_send.anubis
 public type Mail_Structure:
   mail_header_content(String header, String content).
@@ -27,24 +29,24 @@ public define Mail_Structure
   no_data_mail =
   mail_header_content("","").
-public type Email_Address:
-  email_address(Maybe(String) name, String address).
+//public type Email_Address:
+  email_address(String name, String address).
-public type File_Attached :
-  attached_file(String filename, RStream filestream).
+ public type File_Attached :
+  attached_file(String filename). //, RStream filestream).
-public type Email_to_send :
+//public type Email_to_send :
   data_to_send(
-    Email_Address               from, 
-    List(Email_Address)         to, 
-    Maybe(List(Email_Address))  cc, 
-    Maybe(List(Email_Address))  bcc, 
-    Maybe(String)               subject, 
-    String                      content, 
-    List(File_Attached)         files, 
-    Bool                        send_copy,  //send copy to sender by bcc (useful when the email is sent by an automat)
+    Email_Address         from, 
+    List(Email_Address)   to, 
+    List(Email_Address)   cc, 
+    List(Email_Address)   bcc, 
+    String                subject,
+    String                content,
+    List(File_Attached)   files,
+    Bool                  send_copy,  //send copy to sender by bcc (useful when the email is sent by an automat)
 //    String                       from, 
-    Maybe(String)                reply_to
+    String                reply_to
   ).
 define Bool
@@ -113,7 +115,7 @@ define Maybe($T)
       }
   }.
-define Maybe(String)
+ define Maybe(String)
   day_name
   (
     Int day_num
@@ -128,7 +130,7 @@ define Maybe(String)
   else                      failure
   .
-define Maybe(String)
+ define Maybe(String)
   month_name
   (
     Int month_num
@@ -153,13 +155,9 @@ public define String
   (
     Email_Address mail
   )=
-  with  string_name =
-           if mail.name is
-           {
-              failure           then "",
-              success(add_name) then to_MIME_text("UTF-8", add_name) + " "
-            },
-   string_name + "<" + mail.address + ">".
+  (if mail.name = ""  then "" else to_MIME_text("UTF-8", mail.name) + " ") + 
+  "<" + mail.address + ">"
+.
 define String
   get_mime_of_extensions
@@ -241,19 +239,36 @@ public define String
 define String
   data_file_multipart
   (
-    File_Attached  file, 
+    String  attached_file, 
   )=
-  with data_file = if reliable_read(file.filestream, file_size(file.filestream), 100) is 
+  
+  if (Maybe(RStream))file(attached_file, read) is
+  {
+    failure     then  
+      data_file_multipart(attached_file, constant_byte_array(0,0))
+    success(fd) then
+      with data_file = if reliable_read(fd, file_size(attached_file), 100) is 
                    {  
-                     failure then constant_byte_array(0,0),
-                     success(data) then data
-                   },
-  data_file_multipart(file.filename, data_file).
+                     failure        then constant_byte_array(0,0),
+                     success(data)  then data
+                    },
+  
+    data_file_multipart(attached_file, data_file)
+
+  }
+.  
+           if file(fullpath, read) is
+          {
+            failure then   
+              logError(debug_log, "Can't open mail '" + file_name + "'.");failure
+            success(f) then success(f)
+          }
 define String
   data_files_multipart
   (
-    List(File_Attached) files, 
+    //List(File_Attached) files,
+    List(String)        files,
     String              boundary
   )=
   if files is
@@ -265,7 +280,7 @@ define String
   }.
-public define String
+ public define String
   str_utime_send_mail
   (
     UTime t
@@ -287,7 +302,7 @@ public define String
   //+ " +0000"
   .
-public define String
+ public define String
   get_rfc822_date_format
   =
   str_utime_send_mail(unow).
@@ -307,7 +322,7 @@ define Int
   ) =
   if line is
   {
-    [] then pos,
+    []      then pos,
     [h . t] then 
       if h = 32 | h = 9 then pos
                             else _next_ws_pos(t, pos + 1)
@@ -364,7 +379,7 @@ public define String
     Email_to_send   send
   ) =
   //with header_to_name = "To: ",
-  if send is data_to_send(from, to, cc, bcc, subject, content, files, send_copy, reply_to) then
+  if send is data_to_send(from, to_list, cc_list, bcc_list, subject, content, files, send_copy, reply_to) then
     with send_date = get_rfc822_date_format,
          text_type  = if find("<html",content,0) is
                       {
@@ -377,7 +392,7 @@ public define String
                      encode_content(content, text_type = "html"),
          is_multipart = if files is
                         {
-                          [] then false,
+                          []      then false,
                           [h . t] then true
                         },
@@ -386,29 +401,25 @@ public define String
    // "From: " + user.login + "<" + user.login + "@" + domain + ">" + crlf +
     "User-Agent: Calexium lib email sender" + crlf +
     "From: " + "<" + from.address + ">" + crlf +
-    if reply_to is
-    {
-      failure          then "",
-      success(reply_t) then "Reply-To: <" + reply_t +">" + crlf
-    }+
+    (if reply_to = "" then 
+      ""
+    else
+      "Reply-To: <" + reply_to +">" + crlf
+    )+
     "MIME-Version: 1.0" + crlf +
     //header_to_name + folding(to, 68 - length(header_to_name)) + crlf + 
-    "To: " + folding(to, address_to_string) + crlf + 
-    if cc is
-    {
-      failure       then "",
-      success(cc_list) then
+    "To: " + folding(to_list, address_to_string) + crlf + 
+    (
        // with  header_cc_name = "Cc: ",
        // header_cc_name + folding(cc_list, 68 - length(header_cc_name)) + crlf
        if cc_list is [] then ""
                         else "Cc: " + folding(cc_list, address_to_string) + crlf
-    } +
-    if subject is
-    {
-      failure       then "",
-      success(subj) then
-        "Subject: " + to_folded_base64_text("UTF-8", subj) + crlf
-    } +
+    ) +
+    (if subject = "" then 
+      ""
+    else
+        "Subject: " + to_folded_base64_text("UTF-8", subject) + crlf
+    ) +
     if is_multipart then
       with boundary = to_ascii(sha1((from, send_date))),
       "Content-Type: multipart/mixed;" + crlf + 
@@ -522,7 +533,7 @@ public define Maybe(Email_Address)
      failure then
        with result_mail = trim(mail),
        if test_fqa(result_mail) then
-         success(email_address(failure, result_mail))
+         success(email_address("", result_mail))
        else 
          failure,
      success(separator_b) then
@@ -539,8 +550,8 @@ public define Maybe(Email_Address)
              success(add_str) then 
                with name = if name_string is 
                            {
-                              failure then failure,
-                              success(name_str) then success(trim(name_str))
+                              failure then "",
+                              success(name_str) then trim(name_str)
                            },
                if test_fqa(add_str) then
                  success(email_address(name, add_str))
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 12/07/2017
  * Time: 21:53
- * © Calexium 
+ * © David RENÉ
  */
 read system/string.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 12/07/2017
  * Time: 22:02
- * © Calexium 
+ * © David RENÉ
  */
 read tools/base64.anubis
@@ -182,11 +182,11 @@ public define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
     ) =
   if at_beginning_of_line(ls)
   then enhanced_status_tester_state_3(clear_abol(ls)) else
-  if lm_next_char(ls) is (ls,c) then
-  if c = -1 then enhanced_status_tester_state_1(ls) else
-  if c = 50 then enhanced_status_tester_state_4(ls) else
-  if (52 +=< c & c +=< 53) then enhanced_status_tester_state_4(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = -1 then enhanced_status_tester_state_1(_ls) else
+  if c = 50 then enhanced_status_tester_state_4(_ls) else
+  if (52 +=< c & c +=< 53) then enhanced_status_tester_state_4(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
@@ -194,9 +194,9 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
     (
       LM_LexerState_EnhancedStatus ls,
     ) =
-  with ls = lm_remember_match(enhanced_status_tester_action_2,ls),
-  if lm_next_char(ls) is (ls,c) then
-  lm_find_match(ls).
+  with _ls = lm_remember_match(enhanced_status_tester_action_2,ls),
+  if lm_next_char(_ls) is (__ls,c) then
+  lm_find_match(__ls).
 define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
@@ -204,8 +204,8 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
     (
       LM_LexerState_EnhancedStatus ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  lm_find_match(_ls).
 define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
@@ -213,9 +213,9 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
     (
       LM_LexerState_EnhancedStatus ls,
     ) =
-  with ls = lm_remember_match(enhanced_status_tester_action_1,ls),
-  if lm_next_char(ls) is (ls,c) then
-  lm_find_match(ls).
+  with _ls = lm_remember_match(enhanced_status_tester_action_1,ls),
+  if lm_next_char(_ls) is (__ls,c) then
+  lm_find_match(__ls).
 define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
@@ -223,11 +223,11 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
     (
       LM_LexerState_EnhancedStatus ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  if c = 46 then enhanced_status_tester_state_5(ls) else
-  if c = 50 then enhanced_status_tester_state_4(ls) else
-  if (52 +=< c & c +=< 53) then enhanced_status_tester_state_4(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = 46 then enhanced_status_tester_state_5(_ls) else
+  if c = 50 then enhanced_status_tester_state_4(_ls) else
+  if (52 +=< c & c +=< 53) then enhanced_status_tester_state_4(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
@@ -235,10 +235,10 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
     (
       LM_LexerState_EnhancedStatus ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  if c = 46 then enhanced_status_tester_state_5(ls) else
-  if (48 +=< c & c +=< 57) then enhanced_status_tester_state_6(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = 46 then enhanced_status_tester_state_5(_ls) else
+  if (48 +=< c & c +=< 57) then enhanced_status_tester_state_6(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
@@ -246,10 +246,10 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
     (
       LM_LexerState_EnhancedStatus ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  if c = 46 then enhanced_status_tester_state_7(ls) else
-  if (48 +=< c & c +=< 57) then enhanced_status_tester_state_6(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = 46 then enhanced_status_tester_state_7(_ls) else
+  if (48 +=< c & c +=< 57) then enhanced_status_tester_state_6(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
@@ -257,10 +257,10 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
     (
       LM_LexerState_EnhancedStatus ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  if c = 46 then enhanced_status_tester_state_7(ls) else
-  if (48 +=< c & c +=< 57) then enhanced_status_tester_state_8(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = 46 then enhanced_status_tester_state_7(_ls) else
+  if (48 +=< c & c +=< 57) then enhanced_status_tester_state_8(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
@@ -268,10 +268,10 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
     (
       LM_LexerState_EnhancedStatus ls,
     ) =
-  with ls = lm_remember_match(enhanced_status_tester_action_0,ls),
-  if lm_next_char(ls) is (ls,c) then
-  if (48 +=< c & c +=< 57) then enhanced_status_tester_state_8(ls) else
-  lm_find_match(ls).
+  with _ls = lm_remember_match(enhanced_status_tester_action_0,ls),
+  if lm_next_char(_ls) is (__ls,c) then
+  if (48 +=< c & c +=< 57) then enhanced_status_tester_state_8(__ls) else
+  lm_find_match(__ls).
 define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus)
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 12/07/2017
  * Time: 22:28
- * © Calexium 
+ * © David RENÉ
  */
@@ -187,14 +187,14 @@ public define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     ) =
   if at_beginning_of_line(ls)
   then email_tester_state_3(clear_abol(ls)) else
-  if lm_next_char(ls) is (ls,c) then
-  if c = -1 then email_tester_state_1(ls) else
-  if c = 45 then email_tester_state_4(ls) else
-  if (48 +=< c & c +=< 57) then email_tester_state_4(ls) else
-  if (65 +=< c & c +=< 90) then email_tester_state_4(ls) else
-  if c = 95 then email_tester_state_4(ls) else
-  if (97 +=< c & c +=< 122) then email_tester_state_4(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = -1 then email_tester_state_1(_ls) else
+  if c = 45 then email_tester_state_4(_ls) else
+  if (48 +=< c & c +=< 57) then email_tester_state_4(_ls) else
+  if (65 +=< c & c +=< 90) then email_tester_state_4(_ls) else
+  if c = 95 then email_tester_state_4(_ls) else
+  if (97 +=< c & c +=< 122) then email_tester_state_4(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -202,9 +202,9 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  with ls = lm_remember_match(email_tester_action_2,ls),
-  if lm_next_char(ls) is (ls,c) then
-  lm_find_match(ls).
+  with _ls = lm_remember_match(email_tester_action_2,ls),
+  if lm_next_char(_ls) is (__ls,c) then
+  lm_find_match(__ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -212,8 +212,8 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  lm_find_match(_ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -221,9 +221,9 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  with ls = lm_remember_match(email_tester_action_1,ls),
-  if lm_next_char(ls) is (ls,c) then
-  lm_find_match(ls).
+  with _ls = lm_remember_match(email_tester_action_1,ls),
+  if lm_next_char(_ls) is (__ls,c) then
+  lm_find_match(__ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -231,15 +231,15 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  if c = 45 then email_tester_state_4(ls) else
-  if c = 46 then email_tester_state_5(ls) else
-  if (48 +=< c & c +=< 57) then email_tester_state_4(ls) else
-  if c = 64 then email_tester_state_7(ls) else
-  if (65 +=< c & c +=< 90) then email_tester_state_4(ls) else
-  if c = 95 then email_tester_state_4(ls) else
-  if (97 +=< c & c +=< 122) then email_tester_state_4(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = 45 then email_tester_state_4(_ls) else
+  if c = 46 then email_tester_state_5(_ls) else
+  if (48 +=< c & c +=< 57) then email_tester_state_4(_ls) else
+  if c = 64 then email_tester_state_7(_ls) else
+  if (65 +=< c & c +=< 90) then email_tester_state_4(_ls) else
+  if c = 95 then email_tester_state_4(_ls) else
+  if (97 +=< c & c +=< 122) then email_tester_state_4(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -247,13 +247,13 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  if c = 45 then email_tester_state_6(ls) else
-  if (48 +=< c & c +=< 57) then email_tester_state_6(ls) else
-  if (65 +=< c & c +=< 90) then email_tester_state_6(ls) else
-  if c = 95 then email_tester_state_6(ls) else
-  if (97 +=< c & c +=< 122) then email_tester_state_6(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = 45 then email_tester_state_6(_ls) else
+  if (48 +=< c & c +=< 57) then email_tester_state_6(_ls) else
+  if (65 +=< c & c +=< 90) then email_tester_state_6(_ls) else
+  if c = 95 then email_tester_state_6(_ls) else
+  if (97 +=< c & c +=< 122) then email_tester_state_6(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -261,15 +261,15 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  if c = 45 then email_tester_state_6(ls) else
-  if c = 46 then email_tester_state_5(ls) else
-  if (48 +=< c & c +=< 57) then email_tester_state_6(ls) else
-  if c = 64 then email_tester_state_7(ls) else
-  if (65 +=< c & c +=< 90) then email_tester_state_6(ls) else
-  if c = 95 then email_tester_state_6(ls) else
-  if (97 +=< c & c +=< 122) then email_tester_state_6(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = 45 then email_tester_state_6(_ls) else
+  if c = 46 then email_tester_state_5(_ls) else
+  if (48 +=< c & c +=< 57) then email_tester_state_6(_ls) else
+  if c = 64 then email_tester_state_7(_ls) else
+  if (65 +=< c & c +=< 90) then email_tester_state_6(_ls) else
+  if c = 95 then email_tester_state_6(_ls) else
+  if (97 +=< c & c +=< 122) then email_tester_state_6(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -277,12 +277,12 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  if c = 45 then email_tester_state_8(ls) else
-  if (48 +=< c & c +=< 57) then email_tester_state_8(ls) else
-  if (65 +=< c & c +=< 90) then email_tester_state_8(ls) else
-  if (97 +=< c & c +=< 122) then email_tester_state_8(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = 45 then email_tester_state_8(_ls) else
+  if (48 +=< c & c +=< 57) then email_tester_state_8(_ls) else
+  if (65 +=< c & c +=< 90) then email_tester_state_8(_ls) else
+  if (97 +=< c & c +=< 122) then email_tester_state_8(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -290,13 +290,13 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  if c = 45 then email_tester_state_8(ls) else
-  if c = 46 then email_tester_state_9(ls) else
-  if (48 +=< c & c +=< 57) then email_tester_state_8(ls) else
-  if (65 +=< c & c +=< 90) then email_tester_state_8(ls) else
-  if (97 +=< c & c +=< 122) then email_tester_state_8(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = 45 then email_tester_state_8(_ls) else
+  if c = 46 then email_tester_state_9(_ls) else
+  if (48 +=< c & c +=< 57) then email_tester_state_8(_ls) else
+  if (65 +=< c & c +=< 90) then email_tester_state_8(_ls) else
+  if (97 +=< c & c +=< 122) then email_tester_state_8(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -304,12 +304,12 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  if c = 45 then email_tester_state_10(ls) else
-  if (48 +=< c & c +=< 57) then email_tester_state_11(ls) else
-  if (65 +=< c & c +=< 90) then email_tester_state_11(ls) else
-  if (97 +=< c & c +=< 122) then email_tester_state_11(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = 45 then email_tester_state_10(_ls) else
+  if (48 +=< c & c +=< 57) then email_tester_state_11(_ls) else
+  if (65 +=< c & c +=< 90) then email_tester_state_11(_ls) else
+  if (97 +=< c & c +=< 122) then email_tester_state_11(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -317,13 +317,13 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
-  if c = 45 then email_tester_state_10(ls) else
-  if c = 46 then email_tester_state_9(ls) else
-  if (48 +=< c & c +=< 57) then email_tester_state_10(ls) else
-  if (65 +=< c & c +=< 90) then email_tester_state_10(ls) else
-  if (97 +=< c & c +=< 122) then email_tester_state_10(ls) else
-  lm_find_match(ls).
+  if lm_next_char(ls) is (_ls,c) then
+  if c = 45 then email_tester_state_10(_ls) else
+  if c = 46 then email_tester_state_9(_ls) else
+  if (48 +=< c & c +=< 57) then email_tester_state_10(_ls) else
+  if (65 +=< c & c +=< 90) then email_tester_state_10(_ls) else
+  if (97 +=< c & c +=< 122) then email_tester_state_10(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -331,14 +331,14 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  with ls = lm_remember_match(email_tester_action_0,ls),
-  if lm_next_char(ls) is (ls,c) then
-  if c = 45 then email_tester_state_10(ls) else
-  if c = 46 then email_tester_state_12(ls) else
-  if (48 +=< c & c +=< 57) then email_tester_state_11(ls) else
-  if (65 +=< c & c +=< 90) then email_tester_state_11(ls) else
-  if (97 +=< c & c +=< 122) then email_tester_state_11(ls) else
-  lm_find_match(ls).
+  with _ls = lm_remember_match(email_tester_action_0,ls),
+  if lm_next_char(_ls) is (__ls,c) then
+  if c = 45 then email_tester_state_10(__ls) else
+  if c = 46 then email_tester_state_12(__ls) else
+  if (48 +=< c & c +=< 57) then email_tester_state_11(__ls) else
+  if (65 +=< c & c +=< 90) then email_tester_state_11(__ls) else
+  if (97 +=< c & c +=< 122) then email_tester_state_11(__ls) else
+  lm_find_match(__ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -346,12 +346,12 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  if lm_next_char(ls) is (ls,c) then
+  if lm_next_char(ls) is (_ls,c) then
   if c = 45 then email_tester_state_10(ls) else
-  if (48 +=< c & c +=< 57) then email_tester_state_13(ls) else
-  if (65 +=< c & c +=< 90) then email_tester_state_13(ls) else
-  if (97 +=< c & c +=< 122) then email_tester_state_13(ls) else
-  lm_find_match(ls).
+  if (48 +=< c & c +=< 57) then email_tester_state_13(_ls) else
+  if (65 +=< c & c +=< 90) then email_tester_state_13(_ls) else
+  if (97 +=< c & c +=< 122) then email_tester_state_13(_ls) else
+  lm_find_match(_ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -359,14 +359,14 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA)
     (
       LM_LexerState_FQA ls,
     ) =
-  with ls = lm_remember_match(email_tester_action_0,ls),
-  if lm_next_char(ls) is (ls,c) then
-  if c = 45 then email_tester_state_10(ls) else
-  if c = 46 then email_tester_state_12(ls) else
-  if (48 +=< c & c +=< 57) then email_tester_state_13(ls) else
-  if (65 +=< c & c +=< 90) then email_tester_state_13(ls) else
-  if (97 +=< c & c +=< 122) then email_tester_state_13(ls) else
-  lm_find_match(ls).
+  with _ls = lm_remember_match(email_tester_action_0,ls),
+  if lm_next_char(_ls) is (__ls,c) then
+  if c = 45 then email_tester_state_10(__ls) else
+  if c = 46 then email_tester_state_12(__ls) else
+  if (48 +=< c & c +=< 57) then email_tester_state_13(__ls) else
+  if (65 +=< c & c +=< 90) then email_tester_state_13(__ls) else
+  if (97 +=< c & c +=< 122) then email_tester_state_13(__ls) else
+  lm_find_match(__ls).
 define (LM_LexerState_FQA,LM_TokenOrError_FQA)
@@ -423,12 +423,12 @@ public define Bool
       end_of_file      then false,
       token(t)         then
       (
-        with result = implode(t),
-          if length(result) = length(account) then 
+        with _result = implode(t),
+          if length(_result) = length(account) then 
             //logDebug(debug_log,"["+account +"] is FQA valid");
             true
           else 
-            println("["+account+"] is valid FQA but different than ["+result+"]"); 
+            println("["+account+"] is valid FQA but different than ["+_result+"]"); 
             false
       ),
       error            then 
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 16/05/2015
  * Time: 22:50
- * © Calexium 
+ * © David RENÉ
  */
 read system/string.anubis
@@ -291,8 +291,8 @@ public define Result(SmtpClientResult, SmtpClientSession)
                         failure     then logger(logError, "send_ehlo: error sending HELO"); error(error), 
                         success(_)  then 
                           with result2 = receive_reply(conn, false, time_out, logger),
-                          if result2 is reply(code, status, lines) then
-                            if code = 250 then ok(make_smtp_client_session(lines, logger))
+                          if result2 is reply(_code, _status, _lines) then
+                            if _code = 250 then ok(make_smtp_client_session(_lines, logger))
                                           else error(result2)
                           else
                             error(result2)
@@ -3,13 +3,13 @@
  * User: フランスのトトロ 
  * Date: 17/05/2015
  * Time: 01:27
- * © Calexium 
+ * © David RENÉ
  */
 transmit tools/basis.anubis
 transmit system/string.anubis
-define Maybe(String)
+public define Maybe(String)
   day_name
   (
     Int day_num
@@ -24,7 +24,7 @@ define Maybe(String)
   else                      failure
   .
-define Maybe(String)
+public define Maybe(String)
   month_name
   (
     Int month_num
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 31/05/2015
  * Time: 02:41
- * © Calexium 
+ * © David RENÉ
  */
  This is FreeBSD conf file interface.
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 25/06/2016
  * Time: 18:14
- * © Calexium 
+ * © David RENÉ
  */
 read tools/basis.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 09/07/2017
  * Time: 00:39
- * © Calexium 
+ * © David RENÉ
  */
 transmit tools/basis.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 24/06/2017
  * Time: 20:28
- * © Calexium 
+ * © David RENÉ
  */
@@ -4,7 +4,7 @@
  *Copyright*                    
   Copyright (c) Alain Prouté 2003~2007.
-  © Calexium 2007~2017
+  © David RENÉ2007~2017
  *Authors:* 
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 07/12/2014
  * Time: 16:49
- * © Calexium 
+ * © David RENÉ
  */
 // *************************************************************************************
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 07/12/2014
  * Time: 17:12
- * © Calexium 
+ * © David RENÉ
  */
 read tools/basis.anubis
@@ -6,6 +6,7 @@
  *Copyright*                Copyright (c) Alain Prouté 2004-2005.
                             Copyright (c) Calexium 2007-2017.
+                            Copyright (c) David René 2007-2019.
  *Authors* Alain Prouté
@@ -2207,6 +2207,7 @@ define List(HTTP_header)
                  [
                    http_header("Content-Type", to_String(mime_type)),
                    http_header("Etag", "\""+etag+"\""),
+                   http_header("Cache-Control", "max-age=600"),
                    http_header("Content-Length",to_decimal(size)),
                    http_header("Content-Disposition", to_String(c_disposition)+"; filename=\"" + filename +"\"")
@@ -2306,8 +2307,14 @@ define One
          //forget(copy_file_to_Connection(file, connection, size)),
          send_file_body(desc,connection,file,size,0,filename),
       true then
+         with updated_header = 
+          [
+            http_header("Cache-Control", "max-age=600"),
+            http_header("Content-length","0"),
+            http_header("Etag", "\""+current_etag+"\"")
+          ] + headers,
          forget(reliable_write(connection,to_byte_array("HTTP/1.1 304 Not Modified"+crlf)));
-         forget(reliable_write(connection,[format_headers([http_header("Content-length","0") . [http_header("Etag", "\""+current_etag+"\"") . headers]]) , crlf]))
+         forget(reliable_write(connection,[format_headers(updated_header) , crlf]))
          //send_file_body(desc,connection,file,size,0,filename)
    }.
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 20/02/2017
  * Time: 04:31
- * © Calexium 
+ * © David RENÉ
  */
 read calexium_lib/web/CXM_making_a_web_site.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 14/03/2017
  * Time: 04:23
- * © Calexium 
+ * © David RENÉ
  */
 read system/string.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 17/02/2017
  * Time: 17:18
- * © Calexium 
+ * © David RENÉ
  */
 read system/convert.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 07/12/2014
  * Time: 18:10
- * © Calexium 
+ * © David RENÉ
  */
 read system/string.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 07/01/2018
  * Time: 11:59
- * © Calexium 
+ * © David RENÉ
  */
 transmit system/string.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 23/02/2017
  * Time: 21:43
- * © Calexium 
+ * © David RENÉ
  */
 read calexium_lib/web/CXM_making_a_web_site.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ & Julien
  * Date: 22/11/2014
  * Time: 18:36
- * © Calexium 
+ * © David RENÉ
  */
  // needs include
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 25/05/2015
  * Time: 22:38
- * © Calexium 
+ * © David RENÉ
  */
 read calexium_lib/web/CXM_jquery.anubis
 read calexium_lib/web/CXM_making_a_web_site.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ & julien
  * Date: 09/11/2014
  * Time: 15:51
- * © Calexium 
+ * © David RENÉ
  */
 read system/convert.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 26/07/2014
  * Time: 01:25
- * © Calexium 
+ * © David RENÉ
  */
 read calexium_lib/web/CXM_making_a_web_site.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 19/06/2015
  * Time: 21:42
- * © Calexium 
+ * © David RENÉ
  */
 read calexium_lib/web/CXM_making_a_web_site.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 26/03/2017
  * Time: 18:28
- * © Calexium 
+ * © David RENÉ
  */
 read calexium_lib/web/CXM_making_a_web_site.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 18/04/2015
  * Time: 23:21
- * © Calexium 
+ * © David RENÉ
  */
 read tools/basis.anubis
@@ -174,7 +174,7 @@ public define HTML_Partial_Content
   with uid = generate_random_string(20),
   partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)))],
-              literal("<img " + format_attrs(img_button_confirm_image_attrs(core_attrs, uid, actioner)) + " src=\"" + img_path + "\"></img>")).
+              img(img_button_confirm_image_attrs(core_attrs, uid, actioner), img_path)).
 public define HTML_Partial_Content
   img_button_confirm
@@ -232,7 +232,7 @@ public define String
   img_button_confirm(img_path, [], dlg_title, dlg_text, dlg_ok, dlg_cancel, actioner).
-public define String
+public define HTML_Partial_Content
   img_button_confirm
   (
     String                  img_path,
@@ -247,6 +247,12 @@ public define String
   with uid = generate_random_string(20),
   //with event_click = (CoreAttrs)event(onclick, "CalexiumToolBox.jq_query("+format_web_action_name_to_js(web_action, extra_ops)+")"),
+  partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)))],
+    img(img_button_confirm_image_attrs(core_attrs, uid, web_action, extra_ops), img_path))
+.
+
+
+
   "<script type=\"text/javascript\">" + jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)) + "</script>" +
   "<img " + format_attrs(img_button_confirm_image_attrs(core_attrs, uid, web_action, extra_ops)) + " src=\"" + img_path + "\"></img>"
 .
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 06/05/2007
  * Time: 09:39
- * © Calexium 
+ * © David RENÉ
  */
 read tools/basis.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 10/04/2015
  * Time: 22:22
- * © Calexium 
+ * © David RENÉ
  */
 read tools/basis.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 09/05/2015
  * Time: 22:33
- * © Calexium 
+ * © David RENÉ
  */
 transmit tools/basis.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 23/02/2017
  * Time: 21:49
- * © Calexium 
+ * © David RENÉ
  */
 transmit calexium_lib/web/fonts/awesome.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 19/07/2015
  * Time: 13:26
- * © Calexium 
+ * © David RENÉ
  */
 read web/mime.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ 
  * Date: 10/01/2016
  * Time: 12:24
- * © Calexium 
+ * © David RENÉ
  */
 transmit tools/basis.anubis
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 18/02/2017
  * Time: 01:52
- * © Calexium 
+ * © David RENÉ
  */
@@ -3,7 +3,7 @@
  * User: フランスのトトロ aka (David RENÉ) 
  * Date: 01/06/2017
  * Time: 12:03
- * © Calexium 
+ * © David RENÉ
  */
 read calexium_lib/web/CXM_making_a_web_site.anubis