Implemented "Preset on first reply"
SVN revision: 2271
This commit is contained in:
+26
-11
@@ -9314,20 +9314,13 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
|
||||
}
|
||||
}
|
||||
|
||||
sprintf(str, "Preset on reply %s", attr_list[index]);
|
||||
sprintf(str, "Preset on first reply %s", attr_list[index]);
|
||||
if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0 && breply) {
|
||||
|
||||
if (!breedit || (breedit && i == 2)) { /* subst on reedit only if preset is under condition */
|
||||
el_retrieve(lbs, message_id, NULL, NULL, NULL, 0, NULL, 0, str, NULL, NULL, NULL, NULL);
|
||||
|
||||
/* check for multiple substitution */
|
||||
strlcpy(str, preset, sizeof(str));
|
||||
if (strchr(str, '$'))
|
||||
*strchr(str, '$') = 0;
|
||||
if (strchr(str, '%'))
|
||||
*strchr(str, '%') = 0;
|
||||
if (strchr(str, '#'))
|
||||
*strchr(str, '#') = 0;
|
||||
if (strncmp(str, attrib[index], strlen(str)) != 0) {
|
||||
if (str[0] == 0) {
|
||||
if (!breedit || (breedit && i == 2)) { /* subst on reedit only if preset is under condition */
|
||||
|
||||
/* do not format date for date attributes */
|
||||
i = build_subst_list(lbs, slist, svalue, attrib, (attr_flags[index] & (AF_DATE | AF_DATETIME))
|
||||
@@ -9347,6 +9340,28 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
|
||||
}
|
||||
}
|
||||
|
||||
sprintf(str, "Preset on reply %s", attr_list[index]);
|
||||
if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0 && breply) {
|
||||
|
||||
if (!breedit || (breedit && i == 2)) { /* subst on reedit only if preset is under condition */
|
||||
|
||||
/* do not format date for date attributes */
|
||||
i = build_subst_list(lbs, slist, svalue, attrib, (attr_flags[index] & (AF_DATE | AF_DATETIME))
|
||||
== 0);
|
||||
strsubst_list(preset, sizeof(preset), slist, svalue, i);
|
||||
|
||||
/* check for index substitution */
|
||||
if (!bedit && (strchr(preset, '%') || strchr(preset, '#'))) {
|
||||
/* get index */
|
||||
get_auto_index(lbs, index, preset, str, sizeof(str));
|
||||
strcpy(preset, str);
|
||||
}
|
||||
|
||||
if (!strchr(preset, '%'))
|
||||
strcpy(attrib[index], preset);
|
||||
}
|
||||
}
|
||||
|
||||
sprintf(str, "Preset on duplicate %s", attr_list[index]);
|
||||
if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0 && bduplicate) {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user