diff --git a/database/csv_import_status.anubis b/database/csv_import_status.anubis index 2306a82..0ab40a0 100644 --- a/database/csv_import_status.anubis +++ b/database/csv_import_status.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 09/05/2017 * Time: 23:01 - * © Calexium + * © David RENÉ */ diff --git a/database/csv_tools.anubis b/database/csv_tools.anubis index 40ac4b4..624dda2 100644 --- a/database/csv_tools.anubis +++ b/database/csv_tools.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 06/05/2017 * Time: 17:33 - * © Calexium + * © David RENÉ */ read tools/basis.anubis diff --git a/database/db_binds.anubis b/database/db_binds.anubis index 16ed7dd..e747c6c 100644 --- a/database/db_binds.anubis +++ b/database/db_binds.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 diff --git a/database/db_update_fields.anubis b/database/db_update_fields.anubis index 74b6651..cbef89a 100644 --- a/database/db_update_fields.anubis +++ b/database/db_update_fields.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 diff --git a/database/db_version.anubis b/database/db_version.anubis index b765bc3..73d04f4 100644 --- a/database/db_version.anubis +++ b/database/db_version.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 09/07/2017 * Time: 00:52 - * © Calexium + * © David RENÉ */ transmit tools/basis.anubis diff --git a/database/migration_sqlite3.anubis b/database/migration_sqlite3.anubis index de29a8b..807ff00 100644 --- a/database/migration_sqlite3.anubis +++ b/database/migration_sqlite3.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 } }. diff --git a/database/model/db_model.anubis b/database/model/db_model.anubis index d104cf8..7d7a77e 100644 --- a/database/model/db_model.anubis +++ b/database/model/db_model.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 01/01/2016 * Time: 1:34 - * © Calexium + * © David RENÉ */ The HayamiKi (早見木) project diff --git a/database/types/db_migration.anubis b/database/types/db_migration.anubis index 49a7d6d..e4f01c8 100644 --- a/database/types/db_migration.anubis +++ b/database/types/db_migration.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 09/07/2017 * Time: 00:25 - * © Calexium + * © David RENÉ */ diff --git a/densaku_types.anubis b/densaku_types.anubis index b1f2b9f..c2faa9e 100644 --- a/densaku_types.anubis +++ b/densaku_types.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 07/02/2017 * Time: 23:01 - * © Calexium + * © David RENÉ */ diff --git a/ds_files/ds_messages.anubis b/ds_files/ds_messages.anubis index 7163704..6fd0d69 100644 --- a/ds_files/ds_messages.anubis +++ b/ds_files/ds_messages.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 07/02/2017 * Time: 23:05 - * © Calexium + * © David RENÉ */ diff --git a/ds_files/ds_types.anubis b/ds_files/ds_types.anubis index cb78e92..87434a3 100644 --- a/ds_files/ds_types.anubis +++ b/ds_files/ds_types.anubis @@ -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 !!")) + ]) + ]) ] + )] . diff --git a/examples/minimal_web_site.anubis b/examples/minimal_web_site.anubis index 249cb29..b0040c6 100644 --- a/examples/minimal_web_site.anubis +++ b/examples/minimal_web_site.anubis @@ -4,7 +4,7 @@ *Title* A minimal web site. - *Copyright* Copyright © Calexium www.calexium.com. + *Copyright* Copyright © David RENÉwww.calexium.com. *Released* diff --git a/examples/minimal_web_site_vc.anubis b/examples/minimal_web_site_vc.anubis index 2dab6de..3aa0f57 100644 --- a/examples/minimal_web_site_vc.anubis +++ b/examples/minimal_web_site_vc.anubis @@ -4,7 +4,7 @@ *Title* A minimal web site. - *Copyright* Copyright © Calexium www.calexium.com. + *Copyright* Copyright © David RENÉwww.calexium.com. *Released* diff --git a/extensions/json.anubis b/extensions/json.anubis index 55d5ecb..8fff7c1 100644 --- a/extensions/json.anubis +++ b/extensions/json.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 12/12/2015 * Time: 21:48 - * © Calexium + * © David RENÉ */ read tools/basis.anubis diff --git a/file_processor_io/yaml/yaml.anubis b/file_processor_io/yaml/yaml.anubis index 64823a4..075b6a8 100644 --- a/file_processor_io/yaml/yaml.anubis +++ b/file_processor_io/yaml/yaml.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 07/06/2016 * Time: 23:15 - * © Calexium + * © David RENÉ */ read tools/basis.anubis diff --git a/file_processor_io/yaml/yaml_parser.anubis b/file_processor_io/yaml/yaml_parser.anubis index ae2a22e..78eac2f 100644 --- a/file_processor_io/yaml/yaml_parser.anubis +++ b/file_processor_io/yaml/yaml_parser.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 07/06/2016 * Time: 23:15 - * © Calexium + * © David RENÉ */ /* diff --git a/file_processor_io/yaml/yaml_type.anubis b/file_processor_io/yaml/yaml_type.anubis index c607cc8..0019ecc 100644 --- a/file_processor_io/yaml/yaml_type.anubis +++ b/file_processor_io/yaml/yaml_type.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 01/06/2016 * Time: 21:01 - * © Calexium + * © David RENÉ */ diff --git a/mail/compose_email.anubis b/mail/compose_email.anubis index 0368091..97cdaf7 100644 --- a/mail/compose_email.anubis +++ b/mail/compose_email.anubis @@ -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("" + 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)) diff --git a/mail/decode_mail.anubis b/mail/decode_mail.anubis index 4615cef..23a3285 100644 --- a/mail/decode_mail.anubis +++ b/mail/decode_mail.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 12/07/2017 * Time: 21:53 - * © Calexium + * © David RENÉ */ read system/string.anubis diff --git a/mail/encode_mail.anubis b/mail/encode_mail.anubis index d10e48c..47400ee 100644 --- a/mail/encode_mail.anubis +++ b/mail/encode_mail.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 12/07/2017 * Time: 22:02 - * © Calexium + * © David RENÉ */ read tools/base64.anubis diff --git a/mail/lexers/enhanced_status.anubis b/mail/lexers/enhanced_status.anubis index d308513..62ff1ea 100644 --- a/mail/lexers/enhanced_status.anubis +++ b/mail/lexers/enhanced_status.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) diff --git a/mail/lexers/fqa.anubis b/mail/lexers/fqa.anubis index 5342193..fb022ee 100644 --- a/mail/lexers/fqa.anubis +++ b/mail/lexers/fqa.anubis @@ -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 diff --git a/mail/send_mail_type.anubis b/mail/send_mail_type.anubis index 69c1996..c38c04e 100644 --- a/mail/send_mail_type.anubis +++ b/mail/send_mail_type.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 16/05/2015 * Time: 22:50 - * © Calexium + * © David RENÉ */ read system/string.anubis diff --git a/mail/smtp_client.anubis b/mail/smtp_client.anubis index 7cc636d..7e25a42 100644 --- a/mail/smtp_client.anubis +++ b/mail/smtp_client.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) diff --git a/mail/tools.anubis b/mail/tools.anubis index 3c383b4..5430db1 100644 --- a/mail/tools.anubis +++ b/mail/tools.anubis @@ -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 diff --git a/os_tools/freebsd/rc_conf.anubis b/os_tools/freebsd/rc_conf.anubis index 972e483..6a5c6ef 100644 --- a/os_tools/freebsd/rc_conf.anubis +++ b/os_tools/freebsd/rc_conf.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 31/05/2015 * Time: 02:41 - * © Calexium + * © David RENÉ */ This is FreeBSD conf file interface. diff --git a/string/crlf.anubis b/string/crlf.anubis index 4c7b2cd..234c95f 100644 --- a/string/crlf.anubis +++ b/string/crlf.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 25/06/2016 * Time: 18:14 - * © Calexium + * © David RENÉ */ read tools/basis.anubis diff --git a/types/version.anubis b/types/version.anubis index 7210128..8f9c612 100644 --- a/types/version.anubis +++ b/types/version.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 09/07/2017 * Time: 00:39 - * © Calexium + * © David RENÉ */ transmit tools/basis.anubis diff --git a/unit_test/test.anubis b/unit_test/test.anubis index 75488ff..13e10dc 100644 --- a/unit_test/test.anubis +++ b/unit_test/test.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 24/06/2017 * Time: 20:28 - * © Calexium + * © David RENÉ */ diff --git a/web/CXM_common.anubis b/web/CXM_common.anubis index 36eba83..ed03f7c 100644 --- a/web/CXM_common.anubis +++ b/web/CXM_common.anubis @@ -4,7 +4,7 @@ *Copyright* Copyright (c) Alain Prouté 2003~2007. - © Calexium 2007~2017 + © David RENÉ2007~2017 *Authors:* diff --git a/web/CXM_form.anubis b/web/CXM_form.anubis index 900b1ff..fcc5495 100644 --- a/web/CXM_form.anubis +++ b/web/CXM_form.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 07/12/2014 * Time: 16:49 - * © Calexium + * © David RENÉ */ // ************************************************************************************* diff --git a/web/CXM_html_tooltip.anubis b/web/CXM_html_tooltip.anubis index e2ef274..9cff3b1 100644 --- a/web/CXM_html_tooltip.anubis +++ b/web/CXM_html_tooltip.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 07/12/2014 * Time: 17:12 - * © Calexium + * © David RENÉ */ read tools/basis.anubis diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis index 3927684..576062c 100644 --- a/web/CXM_making_a_web_site.anubis +++ b/web/CXM_making_a_web_site.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é diff --git a/web/CXM_multihost_http_server.anubis b/web/CXM_multihost_http_server.anubis index 1c54ff9..4085171 100644 --- a/web/CXM_multihost_http_server.anubis +++ b/web/CXM_multihost_http_server.anubis @@ -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) }. diff --git a/web/CXM_page_message.anubis b/web/CXM_page_message.anubis index 271aabc..d934e52 100644 --- a/web/CXM_page_message.anubis +++ b/web/CXM_page_message.anubis @@ -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 diff --git a/web/CXM_web_action.anubis b/web/CXM_web_action.anubis index 44d34dc..772460f 100644 --- a/web/CXM_web_action.anubis +++ b/web/CXM_web_action.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 14/03/2017 * Time: 04:23 - * © Calexium + * © David RENÉ */ read system/string.anubis diff --git a/web/CXM_web_session.anubis b/web/CXM_web_session.anubis index 7b3ad8d..3076e52 100644 --- a/web/CXM_web_session.anubis +++ b/web/CXM_web_session.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 17/02/2017 * Time: 17:18 - * © Calexium + * © David RENÉ */ read system/convert.anubis diff --git a/web/CXM_widgets.anubis b/web/CXM_widgets.anubis index 2fc79c0..a2013d6 100644 --- a/web/CXM_widgets.anubis +++ b/web/CXM_widgets.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 07/12/2014 * Time: 18:10 - * © Calexium + * © David RENÉ */ read system/string.anubis diff --git a/web/color/color.anubis b/web/color/color.anubis index f4e5948..ae54ddd 100644 --- a/web/color/color.anubis +++ b/web/color/color.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 07/01/2018 * Time: 11:59 - * © Calexium + * © David RENÉ */ transmit system/string.anubis diff --git a/web/fonts/awesome.anubis b/web/fonts/awesome.anubis index c3da76f..c92bcee 100644 --- a/web/fonts/awesome.anubis +++ b/web/fonts/awesome.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 diff --git a/web/jQuery/CXM_jq_form.anubis b/web/jQuery/CXM_jq_form.anubis index e02c1ab..bbb5d51 100644 --- a/web/jQuery/CXM_jq_form.anubis +++ b/web/jQuery/CXM_jq_form.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ & Julien * Date: 22/11/2014 * Time: 18:36 - * © Calexium + * © David RENÉ */ // needs include diff --git a/web/jQuery/CXM_jquery_datatable_plugins.anubis b/web/jQuery/CXM_jquery_datatable_plugins.anubis index 1f607b6..7d28e35 100644 --- a/web/jQuery/CXM_jquery_datatable_plugins.anubis +++ b/web/jQuery/CXM_jquery_datatable_plugins.anubis @@ -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 diff --git a/web/jQuery/CXM_jquery_dialog.anubis b/web/jQuery/CXM_jquery_dialog.anubis index 8c7cee9..31aa5b2 100644 --- a/web/jQuery/CXM_jquery_dialog.anubis +++ b/web/jQuery/CXM_jquery_dialog.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ & julien * Date: 09/11/2014 * Time: 15:51 - * © Calexium + * © David RENÉ */ read system/convert.anubis diff --git a/web/jQuery/CXM_jquery_toolbar.anubis b/web/jQuery/CXM_jquery_toolbar.anubis index ad43d7a..d5765b1 100644 --- a/web/jQuery/CXM_jquery_toolbar.anubis +++ b/web/jQuery/CXM_jquery_toolbar.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 diff --git a/web/jQuery/jq_flot.anubis b/web/jQuery/jq_flot.anubis index e682b91..9cf6a69 100644 --- a/web/jQuery/jq_flot.anubis +++ b/web/jQuery/jq_flot.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 diff --git a/web/jQuery/jqgrid.anubis b/web/jQuery/jqgrid.anubis index e733cf4..7232cdd 100644 --- a/web/jQuery/jqgrid.anubis +++ b/web/jQuery/jqgrid.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 diff --git a/web/js_tools.anubis b/web/js_tools.anubis index 54b7cfd..2a951d9 100644 --- a/web/js_tools.anubis +++ b/web/js_tools.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 18/04/2015 * Time: 23:21 - * © Calexium + * © David RENÉ */ read tools/basis.anubis diff --git a/web/widgets/button.anubis b/web/widgets/button.anubis index e642d5f..5c37e53 100644 --- a/web/widgets/button.anubis +++ b/web/widgets/button.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(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)) +. + + + "" + "" . diff --git a/web/widgets/css_helper.anubis b/web/widgets/css_helper.anubis index 0a7fd24..a79e915 100644 --- a/web/widgets/css_helper.anubis +++ b/web/widgets/css_helper.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 06/05/2007 * Time: 09:39 - * © Calexium + * © David RENÉ */ read tools/basis.anubis diff --git a/web/widgets/dashboard.anubis b/web/widgets/dashboard.anubis index 7935025..f577b09 100644 --- a/web/widgets/dashboard.anubis +++ b/web/widgets/dashboard.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 10/04/2015 * Time: 22:22 - * © Calexium + * © David RENÉ */ read tools/basis.anubis diff --git a/web/widgets/fisheye_menu.anubis b/web/widgets/fisheye_menu.anubis index 5ba7f38..0ff9755 100644 --- a/web/widgets/fisheye_menu.anubis +++ b/web/widgets/fisheye_menu.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 09/05/2015 * Time: 22:33 - * © Calexium + * © David RENÉ */ transmit tools/basis.anubis diff --git a/web/widgets/icon.anubis b/web/widgets/icon.anubis index 7caa843..141c18a 100644 --- a/web/widgets/icon.anubis +++ b/web/widgets/icon.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 diff --git a/web/widgets/icons_set.anubis b/web/widgets/icons_set.anubis index 517d719..e7f97a6 100644 --- a/web/widgets/icons_set.anubis +++ b/web/widgets/icons_set.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 19/07/2015 * Time: 13:26 - * © Calexium + * © David RENÉ */ read web/mime.anubis diff --git a/web/widgets/left_menu.anubis b/web/widgets/left_menu.anubis index 572ebf7..d241c87 100644 --- a/web/widgets/left_menu.anubis +++ b/web/widgets/left_menu.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ * Date: 10/01/2016 * Time: 12:24 - * © Calexium + * © David RENÉ */ transmit tools/basis.anubis diff --git a/web/widgets/menu.anubis b/web/widgets/menu.anubis index 9565e39..2b6de89 100644 --- a/web/widgets/menu.anubis +++ b/web/widgets/menu.anubis @@ -3,7 +3,7 @@ * User: フランスのトトロ aka (David RENÉ) * Date: 18/02/2017 * Time: 01:52 - * © Calexium + * © David RENÉ */ diff --git a/web/widgets/specialized_elements.anubis b/web/widgets/specialized_elements.anubis index 3353aed..8d8e22e 100644 --- a/web/widgets/specialized_elements.anubis +++ b/web/widgets/specialized_elements.anubis @@ -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 -- libgit2 0.21.4