Commit dad598c9ee78d4545b61492b38f4522f1ec2bcc5
1 parent
6e17837a
no message
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
| ... | ... | @@ -250,11 +250,11 @@ define Maybe(One) |
| 250 | 250 | |
| 251 | 251 | equal_but_sign then |
| 252 | 252 | logInfo(logger, "Database migration found from version " + db_ver + " to version " + migration_version+ " by hash difference "); |
| 253 | - if do_table_indexes(db, logger, h, update_db_version) is success(_) then | |
| 253 | + if migrate_to(db, logger) is failure then | |
| 254 | + failure | |
| 255 | + else | |
| 254 | 256 | update_db_version(migration_version); |
| 255 | 257 | do_migration_loop(db, logger, migration_version, t, update_db_version) |
| 256 | - else | |
| 257 | - failure | |
| 258 | 258 | } |
| 259 | 259 | }. |
| 260 | 260 | ... | ... |
database/model/db_model.anubis
database/types/db_migration.anubis
densaku_types.anubis
ds_files/ds_messages.anubis
ds_files/ds_types.anubis
| ... | ... | @@ -3,12 +3,13 @@ |
| 3 | 3 | * User: フランスのトトロ aka (David RENÉ) |
| 4 | 4 | * Date: 07/02/2017 |
| 5 | 5 | * Time: 23:05 |
| 6 | - * © Calexium | |
| 6 | + * © David RENÉ | |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | read densaku_lib/types/densaku.anubis |
| 10 | 10 | |
| 11 | -public define List(DS_Type) calexium_lib_types_description = | |
| 11 | +public define List(DS_Type_File) calexium_lib_types_description = | |
| 12 | + [ds_type_file( auto, auto, | |
| 12 | 13 | [ |
| 13 | 14 | // public type DB_id: |
| 14 | 15 | // none, |
| ... | ... | @@ -80,7 +81,45 @@ public define List(DS_Type) calexium_lib_types_description = |
| 80 | 81 | alternative("url", comment("url is raw action, hence we will only copy that url in final link"), [ |
| 81 | 82 | component(string, "url_name", ) |
| 82 | 83 | ]) |
| 83 | - ]) | |
| 84 | + ]), | |
| 84 | 85 | |
| 86 | +// public type Email_Address: | |
| 87 | +// email_address(String name, String address). | |
| 88 | +// | |
| 89 | + ds_type("Email_Address", [ | |
| 90 | + alternative("email_address", [ | |
| 91 | + component(string, "name"), | |
| 92 | + component(string, "address") | |
| 93 | + ]) | |
| 94 | + ]), | |
| 95 | + | |
| 96 | +//public type Email_to_send : | |
| 97 | +// data_to_send( | |
| 98 | +// Email_Address from, | |
| 99 | +// List(Email_Address) to, | |
| 100 | +// List(Email_Address) cc, | |
| 101 | +// List(Email_Address) bcc, | |
| 102 | +// String subject, | |
| 103 | +// String content, | |
| 104 | +// List(File_Attached) files, | |
| 105 | +// Bool send_copy, //send copy to sender by bcc (useful when the email is sent by an automat) | |
| 106 | +// String from, | |
| 107 | +// String reply_to | |
| 108 | +// ). | |
| 109 | + | |
| 110 | + ds_type("Email_to_send", [ | |
| 111 | + alternative("data_to_send", [ | |
| 112 | + component(ds_type("Email_Address"), "from", comment("email sent from that sender")), | |
| 113 | + component(list, ds_type("Email_Address"), "to", comment("email sent to that list of recipients")), | |
| 114 | + component(list, ds_type("Email_Address"), "cc", comment("email sent as copy to that list of recipients")), | |
| 115 | + component(list, ds_type("Email_Address"), "bcc", comment("email sent as blank carbon copy to that list of recipients")), | |
| 116 | + component(string, "subject", comment("subject of email. Supposed to be UTF8")), | |
| 117 | + component(string, "content", comment("content of the email")), | |
| 118 | + component(list, string, "files", comment("list of files")), | |
| 119 | + component(bool, "send_copy",comment("send copy to sender by bcc (useful when the email is sent by an automat)")), | |
| 120 | + component(string, "reply_to", comment("reply to !!")) | |
| 121 | + ]) | |
| 122 | + ]) | |
| 85 | 123 | ] |
| 124 | + )] | |
| 86 | 125 | . | ... | ... |
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
| ... | ... | @@ -3,7 +3,7 @@ |
| 3 | 3 | * User: フランスのトトロ aka (David RENÉ) |
| 4 | 4 | * Date: 12/07/2017 |
| 5 | 5 | * Time: 01:28 |
| 6 | - * © Calexium | |
| 6 | + * © David RENÉ | |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | read cipher/base64.anubis |
| ... | ... | @@ -15,10 +15,12 @@ read system/logger.anubis |
| 15 | 15 | read system/data_io.anubis |
| 16 | 16 | read web/mime.anubis |
| 17 | 17 | read calexium_lib/net_services_protocols/logger_service.anubis |
| 18 | +read calexium_lib/mail/tools.anubis | |
| 18 | 19 | read calexium_lib/mail/decode_mail.anubis |
| 19 | 20 | read calexium_lib/mail/encode_mail.anubis |
| 20 | 21 | read calexium_lib/mail/lexers/fqa.anubis |
| 21 | - | |
| 22 | +transmit calexium_lib/mail/types/generated/email_address.anubis | |
| 23 | +transmit calexium_lib/mail/types/generated/email_to_send.anubis | |
| 22 | 24 | |
| 23 | 25 | public type Mail_Structure: |
| 24 | 26 | mail_header_content(String header, String content). |
| ... | ... | @@ -27,24 +29,24 @@ public define Mail_Structure |
| 27 | 29 | no_data_mail = |
| 28 | 30 | mail_header_content("",""). |
| 29 | 31 | |
| 30 | -public type Email_Address: | |
| 31 | - email_address(Maybe(String) name, String address). | |
| 32 | +//public type Email_Address: | |
| 33 | + email_address(String name, String address). | |
| 32 | 34 | |
| 33 | -public type File_Attached : | |
| 34 | - attached_file(String filename, RStream filestream). | |
| 35 | + public type File_Attached : | |
| 36 | + attached_file(String filename). //, RStream filestream). | |
| 35 | 37 | |
| 36 | -public type Email_to_send : | |
| 38 | +//public type Email_to_send : | |
| 37 | 39 | data_to_send( |
| 38 | - Email_Address from, | |
| 39 | - List(Email_Address) to, | |
| 40 | - Maybe(List(Email_Address)) cc, | |
| 41 | - Maybe(List(Email_Address)) bcc, | |
| 42 | - Maybe(String) subject, | |
| 43 | - String content, | |
| 44 | - List(File_Attached) files, | |
| 45 | - Bool send_copy, //send copy to sender by bcc (useful when the email is sent by an automat) | |
| 40 | + Email_Address from, | |
| 41 | + List(Email_Address) to, | |
| 42 | + List(Email_Address) cc, | |
| 43 | + List(Email_Address) bcc, | |
| 44 | + String subject, | |
| 45 | + String content, | |
| 46 | + List(File_Attached) files, | |
| 47 | + Bool send_copy, //send copy to sender by bcc (useful when the email is sent by an automat) | |
| 46 | 48 | // String from, |
| 47 | - Maybe(String) reply_to | |
| 49 | + String reply_to | |
| 48 | 50 | ). |
| 49 | 51 | |
| 50 | 52 | define Bool |
| ... | ... | @@ -113,7 +115,7 @@ define Maybe($T) |
| 113 | 115 | } |
| 114 | 116 | }. |
| 115 | 117 | |
| 116 | -define Maybe(String) | |
| 118 | + define Maybe(String) | |
| 117 | 119 | day_name |
| 118 | 120 | ( |
| 119 | 121 | Int day_num |
| ... | ... | @@ -128,7 +130,7 @@ define Maybe(String) |
| 128 | 130 | else failure |
| 129 | 131 | . |
| 130 | 132 | |
| 131 | -define Maybe(String) | |
| 133 | + define Maybe(String) | |
| 132 | 134 | month_name |
| 133 | 135 | ( |
| 134 | 136 | Int month_num |
| ... | ... | @@ -153,13 +155,9 @@ public define String |
| 153 | 155 | ( |
| 154 | 156 | Email_Address mail |
| 155 | 157 | )= |
| 156 | - with string_name = | |
| 157 | - if mail.name is | |
| 158 | - { | |
| 159 | - failure then "", | |
| 160 | - success(add_name) then to_MIME_text("UTF-8", add_name) + " " | |
| 161 | - }, | |
| 162 | - string_name + "<" + mail.address + ">". | |
| 158 | + (if mail.name = "" then "" else to_MIME_text("UTF-8", mail.name) + " ") + | |
| 159 | + "<" + mail.address + ">" | |
| 160 | +. | |
| 163 | 161 | |
| 164 | 162 | define String |
| 165 | 163 | get_mime_of_extensions |
| ... | ... | @@ -241,19 +239,36 @@ public define String |
| 241 | 239 | define String |
| 242 | 240 | data_file_multipart |
| 243 | 241 | ( |
| 244 | - File_Attached file, | |
| 242 | + String attached_file, | |
| 245 | 243 | )= |
| 246 | - with data_file = if reliable_read(file.filestream, file_size(file.filestream), 100) is | |
| 244 | + | |
| 245 | + if (Maybe(RStream))file(attached_file, read) is | |
| 246 | + { | |
| 247 | + failure then | |
| 248 | + data_file_multipart(attached_file, constant_byte_array(0,0)) | |
| 249 | + success(fd) then | |
| 250 | + with data_file = if reliable_read(fd, file_size(attached_file), 100) is | |
| 247 | 251 | { |
| 248 | - failure then constant_byte_array(0,0), | |
| 249 | - success(data) then data | |
| 250 | - }, | |
| 251 | - data_file_multipart(file.filename, data_file). | |
| 252 | + failure then constant_byte_array(0,0), | |
| 253 | + success(data) then data | |
| 254 | + }, | |
| 255 | + | |
| 256 | + data_file_multipart(attached_file, data_file) | |
| 257 | + | |
| 258 | + } | |
| 259 | +. | |
| 260 | + if file(fullpath, read) is | |
| 261 | + { | |
| 262 | + failure then | |
| 263 | + logError(debug_log, "Can't open mail '" + file_name + "'.");failure | |
| 264 | + success(f) then success(f) | |
| 265 | + } | |
| 252 | 266 | |
| 253 | 267 | define String |
| 254 | 268 | data_files_multipart |
| 255 | 269 | ( |
| 256 | - List(File_Attached) files, | |
| 270 | + //List(File_Attached) files, | |
| 271 | + List(String) files, | |
| 257 | 272 | String boundary |
| 258 | 273 | )= |
| 259 | 274 | if files is |
| ... | ... | @@ -265,7 +280,7 @@ define String |
| 265 | 280 | }. |
| 266 | 281 | |
| 267 | 282 | |
| 268 | -public define String | |
| 283 | + public define String | |
| 269 | 284 | str_utime_send_mail |
| 270 | 285 | ( |
| 271 | 286 | UTime t |
| ... | ... | @@ -287,7 +302,7 @@ public define String |
| 287 | 302 | //+ " +0000" |
| 288 | 303 | . |
| 289 | 304 | |
| 290 | -public define String | |
| 305 | + public define String | |
| 291 | 306 | get_rfc822_date_format |
| 292 | 307 | = |
| 293 | 308 | str_utime_send_mail(unow). |
| ... | ... | @@ -307,7 +322,7 @@ define Int |
| 307 | 322 | ) = |
| 308 | 323 | if line is |
| 309 | 324 | { |
| 310 | - [] then pos, | |
| 325 | + [] then pos, | |
| 311 | 326 | [h . t] then |
| 312 | 327 | if h = 32 | h = 9 then pos |
| 313 | 328 | else _next_ws_pos(t, pos + 1) |
| ... | ... | @@ -364,7 +379,7 @@ public define String |
| 364 | 379 | Email_to_send send |
| 365 | 380 | ) = |
| 366 | 381 | //with header_to_name = "To: ", |
| 367 | - if send is data_to_send(from, to, cc, bcc, subject, content, files, send_copy, reply_to) then | |
| 382 | + if send is data_to_send(from, to_list, cc_list, bcc_list, subject, content, files, send_copy, reply_to) then | |
| 368 | 383 | with send_date = get_rfc822_date_format, |
| 369 | 384 | text_type = if find("<html",content,0) is |
| 370 | 385 | { |
| ... | ... | @@ -377,7 +392,7 @@ public define String |
| 377 | 392 | encode_content(content, text_type = "html"), |
| 378 | 393 | is_multipart = if files is |
| 379 | 394 | { |
| 380 | - [] then false, | |
| 395 | + [] then false, | |
| 381 | 396 | [h . t] then true |
| 382 | 397 | }, |
| 383 | 398 | |
| ... | ... | @@ -386,29 +401,25 @@ public define String |
| 386 | 401 | // "From: " + user.login + "<" + user.login + "@" + domain + ">" + crlf + |
| 387 | 402 | "User-Agent: Calexium lib email sender" + crlf + |
| 388 | 403 | "From: " + "<" + from.address + ">" + crlf + |
| 389 | - if reply_to is | |
| 390 | - { | |
| 391 | - failure then "", | |
| 392 | - success(reply_t) then "Reply-To: <" + reply_t +">" + crlf | |
| 393 | - }+ | |
| 404 | + (if reply_to = "" then | |
| 405 | + "" | |
| 406 | + else | |
| 407 | + "Reply-To: <" + reply_to +">" + crlf | |
| 408 | + )+ | |
| 394 | 409 | "MIME-Version: 1.0" + crlf + |
| 395 | 410 | //header_to_name + folding(to, 68 - length(header_to_name)) + crlf + |
| 396 | - "To: " + folding(to, address_to_string) + crlf + | |
| 397 | - if cc is | |
| 398 | - { | |
| 399 | - failure then "", | |
| 400 | - success(cc_list) then | |
| 411 | + "To: " + folding(to_list, address_to_string) + crlf + | |
| 412 | + ( | |
| 401 | 413 | // with header_cc_name = "Cc: ", |
| 402 | 414 | // header_cc_name + folding(cc_list, 68 - length(header_cc_name)) + crlf |
| 403 | 415 | if cc_list is [] then "" |
| 404 | 416 | else "Cc: " + folding(cc_list, address_to_string) + crlf |
| 405 | - } + | |
| 406 | - if subject is | |
| 407 | - { | |
| 408 | - failure then "", | |
| 409 | - success(subj) then | |
| 410 | - "Subject: " + to_folded_base64_text("UTF-8", subj) + crlf | |
| 411 | - } + | |
| 417 | + ) + | |
| 418 | + (if subject = "" then | |
| 419 | + "" | |
| 420 | + else | |
| 421 | + "Subject: " + to_folded_base64_text("UTF-8", subject) + crlf | |
| 422 | + ) + | |
| 412 | 423 | if is_multipart then |
| 413 | 424 | with boundary = to_ascii(sha1((from, send_date))), |
| 414 | 425 | "Content-Type: multipart/mixed;" + crlf + |
| ... | ... | @@ -522,7 +533,7 @@ public define Maybe(Email_Address) |
| 522 | 533 | failure then |
| 523 | 534 | with result_mail = trim(mail), |
| 524 | 535 | if test_fqa(result_mail) then |
| 525 | - success(email_address(failure, result_mail)) | |
| 536 | + success(email_address("", result_mail)) | |
| 526 | 537 | else |
| 527 | 538 | failure, |
| 528 | 539 | success(separator_b) then |
| ... | ... | @@ -539,8 +550,8 @@ public define Maybe(Email_Address) |
| 539 | 550 | success(add_str) then |
| 540 | 551 | with name = if name_string is |
| 541 | 552 | { |
| 542 | - failure then failure, | |
| 543 | - success(name_str) then success(trim(name_str)) | |
| 553 | + failure then "", | |
| 554 | + success(name_str) then trim(name_str) | |
| 544 | 555 | }, |
| 545 | 556 | if test_fqa(add_str) then |
| 546 | 557 | success(email_address(name, add_str)) | ... | ... |
mail/decode_mail.anubis
mail/encode_mail.anubis
mail/lexers/enhanced_status.anubis
| ... | ... | @@ -182,11 +182,11 @@ public define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| 182 | 182 | ) = |
| 183 | 183 | if at_beginning_of_line(ls) |
| 184 | 184 | then enhanced_status_tester_state_3(clear_abol(ls)) else |
| 185 | - if lm_next_char(ls) is (ls,c) then | |
| 186 | - if c = -1 then enhanced_status_tester_state_1(ls) else | |
| 187 | - if c = 50 then enhanced_status_tester_state_4(ls) else | |
| 188 | - if (52 +=< c & c +=< 53) then enhanced_status_tester_state_4(ls) else | |
| 189 | - lm_find_match(ls). | |
| 185 | + if lm_next_char(ls) is (_ls,c) then | |
| 186 | + if c = -1 then enhanced_status_tester_state_1(_ls) else | |
| 187 | + if c = 50 then enhanced_status_tester_state_4(_ls) else | |
| 188 | + if (52 +=< c & c +=< 53) then enhanced_status_tester_state_4(_ls) else | |
| 189 | + lm_find_match(_ls). | |
| 190 | 190 | |
| 191 | 191 | |
| 192 | 192 | define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| ... | ... | @@ -194,9 +194,9 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| 194 | 194 | ( |
| 195 | 195 | LM_LexerState_EnhancedStatus ls, |
| 196 | 196 | ) = |
| 197 | - with ls = lm_remember_match(enhanced_status_tester_action_2,ls), | |
| 198 | - if lm_next_char(ls) is (ls,c) then | |
| 199 | - lm_find_match(ls). | |
| 197 | + with _ls = lm_remember_match(enhanced_status_tester_action_2,ls), | |
| 198 | + if lm_next_char(_ls) is (__ls,c) then | |
| 199 | + lm_find_match(__ls). | |
| 200 | 200 | |
| 201 | 201 | |
| 202 | 202 | define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| ... | ... | @@ -204,8 +204,8 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| 204 | 204 | ( |
| 205 | 205 | LM_LexerState_EnhancedStatus ls, |
| 206 | 206 | ) = |
| 207 | - if lm_next_char(ls) is (ls,c) then | |
| 208 | - lm_find_match(ls). | |
| 207 | + if lm_next_char(ls) is (_ls,c) then | |
| 208 | + lm_find_match(_ls). | |
| 209 | 209 | |
| 210 | 210 | |
| 211 | 211 | define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| ... | ... | @@ -213,9 +213,9 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| 213 | 213 | ( |
| 214 | 214 | LM_LexerState_EnhancedStatus ls, |
| 215 | 215 | ) = |
| 216 | - with ls = lm_remember_match(enhanced_status_tester_action_1,ls), | |
| 217 | - if lm_next_char(ls) is (ls,c) then | |
| 218 | - lm_find_match(ls). | |
| 216 | + with _ls = lm_remember_match(enhanced_status_tester_action_1,ls), | |
| 217 | + if lm_next_char(_ls) is (__ls,c) then | |
| 218 | + lm_find_match(__ls). | |
| 219 | 219 | |
| 220 | 220 | |
| 221 | 221 | define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| ... | ... | @@ -223,11 +223,11 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| 223 | 223 | ( |
| 224 | 224 | LM_LexerState_EnhancedStatus ls, |
| 225 | 225 | ) = |
| 226 | - if lm_next_char(ls) is (ls,c) then | |
| 227 | - if c = 46 then enhanced_status_tester_state_5(ls) else | |
| 228 | - if c = 50 then enhanced_status_tester_state_4(ls) else | |
| 229 | - if (52 +=< c & c +=< 53) then enhanced_status_tester_state_4(ls) else | |
| 230 | - lm_find_match(ls). | |
| 226 | + if lm_next_char(ls) is (_ls,c) then | |
| 227 | + if c = 46 then enhanced_status_tester_state_5(_ls) else | |
| 228 | + if c = 50 then enhanced_status_tester_state_4(_ls) else | |
| 229 | + if (52 +=< c & c +=< 53) then enhanced_status_tester_state_4(_ls) else | |
| 230 | + lm_find_match(_ls). | |
| 231 | 231 | |
| 232 | 232 | |
| 233 | 233 | define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| ... | ... | @@ -235,10 +235,10 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| 235 | 235 | ( |
| 236 | 236 | LM_LexerState_EnhancedStatus ls, |
| 237 | 237 | ) = |
| 238 | - if lm_next_char(ls) is (ls,c) then | |
| 239 | - if c = 46 then enhanced_status_tester_state_5(ls) else | |
| 240 | - if (48 +=< c & c +=< 57) then enhanced_status_tester_state_6(ls) else | |
| 241 | - lm_find_match(ls). | |
| 238 | + if lm_next_char(ls) is (_ls,c) then | |
| 239 | + if c = 46 then enhanced_status_tester_state_5(_ls) else | |
| 240 | + if (48 +=< c & c +=< 57) then enhanced_status_tester_state_6(_ls) else | |
| 241 | + lm_find_match(_ls). | |
| 242 | 242 | |
| 243 | 243 | |
| 244 | 244 | define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| ... | ... | @@ -246,10 +246,10 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| 246 | 246 | ( |
| 247 | 247 | LM_LexerState_EnhancedStatus ls, |
| 248 | 248 | ) = |
| 249 | - if lm_next_char(ls) is (ls,c) then | |
| 250 | - if c = 46 then enhanced_status_tester_state_7(ls) else | |
| 251 | - if (48 +=< c & c +=< 57) then enhanced_status_tester_state_6(ls) else | |
| 252 | - lm_find_match(ls). | |
| 249 | + if lm_next_char(ls) is (_ls,c) then | |
| 250 | + if c = 46 then enhanced_status_tester_state_7(_ls) else | |
| 251 | + if (48 +=< c & c +=< 57) then enhanced_status_tester_state_6(_ls) else | |
| 252 | + lm_find_match(_ls). | |
| 253 | 253 | |
| 254 | 254 | |
| 255 | 255 | define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| ... | ... | @@ -257,10 +257,10 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| 257 | 257 | ( |
| 258 | 258 | LM_LexerState_EnhancedStatus ls, |
| 259 | 259 | ) = |
| 260 | - if lm_next_char(ls) is (ls,c) then | |
| 261 | - if c = 46 then enhanced_status_tester_state_7(ls) else | |
| 262 | - if (48 +=< c & c +=< 57) then enhanced_status_tester_state_8(ls) else | |
| 263 | - lm_find_match(ls). | |
| 260 | + if lm_next_char(ls) is (_ls,c) then | |
| 261 | + if c = 46 then enhanced_status_tester_state_7(_ls) else | |
| 262 | + if (48 +=< c & c +=< 57) then enhanced_status_tester_state_8(_ls) else | |
| 263 | + lm_find_match(_ls). | |
| 264 | 264 | |
| 265 | 265 | |
| 266 | 266 | define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| ... | ... | @@ -268,10 +268,10 @@ define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) |
| 268 | 268 | ( |
| 269 | 269 | LM_LexerState_EnhancedStatus ls, |
| 270 | 270 | ) = |
| 271 | - with ls = lm_remember_match(enhanced_status_tester_action_0,ls), | |
| 272 | - if lm_next_char(ls) is (ls,c) then | |
| 273 | - if (48 +=< c & c +=< 57) then enhanced_status_tester_state_8(ls) else | |
| 274 | - lm_find_match(ls). | |
| 271 | + with _ls = lm_remember_match(enhanced_status_tester_action_0,ls), | |
| 272 | + if lm_next_char(_ls) is (__ls,c) then | |
| 273 | + if (48 +=< c & c +=< 57) then enhanced_status_tester_state_8(__ls) else | |
| 274 | + lm_find_match(__ls). | |
| 275 | 275 | |
| 276 | 276 | |
| 277 | 277 | define (LM_LexerState_EnhancedStatus,LM_TokenOrError_EnhancedStatus) | ... | ... |
mail/lexers/fqa.anubis
| ... | ... | @@ -3,7 +3,7 @@ |
| 3 | 3 | * User: フランスのトトロ aka (David RENÉ) |
| 4 | 4 | * Date: 12/07/2017 |
| 5 | 5 | * Time: 22:28 |
| 6 | - * © Calexium | |
| 6 | + * © David RENÉ | |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | |
| ... | ... | @@ -187,14 +187,14 @@ public define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 187 | 187 | ) = |
| 188 | 188 | if at_beginning_of_line(ls) |
| 189 | 189 | then email_tester_state_3(clear_abol(ls)) else |
| 190 | - if lm_next_char(ls) is (ls,c) then | |
| 191 | - if c = -1 then email_tester_state_1(ls) else | |
| 192 | - if c = 45 then email_tester_state_4(ls) else | |
| 193 | - if (48 +=< c & c +=< 57) then email_tester_state_4(ls) else | |
| 194 | - if (65 +=< c & c +=< 90) then email_tester_state_4(ls) else | |
| 195 | - if c = 95 then email_tester_state_4(ls) else | |
| 196 | - if (97 +=< c & c +=< 122) then email_tester_state_4(ls) else | |
| 197 | - lm_find_match(ls). | |
| 190 | + if lm_next_char(ls) is (_ls,c) then | |
| 191 | + if c = -1 then email_tester_state_1(_ls) else | |
| 192 | + if c = 45 then email_tester_state_4(_ls) else | |
| 193 | + if (48 +=< c & c +=< 57) then email_tester_state_4(_ls) else | |
| 194 | + if (65 +=< c & c +=< 90) then email_tester_state_4(_ls) else | |
| 195 | + if c = 95 then email_tester_state_4(_ls) else | |
| 196 | + if (97 +=< c & c +=< 122) then email_tester_state_4(_ls) else | |
| 197 | + lm_find_match(_ls). | |
| 198 | 198 | |
| 199 | 199 | |
| 200 | 200 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -202,9 +202,9 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 202 | 202 | ( |
| 203 | 203 | LM_LexerState_FQA ls, |
| 204 | 204 | ) = |
| 205 | - with ls = lm_remember_match(email_tester_action_2,ls), | |
| 206 | - if lm_next_char(ls) is (ls,c) then | |
| 207 | - lm_find_match(ls). | |
| 205 | + with _ls = lm_remember_match(email_tester_action_2,ls), | |
| 206 | + if lm_next_char(_ls) is (__ls,c) then | |
| 207 | + lm_find_match(__ls). | |
| 208 | 208 | |
| 209 | 209 | |
| 210 | 210 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -212,8 +212,8 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 212 | 212 | ( |
| 213 | 213 | LM_LexerState_FQA ls, |
| 214 | 214 | ) = |
| 215 | - if lm_next_char(ls) is (ls,c) then | |
| 216 | - lm_find_match(ls). | |
| 215 | + if lm_next_char(ls) is (_ls,c) then | |
| 216 | + lm_find_match(_ls). | |
| 217 | 217 | |
| 218 | 218 | |
| 219 | 219 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -221,9 +221,9 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 221 | 221 | ( |
| 222 | 222 | LM_LexerState_FQA ls, |
| 223 | 223 | ) = |
| 224 | - with ls = lm_remember_match(email_tester_action_1,ls), | |
| 225 | - if lm_next_char(ls) is (ls,c) then | |
| 226 | - lm_find_match(ls). | |
| 224 | + with _ls = lm_remember_match(email_tester_action_1,ls), | |
| 225 | + if lm_next_char(_ls) is (__ls,c) then | |
| 226 | + lm_find_match(__ls). | |
| 227 | 227 | |
| 228 | 228 | |
| 229 | 229 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -231,15 +231,15 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 231 | 231 | ( |
| 232 | 232 | LM_LexerState_FQA ls, |
| 233 | 233 | ) = |
| 234 | - if lm_next_char(ls) is (ls,c) then | |
| 235 | - if c = 45 then email_tester_state_4(ls) else | |
| 236 | - if c = 46 then email_tester_state_5(ls) else | |
| 237 | - if (48 +=< c & c +=< 57) then email_tester_state_4(ls) else | |
| 238 | - if c = 64 then email_tester_state_7(ls) else | |
| 239 | - if (65 +=< c & c +=< 90) then email_tester_state_4(ls) else | |
| 240 | - if c = 95 then email_tester_state_4(ls) else | |
| 241 | - if (97 +=< c & c +=< 122) then email_tester_state_4(ls) else | |
| 242 | - lm_find_match(ls). | |
| 234 | + if lm_next_char(ls) is (_ls,c) then | |
| 235 | + if c = 45 then email_tester_state_4(_ls) else | |
| 236 | + if c = 46 then email_tester_state_5(_ls) else | |
| 237 | + if (48 +=< c & c +=< 57) then email_tester_state_4(_ls) else | |
| 238 | + if c = 64 then email_tester_state_7(_ls) else | |
| 239 | + if (65 +=< c & c +=< 90) then email_tester_state_4(_ls) else | |
| 240 | + if c = 95 then email_tester_state_4(_ls) else | |
| 241 | + if (97 +=< c & c +=< 122) then email_tester_state_4(_ls) else | |
| 242 | + lm_find_match(_ls). | |
| 243 | 243 | |
| 244 | 244 | |
| 245 | 245 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -247,13 +247,13 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 247 | 247 | ( |
| 248 | 248 | LM_LexerState_FQA ls, |
| 249 | 249 | ) = |
| 250 | - if lm_next_char(ls) is (ls,c) then | |
| 251 | - if c = 45 then email_tester_state_6(ls) else | |
| 252 | - if (48 +=< c & c +=< 57) then email_tester_state_6(ls) else | |
| 253 | - if (65 +=< c & c +=< 90) then email_tester_state_6(ls) else | |
| 254 | - if c = 95 then email_tester_state_6(ls) else | |
| 255 | - if (97 +=< c & c +=< 122) then email_tester_state_6(ls) else | |
| 256 | - lm_find_match(ls). | |
| 250 | + if lm_next_char(ls) is (_ls,c) then | |
| 251 | + if c = 45 then email_tester_state_6(_ls) else | |
| 252 | + if (48 +=< c & c +=< 57) then email_tester_state_6(_ls) else | |
| 253 | + if (65 +=< c & c +=< 90) then email_tester_state_6(_ls) else | |
| 254 | + if c = 95 then email_tester_state_6(_ls) else | |
| 255 | + if (97 +=< c & c +=< 122) then email_tester_state_6(_ls) else | |
| 256 | + lm_find_match(_ls). | |
| 257 | 257 | |
| 258 | 258 | |
| 259 | 259 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -261,15 +261,15 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 261 | 261 | ( |
| 262 | 262 | LM_LexerState_FQA ls, |
| 263 | 263 | ) = |
| 264 | - if lm_next_char(ls) is (ls,c) then | |
| 265 | - if c = 45 then email_tester_state_6(ls) else | |
| 266 | - if c = 46 then email_tester_state_5(ls) else | |
| 267 | - if (48 +=< c & c +=< 57) then email_tester_state_6(ls) else | |
| 268 | - if c = 64 then email_tester_state_7(ls) else | |
| 269 | - if (65 +=< c & c +=< 90) then email_tester_state_6(ls) else | |
| 270 | - if c = 95 then email_tester_state_6(ls) else | |
| 271 | - if (97 +=< c & c +=< 122) then email_tester_state_6(ls) else | |
| 272 | - lm_find_match(ls). | |
| 264 | + if lm_next_char(ls) is (_ls,c) then | |
| 265 | + if c = 45 then email_tester_state_6(_ls) else | |
| 266 | + if c = 46 then email_tester_state_5(_ls) else | |
| 267 | + if (48 +=< c & c +=< 57) then email_tester_state_6(_ls) else | |
| 268 | + if c = 64 then email_tester_state_7(_ls) else | |
| 269 | + if (65 +=< c & c +=< 90) then email_tester_state_6(_ls) else | |
| 270 | + if c = 95 then email_tester_state_6(_ls) else | |
| 271 | + if (97 +=< c & c +=< 122) then email_tester_state_6(_ls) else | |
| 272 | + lm_find_match(_ls). | |
| 273 | 273 | |
| 274 | 274 | |
| 275 | 275 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -277,12 +277,12 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 277 | 277 | ( |
| 278 | 278 | LM_LexerState_FQA ls, |
| 279 | 279 | ) = |
| 280 | - if lm_next_char(ls) is (ls,c) then | |
| 281 | - if c = 45 then email_tester_state_8(ls) else | |
| 282 | - if (48 +=< c & c +=< 57) then email_tester_state_8(ls) else | |
| 283 | - if (65 +=< c & c +=< 90) then email_tester_state_8(ls) else | |
| 284 | - if (97 +=< c & c +=< 122) then email_tester_state_8(ls) else | |
| 285 | - lm_find_match(ls). | |
| 280 | + if lm_next_char(ls) is (_ls,c) then | |
| 281 | + if c = 45 then email_tester_state_8(_ls) else | |
| 282 | + if (48 +=< c & c +=< 57) then email_tester_state_8(_ls) else | |
| 283 | + if (65 +=< c & c +=< 90) then email_tester_state_8(_ls) else | |
| 284 | + if (97 +=< c & c +=< 122) then email_tester_state_8(_ls) else | |
| 285 | + lm_find_match(_ls). | |
| 286 | 286 | |
| 287 | 287 | |
| 288 | 288 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -290,13 +290,13 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 290 | 290 | ( |
| 291 | 291 | LM_LexerState_FQA ls, |
| 292 | 292 | ) = |
| 293 | - if lm_next_char(ls) is (ls,c) then | |
| 294 | - if c = 45 then email_tester_state_8(ls) else | |
| 295 | - if c = 46 then email_tester_state_9(ls) else | |
| 296 | - if (48 +=< c & c +=< 57) then email_tester_state_8(ls) else | |
| 297 | - if (65 +=< c & c +=< 90) then email_tester_state_8(ls) else | |
| 298 | - if (97 +=< c & c +=< 122) then email_tester_state_8(ls) else | |
| 299 | - lm_find_match(ls). | |
| 293 | + if lm_next_char(ls) is (_ls,c) then | |
| 294 | + if c = 45 then email_tester_state_8(_ls) else | |
| 295 | + if c = 46 then email_tester_state_9(_ls) else | |
| 296 | + if (48 +=< c & c +=< 57) then email_tester_state_8(_ls) else | |
| 297 | + if (65 +=< c & c +=< 90) then email_tester_state_8(_ls) else | |
| 298 | + if (97 +=< c & c +=< 122) then email_tester_state_8(_ls) else | |
| 299 | + lm_find_match(_ls). | |
| 300 | 300 | |
| 301 | 301 | |
| 302 | 302 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -304,12 +304,12 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 304 | 304 | ( |
| 305 | 305 | LM_LexerState_FQA ls, |
| 306 | 306 | ) = |
| 307 | - if lm_next_char(ls) is (ls,c) then | |
| 308 | - if c = 45 then email_tester_state_10(ls) else | |
| 309 | - if (48 +=< c & c +=< 57) then email_tester_state_11(ls) else | |
| 310 | - if (65 +=< c & c +=< 90) then email_tester_state_11(ls) else | |
| 311 | - if (97 +=< c & c +=< 122) then email_tester_state_11(ls) else | |
| 312 | - lm_find_match(ls). | |
| 307 | + if lm_next_char(ls) is (_ls,c) then | |
| 308 | + if c = 45 then email_tester_state_10(_ls) else | |
| 309 | + if (48 +=< c & c +=< 57) then email_tester_state_11(_ls) else | |
| 310 | + if (65 +=< c & c +=< 90) then email_tester_state_11(_ls) else | |
| 311 | + if (97 +=< c & c +=< 122) then email_tester_state_11(_ls) else | |
| 312 | + lm_find_match(_ls). | |
| 313 | 313 | |
| 314 | 314 | |
| 315 | 315 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -317,13 +317,13 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 317 | 317 | ( |
| 318 | 318 | LM_LexerState_FQA ls, |
| 319 | 319 | ) = |
| 320 | - if lm_next_char(ls) is (ls,c) then | |
| 321 | - if c = 45 then email_tester_state_10(ls) else | |
| 322 | - if c = 46 then email_tester_state_9(ls) else | |
| 323 | - if (48 +=< c & c +=< 57) then email_tester_state_10(ls) else | |
| 324 | - if (65 +=< c & c +=< 90) then email_tester_state_10(ls) else | |
| 325 | - if (97 +=< c & c +=< 122) then email_tester_state_10(ls) else | |
| 326 | - lm_find_match(ls). | |
| 320 | + if lm_next_char(ls) is (_ls,c) then | |
| 321 | + if c = 45 then email_tester_state_10(_ls) else | |
| 322 | + if c = 46 then email_tester_state_9(_ls) else | |
| 323 | + if (48 +=< c & c +=< 57) then email_tester_state_10(_ls) else | |
| 324 | + if (65 +=< c & c +=< 90) then email_tester_state_10(_ls) else | |
| 325 | + if (97 +=< c & c +=< 122) then email_tester_state_10(_ls) else | |
| 326 | + lm_find_match(_ls). | |
| 327 | 327 | |
| 328 | 328 | |
| 329 | 329 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -331,14 +331,14 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 331 | 331 | ( |
| 332 | 332 | LM_LexerState_FQA ls, |
| 333 | 333 | ) = |
| 334 | - with ls = lm_remember_match(email_tester_action_0,ls), | |
| 335 | - if lm_next_char(ls) is (ls,c) then | |
| 336 | - if c = 45 then email_tester_state_10(ls) else | |
| 337 | - if c = 46 then email_tester_state_12(ls) else | |
| 338 | - if (48 +=< c & c +=< 57) then email_tester_state_11(ls) else | |
| 339 | - if (65 +=< c & c +=< 90) then email_tester_state_11(ls) else | |
| 340 | - if (97 +=< c & c +=< 122) then email_tester_state_11(ls) else | |
| 341 | - lm_find_match(ls). | |
| 334 | + with _ls = lm_remember_match(email_tester_action_0,ls), | |
| 335 | + if lm_next_char(_ls) is (__ls,c) then | |
| 336 | + if c = 45 then email_tester_state_10(__ls) else | |
| 337 | + if c = 46 then email_tester_state_12(__ls) else | |
| 338 | + if (48 +=< c & c +=< 57) then email_tester_state_11(__ls) else | |
| 339 | + if (65 +=< c & c +=< 90) then email_tester_state_11(__ls) else | |
| 340 | + if (97 +=< c & c +=< 122) then email_tester_state_11(__ls) else | |
| 341 | + lm_find_match(__ls). | |
| 342 | 342 | |
| 343 | 343 | |
| 344 | 344 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -346,12 +346,12 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 346 | 346 | ( |
| 347 | 347 | LM_LexerState_FQA ls, |
| 348 | 348 | ) = |
| 349 | - if lm_next_char(ls) is (ls,c) then | |
| 349 | + if lm_next_char(ls) is (_ls,c) then | |
| 350 | 350 | if c = 45 then email_tester_state_10(ls) else |
| 351 | - if (48 +=< c & c +=< 57) then email_tester_state_13(ls) else | |
| 352 | - if (65 +=< c & c +=< 90) then email_tester_state_13(ls) else | |
| 353 | - if (97 +=< c & c +=< 122) then email_tester_state_13(ls) else | |
| 354 | - lm_find_match(ls). | |
| 351 | + if (48 +=< c & c +=< 57) then email_tester_state_13(_ls) else | |
| 352 | + if (65 +=< c & c +=< 90) then email_tester_state_13(_ls) else | |
| 353 | + if (97 +=< c & c +=< 122) then email_tester_state_13(_ls) else | |
| 354 | + lm_find_match(_ls). | |
| 355 | 355 | |
| 356 | 356 | |
| 357 | 357 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -359,14 +359,14 @@ define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| 359 | 359 | ( |
| 360 | 360 | LM_LexerState_FQA ls, |
| 361 | 361 | ) = |
| 362 | - with ls = lm_remember_match(email_tester_action_0,ls), | |
| 363 | - if lm_next_char(ls) is (ls,c) then | |
| 364 | - if c = 45 then email_tester_state_10(ls) else | |
| 365 | - if c = 46 then email_tester_state_12(ls) else | |
| 366 | - if (48 +=< c & c +=< 57) then email_tester_state_13(ls) else | |
| 367 | - if (65 +=< c & c +=< 90) then email_tester_state_13(ls) else | |
| 368 | - if (97 +=< c & c +=< 122) then email_tester_state_13(ls) else | |
| 369 | - lm_find_match(ls). | |
| 362 | + with _ls = lm_remember_match(email_tester_action_0,ls), | |
| 363 | + if lm_next_char(_ls) is (__ls,c) then | |
| 364 | + if c = 45 then email_tester_state_10(__ls) else | |
| 365 | + if c = 46 then email_tester_state_12(__ls) else | |
| 366 | + if (48 +=< c & c +=< 57) then email_tester_state_13(__ls) else | |
| 367 | + if (65 +=< c & c +=< 90) then email_tester_state_13(__ls) else | |
| 368 | + if (97 +=< c & c +=< 122) then email_tester_state_13(__ls) else | |
| 369 | + lm_find_match(__ls). | |
| 370 | 370 | |
| 371 | 371 | |
| 372 | 372 | define (LM_LexerState_FQA,LM_TokenOrError_FQA) |
| ... | ... | @@ -423,12 +423,12 @@ public define Bool |
| 423 | 423 | end_of_file then false, |
| 424 | 424 | token(t) then |
| 425 | 425 | ( |
| 426 | - with result = implode(t), | |
| 427 | - if length(result) = length(account) then | |
| 426 | + with _result = implode(t), | |
| 427 | + if length(_result) = length(account) then | |
| 428 | 428 | //logDebug(debug_log,"["+account +"] is FQA valid"); |
| 429 | 429 | true |
| 430 | 430 | else |
| 431 | - println("["+account+"] is valid FQA but different than ["+result+"]"); | |
| 431 | + println("["+account+"] is valid FQA but different than ["+_result+"]"); | |
| 432 | 432 | false |
| 433 | 433 | ), |
| 434 | 434 | error then | ... | ... |
mail/send_mail_type.anubis
mail/smtp_client.anubis
| ... | ... | @@ -291,8 +291,8 @@ public define Result(SmtpClientResult, SmtpClientSession) |
| 291 | 291 | failure then logger(logError, "send_ehlo: error sending HELO"); error(error), |
| 292 | 292 | success(_) then |
| 293 | 293 | with result2 = receive_reply(conn, false, time_out, logger), |
| 294 | - if result2 is reply(code, status, lines) then | |
| 295 | - if code = 250 then ok(make_smtp_client_session(lines, logger)) | |
| 294 | + if result2 is reply(_code, _status, _lines) then | |
| 295 | + if _code = 250 then ok(make_smtp_client_session(_lines, logger)) | |
| 296 | 296 | else error(result2) |
| 297 | 297 | else |
| 298 | 298 | error(result2) | ... | ... |
mail/tools.anubis
| ... | ... | @@ -3,13 +3,13 @@ |
| 3 | 3 | * User: フランスのトトロ |
| 4 | 4 | * Date: 17/05/2015 |
| 5 | 5 | * Time: 01:27 |
| 6 | - * © Calexium | |
| 6 | + * © David RENÉ | |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | transmit tools/basis.anubis |
| 10 | 10 | transmit system/string.anubis |
| 11 | 11 | |
| 12 | -define Maybe(String) | |
| 12 | +public define Maybe(String) | |
| 13 | 13 | day_name |
| 14 | 14 | ( |
| 15 | 15 | Int day_num |
| ... | ... | @@ -24,7 +24,7 @@ define Maybe(String) |
| 24 | 24 | else failure |
| 25 | 25 | . |
| 26 | 26 | |
| 27 | -define Maybe(String) | |
| 27 | +public define Maybe(String) | |
| 28 | 28 | month_name |
| 29 | 29 | ( |
| 30 | 30 | Int month_num | ... | ... |
os_tools/freebsd/rc_conf.anubis
string/crlf.anubis
types/version.anubis
unit_test/test.anubis
web/CXM_common.anubis
web/CXM_form.anubis
web/CXM_html_tooltip.anubis
web/CXM_making_a_web_site.anubis
web/CXM_multihost_http_server.anubis
| ... | ... | @@ -2207,6 +2207,7 @@ define List(HTTP_header) |
| 2207 | 2207 | [ |
| 2208 | 2208 | http_header("Content-Type", to_String(mime_type)), |
| 2209 | 2209 | http_header("Etag", "\""+etag+"\""), |
| 2210 | + http_header("Cache-Control", "max-age=600"), | |
| 2210 | 2211 | http_header("Content-Length",to_decimal(size)), |
| 2211 | 2212 | http_header("Content-Disposition", to_String(c_disposition)+"; filename=\"" + filename +"\"") |
| 2212 | 2213 | |
| ... | ... | @@ -2306,8 +2307,14 @@ define One |
| 2306 | 2307 | //forget(copy_file_to_Connection(file, connection, size)), |
| 2307 | 2308 | send_file_body(desc,connection,file,size,0,filename), |
| 2308 | 2309 | true then |
| 2310 | + with updated_header = | |
| 2311 | + [ | |
| 2312 | + http_header("Cache-Control", "max-age=600"), | |
| 2313 | + http_header("Content-length","0"), | |
| 2314 | + http_header("Etag", "\""+current_etag+"\"") | |
| 2315 | + ] + headers, | |
| 2309 | 2316 | forget(reliable_write(connection,to_byte_array("HTTP/1.1 304 Not Modified"+crlf))); |
| 2310 | - forget(reliable_write(connection,[format_headers([http_header("Content-length","0") . [http_header("Etag", "\""+current_etag+"\"") . headers]]) , crlf])) | |
| 2317 | + forget(reliable_write(connection,[format_headers(updated_header) , crlf])) | |
| 2311 | 2318 | //send_file_body(desc,connection,file,size,0,filename) |
| 2312 | 2319 | }. |
| 2313 | 2320 | ... | ... |
web/CXM_page_message.anubis
web/CXM_web_action.anubis
web/CXM_web_session.anubis
web/CXM_widgets.anubis
web/color/color.anubis
web/fonts/awesome.anubis
web/jQuery/CXM_jq_form.anubis
web/jQuery/CXM_jquery_datatable_plugins.anubis
web/jQuery/CXM_jquery_dialog.anubis
web/jQuery/CXM_jquery_toolbar.anubis
web/jQuery/jq_flot.anubis
web/jQuery/jqgrid.anubis
web/js_tools.anubis
web/widgets/button.anubis
| ... | ... | @@ -174,7 +174,7 @@ public define HTML_Partial_Content |
| 174 | 174 | with uid = generate_random_string(20), |
| 175 | 175 | |
| 176 | 176 | 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)))], |
| 177 | - literal("<img " + format_attrs(img_button_confirm_image_attrs(core_attrs, uid, actioner)) + " src=\"" + img_path + "\"></img>")). | |
| 177 | + img(img_button_confirm_image_attrs(core_attrs, uid, actioner), img_path)). | |
| 178 | 178 | |
| 179 | 179 | public define HTML_Partial_Content |
| 180 | 180 | img_button_confirm |
| ... | ... | @@ -232,7 +232,7 @@ public define String |
| 232 | 232 | img_button_confirm(img_path, [], dlg_title, dlg_text, dlg_ok, dlg_cancel, actioner). |
| 233 | 233 | |
| 234 | 234 | |
| 235 | -public define String | |
| 235 | +public define HTML_Partial_Content | |
| 236 | 236 | img_button_confirm |
| 237 | 237 | ( |
| 238 | 238 | String img_path, |
| ... | ... | @@ -247,6 +247,12 @@ public define String |
| 247 | 247 | with uid = generate_random_string(20), |
| 248 | 248 | //with event_click = (CoreAttrs)event(onclick, "CalexiumToolBox.jq_query("+format_web_action_name_to_js(web_action, extra_ops)+")"), |
| 249 | 249 | |
| 250 | + 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)))], | |
| 251 | + img(img_button_confirm_image_attrs(core_attrs, uid, web_action, extra_ops), img_path)) | |
| 252 | +. | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 250 | 256 | "<script type=\"text/javascript\">" + jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)) + "</script>" + |
| 251 | 257 | "<img " + format_attrs(img_button_confirm_image_attrs(core_attrs, uid, web_action, extra_ops)) + " src=\"" + img_path + "\"></img>" |
| 252 | 258 | . | ... | ... |
web/widgets/css_helper.anubis
web/widgets/dashboard.anubis
web/widgets/fisheye_menu.anubis
web/widgets/icon.anubis
web/widgets/icons_set.anubis
web/widgets/left_menu.anubis
web/widgets/menu.anubis