diff -rc alpine-2.21/alpine/adrbkcmd.c alpine-2.21.rules/alpine/adrbkcmd.c
*** alpine-2.21/alpine/adrbkcmd.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/adrbkcmd.c Sun Feb 5 16:15:21 2017
***************
*** 4128,4133 ****
--- 4128,4135 ----
* won't do anything, but will cause compose_mail to think there's
* already a role so that it won't try to confirm the default.
*/
+ if (ps_global->role)
+ fs_give((void **)&ps_global->role);
if(role)
role = copy_action(role);
else{
***************
*** 4135,4140 ****
--- 4137,4143 ----
memset((void *)role, 0, sizeof(*role));
role->nick = cpystr("Default Role");
}
+ ps_global->role = cpystr(role->nick);
}
compose_mail(addr, fcc, role, NULL, NULL);
diff -rc alpine-2.21/alpine/alpine.c alpine-2.21.rules/alpine/alpine.c
*** alpine-2.21/alpine/alpine.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/alpine.c Sun Feb 5 16:15:21 2017
***************
*** 485,490 ****
--- 485,491 ----
/* Set up optional for user-defined display filtering */
pine_state->tools.display_filter = dfilter;
pine_state->tools.display_filter_trigger = dfilter_trigger;
+ pine_state->tools.exec_rule = exec_function_rule;
#ifdef _WINDOWS
if(ps_global->install_flag){
***************
*** 3162,3167 ****
--- 3163,3171 ----
extern KBESC_T *kbesc;
dprint((2, "goodnight_gracey:\n"));
+ strncpy(pine_state->cur_folder, pine_state->inbox_name,
+ sizeof(pine_state->cur_folder));
+ pine_state->cur_folder[sizeof(pine_state->cur_folder) - 1] = '\0';
/* We want to do this here before we close up the streams */
trim_remote_adrbks();
diff -rc alpine-2.21/alpine/confscroll.c alpine-2.21.rules/alpine/confscroll.c
*** alpine-2.21/alpine/confscroll.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/confscroll.c Sun Feb 5 16:15:21 2017
***************
*** 51,56 ****
--- 51,57 ----
#include "../pith/tempfile.h"
#include "../pith/pattern.h"
#include "../pith/charconv/utf8.h"
+ #include "../pith/rules.h"
#define CONFIG_SCREEN_HELP_TITLE _("HELP FOR SETUP CONFIGURATION")
***************
*** 2436,2441 ****
--- 2437,2445 ----
* Now go and set the current_val based on user_val changes
* above. Turn off command line settings...
*/
+ set_current_val((*cl)->var,
+ (strcmp((*cl)->var->name,"key-definition-rules") ? TRUE : FALSE),
+ FALSE);
set_current_val((*cl)->var, TRUE, FALSE);
fix_side_effects(ps, (*cl)->var, 0);
***************
*** 5200,5205 ****
--- 5204,5233 ----
var == &ps->vars[V_ABOOK_FORMATS]){
addrbook_reset();
}
+ else if(var == &ps->vars[V_INDEX_RULES]){
+ if(ps_global->rule_list)
+ free_parsed_rule_list(&ps_global->rule_list);
+ create_rule_list(ps->vars);
+ reset_index_format();
+ clear_index_cache(ps->mail_stream, 0);
+ }
+ else if(var == &ps->vars[V_COMPOSE_RULES] ||
+ var == &ps->vars[V_FORWARD_RULES] ||
+ var == &ps->vars[V_KEY_RULES] ||
+ var == &ps->vars[V_REPLACE_RULES] ||
+ var == &ps->vars[V_REPLY_INDENT_RULES] ||
+ var == &ps->vars[V_REPLY_LEADIN_RULES] ||
+ var == &ps->vars[V_RESUB_RULES] ||
+ var == &ps->vars[V_SAVE_RULES] ||
+ var == &ps->vars[V_SMTP_RULES] ||
+ var == &ps->vars[V_SORT_RULES] ||
+ var == &ps->vars[V_STARTUP_RULES] ||
+ var == &ps->vars[V_THREAD_DISP_STYLE_RULES] ||
+ var == &ps->vars[V_THREAD_INDEX_STYLE_RULES]){
+ if(ps_global->rule_list)
+ free_parsed_rule_list(&ps_global->rule_list);
+ create_rule_list(ps->vars);
+ }
else if(var == &ps->vars[V_INDEX_FORMAT]){
reset_index_format();
clear_index_cache(ps->mail_stream, 0);
diff -rc alpine-2.21/alpine/dispfilt.c alpine-2.21.rules/alpine/dispfilt.c
*** alpine-2.21/alpine/dispfilt.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/dispfilt.c Sun Feb 5 16:15:21 2017
***************
*** 461,463 ****
--- 461,523 ----
return(passed);
}
+
+ char *
+ exec_function_rule(char *rawcmd, gf_io_t input_gc, gf_io_t output_pc)
+ {
+ char *status = NULL, *cmd, *tmpfile = NULL;
+
+ if((cmd = expand_filter_tokens(rawcmd,NULL,&tmpfile,NULL,NULL,NULL,NULL,NULL)) != NULL){
+ suspend_busy_cue();
+ ps_global->mangled_screen = 1;
+ if(tmpfile){
+ PIPE_S *filter_pipe;
+ FILE *fp;
+ gf_io_t gc, pc;
+ STORE_S *tmpf_so;
+
+ /* write the tmp file */
+ if((tmpf_so = so_get(FileStar, tmpfile, WRITE_ACCESS|OWNER_ONLY|WRITE_TO_LOCALE)) != NULL){
+ /* copy input to tmp file */
+ gf_set_so_writec(&pc, tmpf_so);
+ gf_filter_init();
+ status = gf_pipe(input_gc, pc);
+ gf_clear_so_writec(tmpf_so);
+ if(so_give(&tmpf_so) != 0 && status == NULL)
+ status = error_description(errno);
+
+ /* prepare the terminal in case the filter uses it */
+ if(status == NULL){
+ if((filter_pipe = open_system_pipe(cmd, NULL, NULL,
+ PIPE_USER|PIPE_PROT|PIPE_NOSHELL|PIPE_SILENT,
+ 0, pipe_callback, NULL)) != NULL){
+ if(close_system_pipe(&filter_pipe, NULL, pipe_callback) == 0){
+ /* pull result out of tmp file */
+ if((fp = our_fopen(tmpfile, "rb")) != NULL){
+ gf_set_readc(&gc, fp, 0L, FileStar, READ_FROM_LOCALE);
+ gf_filter_init();
+ status = gf_pipe(gc, output_pc);
+ fclose(fp);
+ }
+ else
+ status = "Can't read result of EXEC command";
+ }
+ else
+ status = "EXEC command command returned error.";
+ }
+ else
+ status = "Can't open pipe for EXEC command";
+ }
+
+ our_unlink(tmpfile);
+ }
+ else
+ status = "Can't open EXEC command tmp file";
+ }
+
+ resume_busy_cue(0);
+ fs_give((void **)&cmd);
+ }
+
+ return(status);
+ }
diff -rc alpine-2.21/alpine/dispfilt.h alpine-2.21.rules/alpine/dispfilt.h
*** alpine-2.21/alpine/dispfilt.h Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/dispfilt.h Sun Feb 5 16:15:21 2017
***************
*** 25,31 ****
char *expand_filter_tokens(char *, ENVELOPE *, char **, char **, char **, int *, int *, int *);
char *filter_session_key(void);
char *filter_data_file(int);
!
#endif /* PINE_DISPFILT_INCLUDED */
--- 25,31 ----
char *expand_filter_tokens(char *, ENVELOPE *, char **, char **, char **, int *, int *, int *);
char *filter_session_key(void);
char *filter_data_file(int);
! char *exec_function_rule(char *, gf_io_t, gf_io_t);
#endif /* PINE_DISPFILT_INCLUDED */
diff -rc alpine-2.21/alpine/folder.c alpine-2.21.rules/alpine/folder.c
*** alpine-2.21/alpine/folder.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/folder.c Sun Feb 5 16:15:21 2017
***************
*** 248,254 ****
dprint((1, "=== folder_screen called ====\n"));
mailcap_free(); /* free resources we won't be using for a while */
ps->next_screen = SCREEN_FUN_NULL;
!
/* Initialize folder state and dispatches */
memset(&fs, 0, sizeof(FSTATE_S));
fs.context = cntxt;
--- 248,254 ----
dprint((1, "=== folder_screen called ====\n"));
mailcap_free(); /* free resources we won't be using for a while */
ps->next_screen = SCREEN_FUN_NULL;
! strcpy(ps->screen_name, "folder");
/* Initialize folder state and dispatches */
memset(&fs, 0, sizeof(FSTATE_S));
fs.context = cntxt;
***************
*** 345,350 ****
--- 345,351 ----
pine_mail_close(*fs.cache_streamp);
ps->prev_screen = folder_screen;
+ strcpy(ps->screen_name, "unknown");
}
diff -rc alpine-2.21/alpine/mailcmd.c alpine-2.21.rules/alpine/mailcmd.c
*** alpine-2.21/alpine/mailcmd.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/mailcmd.c Sun Feb 5 16:15:21 2017
***************
*** 73,78 ****
--- 73,79 ----
#include "../pith/tempfile.h"
#include "../pith/search.h"
#include "../pith/margin.h"
+ #include "../pith/rules.h"
#ifdef _WINDOWS
#include "../pico/osdep/mswin.h"
#endif
***************
*** 2657,2662 ****
--- 2658,2666 ----
role->nick = cpystr("Default Role");
}
+ if(state->role)
+ fs_give((void **)&state->role);
+ state->role = cpystr(role->nick); /* remember the role */
state->redrawer = NULL;
switch(action){
case 'c':
***************
*** 2707,2718 ****
char *nmsgs, ENVELOPE *env, long int rawmsgno, char *section,
SaveDel *dela, SavePreserveOrder *prea)
{
! int rc, ku = -1, n, flags, last_rc = 0, saveable_count = 0, done = 0;
int delindex, preindex, r;
char prompt[6*MAX_SCREEN_COLS+1], *p, expanded[MAILTMPLEN];
char *buf = tmp_20k_buf;
char shortbuf[200];
! char *folder;
HelpType help;
SaveDel del = DontAsk;
SavePreserveOrder pre = DontAskPreserve;
--- 2711,2722 ----
char *nmsgs, ENVELOPE *env, long int rawmsgno, char *section,
SaveDel *dela, SavePreserveOrder *prea)
{
! int rc, ku = -1, n = 0, flags, last_rc = 0, saveable_count = 0, done = 0;
int delindex, preindex, r;
char prompt[6*MAX_SCREEN_COLS+1], *p, expanded[MAILTMPLEN];
char *buf = tmp_20k_buf;
char shortbuf[200];
! char *folder, folder2[MAXPATH];
HelpType help;
SaveDel del = DontAsk;
SavePreserveOrder pre = DontAskPreserve;
***************
*** 2720,2725 ****
--- 2724,2730 ----
static HISTORY_S *history = NULL;
CONTEXT_S *tc;
ESCKEY_S ekey[10];
+ RULE_RESULT *rule;
if(!cntxt)
alpine_panic("no context ptr in save_prompt");
***************
*** 2729,2734 ****
--- 2734,2748 ----
if(!(folder = save_get_default(state, env, rawmsgno, section, cntxt)))
return(0); /* message expunged! */
+ if (rule = get_result_rule(V_SAVE_RULES, FOR_SAVE, env)){
+ strncpy(folder2,rule->result,sizeof(folder2)-1);
+ folder2[sizeof(folder2)-1] = '\0';
+ folder = folder2;
+ if (rule->result)
+ fs_give((void **)&rule->result);
+ fs_give((void **)&rule);
+ }
+
/* how many context's can be saved to... */
for(tc = state->context_list; tc; tc = tc->next)
if(!NEWS_TEST(tc))
diff -rc alpine-2.21/alpine/mailindx.c alpine-2.21.rules/alpine/mailindx.c
*** alpine-2.21/alpine/mailindx.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/mailindx.c Sun Feb 5 16:15:21 2017
***************
*** 229,234 ****
--- 229,236 ----
state->prev_screen = mail_index_screen;
state->next_screen = SCREEN_FUN_NULL;
+ setup_threading_display_style();
+
if(THRD_AUTO_VIEW()
&& sp_viewing_a_thread(state->mail_stream)
&& state->view_skipped_index
***************
*** 240,249 ****
--- 242,255 ----
adjust_cur_to_visible(state->mail_stream, state->msgmap);
+ strcpy(state->screen_name,"index");
+
if(THRD_INDX())
thread_index_screen(state);
else
index_index_screen(state);
+
+ strcpy(state->screen_name,"unknown");
}
diff -rc alpine-2.21/alpine/mailview.c alpine-2.21.rules/alpine/mailview.c
*** alpine-2.21/alpine/mailview.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/mailview.c Sun Feb 5 16:15:21 2017
***************
*** 243,248 ****
--- 243,250 ----
ps->prev_screen = mail_view_screen;
ps->force_prefer_plain = ps->force_no_prefer_plain = 0;
+ strcpy(ps->screen_name, "text");
+
if(ps->ttyo->screen_rows - HEADER_ROWS(ps) - FOOTER_ROWS(ps) < 1){
q_status_message(SM_ORDER | SM_DING, 0, 3,
_("Screen too small to view message"));
***************
*** 479,484 ****
--- 481,488 ----
}
while(ps->next_screen == SCREEN_FUN_NULL);
+ strcpy(ps->screen_name, "unknown");
+
if (prefix && *prefix)
fs_give((void **)&prefix);
if(we_cancel)
diff -rc alpine-2.21/alpine/osdep/termin.gen.c alpine-2.21.rules/alpine/osdep/termin.gen.c
*** alpine-2.21/alpine/osdep/termin.gen.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/osdep/termin.gen.c Sun Feb 5 16:15:21 2017
***************
*** 33,38 ****
--- 33,40 ----
#include "../../pith/newmail.h"
#include "../../pith/conf.h"
#include "../../pith/busy.h"
+ #include "../../pith/list.h"
+ #include "../../pith/rules.h"
#include "../../pico/estruct.h"
#include "../../pico/pico.h"
***************
*** 72,78 ****
* Generic tty input routines
*/
!
/*----------------------------------------------------------------------
Read a character from keyboard with timeout
Input: none
--- 74,81 ----
* Generic tty input routines
*/
! void process_init_cmds(struct pine *, char **);
! void queue_init_errors(struct pine *);
/*----------------------------------------------------------------------
Read a character from keyboard with timeout
Input: none
***************
*** 114,119 ****
--- 117,157 ----
*utf8str = NULL;
ucs = read_char(tm);
+ if(!ps_global->initial_cmds){
+ RULE_RESULT *rule;
+ char **list = NULL, *error = NULL;
+ int commas = 0, k; /* From args.c */
+
+ ps_global->pressed_key = cpystr(pretty_command(ucs));
+ rule = (RULE_RESULT *)get_result_rule(V_KEY_RULES, FOR_KEY, NULL);
+ if(ps_global->pressed_key)
+ fs_give((void **)&ps_global->pressed_key);
+ if (rule){
+ for(k = 0; rule->result[k]; k++)
+ if(rule->result[k] == ',') commas++;
+ list = parse_list(rule->result, commas+1, 0, &error);
+ if(error)
+ sprintf(tmp_20k_buf, "Error in parsing command list: %s, %s",
+ rule->result, error);
+ if (rule->result)
+ fs_give((void **)&rule->result);
+ fs_give((void **)&rule);
+ if(error){
+ q_status_message(SM_ORDER | SM_DING, 0, 2, tmp_20k_buf);
+ return (NO_OP_COMMAND);
+ }
+ process_init_cmds(ps_global, list);
+ if(ps_global->init_errs){
+ queue_init_errors(ps_global);
+ return (NO_OP_COMMAND);
+ }
+ ucs = read_char(tm);
+ ps_global->in_init_seq = 1; /* no output please */
+ for(k = 0; k < commas; k++)
+ if(list[k]) fs_give((void **)&list[k]);
+ if (list) fs_give((void **)list);
+ }
+ }
if(ucs != NO_OP_COMMAND && ucs != NO_OP_IDLE && ucs != KEY_RESIZE)
zero_new_mail_count();
***************
*** 1158,1163 ****
--- 1196,1202 ----
if(!*ps_global->initial_cmds && ps_global->free_initial_cmds){
fs_give((void **) &ps_global->free_initial_cmds);
ps_global->initial_cmds = NULL;
+ firsttime = (char) 1;
}
return(ret);
diff -rc alpine-2.21/alpine/reply.c alpine-2.21.rules/alpine/reply.c
*** alpine-2.21/alpine/reply.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/reply.c Sun Feb 5 16:15:21 2017
***************
*** 62,68 ****
#include "../pith/tempfile.h"
#include "../pith/busy.h"
#include "../pith/ablookup.h"
!
/*
* Internal Prototypes
--- 62,69 ----
#include "../pith/tempfile.h"
#include "../pith/busy.h"
#include "../pith/ablookup.h"
! #include "../pith/copyaddr.h"
! #include "../pith/rules.h"
/*
* Internal Prototypes
***************
*** 109,119 ****
long msgno, j, totalm, rflags, *seq = NULL;
int i, include_text = 0, times = -1, warned = 0, rv = 0,
flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0;
! int rolemsg = 0, copytomsg = 0;
gf_io_t pc;
PAT_STATE dummy;
REDRAFT_POS_S *redraft_pos = NULL;
ACTION_S *role = NULL, *nrole;
#if defined(DOS) && !defined(_WINDOWS)
char *reserve;
#endif
--- 110,121 ----
long msgno, j, totalm, rflags, *seq = NULL;
int i, include_text = 0, times = -1, warned = 0, rv = 0,
flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0;
! int rolemsg = 0, copytomsg = 0, do_role_early = 0;
gf_io_t pc;
PAT_STATE dummy;
REDRAFT_POS_S *redraft_pos = NULL;
ACTION_S *role = NULL, *nrole;
+ RULE_RESULT *rule;
#if defined(DOS) && !defined(_WINDOWS)
char *reserve;
#endif
***************
*** 139,144 ****
--- 141,209 ----
&& F_ON(F_ENABLE_FULL_HDR_AND_TEXT, ps_global))
reply_raw_body = 1;
+ /* Setup possible role */
+ if(role_arg)
+ role = copy_action(role_arg);
+
+ if(!role && F_ON(F_ENABLE_EDIT_REPLY_INDENT, pine_state)){
+ for(msgno = mn_first_cur(pine_state->msgmap);
+ msgno > 0L; msgno = mn_next_cur(pine_state->msgmap)){
+
+ env = pine_mail_fetchstructure(pine_state->mail_stream,
+ mn_m2raw(pine_state->msgmap, msgno),
+ NULL);
+ if(!env) {
+ q_status_message1(SM_ORDER,3,4,
+ _("Error fetching message %s. Can't reply to it."),
+ long2string(msgno));
+ goto done_early;
+ }
+
+ if(rule = get_result_rule(V_REPLY_INDENT_RULES, FOR_COMPOSE , env)){
+ RULELIST *list = get_rulelist_from_code(V_REPLY_INDENT_RULES,
+ ps_global->rule_list);
+ RULE_S *prule = get_rule(list, rule->number);
+ if(condition_contains_token(prule->condition, ROLE_TOKEN))
+ do_role_early++;
+ if(rule->result)
+ fs_give((void **)&rule->result);
+ fs_give((void **)&rule);
+ }
+ }
+ }
+
+ if(do_role_early){
+ rflags = ROLE_REPLY;
+ if(nonempty_patterns(rflags, &dummy)){
+ /* setup default role */
+ nrole = NULL;
+ j = mn_first_cur(pine_state->msgmap);
+ do {
+ role = nrole;
+ nrole = set_role_from_msg(pine_state, rflags,
+ mn_m2raw(pine_state->msgmap, j),
+ NULL);
+ } while(nrole && (!role || nrole == role)
+ && (j=mn_next_cur(pine_state->msgmap)) > 0L);
+
+ if(!role || nrole == role)
+ role = nrole;
+ else
+ role = NULL;
+
+ if(confirm_role(rflags, &role))
+ role = combine_inherited_role(role);
+ else{ /* cancel reply */
+ role = NULL;
+ cmd_cancelled("Reply");
+ goto done_early;
+ }
+ }
+ }
+
+ if (role)
+ ps_global->role = cpystr(role->nick); /* remember the role */
+
/*
* We may have to loop through first to figure out what default
* reply-indent-string to offer...
***************
*** 287,294 ****
outgoing->subject = cpystr("Re: several messages");
}
}
! else
! outgoing->subject = reply_subject(env->subject, NULL, 0);
}
/* fill reply header */
--- 352,369 ----
outgoing->subject = cpystr("Re: several messages");
}
}
! else{
! RULE_RESULT *rule;
! rule = get_result_rule(V_RESUB_RULES,FOR_RESUB|FOR_TRIM , env);
! if (rule){
! outgoing->subject = reply_subject(rule->result, NULL, 0);
! if (rule->result)
! fs_give((void **)&rule->result);
! fs_give((void **)&rule);
! }
! else
! outgoing->subject = reply_subject(env->subject, NULL, 0);
! }
}
/* fill reply header */
***************
*** 307,319 ****
if(sp_expunge_count(pine_state->mail_stream)) /* cur msg expunged */
goto done_early;
! /* Setup possible role */
! if (ps_global->reply.role_chosen)
! role = ps_global->reply.role_chosen;
! else if(role_arg)
! role = copy_action(role_arg);
!
! if(!role){
rflags = ROLE_REPLY;
if(!ps_global->reply.role_chosen && nonempty_patterns(rflags, &dummy)){
/* setup default role */
--- 382,388 ----
if(sp_expunge_count(pine_state->mail_stream)) /* cur msg expunged */
goto done_early;
! if(!do_role_early){
rflags = ROLE_REPLY;
if(!ps_global->reply.role_chosen && nonempty_patterns(rflags, &dummy)){
/* setup default role */
***************
*** 724,729 ****
--- 793,801 ----
if(prefix)
fs_give((void **)&prefix);
+ if (ps_global->role)
+ fs_give((void **)&ps_global->role);
+
if(fcc)
fs_give((void **) &fcc);
***************
*** 1598,1606 ****
}
}
! if(role)
q_status_message1(SM_ORDER, 3, 4,
_("Forwarding using role \"%s\""), role->nick);
if(role && role->template){
char *filtered;
--- 1670,1683 ----
}
}
! if (ps_global->role)
! fs_give((void **)&ps_global->role);
!
! if(role){
q_status_message1(SM_ORDER, 3, 4,
_("Forwarding using role \"%s\""), role->nick);
+ ps_global->role = cpystr(role->nick);
+ }
if(role && role->template){
char *filtered;
***************
*** 1832,1837 ****
--- 1909,1915 ----
#if defined(DOS) && !defined(_WINDOWS)
free((void *)reserve);
#endif
+ outgoing->sparep = env && env->from ? copyaddr(env->from) : NULL;
pine_send(outgoing, &body, "FORWARD MESSAGE",
role, NULL, &reply, redraft_pos,
NULL, NULL, 0);
diff -rc alpine-2.21/alpine/roleconf.c alpine-2.21.rules/alpine/roleconf.c
*** alpine-2.21/alpine/roleconf.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/roleconf.c Sun Feb 5 16:15:21 2017
***************
*** 7706,7711 ****
--- 7706,7716 ----
if(apval)
*apval = (role && role->nick) ? cpystr(role->nick) : NULL;
+ if (ps_global->role)
+ fs_give((void **)&ps_global->role);
+ if (role && role->nick)
+ ps_global->role = cpystr(role->nick);
+
if((*cl)->value)
fs_give((void **)&((*cl)->value));
diff -rc alpine-2.21/alpine/send.c alpine-2.21.rules/alpine/send.c
*** alpine-2.21/alpine/send.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/alpine/send.c Sun Feb 5 16:15:21 2017
***************
*** 63,69 ****
#include "../pith/mimetype.h"
#include "../pith/send.h"
#include "../pith/smime.h"
!
typedef struct body_particulars {
unsigned short type, encoding, had_csp;
--- 63,69 ----
#include "../pith/mimetype.h"
#include "../pith/send.h"
#include "../pith/smime.h"
! #include "../pith/rules.h"
typedef struct body_particulars {
unsigned short type, encoding, had_csp;
***************
*** 240,245 ****
--- 240,250 ----
role->nick = cpystr("Default Role");
}
+ if (ps_global->role)
+ fs_give((void **)&ps_global->role);
+
+ ps_global->role = cpystr(role->nick);
+
pine_state->redrawer = NULL;
compose_mail(NULL, NULL, role, NULL, NULL);
free_action(&role);
***************
*** 449,456 ****
ps_global->next_screen = prev_screen;
ps_global->redrawer = redraw;
! if(role)
role = combine_inherited_role(role);
}
break;
--- 454,465 ----
ps_global->next_screen = prev_screen;
ps_global->redrawer = redraw;
! if (ps_global->role)
! fs_give((void **)&ps_global->role);
! if(role){
role = combine_inherited_role(role);
+ ps_global->role = cpystr(role->nick);
+ }
}
break;
***************
*** 645,653 ****
}
}
! if(role)
q_status_message1(SM_ORDER, 3, 4, _("Composing using role \"%s\""),
role->nick);
/*
* The type of storage object allocated below is vitally
--- 654,667 ----
}
}
! if (ps_global->role)
! fs_give((void **)&ps_global->role);
!
! if(role){
q_status_message1(SM_ORDER, 3, 4, _("Composing using role \"%s\""),
role->nick);
+ ps_global->role = cpystr(role->nick);
+ }
/*
* The type of storage object allocated below is vitally
***************
*** 2476,2481 ****
--- 2490,2515 ----
removing_trailing_white_space(pf->textbuf);
(void)removing_double_quotes(pf->textbuf);
build_address(pf->textbuf, &addr, NULL, NULL, NULL);
+ if (!strncmp(pf->name,"Lcc",3) && addr && *addr){
+ RULE_RESULT *rule;
+
+ outgoing->date = (unsigned char *) cpystr(addr);
+ ps_global->procid = cpystr("fwd-lcc");
+ rule = get_result_rule(V_FORWARD_RULES,
+ FOR_COMPOSE|FOR_TRIM, outgoing);
+ if (rule){
+ addr = cpystr(rule->result);
+ removing_trailing_white_space(addr);
+ (void)removing_extra_stuff(addr);
+ if (rule->result)
+ fs_give((void **)&rule->result);
+ fs_give((void **)&rule);
+ }
+ fs_give((void **)&ps_global->procid);
+ if (outgoing->date)
+ fs_give((void **)&outgoing->date);
+ }
+
rfc822_parse_adrlist(pf->addr, addr,
ps_global->maildomain);
fs_give((void **)&addr);
diff -rc alpine-2.21/pith/Makefile.am alpine-2.21.rules/pith/Makefile.am
*** alpine-2.21/pith/Makefile.am Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/Makefile.am Sun Feb 5 16:15:21 2017
***************
*** 26,32 ****
filter.c flag.c folder.c handle.c help.c helpindx.c hist.c icache.c imap.c init.c \
keyword.c ldap.c list.c mailcap.c mailcmd.c mailindx.c maillist.c mailview.c \
margin.c mimedesc.c mimetype.c msgno.c newmail.c news.c pattern.c pipe.c \
! readfile.c remote.c reply.c rfc2231.c save.c search.c sequence.c send.c sort.c \
state.c status.c store.c stream.c string.c strlst.c takeaddr.c tempfile.c text.c \
thread.c adjtime.c url.c util.c helptext.c smkeys.c smime.c
--- 26,32 ----
filter.c flag.c folder.c handle.c help.c helpindx.c hist.c icache.c imap.c init.c \
keyword.c ldap.c list.c mailcap.c mailcmd.c mailindx.c maillist.c mailview.c \
margin.c mimedesc.c mimetype.c msgno.c newmail.c news.c pattern.c pipe.c \
! readfile.c remote.c reply.c rfc2231.c rules.c save.c search.c sequence.c send.c sort.c \
state.c status.c store.c stream.c string.c strlst.c takeaddr.c tempfile.c text.c \
thread.c adjtime.c url.c util.c helptext.c smkeys.c smime.c
diff -rc alpine-2.21/pith/Makefile.in alpine-2.21.rules/pith/Makefile.in
*** alpine-2.21/pith/Makefile.in Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/Makefile.in Sun Feb 5 16:15:21 2017
***************
*** 147,153 ****
margin.$(OBJEXT) mimedesc.$(OBJEXT) mimetype.$(OBJEXT) \
msgno.$(OBJEXT) newmail.$(OBJEXT) news.$(OBJEXT) \
pattern.$(OBJEXT) pipe.$(OBJEXT) readfile.$(OBJEXT) \
! remote.$(OBJEXT) reply.$(OBJEXT) rfc2231.$(OBJEXT) \
save.$(OBJEXT) search.$(OBJEXT) sequence.$(OBJEXT) \
send.$(OBJEXT) sort.$(OBJEXT) state.$(OBJEXT) status.$(OBJEXT) \
store.$(OBJEXT) stream.$(OBJEXT) string.$(OBJEXT) \
--- 147,153 ----
margin.$(OBJEXT) mimedesc.$(OBJEXT) mimetype.$(OBJEXT) \
msgno.$(OBJEXT) newmail.$(OBJEXT) news.$(OBJEXT) \
pattern.$(OBJEXT) pipe.$(OBJEXT) readfile.$(OBJEXT) \
! remote.$(OBJEXT) reply.$(OBJEXT) rfc2231.$(OBJEXT) rules.$(OBJEXT) \
save.$(OBJEXT) search.$(OBJEXT) sequence.$(OBJEXT) \
send.$(OBJEXT) sort.$(OBJEXT) state.$(OBJEXT) status.$(OBJEXT) \
store.$(OBJEXT) stream.$(OBJEXT) string.$(OBJEXT) \
***************
*** 442,448 ****
filter.c flag.c folder.c handle.c help.c helpindx.c hist.c icache.c imap.c init.c \
keyword.c ldap.c list.c mailcap.c mailcmd.c mailindx.c maillist.c mailview.c \
margin.c mimedesc.c mimetype.c msgno.c newmail.c news.c pattern.c pipe.c \
! readfile.c remote.c reply.c rfc2231.c save.c search.c sequence.c send.c sort.c \
state.c status.c store.c stream.c string.c strlst.c takeaddr.c tempfile.c text.c \
thread.c adjtime.c url.c util.c helptext.c smkeys.c smime.c
--- 442,448 ----
filter.c flag.c folder.c handle.c help.c helpindx.c hist.c icache.c imap.c init.c \
keyword.c ldap.c list.c mailcap.c mailcmd.c mailindx.c maillist.c mailview.c \
margin.c mimedesc.c mimetype.c msgno.c newmail.c news.c pattern.c pipe.c \
! readfile.c remote.c reply.c rfc2231.c rules.c save.c search.c sequence.c send.c sort.c \
state.c status.c store.c stream.c string.c strlst.c takeaddr.c tempfile.c text.c \
thread.c adjtime.c url.c util.c helptext.c smkeys.c smime.c
***************
*** 574,579 ****
--- 574,580 ----
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rules.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff -rc alpine-2.21/pith/adrbklib.c alpine-2.21.rules/pith/adrbklib.c
*** alpine-2.21/pith/adrbklib.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/adrbklib.c Sun Feb 5 16:15:21 2017
***************
*** 5136,5143 ****
if(as.cur >= as.how_many_personals)
pab->type |= GLOBAL;
! pab->access = adrbk_access(pab);
!
/* global address books are forced readonly */
if(pab->type & GLOBAL && pab->access != NoAccess)
pab->access = ReadOnly;
--- 5136,5149 ----
if(as.cur >= as.how_many_personals)
pab->type |= GLOBAL;
! if(ps_global->mail_stream &&
! ps_global->mail_stream->lock && (pab->type & REMOTE_VIA_IMAP)){
! as.initialized = 0;
! pab->access = NoAccess;
! }
! else{
! pab->access = adrbk_access(pab);
! }
/* global address books are forced readonly */
if(pab->type & GLOBAL && pab->access != NoAccess)
pab->access = ReadOnly;
diff -rc alpine-2.21/pith/conf.c alpine-2.21.rules/pith/conf.c
*** alpine-2.21/pith/conf.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/conf.c Sun Feb 5 16:15:21 2017
***************
*** 29,34 ****
--- 29,35 ----
#include "../pith/remote.h"
#include "../pith/keyword.h"
#include "../pith/mailview.h"
+ #include "../pith/rules.h"
#include "../pith/list.h"
#include "../pith/status.h"
#include "../pith/ldap.h"
***************
*** 222,227 ****
--- 223,258 ----
CONF_TXT_T cf_text_editor[] = "Specifies the program invoked by ^_ in the Composer,\n# or the \"enable-alternate-editor-implicitly\" feature.";
+ CONF_TXT_T cf_text_compose_rules[] = "Allows a user to set rules when composing messages.";
+
+ CONF_TXT_T cf_text_forward_rules[] = "Allows a user to set rules when forwarding messages.";
+
+ CONF_TXT_T cf_text_reply_rules[] = "Allows a user to set rules when replying messages.";
+
+ CONF_TXT_T cf_text_index_rules[] = "Allows a user to supersede global index format variable in designated folders.";
+
+ CONF_TXT_T cf_text_key_def_rules[] = "Allows a user to override keystrokes in certain screens.";
+
+ CONF_TXT_T cf_text_replace_rules[] = "Allows a user to change the form a specify field in the index-format is \n# displayed.";
+
+ CONF_TXT_T cf_text_reply_indent_rules[] = "Allows a user to change the form a specify a reply-indent-string\n# based of rules.";
+
+ CONF_TXT_T cf_text_reply_leadin_rules[] = "Allows a user to replace the reply-leadin message based on different parameters.";
+
+ CONF_TXT_T cf_text_reply_subject_rules[] = "Allows a user to replace the subject of a message in a customs based way";
+
+ CONF_TXT_T cf_text_thread_displaystyle_rule[] = "Allows a user to specify the threading style of specific folders";
+
+ CONF_TXT_T cf_text_thread_indexstyle_rule[] = "Allows a user to specify the threading index style of specific folders";
+
+ CONF_TXT_T cf_text_save_rules[] = "Allows a user to specify a save folder message for specific senders or folders.";
+
+ CONF_TXT_T cf_text_smtp_rules[] = "Allows a user to specify a smtp server to be used when sending e-mail,\n# according to the rules specified here.";
+
+ CONF_TXT_T cf_text_sort_rules[] = "Allows a user to specify the sort default order of a specific folder.";
+
+ CONF_TXT_T cf_text_startup_rules[] = "Allows a user to specify the position of a highlighted message when opening a \n# folder.";
+
CONF_TXT_T cf_text_speller[] = "Specifies the program invoked by ^T in the Composer.";
#ifdef _WINDOWS
***************
*** 550,555 ****
--- 581,614 ----
NULL, cf_text_thread_exp_char},
{"threading-lastreply-character", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
"Threading Last Reply Character", cf_text_thread_lastreply_char},
+ {"threading-display-style-rule", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+ "Threading Display Style Rule", cf_text_thread_displaystyle_rule},
+ {"threading-index-style-rule", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+ "Threading Index Style Rule", cf_text_thread_indexstyle_rule},
+ {"compose-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+ "Compose Rules", cf_text_compose_rules},
+ {"forward-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+ "Forward Rules", cf_text_forward_rules},
+ {"index-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0,
+ "Index Rules", cf_text_index_rules},
+ {"key-definition-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0,
+ "Key Definition Rules", cf_text_key_def_rules},
+ {"replace-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0,
+ "Replace Rules", cf_text_replace_rules},
+ {"reply-indent-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+ "Reply Indent Rules", cf_text_reply_indent_rules},
+ {"reply-leadin-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0,
+ "Reply Leadin Rules", cf_text_reply_leadin_rules},
+ {"reply-subject-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0,
+ "Reply Subject Rules", cf_text_reply_subject_rules},
+ {"save-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+ "Save Rules", cf_text_save_rules},
+ {"smtp-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+ "Smtp Rules", cf_text_smtp_rules},
+ {"sort-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+ "Sort Rules", cf_text_sort_rules},
+ {"startup-rules", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+ "Startup Rules", cf_text_startup_rules},
#ifndef _WINDOWS
{"display-character-set", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
NULL, cf_text_disp_char_set},
***************
*** 2635,2640 ****
--- 2694,2700 ----
if(cmds_f)
(*cmds_f)(ps, VAR_INIT_CMD_LIST);
+ (void)create_rule_list(ps_global->vars);
#ifdef _WINDOWS
mswin_set_quit_confirm (F_OFF(F_QUIT_WO_CONFIRM, ps_global));
#endif /* _WINDOWS */
***************
*** 3081,3086 ****
--- 3141,3148 ----
F_FORCE_LOW_SPEED, h_config_force_low_speed, PREF_OS_LWSD, 0},
{"auto-move-read-msgs", "Auto Move Read Messages",
F_AUTO_READ_MSGS, h_config_auto_read_msgs, PREF_MISC, 0},
+ {"auto-move-read-msgs-using-rules", "Auto Move Read Messages Using Rules",
+ F_AUTO_READ_MSGS_RULES, h_config_auto_read_msgs_rules, PREF_MISC, 0},
{"auto-unselect-after-apply", NULL,
F_AUTO_UNSELECT, h_config_auto_unselect, PREF_MISC, 0},
{"auto-unzoom-after-apply", NULL,
***************
*** 7699,7704 ****
--- 7761,7794 ----
return(h_config_ab_sort_rule);
case V_FLD_SORT_RULE :
return(h_config_fld_sort_rule);
+ case V_THREAD_DISP_STYLE_RULES:
+ return(h_config_thread_display_style_rule);
+ case V_THREAD_INDEX_STYLE_RULES:
+ return(h_config_thread_index_style_rule);
+ case V_COMPOSE_RULES:
+ return(h_config_compose_rules);
+ case V_FORWARD_RULES:
+ return(h_config_forward_rules);
+ case V_INDEX_RULES:
+ return(h_config_index_rules);
+ case V_KEY_RULES:
+ return(h_config_key_macro_rules);
+ case V_REPLACE_RULES:
+ return(h_config_replace_rules);
+ case V_REPLY_INDENT_RULES:
+ return(h_config_reply_indent_rules);
+ case V_REPLY_LEADIN_RULES:
+ return(h_config_reply_leadin_rules);
+ case V_RESUB_RULES:
+ return(h_config_resub_rules);
+ case V_SAVE_RULES:
+ return(h_config_save_rules);
+ case V_SMTP_RULES:
+ return(h_config_smtp_rules);
+ case V_SORT_RULES:
+ return(h_config_sort_rules);
+ case V_STARTUP_RULES:
+ return(h_config_startup_rules);
case V_POST_CHAR_SET :
return(h_config_post_char_set);
case V_UNK_CHAR_SET :
diff -rc alpine-2.21/pith/conf.h alpine-2.21.rules/pith/conf.h
*** alpine-2.21/pith/conf.h Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/conf.h Sun Feb 5 16:15:21 2017
***************
*** 148,153 ****
--- 148,193 ----
#define GLO_AB_SORT_RULE vars[V_AB_SORT_RULE].global_val.p
#define VAR_FLD_SORT_RULE vars[V_FLD_SORT_RULE].current_val.p
#define GLO_FLD_SORT_RULE vars[V_FLD_SORT_RULE].global_val.p
+ #define VAR_COMPOSE_RULES vars[V_COMPOSE_RULES].current_val.l
+ #define GLO_COMPOSE_RULES vars[V_COMPOSE_RULES].global_val.l
+ #define USR_COMPOSE_RULES vars[V_COMPOSE_RULES].user_val.l
+ #define VAR_FORWARD_RULES vars[V_FORWARD_RULES].current_val.l
+ #define GLO_FORWARD_RULES vars[V_FORWARD_RULES].global_val.l
+ #define USR_FORWARD_RULES vars[V_FORWARD_RULES].user_val.l
+ #define VAR_INDEX_RULES vars[V_INDEX_RULES].current_val.l
+ #define GLO_INDEX_RULES vars[V_INDEX_RULES].global_val.l
+ #define USR_INDEX_RULES vars[V_INDEX_RULES].user_val.l
+ #define VAR_KEY_RULES vars[V_KEY_RULES].current_val.l
+ #define GLO_KEY_RULES vars[V_KEY_RULES].global_val.l
+ #define USR_KEY_RULES vars[V_KEY_RULES].user_val.l
+ #define VAR_REPLACE_RULES vars[V_REPLACE_RULES].current_val.l
+ #define GLO_REPLACE_RULES vars[V_REPLACE_RULES].global_val.l
+ #define USR_REPLACE_RULES vars[V_REPLACE_RULES].user_val.l
+ #define VAR_REPLY_INDENT_RULES vars[V_REPLY_INDENT_RULES].current_val.l
+ #define GLO_REPLY_INDENT_RULES vars[V_REPLY_INDENT_RULES].global_val.l
+ #define USR_REPLY_INDENT_RULES vars[V_REPLY_INDENT_RULES].user_val.l
+ #define VAR_REPLY_LEADIN_RULES vars[V_REPLY_LEADIN_RULES].current_val.l
+ #define GLO_REPLY_LEADIN_RULES vars[V_REPLY_LEADIN_RULES].global_val.l
+ #define USR_REPLY_LEADIN_RULES vars[V_REPLY_LEADIN_RULES].user_val.l
+ #define VAR_RESUB_RULES vars[V_RESUB_RULES].current_val.l
+ #define GLO_RESUB_RULES vars[V_RESUB_RULES].global_val.l
+ #define USR_RESUB_RULES vars[V_RESUB_RULES].user_val.l
+ #define VAR_THREAD_DISP_STYLE_RULES vars[V_THREAD_DISP_STYLE_RULES].current_val.l
+ #define GLO_THREAD_DISP_STYLE_RULES vars[V_THREAD_DISP_STYLE_RULES].global_val.l
+ #define VAR_THREAD_INDEX_STYLE_RULES vars[V_THREAD_INDEX_STYLE_RULES].current_val.l
+ #define GLO_THREAD_INDEX_STYLE_RULES vars[V_THREAD_INDEX_STYLE_RULES].global_val.l
+ #define VAR_SAVE_RULES vars[V_SAVE_RULES].current_val.l
+ #define GLO_SAVE_RULES vars[V_SAVE_RULES].global_val.l
+ #define USR_SAVE_RULES vars[V_SAVE_RULES].user_val.l
+ #define VAR_SMTP_RULES vars[V_SMTP_RULES].current_val.l
+ #define GLO_SMTP_RULES vars[V_SMTP_RULES].global_val.l
+ #define USR_SMTP_RULES vars[V_SMTP_RULES].user_val.l
+ #define VAR_SORT_RULES vars[V_SORT_RULES].current_val.l
+ #define GLO_SORT_RULES vars[V_SORT_RULES].global_val.l
+ #define USR_SORT_RULES vars[V_SORT_RULES].user_val.l
+ #define VAR_STARTUP_RULES vars[V_STARTUP_RULES].current_val.l
+ #define GLO_STARTUP_RULES vars[V_STARTUP_RULES].global_val.l
+ #define USR_STARTUP_RULES vars[V_STARTUP_RULES].user_val.l
#ifndef _WINDOWS
#define VAR_CHAR_SET vars[V_CHAR_SET].current_val.p
#define GLO_CHAR_SET vars[V_CHAR_SET].global_val.p
diff -rc alpine-2.21/pith/conftype.h alpine-2.21.rules/pith/conftype.h
*** alpine-2.21/pith/conftype.h Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/conftype.h Sun Feb 5 16:15:21 2017
***************
*** 70,75 ****
--- 70,89 ----
, V_THREAD_MORE_CHAR
, V_THREAD_EXP_CHAR
, V_THREAD_LASTREPLY_CHAR
+ , V_THREAD_DISP_STYLE_RULES
+ , V_THREAD_INDEX_STYLE_RULES
+ , V_COMPOSE_RULES
+ , V_FORWARD_RULES
+ , V_INDEX_RULES
+ , V_KEY_RULES
+ , V_REPLACE_RULES
+ , V_REPLY_INDENT_RULES
+ , V_REPLY_LEADIN_RULES
+ , V_RESUB_RULES
+ , V_SAVE_RULES
+ , V_SMTP_RULES
+ , V_SORT_RULES
+ , V_STARTUP_RULES
#ifndef _WINDOWS
, V_CHAR_SET
, V_OLD_CHAR_SET
***************
*** 332,337 ****
--- 346,352 ----
F_FULL_AUTO_EXPUNGE,
F_EXPUNGE_MANUALLY,
F_AUTO_READ_MSGS,
+ F_AUTO_READ_MSGS_RULES,
F_AUTO_FCC_ONLY,
F_READ_IN_NEWSRC_ORDER,
F_SELECT_WO_CONFIRM,
diff -rc alpine-2.21/pith/detoken.c alpine-2.21.rules/pith/detoken.c
*** alpine-2.21/pith/detoken.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/detoken.c Sun Feb 5 16:15:21 2017
***************
*** 25,31 ****
#include "../pith/reply.h"
#include "../pith/mailindx.h"
#include "../pith/options.h"
!
/*
* Hook to read signature from local file
--- 25,31 ----
#include "../pith/reply.h"
#include "../pith/mailindx.h"
#include "../pith/options.h"
! #include "../pith/rules.h"
/*
* Hook to read signature from local file
***************
*** 91,96 ****
--- 91,98 ----
if(is_sig){
/*
+ * First we check if there is a rule about signatures, if there is
+ * use it, otherwise keep going and do the following:
* If role->litsig is set, we use it;
* Else, if VAR_LITERAL_SIG is set, we use that;
* Else, if role->sig is set, we use that;
***************
*** 104,117 ****
* there is no reason to mix them, so we don't provide support to
* do so.
*/
! if(role && role->litsig)
! literal_sig = role->litsig;
! else if(ps_global->VAR_LITERAL_SIG)
! literal_sig = ps_global->VAR_LITERAL_SIG;
! else if(role && role->sig)
! sigfile = role->sig;
! else
! sigfile = ps_global->VAR_SIGNATURE_FILE;
}
else if(role && role->template)
sigfile = role->template;
--- 106,130 ----
* there is no reason to mix them, so we don't provide support to
* do so.
*/
! { RULE_RESULT *rule;
! rule = get_result_rule(V_COMPOSE_RULES, FOR_COMPOSE, env);
! if (rule){
! sigfile = cpystr(rule->result);
! if (rule->result)
! fs_give((void **)&rule->result);
! fs_give((void **)&rule);
! }
! }
! if (!sigfile){
! if(role && role->litsig)
! literal_sig = role->litsig;
! else if(ps_global->VAR_LITERAL_SIG)
! literal_sig = ps_global->VAR_LITERAL_SIG;
! else if(role && role->sig)
! sigfile = role->sig;
! else
! sigfile = ps_global->VAR_SIGNATURE_FILE;
! }
}
else if(role && role->template)
sigfile = role->template;
***************
*** 302,308 ****
}
}
}
! else if(pt->what_for & FOR_REPLY_INTRO)
repl = get_reply_data(env, role, pt->ctype,
subbuf, sizeof(subbuf)-1);
--- 315,321 ----
}
}
}
! else if(pt->what_for & (FOR_REPLY_INTRO | FOR_RULE))
repl = get_reply_data(env, role, pt->ctype,
subbuf, sizeof(subbuf)-1);
diff -rc alpine-2.21/pith/indxtype.h alpine-2.21.rules/pith/indxtype.h
*** alpine-2.21/pith/indxtype.h Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/indxtype.h Sun Feb 5 16:15:21 2017
***************
*** 84,89 ****
--- 84,94 ----
iCurNews, iArrow,
iMailbox, iAddress, iInit, iCursorPos,
iDay2Digit, iMon2Digit, iYear2Digit,
+ iFolder, iFlag, iCollection, iRole, iProcid, iScreen, iPkey,
+ iNick, iFccFrom, iFccSender, iAltAddress,
+ iAddressTo, iAddressCc, iAddressRecip, iAddressSender,
+ iBcc, iLcc,
+ iFfrom, iFadd,
iSTime, iSTime24, iKSize,
iRoleNick, iNewLine,
iHeader, iText,
***************
*** 105,119 ****
/* these are flags for the what_for field in INDEX_PARSE_T */
! #define FOR_NOTHING 0x00
! #define FOR_INDEX 0x01
! #define FOR_REPLY_INTRO 0x02
! #define FOR_TEMPLATE 0x04 /* or for signature */
! #define FOR_FILT 0x08
! #define DELIM_USCORE 0x10
! #define DELIM_PAREN 0x20
! #define DELIM_COLON 0x40
!
#define DEFAULT_REPLY_INTRO "default"
--- 110,135 ----
/* these are flags for the what_for field in INDEX_PARSE_T */
! #define FOR_NOTHING 0x00000
! #define FOR_INDEX 0x00001
! #define FOR_REPLY_INTRO 0x00002
! #define FOR_TEMPLATE 0x00004 /* or for signature */
! #define FOR_FILT 0x00008
! #define DELIM_USCORE 0x00010
! #define DELIM_PAREN 0x00020
! #define DELIM_COLON 0x00040
! #define FOR_FOLDER 0x00080 /* for rules */
! #define FOR_RULE 0x00100 /* for rules */
! #define FOR_TRIM 0x00200 /* for rules */
! #define FOR_RESUB 0x00400 /* for rules */
! #define FOR_REPLACE 0x00800 /* for rules */
! #define FOR_SORT 0x01000 /* for rules */
! #define FOR_FLAG 0x02000 /* for rules */
! #define FOR_COMPOSE 0x04000 /* for rules */
! #define FOR_THREAD 0x08000 /* for rules */
! #define FOR_STARTUP 0x10000 /* for rules */
! #define FOR_KEY 0x20000 /* for rules */
! #define FOR_SAVE 0x40000 /* for rules */
#define DEFAULT_REPLY_INTRO "default"
diff -rc alpine-2.21/pith/mailcmd.c alpine-2.21.rules/pith/mailcmd.c
*** alpine-2.21/pith/mailcmd.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/mailcmd.c Sun Feb 5 16:15:21 2017
***************
*** 39,44 ****
--- 39,45 ----
#include "../pith/ablookup.h"
#include "../pith/search.h"
#include "../pith/charconv/utf8.h"
+ #include "../pith/rules.h"
#ifdef _WINDOWS
#include "../pico/osdep/mswin.h"
***************
*** 665,670 ****
--- 666,672 ----
strncpy(ps_global->cur_folder, p, sizeof(ps_global->cur_folder)-1);
ps_global->cur_folder[sizeof(ps_global->cur_folder)-1] = '\0';
ps_global->context_current = ps_global->context_list;
+ setup_threading_index_style();
reset_index_format();
clear_index_cache(ps_global->mail_stream, 0);
/* MUST sort before restoring msgno! */
***************
*** 991,996 ****
--- 993,999 ----
clear_index_cache(ps_global->mail_stream, 0);
reset_index_format();
+ setup_threading_index_style();
/*
* Start news reading with messages the user's marked deleted
***************
*** 1114,1120 ****
if(!cur_already_set && mn_get_total(ps_global->msgmap) > 0L){
! perfolder_startup_rule = reset_startup_rule(ps_global->mail_stream);
if(ps_global->start_entry > 0){
mn_set_cur(ps_global->msgmap, mn_get_revsort(ps_global->msgmap)
--- 1117,1126 ----
if(!cur_already_set && mn_get_total(ps_global->msgmap) > 0L){
! perfolder_startup_rule = get_perfolder_startup_rule(ps_global->mail_stream,
! V_STARTUP_RULES, newfolder);
!
! reset_startup_rule(ps_global->mail_stream);
if(ps_global->start_entry > 0){
mn_set_cur(ps_global->msgmap, mn_get_revsort(ps_global->msgmap)
***************
*** 1136,1259 ****
else
use_this_startup_rule = ps_global->inc_startup_rule;
! switch(use_this_startup_rule){
! /*
! * For news in incoming collection we're doing the same thing
! * for first-unseen and first-recent. In both those cases you
! * get first-unseen if FAKE_NEW is off and first-recent if
! * FAKE_NEW is on. If FAKE_NEW is on, first unseen is the
! * same as first recent because all recent msgs are unseen
! * and all unrecent msgs are seen (see pine_mail_open).
! */
! case IS_FIRST_UNSEEN:
! first_unseen:
! mn_set_cur(ps_global->msgmap,
! (sp_first_unseen(m)
! && mn_get_sort(ps_global->msgmap) == SortArrival
! && !mn_get_revsort(ps_global->msgmap)
! && !get_lflag(ps_global->mail_stream, NULL,
! sp_first_unseen(m), MN_EXLD)
! && (n = mn_raw2m(ps_global->msgmap,
! sp_first_unseen(m))))
! ? n
! : first_sorted_flagged(F_UNSEEN | F_UNDEL, m, pc,
! THREADING() ? 0 : FSF_SKIP_CHID));
! break;
!
! case IS_FIRST_RECENT:
! first_recent:
! /*
! * We could really use recent for news but this is the way
! * it has always worked, so we'll leave it. That is, if
! * the FAKE_NEW feature is on, recent and unseen are
! * equivalent, so it doesn't matter. If the feature isn't
! * on, all the undeleted messages are unseen and we start
! * at the first one. User controls with the FAKE_NEW feature.
! */
! if(IS_NEWS(ps_global->mail_stream)){
! mn_set_cur(ps_global->msgmap,
! first_sorted_flagged(F_UNSEEN|F_UNDEL, m, pc,
! THREADING() ? 0 : FSF_SKIP_CHID));
! }
! else{
! mn_set_cur(ps_global->msgmap,
! first_sorted_flagged(F_RECENT | F_UNSEEN
! | F_UNDEL,
! m, pc,
! THREADING() ? 0 : FSF_SKIP_CHID));
! }
! break;
!
! case IS_FIRST_IMPORTANT:
! mn_set_cur(ps_global->msgmap,
! first_sorted_flagged(F_FLAG|F_UNDEL, m, pc,
! THREADING() ? 0 : FSF_SKIP_CHID));
! break;
!
! case IS_FIRST_IMPORTANT_OR_UNSEEN:
!
! if(IS_NEWS(ps_global->mail_stream))
! goto first_unseen;
!
! {
! MsgNo flagged, first_unseen;
!
! flagged = first_sorted_flagged(F_FLAG|F_UNDEL, m, pc,
! THREADING() ? 0 : FSF_SKIP_CHID);
! first_unseen = (sp_first_unseen(m)
! && mn_get_sort(ps_global->msgmap) == SortArrival
! && !mn_get_revsort(ps_global->msgmap)
! && !get_lflag(ps_global->mail_stream, NULL,
! sp_first_unseen(m), MN_EXLD)
! && (n = mn_raw2m(ps_global->msgmap,
! sp_first_unseen(m))))
! ? n
! : first_sorted_flagged(F_UNSEEN|F_UNDEL, m, pc,
! THREADING() ? 0 : FSF_SKIP_CHID);
! mn_set_cur(ps_global->msgmap,
! (MsgNo) MIN((int) flagged, (int) first_unseen));
!
! }
!
! break;
!
! case IS_FIRST_IMPORTANT_OR_RECENT:
!
! if(IS_NEWS(ps_global->mail_stream))
! goto first_recent;
!
! {
! MsgNo flagged, first_recent;
!
! flagged = first_sorted_flagged(F_FLAG|F_UNDEL, m, pc,
! THREADING() ? 0 : FSF_SKIP_CHID);
! first_recent = first_sorted_flagged(F_RECENT | F_UNSEEN
! | F_UNDEL,
! m, pc,
! THREADING() ? 0 : FSF_SKIP_CHID);
! mn_set_cur(ps_global->msgmap,
! (MsgNo) MIN((int) flagged, (int) first_recent));
! }
!
! break;
!
! case IS_FIRST:
! mn_set_cur(ps_global->msgmap,
! first_sorted_flagged(F_UNDEL, m, pc,
! THREADING() ? 0 : FSF_SKIP_CHID));
! break;
!
! case IS_LAST:
! mn_set_cur(ps_global->msgmap,
! first_sorted_flagged(F_UNDEL, m, pc,
! FSF_LAST | (THREADING() ? 0 : FSF_SKIP_CHID)));
! break;
!
! default:
! alpine_panic("Unexpected incoming startup case");
! break;
!
! }
}
else if(IS_NEWS(ps_global->mail_stream)){
/*
--- 1142,1148 ----
else
use_this_startup_rule = ps_global->inc_startup_rule;
! find_startup_position(use_this_startup_rule, m, pc);
}
else if(IS_NEWS(ps_global->mail_stream)){
/*
***************
*** 1431,1439 ****
/* Save read messages? */
if(VAR_READ_MESSAGE_FOLDER && VAR_READ_MESSAGE_FOLDER[0]
&& sp_flagged(stream, SP_INBOX)
! && (seen_not_del = count_flagged(stream, F_SEEN | F_UNDEL))){
if(F_ON(F_AUTO_READ_MSGS,ps_global)
|| (pith_opt_read_msg_prompt
&& (*pith_opt_read_msg_prompt)(seen_not_del, VAR_READ_MESSAGE_FOLDER)))
/* move inbox's read messages */
--- 1320,1330 ----
/* Save read messages? */
if(VAR_READ_MESSAGE_FOLDER && VAR_READ_MESSAGE_FOLDER[0]
&& sp_flagged(stream, SP_INBOX)
! && (F_ON(F_AUTO_READ_MSGS_RULES, ps_global) ||
! (seen_not_del = count_flagged(stream, F_SEEN | F_UNDEL)))){
if(F_ON(F_AUTO_READ_MSGS,ps_global)
+ || F_ON(F_AUTO_READ_MSGS_RULES, ps_global)
|| (pith_opt_read_msg_prompt
&& (*pith_opt_read_msg_prompt)(seen_not_del, VAR_READ_MESSAGE_FOLDER)))
/* move inbox's read messages */
***************
*** 1716,1721 ****
--- 1607,1615 ----
char *bufp = NULL;
MESSAGECACHE *mc;
+ if (F_ON(F_AUTO_READ_MSGS_RULES, ps_global))
+ return move_read_msgs_using_rules(stream, dstfldr, buf);
+
if(!is_absolute_path(dstfldr)
&& !(save_context = default_save_context(ps_global->context_list)))
save_context = ps_global->context_list;
***************
*** 1755,1762 ****
snprintf(buf, buflen, "Moving %s read message%s to \"%s\"",
comatose(searched), plural(searched), dstfldr);
we_cancel = busy_cue(buf, NULL, 0);
! if(save(ps_global, stream, save_context, dstfldr, msgmap,
! SV_DELETE | SV_FIX_DELS | SV_INBOXWOCNTXT) == searched)
strncpy(bufp = buf + 1, "Moved", MIN(5,buflen)); /* change Moving to Moved */
buf[buflen-1] = '\0';
--- 1649,1657 ----
snprintf(buf, buflen, "Moving %s read message%s to \"%s\"",
comatose(searched), plural(searched), dstfldr);
we_cancel = busy_cue(buf, NULL, 0);
! ps_global->exiting = 1;
! if((save(ps_global, stream, save_context, dstfldr, msgmap,
! SV_DELETE | SV_FIX_DELS | SV_INBOXWOCNTXT) == searched))
strncpy(bufp = buf + 1, "Moved", MIN(5,buflen)); /* change Moving to Moved */
buf[buflen-1] = '\0';
***************
*** 1794,1800 ****
&& ((context_isambig(folder)
&& folder_is_nick(folder, FOLDERS(context), 0))
|| folder_index(folder, context, FI_FOLDER) > 0)
! && (seen_undel = count_flagged(stream, F_SEEN | F_UNDEL))){
for(; f && *archive; archive++){
char *p;
--- 1689,1697 ----
&& ((context_isambig(folder)
&& folder_is_nick(folder, FOLDERS(context), 0))
|| folder_index(folder, context, FI_FOLDER) > 0)
! && ((seen_undel = count_flagged(stream, F_SEEN | F_UNDEL))
! || (F_ON(F_AUTO_READ_MSGS,ps_global) &&
! F_ON(F_AUTO_READ_MSGS_RULES, ps_global)))){
for(; f && *archive; archive++){
char *p;
***************
*** 2755,2757 ****
--- 2652,2946 ----
return(*target ? target : NULL);
}
+
+ char *
+ move_read_msgs_using_rules(MAILSTREAM *stream, char *dstfldr, char *buf)
+ {
+ CONTEXT_S *save_context = NULL;
+ char **folder_to_save = NULL;
+ int num, we_cancel;
+ long i, j, success;
+ MSGNO_S *msgmap = NULL;
+ unsigned long nmsgs = 0L, stream_nmsgs;
+
+ if(!is_absolute_path(dstfldr)
+ && !(save_context = default_save_context(ps_global->context_list)))
+ save_context = ps_global->context_list;
+
+ folder_to_save = (char **)fs_get((stream->nmsgs + 1)*sizeof(char *));
+ folder_to_save[0] = NULL;
+ mn_init(&msgmap, stream->nmsgs);
+ stream_nmsgs = stream->nmsgs;
+ for (i = 1L; i <= stream_nmsgs ; i++){
+ set_lflag(stream, msgmap, i, MN_SLCT, 0);
+ folder_to_save[i] = get_lflag(stream, NULL, i, MN_EXLD)
+ ? NULL : get_folder_to_save(stream, i, dstfldr);
+ }
+ for (i = 1L; i <= stream_nmsgs; i++){
+ num = 0;
+ if (folder_to_save[i]){
+ mn_init(&msgmap, stream_nmsgs);
+ for (j = i; j <= stream_nmsgs ; j++){
+ if (folder_to_save[j]){
+ if (!strcmp(folder_to_save[i], folder_to_save[j])){
+ set_lflag(stream, msgmap, j, MN_SLCT, 1);
+ num++;
+ if (j != i)
+ fs_give((void **)&folder_to_save[j]);
+ }
+ }
+ }
+ pseudo_selected(stream, msgmap);
+ sprintf(buf, "Moving %s read message%s to \"%.45s\"",
+ comatose(num), plural(num), folder_to_save[i]);
+ we_cancel = busy_cue(buf, NULL, 1);
+ ps_global->exiting = 1;
+ if(success = save(ps_global, stream,save_context, folder_to_save[i],
+ msgmap, SV_DELETE | SV_FIX_DELS))
+ nmsgs += success;
+ if(we_cancel)
+ cancel_busy_cue(success ? 0 : -1);
+ for (j = i; j <= stream_nmsgs ; j++)
+ set_lflag(stream, msgmap, j, MN_SLCT, 0);
+ fs_give((void **)&folder_to_save[i]);
+ mn_give(&msgmap);
+ }
+ }
+ ps_global->exiting = 0; /* useful if we call from aggregate operations */
+ sprintf(buf, "Moved automatically %s message%s",
+ comatose(nmsgs), plural(nmsgs));
+ if (folder_to_save)
+ fs_give((void **)folder_to_save);
+ rule_curpos = 0L;
+ return buf;
+ }
+
+ char *
+ get_folder_to_save(MAILSTREAM *stream, long i, char *dstfldr)
+ {
+ MESSAGECACHE *mc = NULL;
+ RULE_RESULT *rule;
+ MSGNO_S *msgmap = NULL;
+ char *folder_to_save = NULL, *save_folder = NULL;
+ int n;
+ long msgno;
+
+ /* The plan is as follows: Select each message of the folder. We
+ * need to set the cursor correctly so that iFlag gets the value
+ * correctly too, otherwise iFlag will get the value of the position
+ * of the cursor. After that we need to look for a rule that applies
+ * to the message and get the saving folder. If we get a saving folder,
+ * and we used the _FLAG_ token, use that folder, if no
+ * _FLAG_ token was used, move only if seen and not deleted, to the
+ * folder specified in the saving rule. If we did not get a saving
+ * folder from the rule, just save in the default folder.
+ */
+ mn_init(&msgmap, stream->nmsgs);
+ rule_curpos = i;
+ msgno = mn_m2raw(msgmap, i);
+ if (msgno > 0L){
+ mc = mail_elt(stream, msgno);
+ rule = (RULE_RESULT *)
+ get_result_rule(V_SAVE_RULES, FOR_SAVE, mc->private.msg.env);
+ if (rule){
+ folder_to_save = cpystr(rule->result);
+ n = rule->number;
+ fs_give((void **)&rule->result);
+ fs_give((void **)&rule);
+ }
+ }
+
+ if (folder_to_save && *folder_to_save){
+ RULELIST *list = get_rulelist_from_code(V_SAVE_RULES,
+ ps_global->rule_list);
+ RULE_S *prule = get_rule(list, n);
+ if (condition_contains_token(prule->condition, "_FLAG_")
+ || (mc->valid && mc->seen && !mc->deleted)
+ || (!mc->valid && mc->searched))
+ save_folder = cpystr(folder_to_save);
+ else
+ save_folder = NULL;
+ }
+ else
+ if (!mc || (mc->seen && !mc->deleted))
+ save_folder = cpystr(dstfldr);
+ mn_give(&msgmap);
+ rule_curpos = 0L;
+ return save_folder;
+ }
+
+ unsigned long
+ rules_cursor_pos(MAILSTREAM *stream)
+ {
+ MSGNO_S *msgmap = sp_msgmap(stream);
+ return rule_curpos != 0L ? rule_curpos : mn_m2raw(msgmap,mn_get_cur(msgmap));
+ }
+
+ void
+ setup_threading_index_style(void)
+ {
+ RULE_RESULT *rule;
+ NAMEVAL_S *v;
+ int i;
+
+ rule = get_result_rule(V_THREAD_INDEX_STYLE_RULES, FOR_THREAD, NULL);
+ if (rule || ps_global->VAR_THREAD_INDEX_STYLE){
+ for(i = 0; v = thread_index_styles(i); i++)
+ if(!strucmp(rule ? rule->result : ps_global->VAR_THREAD_INDEX_STYLE,
+ rule ? (v ? v->name : "" ) : S_OR_L(v))){
+ ps_global->thread_index_style = v->value;
+ break;
+ }
+ if (rule){
+ if (rule->result)
+ fs_give((void **)&rule->result);
+ fs_give((void **)&rule);
+ }
+ }
+ }
+
+ unsigned
+ get_perfolder_startup_rule(MAILSTREAM *stream, int rule_type, char *folder)
+ {
+ unsigned startup_rule;
+ char *rule_result;
+
+ startup_rule = reset_startup_rule(stream);
+ rule_result = get_rule_result(FOR_STARTUP, folder, rule_type);
+ if (rule_result && *rule_result){
+ int i;
+ NAMEVAL_S *v;
+
+ for(i = 0; v = incoming_startup_rules(i); i++)
+ if(!strucmp(rule_result, v->name)){
+ startup_rule = v->value;
+ break;
+ }
+ fs_give((void **)&rule_result);
+ }
+ return startup_rule;
+ }
+
+ void
+ find_startup_position(int rule, MAILSTREAM *m, long pc)
+ {
+ long n;
+ switch(rule){
+ /*
+ * For news in incoming collection we're doing the same thing
+ * for first-unseen and first-recent. In both those cases you
+ * get first-unseen if FAKE_NEW is off and first-recent if
+ * FAKE_NEW is on. If FAKE_NEW is on, first unseen is the
+ * same as first recent because all recent msgs are unseen
+ * and all unrecent msgs are seen (see pine_mail_open).
+ */
+ case IS_FIRST_UNSEEN:
+ first_unseen:
+ mn_set_cur(ps_global->msgmap,
+ (sp_first_unseen(m)
+ && mn_get_sort(ps_global->msgmap) == SortArrival
+ && !mn_get_revsort(ps_global->msgmap)
+ && !get_lflag(ps_global->mail_stream, NULL,
+ sp_first_unseen(m), MN_EXLD)
+ && (n = mn_raw2m(ps_global->msgmap,
+ sp_first_unseen(m))))
+ ? n
+ : first_sorted_flagged(F_UNSEEN | F_UNDEL, m, pc,
+ THREADING() ? 0 : FSF_SKIP_CHID));
+ break;
+
+ case IS_FIRST_RECENT:
+ first_recent:
+ /*
+ * We could really use recent for news but this is the way
+ * it has always worked, so we'll leave it. That is, if
+ * the FAKE_NEW feature is on, recent and unseen are
+ * equivalent, so it doesn't matter. If the feature isn't
+ * on, all the undeleted messages are unseen and we start
+ * at the first one. User controls with the FAKE_NEW feature.
+ */
+ if(IS_NEWS(ps_global->mail_stream)){
+ mn_set_cur(ps_global->msgmap,
+ first_sorted_flagged(F_UNSEEN|F_UNDEL, m, pc,
+ THREADING() ? 0 : FSF_SKIP_CHID));
+ }
+ else{
+ mn_set_cur(ps_global->msgmap,
+ first_sorted_flagged(F_RECENT | F_UNSEEN
+ | F_UNDEL,
+ m, pc,
+ THREADING() ? 0 : FSF_SKIP_CHID));
+ }
+ break;
+
+ case IS_FIRST_IMPORTANT:
+ mn_set_cur(ps_global->msgmap,
+ first_sorted_flagged(F_FLAG|F_UNDEL, m, pc,
+ THREADING() ? 0 : FSF_SKIP_CHID));
+ break;
+
+ case IS_FIRST_IMPORTANT_OR_UNSEEN:
+
+ if(IS_NEWS(ps_global->mail_stream))
+ goto first_unseen;
+
+ {
+ MsgNo flagged, first_unseen;
+
+ flagged = first_sorted_flagged(F_FLAG|F_UNDEL, m, pc,
+ THREADING() ? 0 : FSF_SKIP_CHID);
+ first_unseen = (sp_first_unseen(m)
+ && mn_get_sort(ps_global->msgmap) == SortArrival
+ && !mn_get_revsort(ps_global->msgmap)
+ && !get_lflag(ps_global->mail_stream, NULL,
+ sp_first_unseen(m), MN_EXLD)
+ && (n = mn_raw2m(ps_global->msgmap,
+ sp_first_unseen(m))))
+ ? n
+ : first_sorted_flagged(F_UNSEEN|F_UNDEL, m, pc,
+ THREADING() ? 0 : FSF_SKIP_CHID);
+ mn_set_cur(ps_global->msgmap,
+ (MsgNo) MIN((int) flagged, (int) first_unseen));
+
+ }
+
+ break;
+
+ case IS_FIRST_IMPORTANT_OR_RECENT:
+
+ if(IS_NEWS(ps_global->mail_stream))
+ goto first_recent;
+
+ {
+ MsgNo flagged, first_recent;
+
+ flagged = first_sorted_flagged(F_FLAG|F_UNDEL, m, pc,
+ THREADING() ? 0 : FSF_SKIP_CHID);
+ first_recent = first_sorted_flagged(F_RECENT | F_UNSEEN
+ | F_UNDEL,
+ m, pc,
+ THREADING() ? 0 : FSF_SKIP_CHID);
+ mn_set_cur(ps_global->msgmap,
+ (MsgNo) MIN((int) flagged, (int) first_recent));
+ }
+
+ break;
+
+ case IS_FIRST:
+ mn_set_cur(ps_global->msgmap,
+ first_sorted_flagged(F_UNDEL, m, pc,
+ THREADING() ? 0 : FSF_SKIP_CHID));
+ break;
+
+ case IS_LAST:
+ mn_set_cur(ps_global->msgmap,
+ first_sorted_flagged(F_UNDEL, m, pc,
+ FSF_LAST | (THREADING() ? 0 : FSF_SKIP_CHID)));
+ break;
+
+ default:
+ alpine_panic("Unexpected incoming startup case");
+ break;
+
+ }
+ }
diff -rc alpine-2.21/pith/mailcmd.h alpine-2.21.rules/pith/mailcmd.h
*** alpine-2.21/pith/mailcmd.h Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/mailcmd.h Sun Feb 5 16:15:21 2017
***************
*** 42,47 ****
--- 42,49 ----
#define DB_FROMTAB 0x02 /* opening because of TAB command */
#define DB_INBOXWOCNTXT 0x04 /* interpret inbox as one true inbox */
+ static MAILSTREAM *saved_stream;
+ static unsigned long rule_curpos = 0L;
/*
* generic "is aggregate message command?" test
***************
*** 63,69 ****
--- 65,77 ----
void expunge_and_close(MAILSTREAM *, char **, unsigned long);
void agg_select_all(MAILSTREAM *, MSGNO_S *, long *, int);
char *move_read_msgs(MAILSTREAM *, char *, char *, size_t, long);
+ char *move_read_msgs_using_rules (MAILSTREAM *, char *, char *);
+ unsigned get_perfolder_startup_rule (MAILSTREAM *, int, char *);
+ void setup_threading_index_style (void);
+ void find_startup_position (int, MAILSTREAM *, long);
+ char *get_folder_to_save (MAILSTREAM *, long, char *);
char *move_read_incoming(MAILSTREAM *, CONTEXT_S *, char *, char **, char *, size_t);
+ unsigned long rules_cursor_pos (MAILSTREAM *);
void cross_delete_crossposts(MAILSTREAM *);
long zoom_index(struct pine *, MAILSTREAM *, MSGNO_S *, int);
int unzoom_index(struct pine *, MAILSTREAM *, MSGNO_S *);
diff -rc alpine-2.21/pith/mailindx.c alpine-2.21.rules/pith/mailindx.c
*** alpine-2.21/pith/mailindx.c Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/mailindx.c Sun Feb 5 16:15:21 2017
***************
*** 40,45 ****
--- 40,46 ----
#include "../pith/send.h"
#include "../pith/options.h"
#include "../pith/ablookup.h"
+ #include "../pith/rules.h"
#ifdef _WINDOWS
#include "../pico/osdep/mswin.h"
#endif
***************
*** 377,382 ****
--- 378,390 ----
PAT_STATE pstate;
PAT_S *pat;
int we_set_it = 0;
+ char *rule;
+
+ if(rule = get_rule_result(FOR_INDEX, ps_global->cur_folder, V_INDEX_RULES)){
+ init_index_format(rule, &ps_global->index_disp_format);
+ fs_give((void **)&rule);
+ return;
+ }
if(ps_global->mail_stream && nonempty_patterns(rflags, &pstate)){
for(pat = first_pattern(&pstate); pat; pat = next_pattern(&pstate)){
***************
*** 450,464 ****
static INDEX_PARSE_T itokens[] = {
{"STATUS", iStatus, FOR_INDEX},
{"MSGNO", iMessNo, FOR_INDEX},
! {"DATE", iDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"FROMORTO", iFromTo, FOR_INDEX},
{"FROMORTONOTNEWS", iFromToNotNews, FOR_INDEX},
{"SIZE", iSize, FOR_INDEX},
{"SIZECOMMA", iSizeComma, FOR_INDEX},
{"SIZETHREAD", iSizeThread, FOR_INDEX},
{"SIZENARROW", iSizeNarrow, FOR_INDEX},
{"KSIZE", iKSize, FOR_INDEX},
! {"SUBJECT", iSubject, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"SHORTSUBJECT", iShortSubject, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"FULLSTATUS", iFStatus, FOR_INDEX},
{"IMAPSTATUS", iIStatus, FOR_INDEX},
--- 458,472 ----
static INDEX_PARSE_T itokens[] = {
{"STATUS", iStatus, FOR_INDEX},
{"MSGNO", iMessNo, FOR_INDEX},
! {"DATE", iDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
{"FROMORTO", iFromTo, FOR_INDEX},
{"FROMORTONOTNEWS", iFromToNotNews, FOR_INDEX},
{"SIZE", iSize, FOR_INDEX},
{"SIZECOMMA", iSizeComma, FOR_INDEX},
{"SIZETHREAD", iSizeThread, FOR_INDEX},
{"SIZENARROW", iSizeNarrow, FOR_INDEX},
{"KSIZE", iKSize, FOR_INDEX},
! {"SUBJECT", iSubject, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE|FOR_TRIM},
{"SHORTSUBJECT", iShortSubject, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"FULLSTATUS", iFStatus, FOR_INDEX},
{"IMAPSTATUS", iIStatus, FOR_INDEX},
***************
*** 469,524 ****
{"SUBJECTTEXT", iSubjectText, FOR_INDEX},
{"SUBJKEYTEXT", iSubjKeyText, FOR_INDEX},
{"SUBJKEYINITTEXT", iSubjKeyInitText, FOR_INDEX},
! {"OPENINGTEXT", iOpeningText, FOR_INDEX},
! {"OPENINGTEXTNQ", iOpeningTextNQ, FOR_INDEX},
! {"KEY", iKey, FOR_INDEX},
! {"KEYINIT", iKeyInit, FOR_INDEX},
{"DESCRIPSIZE", iDescripSize, FOR_INDEX},
{"ATT", iAtt, FOR_INDEX},
{"SCORE", iScore, FOR_INDEX},
{"PRIORITY", iPrio, FOR_INDEX},
{"PRIORITYALPHA", iPrioAlpha, FOR_INDEX},
! {"PRIORITY!", iPrioBang, FOR_INDEX},
! {"LONGDATE", iLDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SHORTDATE1", iS1Date, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SHORTDATE2", iS2Date, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SHORTDATE3", iS3Date, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SHORTDATE4", iS4Date, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"DATEISO", iDateIso, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SHORTDATEISO", iDateIsoS, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATE", iSDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTTIME", iSTime, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"SMARTTIME24", iSTime24, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATEISO", iSDateIso, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATESHORTISO",iSDateIsoS, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATES1", iSDateS1, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATES2", iSDateS2, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATES3", iSDateS3, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATES4", iSDateS4, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIME", iSDateTime, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMEISO",iSDateTimeIso, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMESHORTISO",iSDateTimeIsoS,FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMES1", iSDateTimeS1, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMES2", iSDateTimeS2, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMES3", iSDateTimeS3, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMES4", iSDateTimeS4, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIME24", iSDateTime24, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMEISO24", iSDateTimeIso24,FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMESHORTISO24",iSDateTimeIsoS24,FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMES124", iSDateTimeS124, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMES224", iSDateTimeS224, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMES324", iSDateTimeS324, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATETIMES424", iSDateTimeS424, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"TIME24", iTime24, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"TIME12", iTime12, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"TIMEZONE", iTimezone, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"MONTHABBREV", iMonAbb, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"DAYOFWEEKABBREV", iDayOfWeekAbb, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"DAYOFWEEK", iDayOfWeek, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"FROM", iFrom, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"TO", iTo, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SENDER", iSender, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"CC", iCc, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"RECIPS", iRecips, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"NEWS", iNews, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"TOANDNEWS", iToAndNews, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
--- 477,536 ----
{"SUBJECTTEXT", iSubjectText, FOR_INDEX},
{"SUBJKEYTEXT", iSubjKeyText, FOR_INDEX},
{"SUBJKEYINITTEXT", iSubjKeyInitText, FOR_INDEX},
! {"OPENINGTEXT", iOpeningText, FOR_INDEX|FOR_RULE|FOR_SAVE|FOR_TRIM},
! {"OPENINGTEXTNQ", iOpeningTextNQ, FOR_INDEX|FOR_RULE|FOR_SAVE|FOR_TRIM},
! {"KEY", iKey, FOR_INDEX|FOR_RULE|FOR_SAVE|FOR_COMPOSE},
! {"KEYINIT", iKeyInit, FOR_INDEX|FOR_RULE|FOR_SAVE|FOR_COMPOSE},
{"DESCRIPSIZE", iDescripSize, FOR_INDEX},
{"ATT", iAtt, FOR_INDEX},
{"SCORE", iScore, FOR_INDEX},
{"PRIORITY", iPrio, FOR_INDEX},
{"PRIORITYALPHA", iPrioAlpha, FOR_INDEX},
! {"PRIORITY!", iPrioBang, FOR_INDEX},
! {"LONGDATE", iLDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SHORTDATE1", iS1Date, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SHORTDATE2", iS2Date, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SHORTDATE3", iS3Date, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SHORTDATE4", iS4Date, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"DATEISO", iDateIso, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SHORTDATEISO", iDateIsoS, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATE", iSDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTTIME", iSTime, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
{"SMARTTIME24", iSTime24, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"SMARTDATEISO", iSDateIso, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATESHORTISO",iSDateIsoS, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATES1", iSDateS1, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATES2", iSDateS2, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATES3", iSDateS3, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATES4", iSDateS4, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIME", iSDateTime, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMEISO",iSDateTimeIso, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMESHORTISO",iSDateTimeIsoS,FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMES1", iSDateTimeS1, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMES2", iSDateTimeS2, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMES3", iSDateTimeS3, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMES4", iSDateTimeS4, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIME24", iSDateTime24, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMEISO24", iSDateTimeIso24,FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMESHORTISO24",iSDateTimeIsoS24,FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMES124", iSDateTimeS124, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMES224", iSDateTimeS224, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMES324", iSDateTimeS324, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"SMARTDATETIMES424", iSDateTimeS424, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"TIME24", iTime24, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"TIME12", iTime12, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"TIMEZONE", iTimezone, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"MONTHABBREV", iMonAbb, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"DAYOFWEEKABBREV", iDayOfWeekAbb, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"DAYOFWEEK", iDayOfWeek, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"FROM", iFrom, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_COMPOSE},
! {"TO", iTo, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_COMPOSE},
! {"SENDER", iSender, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"CC", iCc, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_SAVE|FOR_SAVE},
! {"ADDRESSTO", iAddressTo, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"ADDRESSCC", iAddressCc, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"ADDRESSRECIPS", iAddressRecip, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"ADDRESSSENDER", iAddressSender, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
{"RECIPS", iRecips, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"NEWS", iNews, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"TOANDNEWS", iToAndNews, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
***************
*** 527,582 ****
{"NEWSANDRECIPS", iNewsAndRecips, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"MSGID", iMsgID, FOR_REPLY_INTRO|FOR_TEMPLATE},
{"CURNEWS", iCurNews, FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"DAYDATE", iRDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"PREFDATE", iPrefDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"PREFTIME", iPrefTime, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"PREFDATETIME", iPrefDateTime, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"DAY", iDay, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"DAYORDINAL", iDayOrdinal, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"DAY2DIGIT", iDay2Digit, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"MONTHLONG", iMonLong, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"MONTH", iMon, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"MONTH2DIGIT", iMon2Digit, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"YEAR", iYear, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"YEAR2DIGIT", iYear2Digit, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"ADDRESS", iAddress, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"MAILBOX", iMailbox, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"ROLENICK", iRoleNick, FOR_REPLY_INTRO|FOR_TEMPLATE},
{"INIT", iInit, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"CURDATE", iCurDate, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURDATEISO", iCurDateIso, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURDATEISOS", iCurDateIsoS, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURTIME24", iCurTime24, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURTIME12", iCurTime12, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURDAY", iCurDay, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURDAY2DIGIT", iCurDay2Digit, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURDAYOFWEEK", iCurDayOfWeek, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
{"CURDAYOFWEEKABBREV", iCurDayOfWeekAbb,
! FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURMONTH", iCurMon, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURMONTH2DIGIT", iCurMon2Digit, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURMONTHLONG", iCurMonLong, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURMONTHABBREV", iCurMonAbb, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURYEAR", iCurYear, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURYEAR2DIGIT", iCurYear2Digit, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURPREFDATE", iCurPrefDate, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"CURPREFTIME", iCurPrefTime, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
{"CURPREFDATETIME", iCurPrefDateTime,
! FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"LASTMONTH", iLstMon, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"LASTMONTH2DIGIT", iLstMon2Digit, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"LASTMONTHLONG", iLstMonLong, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"LASTMONTHABBREV", iLstMonAbb, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"LASTMONTHYEAR", iLstMonYear, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
{"LASTMONTHYEAR2DIGIT", iLstMonYear2Digit,
! FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"LASTYEAR", iLstYear, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
! {"LASTYEAR2DIGIT", iLstYear2Digit, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT},
{"HEADER", iHeader, FOR_INDEX},
{"TEXT", iText, FOR_INDEX},
{"ARROW", iArrow, FOR_INDEX},
{"NEWLINE", iNewLine, FOR_REPLY_INTRO},
{"CURSORPOS", iCursorPos, FOR_TEMPLATE},
{NULL, iNothing, FOR_NOTHING}
};
--- 539,609 ----
{"NEWSANDRECIPS", iNewsAndRecips, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"MSGID", iMsgID, FOR_REPLY_INTRO|FOR_TEMPLATE},
{"CURNEWS", iCurNews, FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"DAYDATE", iRDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"PREFDATE", iPrefDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"PREFTIME", iPrefTime, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"PREFDATETIME", iPrefDateTime, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"DAY", iDay, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"DAYORDINAL", iDayOrdinal, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"DAY2DIGIT", iDay2Digit, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"MONTHLONG", iMonLong, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"MONTH", iMon, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"MONTH2DIGIT", iMon2Digit, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"YEAR", iYear, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"YEAR2DIGIT", iYear2Digit, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE},
! {"ADDRESS", iAddress, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE},
{"MAILBOX", iMailbox, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
{"ROLENICK", iRoleNick, FOR_REPLY_INTRO|FOR_TEMPLATE},
{"INIT", iInit, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE},
! {"CURDATE", iCurDate, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURDATEISO", iCurDateIso, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURDATEISOS", iCurDateIsoS, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURTIME24", iCurTime24, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURTIME12", iCurTime12, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURDAY", iCurDay, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURDAY2DIGIT", iCurDay2Digit, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURDAYOFWEEK", iCurDayOfWeek, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
{"CURDAYOFWEEKABBREV", iCurDayOfWeekAbb,
! FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURMONTH", iCurMon, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURMONTH2DIGIT", iCurMon2Digit, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURMONTHLONG", iCurMonLong, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURMONTHABBREV", iCurMonAbb, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURYEAR", iCurYear, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURYEAR2DIGIT", iCurYear2Digit, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURPREFDATE", iCurPrefDate, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"CURPREFTIME", iCurPrefTime, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
{"CURPREFDATETIME", iCurPrefDateTime,
! FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"LASTMONTH", iLstMon, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"LASTMONTH2DIGIT", iLstMon2Digit, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"LASTMONTHLONG", iLstMonLong, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"LASTMONTHABBREV", iLstMonAbb, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"LASTMONTHYEAR", iLstMonYear, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
{"LASTMONTHYEAR2DIGIT", iLstMonYear2Digit,
! FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"LASTYEAR", iLstYear, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
! {"LASTYEAR2DIGIT", iLstYear2Digit, FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_FILT|FOR_RULE|FOR_SAVE},
{"HEADER", iHeader, FOR_INDEX},
{"TEXT", iText, FOR_INDEX},
{"ARROW", iArrow, FOR_INDEX},
{"NEWLINE", iNewLine, FOR_REPLY_INTRO},
{"CURSORPOS", iCursorPos, FOR_TEMPLATE},
+ {"NICK", iNick, FOR_RULE|FOR_SAVE},
+ {"FCCFROM", iFccFrom, FOR_RULE|FOR_SAVE},
+ {"FCCSENDER", iFccSender, FOR_RULE|FOR_SAVE},
+ {"ALTADDRESS", iAltAddress, FOR_RULE|FOR_SAVE},
+ {"FOLDER", iFolder, FOR_RULE|FOR_SAVE|FOR_FOLDER},
+ {"ROLE", iRole, FOR_RULE|FOR_RESUB|FOR_TRIM|FOR_TEMPLATE},
+ {"PROCID", iProcid, FOR_RULE|FOR_RESUB|FOR_FLAG|FOR_COMPOSE|FOR_TRIM|FOR_TEMPLATE},
+ {"PKEY", iPkey, FOR_RULE|FOR_KEY},
+ {"SCREEN", iScreen, FOR_RULE|FOR_KEY},
+ {"FLAG", iFlag, FOR_RULE|FOR_SAVE|FOR_FLAG},
+ {"COLLECTION", iCollection, FOR_RULE|FOR_SAVE|FOR_COMPOSE|FOR_FOLDER},
+ {"BCC", iBcc, FOR_COMPOSE|FOR_RULE},
+ {"LCC", iLcc, FOR_COMPOSE|FOR_RULE},
+ {"FORWARDFROM", iFfrom, FOR_COMPOSE|FOR_RULE},
+ {"FORWARDADDRESS", iFadd, FOR_COMPOSE|FOR_RULE},
{NULL, iNothing, FOR_NOTHING}
};
***************
*** 2483,2488 ****
--- 2510,2533 ----
from_str(cdesc->ctype, idata, str, sizeof(str), ice);
break;
+ case iAddressTo:
+ case iAddressCc:
+ case iAddressRecip:
+ {ENVELOPE *env;
+ int we_clear;
+ env = rules_fetchenvelope(idata, &we_clear);
+ sprintf(str, "%-*.*s", ifield->width, ifield->width,
+ detoken_src((cdesc->ctype == iAddressTo
+ ? "_ADDRESSTO_"
+ : (cdesc->ctype == iAddressCc
+ ? "_ADRESSCC_"
+ : "_ADRESSRECIPS_")), FOR_INDEX,
+ env, NULL, NULL, NULL));
+ if(we_clear)
+ mail_free_envelope(&env);
+ }
+ break;
+
case iTo:
if(((field = ((addr = fetch_to(idata))
? "To"
***************
*** 3833,3839 ****
--- 3878,3894 ----
if(p > buf){
size_t l;
+ ENVELOPE *env;
+ char *rule_result;
+ if(rule_result = find_value((delete_quotes
+ ? "_OPENINGTEXTNQ_" : "_OPENINGTEXT_"),
+ buf, PROCESS_SP, idata, 4)){
+ collspaces(rule_result);
+ strncpy(buf, rule_result, sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
+ fs_give((void **) &rule_result);
+ }
l = strlen(buf);
l += 100;
firsttext = fs_get((l+1) * sizeof(char));
***************
*** 5407,5416 ****
{
char *subject, *origsubj, *origstr, *rawsubj, *sptr = NULL;
char *p, *border, *q = NULL, *free_subj = NULL;
! char *sp;
size_t len;
int width = -1;
! int depth = 0, mult = 2;
int save;
int do_subj = 0, truncated_tree = 0;
PINETHRD_S *thd, *thdorig;
--- 5462,5471 ----
{
char *subject, *origsubj, *origstr, *rawsubj, *sptr = NULL;
char *p, *border, *q = NULL, *free_subj = NULL;
! char *sp, *rule_result;
size_t len;
int width = -1;
! int depth = 0, mult = 2, collapsed, i, we_clear = 0;
int save;
int do_subj = 0, truncated_tree = 0;
PINETHRD_S *thd, *thdorig;
***************
*** 5466,5471 ****
--- 5521,5534 ----
* to free it at the end of this routine.
*/
+ if (rule_result = find_value("_SUBJECT_", origsubj, PROCESS_SP, idata, 4)){
+ if(origsubj)
+ fs_give((void **)&origsubj);
+ we_clear++;
+ origsubj = cpystr(rule_result);
+ fs_give((void **)&rule_result);
+ }
+
if(shorten)
shorten_subject(origsubj);
***************
*** 5908,5913 ****
--- 5971,5979 ----
if(free_subj)
fs_give((void **) &free_subj);
+
+ if (we_clear && origsubj)
+ fs_give((void **)&origsubj);
}
***************
*** 6276,6291 ****
? "To"
: (addr = fetch_cc(idata))
? "Cc"
! : NULL))
! && set_index_addr(idata, field, addr, "To: ",
! strsize-1, fptr))
! break;
if(ctype == iFromTo &&
(newsgroups = fetch_newsgroups(idata)) &&
*newsgroups){
! snprintf(fptr, strsize, "To: %-*.*s", (int)(strsize-1-4), (int)(strsize-1-4),
! newsgroups);
break;
}
--- 6342,6374 ----
? "To"
: (addr = fetch_cc(idata))
? "Cc"
! : NULL))){
! char *rule_result;
! rule_result = find_value("_FROM_", NULL, 0, idata, 1);
! if (!rule_result)
! set_index_addr(idata, field, addr, "To: ",
! strsize-1, fptr);
! else{
! sprintf(str, "%-*.*s", strsize-1, strsize-1,
! rule_result);
! fs_give((void **)&rule_result);
! }
+ break;
+ }
if(ctype == iFromTo &&
(newsgroups = fetch_newsgroups(idata)) &&
*newsgroups){
! char *rule_result;
! rule_result = find_value("_FROM_", NULL, 0, idata, 1);
! if (!rule_result)
! sprintf(str, "To: %-*.*s", strsize-1-4,
! strsize-1-4, newsgroups);
! else{
! sprintf(str, "%-*.*s", strsize-1, strsize-1,
! rule_result);
! fs_give((void **)&rule_result);
! }
break;
}
***************
*** 6298,6304 ****
break;
case iFrom:
! set_index_addr(idata, "From", fetch_from(idata), NULL, strsize-1, fptr);
break;
case iAddress:
--- 6381,6395 ----
break;
case iFrom:
! { char *rule_result;
! rule_result = find_value("_FROM_", NULL, 0, idata, 4);
! if (!rule_result)
! set_index_addr(idata, "From", fetch_from(idata), NULL, strsize-1, fptr);
! else{
! sprintf(str, "%-*.*s", strsize-1, strsize-1, rule_result);
! fs_give((void **)&rule_result);
! }
! }
break;
case iAddress:
***************
*** 6596,6598 ****
--- 6687,6750 ----
}
}
}
+
+ void
+ setup_threading_display_style(void)
+ {
+ RULE_RESULT *rule;
+ NAMEVAL_S *v;
+ int i;
+
+ rule = get_result_rule(V_THREAD_DISP_STYLE_RULES, FOR_THREAD, NULL);
+ if (rule || ps_global->VAR_THREAD_DISP_STYLE){
+ for(i = 0; v = thread_disp_styles(i); i++)
+ if(!strucmp(rule ? rule->result : ps_global->VAR_THREAD_DISP_STYLE,
+ rule ? (v ? v->name : "" ) : S_OR_L(v))){
+ ps_global->thread_disp_style = v->value;
+ break;
+ }
+ if (rule){
+ if (rule->result)
+ fs_give((void **)&rule->result);
+ fs_give((void **)&rule);
+ }
+ }
+ }
+
+ char *
+ find_value(char *token, char *use_this, int flag, INDEXDATA_S *idata, int nfcn)
+ {
+ int n = 0, i, rule_context, we_clear;
+ char *rule_result = NULL, **list;
+ ENVELOPE *env;
+ RULELIST *rule;
+ RULE_S *prule;
+
+ env = rules_fetchenvelope(idata, &we_clear);
+ if(env && env->sparep)
+ fs_give((void **)&env->sparep);
+ if(we_clear)
+ mail_free_envelope(&env);
+ if(rule = get_rulelist_from_code(V_REPLACE_RULES, ps_global->rule_list)){
+ list = functions_for_token(token);
+ while(rule_result == NULL && (prule = get_rule(rule,n++))){
+ rule_context = 0;
+ if (prule->action->token && !strcmp(prule->action->token, token)){
+ for (i = 0; i < nfcn; i++)
+ if(list[i+1] && !strcmp(prule->action->function, list[i+1]))
+ rule_context |= context_for_function(list[i+1]);
+ if (rule_context){
+ env = rules_fetchenvelope(idata, &we_clear);
+ if(use_this)
+ env->sparep = get_sparep_for_rule(use_this, flag);
+ rule_result = process_rule(prule, rule_context, env);
+ if(env->sparep)
+ free_sparep_for_rule(&env->sparep);
+ if(we_clear)
+ mail_free_envelope(&env);
+ }
+ }
+ }
+ }
+ return rule_result;
+ }
diff -rc alpine-2.21/pith/mailindx.h alpine-2.21.rules/pith/mailindx.h
*** alpine-2.21/pith/mailindx.h Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/mailindx.h Sun Feb 5 16:15:21 2017
***************
*** 30,35 ****
--- 30,38 ----
/* exported prototypes */
+ SortOrder translate (char *, int);
+ char *find_value (char *, char *, int, INDEXDATA_S *, int);
+ void setup_threading_display_style (void);
int msgline_hidden(MAILSTREAM *, MSGNO_S *, long, int);
void adjust_cur_to_visible(MAILSTREAM *, MSGNO_S *);
unsigned long line_hash(char *);
diff -rc alpine-2.21/pith/makefile.wnt alpine-2.21.rules/pith/makefile.wnt
*** alpine-2.21/pith/makefile.wnt Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/makefile.wnt Sun Feb 5 16:15:21 2017
***************
*** 45,51 ****
init.h keyword.h ldap.h list.h mailcap.h mailcmd.h mailindx.h maillist.h \
mailpart.h mailview.h margin.h mimedesc.h mimetype.h msgno.h newmail.h news.h \
options.h pattern.h pineelt.h pipe.h readfile.h remote.h remtype.h repltype.h reply.h \
! rfc2231.h save.h savetype.h search.h send.h sequence.h signal.h sort.h sorttype.h \
state.h status.h store.h stream.h string.h strlst.h takeaddr.h tempfile.h text.h \
thread.h url.h user.h util.h
--- 45,51 ----
init.h keyword.h ldap.h list.h mailcap.h mailcmd.h mailindx.h maillist.h \
mailpart.h mailview.h margin.h mimedesc.h mimetype.h msgno.h newmail.h news.h \
options.h pattern.h pineelt.h pipe.h readfile.h remote.h remtype.h repltype.h reply.h \
! rfc2231.h rules.h save.h savetype.h search.h send.h sequence.h signal.h sort.h sorttype.h \
state.h status.h store.h stream.h string.h strlst.h takeaddr.h tempfile.h text.h \
thread.h url.h user.h util.h
***************
*** 54,60 ****
filter.obj flag.obj folder.obj handle.obj help.obj helptext.obj hist.obj icache.obj imap.obj init.obj \
keyword.obj ldap.obj list.obj mailcap.obj mailcmd.obj mailindx.obj maillist.obj mailview.obj \
margin.obj mimedesc.obj mimetype.obj msgno.obj newmail.obj news.obj pattern.obj pipe.obj \
! readfile.obj remote.obj reply.obj rfc2231.obj save.obj search.obj sequence.obj send.obj sort.obj state.obj \
status.obj store.obj stream.obj string.obj strlst.obj takeaddr.obj tempfile.obj text.obj \
thread.obj adjtime.obj url.obj util.obj
--- 54,60 ----
filter.obj flag.obj folder.obj handle.obj help.obj helptext.obj hist.obj icache.obj imap.obj init.obj \
keyword.obj ldap.obj list.obj mailcap.obj mailcmd.obj mailindx.obj maillist.obj mailview.obj \
margin.obj mimedesc.obj mimetype.obj msgno.obj newmail.obj news.obj pattern.obj pipe.obj \
! readfile.obj remote.obj reply.obj rfc2231.obj rules.obj save.obj search.obj sequence.obj send.obj sort.obj state.obj \
status.obj store.obj stream.obj string.obj strlst.obj takeaddr.obj tempfile.obj text.obj \
thread.obj adjtime.obj url.obj util.obj
diff -rc alpine-2.21/pith/pine.hlp alpine-2.21.rules/pith/pine.hlp
*** alpine-2.21/pith/pine.hlp Sun Feb 5 16:02:36 2017
--- alpine-2.21.rules/pith/pine.hlp Sun Feb 5 16:15:21 2017
***************
*** 3855,3860 ****
--- 3855,3861 ----
FEATURE:
FEATURE:
FEATURE:
+ FEATURE:
FEATURE:
FEATURE:
FEATURE:
***************
*** 19045,19050 ****
--- 19046,19052 ----
"" option,
in the "" option,
in signature files,
+ in the "new-rules" option,
in template files used in
"roles", and in the folder name
that is the target of a Filter Rule.
***************
*** 19057,19063 ****
!
Tokens Available for all Cases (except Filter Rules)
- SUBJECT
--- 19059,19065 ----
!
Tokens Available for all Cases (except Filter Rules or in some cases for new-rules)
- SUBJECT
***************
*** 19091,19096 ****
--- 19093,19114 ----
For example, "mailbox@domain".
+ - ADDRESSTO
+ -
+ This is similar to the "TO" token, only it is always the
+ email address of all people listed in the TO: field of the messages. Addresses
+ are separated by a blank space. Example, "mailbox@domain" when
+ the e-mail message contains only one person in the To: field, or
+ "peter@flintstones.com president@world.com".
+
+
+ - ADDRESSSENDER
+ -
+ This is similar to the "sender" token, only it is always the
+ email address of all person listed in the Sender: field of the message.
+ Example: "mailbox@domain".
+
+
- MAILBOX
-
This is the same as the "ADDRESS" except that the
***************
*** 19138,19143 ****
--- 19156,19170 ----
message's "Cc:" header field.
+ - ADDRESSCC
+ -
+ This is similar to the "CC" token, only it is always the
+ email address of all people listed in the Cc: field of the messages. Addresses
+ are separated by a blank space. Example: "mailbox@domain" when
+ the e-mail message contains only one person in the Cc: field, or
+ "peter@flintstones.com president@world.com".
+
+
- RECIPS
-
This token represents the personal names (or email addresses if the names
***************
*** 19146,19151 ****
--- 19173,19186 ----
the message's "Cc:" header field.
+ - ADDRESSRECIPS
+ -
+ This token represent the e-mail addresses of the people in the To: and
+ Cc: fields, exactly in that order separated by a space. It is almost obtained
+ by concatenating the ADDRESSTO and ADDRESSCC tokens.
+
+
+
- NEWSANDRECIPS
-
This token represents the newsgroups from the
***************
*** 20270,20275 ****
--- 20305,20414 ----
+
Tokens Available Only for New-Rules
+
+
+ - FCCFROM
+ -
+ The Fcc: folder assigned to the email address in the From: field in the
+ addressbook.
+
+
+
+
+ - FCCSENDER
+ -
+ The Fcc: folder assigned to the email address in the Sender: field in the
+ addressbook.
+
+
+
+
+ - ALTADDRESS
+ -
+ The value of your
+
+ variable. At this time, no expansion of regular expressions is supported.
+
+
+
+
+ - NICK
+ -
+ Nickname of the person in the From field in your addressbook.
+
+
+
+
+ - FOLDER
+ -
+ Name of the folder where the rule will be applied.
+
+
+
+
+ - COLLECTION
+ -
+ Name of the collection list where the rule will be applied.
+
+
+
+
+ - ROLE
+ -
+ Name of the Role used to reply a message.
+
+
+
+
+ - BCC
+ -
+ Not implemented yet, but it will be implemented in future versions. It will
+ be used for compose
+ reply
+ forward
+ rules.
+
+
+
+
+ - LCC
+ -
+ This is the value of the Lcc: field at the moment that you start the composition.
+
+
+
+
+ - FORWARDFROM
+ -
+ This corresponds to the personal name (or address if there's no personal
+ name) of the person who sent the message that you are forwarding.
+
+
+
+
+ - FORWARDADDRESS
+ -
+ This is the address of the person that sent the message that you
+ are forwarding.
+
+
+
+
+
+
+
+ - FLAG
+ -
+ A string containing the value of all the flags associated to a specific
+ message. The possible values of allowed flags are "*" for Important, "N"
+ for recent or new, "U" for unseen or unread, "R" for seen or read, "A" for
+ answered and "D" for deleted. See an example of its use in the
+ new rules explanation and example help.
+
+
+
+
Token Available Only for Templates and Signatures
***************
*** 23397,23402 ****
--- 23536,24432 ----
<End of help on this topic>