bbs/magicka
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modify to and subject on reply

Browse Source
This commit is contained in:
Andrew Pamment 2018-05-09 13:19:49 +10:00
parent 94a273038a
commit 8c9111fa17
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
STRINGS.CHANGES
View File

@ -79,6 +79,14 @@ LINE 190 MODIFIED
OLDSTRING: "\e[1;30m[\e[1;34;44m%4d\e[1;30;40m] \e[1;37m%-25.25s \e[1;32m%-15.15s \e[1;33m%-15.15s \e[1;35m%02d:%02d %02d-%02d-%02d\e[K\e[0m\r\n" OLDSTRING: "\e[1;30m[\e[1;34;44m%4d\e[1;30;40m] \e[1;37m%-25.25s \e[1;32m%-15.15s \e[1;33m%-15.15s \e[1;35m%02d:%02d %02d-%02d-%02d\e[K\e[0m\r\n"
NEWSTRING: "\e[1;30m[\e[1;34;44m%5d\e[1;30;40m] \e[1;37m%-24.24s \e[1;32m%-15.15s \e[1;33m%-15.15s \e[1;35m%02d:%02d %02d-%02d-%02d\e[K\e[0m\r\n" NEWSTRING: "\e[1;30m[\e[1;34;44m%5d\e[1;30;40m] \e[1;37m%-24.24s \e[1;32m%-15.15s \e[1;33m%-15.15s \e[1;35m%02d:%02d %02d-%02d-%02d\e[K\e[0m\r\n"
LINE 115 MODIFIED
OLDSTRING: "\r\n\r\nReplying to: %s\r\n"
NEWSTRING: "\r\n\e[1;32m To: \e[0m"
LINE 116 MODIFIED
OLDSTRING: "Change Subject? (Y/N) "
NEWSTRING: "\r\n\e[1;32mSubject: \e[0m"
Changes from v0.8-alpha -> v0.9-alpha Changes from v0.8-alpha -> v0.9-alpha
-------------------------------------------------------------- --------------------------------------------------------------
LINE: 255 NEW LINE: 255 NEW

4
dist/magicka.strings vendored
View File

@ -112,8 +112,8 @@ Quoting Cancelled\r\n
\e[1;30m-------------------------------------------------------------------------------\e[0m\r\n \e[1;30m-------------------------------------------------------------------------------\e[0m\r\n
\r\n\e[1;37mPress \e[1;36mR \e[1;37mto reply, \e[1;36mQ \e[1;37mto quit, \e[1;36mB \e[1;37mto go Back, \e[1;36mSPACE \e[1;37mfor Next Mesage... \r\n\e[1;37mPress \e[1;36mR \e[1;37mto reply, \e[1;36mQ \e[1;37mto quit, \e[1;36mB \e[1;37mto go Back, \e[1;36mSPACE \e[1;37mfor Next Mesage...
\r\nSorry, you are not allowed to post in this area\r\n \r\nSorry, you are not allowed to post in this area\r\n
\r\n\r\nReplying to: %s\r\n \r\n\e[1;32m To: \e[0m
Change Subject? (Y/N) \r\n\e[1;32mSubject: \e[0m
\r\nNew subject: \r\nNew subject:
\r\nOk, not changing the subject line... \r\nOk, not changing the subject line...
\r\n\r\nNo more messages\r\n \r\n\r\nNo more messages\r\n

27
src/mail_menu.c
View File

@ -1700,23 +1700,14 @@ int read_message(struct user_record *user, struct msg_headers *msghs, int mailno
subject = (char *)malloc(strlen(buffer) + 1); subject = (char *)malloc(strlen(buffer) + 1);
strcpy(subject, buffer); strcpy(subject, buffer);
s_printf(get_string(114), subject); s_printf(get_string(114));
s_readstring_inject(buffer, 32, msghs->msgs[mailno]->from);
to = strdup(buffer);
s_printf(get_string(115)); s_printf(get_string(115));
s_readstring_inject(buffer, 64, subject);
c = s_getc();
if (tolower(c) == 'y') {
s_printf(get_string(116));
s_readstring(buffer, 25);
if (strlen(buffer) == 0) {
s_printf(get_string(117));
} else {
free(subject); free(subject);
subject = (char *)malloc(strlen(buffer) + 1); subject = strdup(buffer);
strcpy(subject, buffer);
}
}
s_printf("\r\n"); s_printf("\r\n");
if (msghs->msgs[mailno]->from != NULL) { if (msghs->msgs[mailno]->from != NULL) {
@ -1730,11 +1721,9 @@ int read_message(struct user_record *user, struct msg_headers *msghs, int mailno
sprintf(from, "%s %s", user->firstname, user->lastname); sprintf(from, "%s %s", user->firstname, user->lastname);
} }
if (conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_NEWSGROUP_AREA) { if (conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_NEWSGROUP_AREA) {
free(to);
to = (char *)malloc(4); to = (char *)malloc(4);
strcpy(to, "ALL"); strcpy(to, "ALL");
} else {
to = (char *)malloc(strlen(buffer) + 1);
strcpy(to, buffer);
} }
replybody = external_editor(user, to, from, body, z2, msghs->msgs[mailno]->from, subject, 0, 0); replybody = external_editor(user, to, from, body, z2, msghs->msgs[mailno]->from, subject, 0, 0);
if (replybody != NULL) { if (replybody != NULL) {
@ -2128,7 +2117,7 @@ void post_message(struct user_record *user) {
sprintf(buffer, "ALL"); sprintf(buffer, "ALL");
} else { } else {
s_printf(get_string(54)); s_printf(get_string(54));
s_readstring(buffer, 16); s_readstring(buffer, 32);
} }
if (strlen(buffer) == 0) { if (strlen(buffer) == 0) {
strcpy(buffer, "ALL"); strcpy(buffer, "ALL");