Small updates for mailreading
This commit is contained in:
parent
f57d6bc53c
commit
e31e54ba4e
@ -987,7 +987,8 @@ void ShowMsgHdr(void)
|
|||||||
|
|
||||||
/* Subject : */
|
/* Subject : */
|
||||||
pout(YELLOW, BLACK, (char *) Language(210));
|
pout(YELLOW, BLACK, (char *) Language(210));
|
||||||
pout(GREEN, BLACK, chartran(Msg.Subject));
|
colour(GREEN, BLACK);
|
||||||
|
PUTSTR(chartran(Msg.Subject));
|
||||||
Enter(1);
|
Enter(1);
|
||||||
|
|
||||||
colour(CFG.HiliteF, CFG.HiliteB);
|
colour(CFG.HiliteF, CFG.HiliteB);
|
||||||
@ -1159,7 +1160,7 @@ int Export_a_Msg(unsigned int Num)
|
|||||||
*/
|
*/
|
||||||
int Read_a_Msg(unsigned int Num, int UpdateLR)
|
int Read_a_Msg(unsigned int Num, int UpdateLR)
|
||||||
{
|
{
|
||||||
char *p = NULL, *fn, *charset = NULL, *charsin = NULL, temp[256];
|
char *p = NULL, *fn, *charset = NULL, *charsin = NULL;
|
||||||
int ShowMsg = TRUE;
|
int ShowMsg = TRUE;
|
||||||
lastread LR;
|
lastread LR;
|
||||||
|
|
||||||
@ -1247,11 +1248,13 @@ int Read_a_Msg(unsigned int Num, int UpdateLR)
|
|||||||
}
|
}
|
||||||
free(fn);
|
free(fn);
|
||||||
|
|
||||||
if ((charset == NULL) && (msgs.Charset != FTNC_NONE)) {
|
if (charset == NULL) {
|
||||||
/*
|
/*
|
||||||
* No charset marked in the message, use the area charset
|
* No charset marked in the message, we are going to asume
|
||||||
|
* that an ancient dos program is used with IBMPC characters.
|
||||||
|
* This means CP437.
|
||||||
*/
|
*/
|
||||||
charsin = xstrcpy(get_ic_ftn(msgs.Charset));
|
charsin = xstrcpy((char *)"CP437");
|
||||||
} else {
|
} else {
|
||||||
charsin = xstrcpy(get_ic_ftn(find_ftn_charset(charset)));
|
charsin = xstrcpy(get_ic_ftn(find_ftn_charset(charset)));
|
||||||
}
|
}
|
||||||
@ -1275,7 +1278,10 @@ int Read_a_Msg(unsigned int Num, int UpdateLR)
|
|||||||
do {
|
do {
|
||||||
if ((p[0] == '\001') || (!strncmp(p, "SEEN-BY:", 8)) || (!strncmp(p, "AREA:", 5))) {
|
if ((p[0] == '\001') || (!strncmp(p, "SEEN-BY:", 8)) || (!strncmp(p, "AREA:", 5))) {
|
||||||
if (Kludges) {
|
if (Kludges) {
|
||||||
pout(LIGHTGRAY, BLACK, p);
|
colour(LIGHTGRAY, BLACK);
|
||||||
|
if (p[0] == '\001')
|
||||||
|
p[0]= 'a'; // Make it printable
|
||||||
|
PUTSTR(chartran(p));
|
||||||
Enter(1);
|
Enter(1);
|
||||||
if (CheckLine(CFG.TextColourF, CFG.TextColourB, FALSE))
|
if (CheckLine(CFG.TextColourF, CFG.TextColourB, FALSE))
|
||||||
break;
|
break;
|
||||||
@ -1285,10 +1291,8 @@ int Read_a_Msg(unsigned int Num, int UpdateLR)
|
|||||||
if (strchr(p, '>') != NULL)
|
if (strchr(p, '>') != NULL)
|
||||||
if ((strlen(p) - strlen(strchr(p, '>'))) < 10)
|
if ((strlen(p) - strlen(strchr(p, '>'))) < 10)
|
||||||
colour(CFG.HiliteF, CFG.HiliteB);
|
colour(CFG.HiliteF, CFG.HiliteB);
|
||||||
strncpy(temp, chartran(p), sizeof(temp) -1);
|
PUTSTR(chartran(p));
|
||||||
PUTSTR(temp);
|
|
||||||
Enter(1);
|
Enter(1);
|
||||||
|
|
||||||
if (CheckLine(CFG.TextColourF, CFG.TextColourB, FALSE))
|
if (CheckLine(CFG.TextColourF, CFG.TextColourB, FALSE))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -466,9 +466,6 @@ void user(void)
|
|||||||
Chg_Charset();
|
Chg_Charset();
|
||||||
}
|
}
|
||||||
|
|
||||||
setlocale(LC_CTYPE, getlocale(exitinfo.Charset));
|
|
||||||
Syslog('b', "setlocale(LC_CTYPE, NULL) returns \"%s\"", printable(setlocale(LC_CTYPE, NULL), 0));
|
|
||||||
|
|
||||||
GetLastUser();
|
GetLastUser();
|
||||||
StartTime = xstrcpy(GetLocalHM());
|
StartTime = xstrcpy(GetLocalHM());
|
||||||
ChangeHomeDir(exitinfo.Name, exitinfo.Email);
|
ChangeHomeDir(exitinfo.Name, exitinfo.Email);
|
||||||
|
Reference in New Issue
Block a user