From 827cbede633bca7cfcaaea118bbf0bf3e3afc74f Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Thu, 20 Feb 2003 21:06:46 +0000 Subject: [PATCH] Fixed deleting messages, added menu item 206 --- ChangeLog | 8 +- TODO | 4 - html/menus/menu200.html | 4 +- lang/Language.xref | 4 +- lang/dutch.txt | 2 +- lang/english.txt | 2 +- lang/galego.txt | 2 +- lang/german.txt | 2 +- lang/italian.txt | 2 +- lang/spanish.txt | 2 +- lib/term.c | 1 + mbsebbs/mail.c | 434 +++++++++++++++++++++++----------------- 12 files changed, 270 insertions(+), 197 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69772d85..ac0f2160 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ v0.37.01 14-Jan-2003. Removed charset conversion/translation. Added integer endian byteorder swapper, usefull for non-Intel hardware. + The poutCR function for the bbs never did send a newline. mbtask: Arcmail for non-CM nodes and Txx nodes is now sent during the @@ -113,6 +114,10 @@ v0.37.01 14-Jan-2003. Maybe removed a bug where the bbs sometimes crashed during mail reading. Fixed some minor things to the door.sys file. + Normal users were allowed to delete messages of other users, + now only the writer or those with sysop access to the area are + allowed to delete messages. + Finally wrote Delete Message from the menu (menu 206). examples: The English and Dutch templates are updated to show the new @@ -121,7 +126,8 @@ v0.37.01 14-Jan-2003. functions. lang: - Changed english and dutch language prompts 11, 12, 13 and 107. + Changed english and dutch language prompts 11, 12, 13, 14 and + 107. Changed in other languages as well, but in English. diff --git a/TODO b/TODO index 59f0de44..28cab0c2 100644 --- a/TODO +++ b/TODO @@ -41,10 +41,6 @@ mbsebbs: L: ChangeHandle, allow own unix name as handle. - N: Delete messages from the menu. - - N: With delete message during reading there is no check. - newuser: L: Allow handles to be the same as the unixname. diff --git a/html/menus/menu200.html b/html/menus/menu200.html index a987acff..3d1c7e6a 100644 --- a/html/menus/menu200.html +++ b/html/menus/menu200.html @@ -12,7 +12,7 @@
-
Last update 08-Feb-2003
+
Last update 20-Feb-2003

MBSE BBS Message Area Menus

@@ -53,7 +53,7 @@

  • Delete a Message: This option will let the - user delete a specific message. He must the the owner or recipient of that + user delete a specific message. He must the the owner of that message or have sysop rights in that area to be able to delete a message.
    Optional data: None.

    diff --git a/lang/Language.xref b/lang/Language.xref index c8f446cb..5d9ae1ff 100644 --- a/lang/Language.xref +++ b/lang/Language.xref @@ -12,7 +12,7 @@ 11 mail.c email.c HR|Export to (H)ome or (R)ules directory: 12 mail.c email.c |Message exported to rules directory as 13 dispfile.c |No rules found for this area -14 .c | +14 mail.c |You are not allowed to delete that message 15 .c | 16 .c | 17 .c | @@ -329,7 +329,7 @@ 328 bbslist.c | Date of Entry : 329 bbslist.c | Entry Name : 330 bbslist.c |Delete BBS -331 bbslist.c oneline.c |Please enter number to delete: +331 bbslist.c oneline.c mail.c |Please enter number to delete: 332 bbslist.c oneline.c |Record 333 bbslist.c oneline.c |does not belong to you. 334 bbslist.c oneline.c |already marked for deletion diff --git a/lang/dutch.txt b/lang/dutch.txt index 434259ec..10764e01 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -12,7 +12,7 @@ JN|Is Uw naam juist gespeld? [J/n] HR|Exporteer naar (H)ome of (R)egels directory: |Bericht geexporteerd naar rules directory als |Geen regels gevonden voor dit gebied -|Bytes op de rekening +|Je mag dit bericht niet verwijderen |Tijd gestort vandaag |Bytes gestort vandaag |Tijd opgenomen vandaag diff --git a/lang/english.txt b/lang/english.txt index 4aeb717d..53f14779 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -12,7 +12,7 @@ YN|Did you spell your name correctly? [Y/n] HR|Export to (H)ome or (R)ules directory: |Message exported to rules directory as |No rules found for this area -|Bytes in account +|You are not allowed to delete that message |Time deposited today |Bytes deposited today |Time withdrawn today diff --git a/lang/galego.txt b/lang/galego.txt index 37bf221b..cb4d7899 100644 --- a/lang/galego.txt +++ b/lang/galego.txt @@ -12,7 +12,7 @@ SN| HR|Export to (H)ome or (R)ules directory: |Message exported to rules directory as |No rules found for this area -|Bytes na cuenta : +|You are not allowed to delete that message |Tempo depositado hoxe : |Bytes depositados hoxe : |Tempo retirado hoxe : diff --git a/lang/german.txt b/lang/german.txt index 5ced16b4..ca30a058 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -12,7 +12,7 @@ JN|Haben Sie Ihren Namen korrekt eingegeben? [J/n] HR|Export to (H)ome or (R)ules directory: |Message exported to rules directory as |No rules found for this area -|Kontostand Daten (KBytes) . . . . : +|You are not allowed to delete that message |Heute gesparte Zeit . . . . . . . : |Heute gesparte KBytes . . . . . . : |Heute abgehobene Zeit . . . . . . : diff --git a/lang/italian.txt b/lang/italian.txt index 24bf4764..afeb0d27 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -12,7 +12,7 @@ SN|Hai scritto il tuo nome e cognome correttamente? [S/n] HR|Export to (H)ome or (R)ules directory: |Message exported to rules directory as |No rules found for this area -|Byte disponibili : +|You are not allowed to delete that message |Tempo depositato oggi: |Byte depositati oggi : |Tempo prelevato oggi : diff --git a/lang/spanish.txt b/lang/spanish.txt index f4ac1641..00c26f4c 100644 --- a/lang/spanish.txt +++ b/lang/spanish.txt @@ -12,7 +12,7 @@ SN| HR|Export to (H)ome or (R)ules directory: |Message exported to rules directory as |No rules found for this area -|Bytes en la cuenta : +|You are not allowed to delete that message |Tiempo depositado hoy : |Bytes depositados hoy : |Tiempo retirado hoy : diff --git a/lib/term.c b/lib/term.c index 8fde1d26..afe5ad06 100644 --- a/lib/term.c +++ b/lib/term.c @@ -87,6 +87,7 @@ void poutCR(int fg, int bg, char *Str) { colour(fg, bg); fputs(Str, stdout); + fprintf(stdout, "\n"); fflush(stdout); } diff --git a/mbsebbs/mail.c b/mbsebbs/mail.c index c674d141..158c45d6 100644 --- a/mbsebbs/mail.c +++ b/mbsebbs/mail.c @@ -101,30 +101,30 @@ int IsMe(char *); /* Test if this is my userrecord */ */ int LC(int Lines) { - int z; + int z; - iLineCount += Lines; + iLineCount += Lines; - if (iLineCount >= exitinfo.iScreenLen && iLineCount < 1000) { - iLineCount = 1; + if (iLineCount >= exitinfo.iScreenLen && iLineCount < 1000) { + iLineCount = 1; - pout(CFG.MoreF, CFG.MoreB, (char *) Language(61)); - fflush(stdout); - alarm_on(); - z = toupper(Getone()); + pout(CFG.MoreF, CFG.MoreB, (char *) Language(61)); + fflush(stdout); + alarm_on(); + z = toupper(Getone()); - if (z == Keystroke(61, 1)) { - printf("\n"); - return(1); - } - - if (z == Keystroke(61, 2)) - iLineCount = 50000; - - Blanker(strlen(Language(61))); + if (z == Keystroke(61, 1)) { + printf("\n"); + return(1); } - return(0); + if (z == Keystroke(61, 2)) + iLineCount = 50000; + + Blanker(strlen(Language(61))); + } + + return(0); } @@ -135,14 +135,14 @@ int LC(int Lines) int Post_Allowed(void); int Post_Allowed(void) { - if (msgs.MsgKinds == RONLY) { - /* Message area is Readonly */ - pout(LIGHTRED, BLACK, (char *) Language(437)); - fflush(stdout); - sleep(3); - return FALSE; - } - return TRUE; + if (msgs.MsgKinds == RONLY) { + /* Message area is Readonly */ + pout(LIGHTRED, BLACK, (char *) Language(437)); + fflush(stdout); + sleep(3); + return FALSE; + } + return TRUE; } @@ -240,30 +240,30 @@ int Crash_Option(faddr *Dest) int IsPrivate(void); int IsPrivate(void) { - int rc = FALSE; + int rc = FALSE; - if (msgs.MsgKinds == BOTH) { - Enter(1); - /* Private [y/N]: */ - pout(CYAN, BLACK, (char *) Language(163)); - fflush(stdout); - alarm_on(); - if (toupper(Getone()) == Keystroke(163, 0)) { - rc = TRUE; - printf("%c", Keystroke(163, 0)); - } else { - printf("%c", Keystroke(163, 1)); - } - fflush(stdout); - } + if (msgs.MsgKinds == BOTH) { + Enter(1); + /* Private [y/N]: */ + pout(CYAN, BLACK, (char *) Language(163)); + fflush(stdout); + alarm_on(); + if (toupper(Getone()) == Keystroke(163, 0)) { + rc = TRUE; + printf("%c", Keystroke(163, 0)); + } else { + printf("%c", Keystroke(163, 1)); + } + fflush(stdout); + } - /* - * Allways set the private flag in Private areas. - */ - if (msgs.MsgKinds == PRIVATE) - rc = TRUE; + /* + * Allways set the private flag in Private areas. + */ + if (msgs.MsgKinds == PRIVATE) + rc = TRUE; - return rc; + return rc; } @@ -1175,88 +1175,100 @@ void Read_Msgs() */ int ReadPanel() { - int input; + int input; - WhosDoingWhat(READ_POST); + WhosDoingWhat(READ_POST); - colour(WHITE, RED); - if (msgs.UsrDelete || exitinfo.Security.level >= CFG.sysop_access) { - /* (A)gain, (N)ext, (L)ast, (R)eply, (E)nter, (D)elete, (Q)uit, e(X)port */ - printf("%s", (char *) Language(214)); - } else { - /* (A)gain, (N)ext, (L)ast, (R)eply, (E)nter, (Q)uit, e(X)port */ - printf("%s", (char *) Language(215)); + colour(WHITE, RED); + /* + * The writer of the message, sysops, and who has sysop rights to the message area + * are allowed to delete messages. + */ + if ((msgs.UsrDelete && IsMe(Msg.From)) || (exitinfo.Security.level >= CFG.sysop_access) || + Access(exitinfo.Security, msgs.SYSec)) { + /* (A)gain, (N)ext, (L)ast, (R)eply, (E)nter, (D)elete, (Q)uit, e(X)port */ + printf("%s", (char *) Language(214)); + } else { + /* (A)gain, (N)ext, (L)ast, (R)eply, (E)nter, (Q)uit, e(X)port */ + printf("%s", (char *) Language(215)); + } + if ((exitinfo.Security.level >= CFG.sysop_access) || Access(exitinfo.Security, msgs.SYSec)) + printf(", (!)"); + + printf(": "); + + fflush(stdout); + alarm_on(); + input = toupper(Getone()); + + if (input == '!') { /* ! Toggle kludges display */ + if ((exitinfo.Security.level >= CFG.sysop_access) || Access(exitinfo.Security, msgs.SYSec)) { + if (Kludges) + Kludges = FALSE; + else + Kludges = TRUE; } - if (exitinfo.Security.level >= CFG.sysop_access) - printf(", (!)"); + Read_a_Msg(LastNum, TRUE); + + } else if (input == Keystroke(214, 0)) { /* (A)gain */ + Read_a_Msg(LastNum, TRUE); - printf(": "); + } else if (input == Keystroke(214, 4)) { /* (P)ost */ + Post_Msg(); + Read_a_Msg(LastNum, TRUE); - fflush(stdout); - alarm_on(); - input = toupper(Getone()); + } else if (input == Keystroke(214, 2)) { /* (L)ast */ + if (LastNum > MsgBase.Lowest) + LastNum--; + Read_a_Msg(LastNum, TRUE); - if (input == '!') { - if (exitinfo.Security.level >= CFG.sysop_access) { - if (Kludges) - Kludges = FALSE; - else - Kludges = TRUE; - } + } else if (input == Keystroke(214, 3)) { /* (R)eply */ + Reply_Msg(TRUE); + Read_a_Msg(LastNum, TRUE); + + } else if (input == Keystroke(214, 5)) { /* (Q)uit */ + /* Quit */ + printf("%s\n", (char *) Language(189)); + return FALSE; + + } else if (input == Keystroke(214, 7)) { /* e(X)port */ + Export_a_Msg(LastNum); + Read_a_Msg(LastNum, TRUE); + + } else if (input == '+') { + if (Msg.Reply) + LastNum = Msg.Reply; + Read_a_Msg(LastNum, TRUE); + + } else if (input == '-') { + if (Msg.Original) + LastNum = Msg.Original; + Read_a_Msg(LastNum, TRUE); + + } else if (input == Keystroke(214, 6)) { /* (D)elete */ + if ((msgs.UsrDelete && IsMe(Msg.From)) || (exitinfo.Security.level >= CFG.sysop_access) || + Access(exitinfo.Security, msgs.SYSec)) { + Delete_MsgNum(LastNum); + if (LastNum < MsgBase.Highest) { + LastNum++; Read_a_Msg(LastNum, TRUE); - } else if (input == Keystroke(214, 0)) { /* (A)gain */ - Read_a_Msg(LastNum, TRUE); - - } else if (input == Keystroke(214, 4)) { /* (P)ost */ - Post_Msg(); - Read_a_Msg(LastNum, TRUE); - - } else if (input == Keystroke(214, 2)) { /* (L)ast */ - if (LastNum > MsgBase.Lowest) - LastNum--; - Read_a_Msg(LastNum, TRUE); - - } else if (input == Keystroke(214, 3)) { /* (R)eply */ - Reply_Msg(TRUE); - Read_a_Msg(LastNum, TRUE); - - } else if (input == Keystroke(214, 5)) { /* (Q)uit */ - /* Quit */ - printf("%s\n", (char *) Language(189)); + } else { return FALSE; - - } else if (input == Keystroke(214, 7)) { /* e(X)port */ - Export_a_Msg(LastNum); - Read_a_Msg(LastNum, TRUE); - - } else if (input == '+') { - if (Msg.Reply) - LastNum = Msg.Reply; - Read_a_Msg(LastNum, TRUE); - - } else if (input == '-') { - if (Msg.Original) - LastNum = Msg.Original; - Read_a_Msg(LastNum, TRUE); - - } else if (input == Keystroke(214, 6)) { /* (D)elete */ - Delete_MsgNum(LastNum); - if (LastNum < MsgBase.Highest) { - LastNum++; - Read_a_Msg(LastNum, TRUE); - } else { - return FALSE; - } + } } else { - /* Next */ - pout(WHITE, BLACK, (char *) Language(216)); - if (LastNum < MsgBase.Highest) - LastNum++; - else - return FALSE; - Read_a_Msg(LastNum, TRUE); + Read_a_Msg(LastNum, TRUE); } - return TRUE; + + } else { + /* Next */ + pout(WHITE, BLACK, (char *) Language(216)); + if (LastNum < MsgBase.Highest) + LastNum++; + else + return FALSE; + Read_a_Msg(LastNum, TRUE); + } + return TRUE; } @@ -1476,64 +1488,64 @@ int IsMe(char *Name) void QuickScan_Msgs() { - int FoundMsg = FALSE; - long i; + int FoundMsg = FALSE; + long i; - iLineCount = 2; - WhosDoingWhat(READ_POST); + iLineCount = 2; + WhosDoingWhat(READ_POST); - if (MsgBase.Total == 0) { - Enter(1); - /* There are no messages in this area. */ - pout(WHITE, BLACK, (char *) Language(205)); - Enter(3); - sleep(3); - return; - } + if (MsgBase.Total == 0) { + Enter(1); + /* There are no messages in this area. */ + pout(WHITE, BLACK, (char *) Language(205)); + Enter(3); + sleep(3); + return; + } - clear(); - /* # From To Subject */ - poutCR(YELLOW, BLUE, (char *) Language(220)); + clear(); + /* # From To Subject */ + poutCR(YELLOW, BLUE, (char *) Language(220)); - if (Msg_Open(sMsgAreaBase)) { - for (i = MsgBase.Lowest; i <= MsgBase.Highest; i++) { - if (Msg_ReadHeader(i) && ((msgs.Type != NETMAIL) || + if (Msg_Open(sMsgAreaBase)) { + for (i = MsgBase.Lowest; i <= MsgBase.Highest; i++) { + if (Msg_ReadHeader(i) && ((msgs.Type != NETMAIL) || ((msgs.Type == NETMAIL) && ((IsMe(Msg.From)) || (IsMe(Msg.To)))))) { - colour(WHITE, BLACK); - printf("%-6lu", Msg.Id); - if (IsMe(Msg.From)) - colour(LIGHTCYAN, BLACK); - else - colour(CYAN, BLACK); - printf("%s ", padleft(Msg.From, 20, ' ')); + colour(WHITE, BLACK); + printf("%-6lu", Msg.Id); + if (IsMe(Msg.From)) + colour(LIGHTCYAN, BLACK); + else + colour(CYAN, BLACK); + printf("%s ", padleft(Msg.From, 20, ' ')); - if (IsMe(Msg.To)) - colour(LIGHTGREEN, BLACK); - else - colour(GREEN, BLACK); - printf("%s ", padleft(Msg.To, 20, ' ')); - colour(MAGENTA, BLACK); - printf("%s", padleft(Msg.Subject, 31, ' ')); - printf("\n"); - FoundMsg = TRUE; - if (LC(1)) - break; - } - } - Msg_Close(); + if (IsMe(Msg.To)) + colour(LIGHTGREEN, BLACK); + else + colour(GREEN, BLACK); + printf("%s ", padleft(Msg.To, 20, ' ')); + colour(MAGENTA, BLACK); + printf("%s", padleft(Msg.Subject, 31, ' ')); + printf("\n"); + FoundMsg = TRUE; + if (LC(1)) + break; + } } + Msg_Close(); + } - if(!FoundMsg) { - Enter(1); - /* There are no messages in this area. */ - pout(LIGHTGREEN, BLACK, (char *) Language(205)); - Enter(2); - sleep(3); - } + if (!FoundMsg) { + Enter(1); + /* There are no messages in this area. */ + pout(LIGHTGREEN, BLACK, (char *) Language(205)); + Enter(2); + sleep(3); + } - iLineCount = 2; - Pause(); + iLineCount = 2; + Pause(); } @@ -1543,7 +1555,67 @@ void QuickScan_Msgs() */ void Delete_Msg() { + char *temp; + unsigned long Msgnum = 0L; + + WhosDoingWhat(READ_POST); + + /* + * The area data is already set, so we can do the next things + */ + if (MsgBase.Total == 0) { + colour(WHITE, BLACK); + /* There are no messages in this area */ + printf("\n%s\n\n", (char *) Language(205)); + sleep(3); return; + } + + colour(CFG.TextColourF, CFG.TextColourB); + /* Message area \"%s\" contains %lu messages. */ + printf("\n%s\"%s\" %s%lu %s", (char *) Language(221), sMsgAreaDesc, + (char *) Language(222), MsgBase.Total, (char *) Language(223)); + + colour(WHITE, BLACK); + /* Please enter a message between */ + printf("\n%s(%lu - %lu): ", (char *) Language(224), MsgBase.Lowest, MsgBase.Highest); + + temp = calloc(81, sizeof(char)); + colour(CFG.InputColourF, CFG.InputColourB); + GetstrC(temp, 10); + if ((strcmp(temp, "")) != 0) + Msgnum = atoi(temp); + free(temp); + + if (!Msg_Open(sMsgAreaBase)) { + WriteError("Error open JAM base %s", sMsgAreaBase); + return; + } + + if (!Msg_ReadHeader(Msgnum)) { + perror(""); + colour(WHITE, BLACK); + /* Message doesn't exist */ + printf("\n%s\n\n", (char *)Language(77)); + Msg_Close(); + sleep(3); + return; + } + Msg_Close(); + + /* + * Message does exist and a valid number is suplied, check and finally mark the message deleted. + */ + if ((msgs.UsrDelete && IsMe(Msg.From)) || (exitinfo.Security.level >= CFG.sysop_access) || + Access(exitinfo.Security, msgs.SYSec)) { + Delete_MsgNum(Msgnum); + } else { + colour(LIGHTRED, BLACK); + printf("\n%s\n\n", (char *)Language(14)); + } + + sleep(3); + return; } @@ -1933,27 +2005,25 @@ void MsgArea_List(char *Option) -/* - * Function deletes a specified message. - */ void Delete_MsgNum(unsigned long MsgNum) { - int Result = FALSE; + int Result = FALSE; - pout(LIGHTRED, BLACK, (char *) Language(230)); + /* Deleting message */ + pout(LIGHTRED, BLACK, (char *) Language(230)); - if (Msg_Open(sMsgAreaBase)) { - if (Msg_Lock(15L)) { - Result = Msg_Delete(MsgNum); - Msg_UnLock(); - } - Msg_Close(); + if (Msg_Open(sMsgAreaBase)) { + if (Msg_Lock(15L)) { + Result = Msg_Delete(MsgNum); + Msg_UnLock(); } + Msg_Close(); + } - if (Result) - Syslog('+', "Deleted msg #%lu in Area #%d (%s)", MsgNum, iMsgAreaNumber, sMsgAreaDesc); - else - WriteError("ERROR delete msg #%lu in Area #%d (%s)", MsgNum, iMsgAreaNumber, sMsgAreaDesc); + if (Result) + Syslog('+', "Deleted msg #%lu in Area #%d (%s)", MsgNum, iMsgAreaNumber, sMsgAreaDesc); + else + WriteError("ERROR delete msg #%lu in Area #%d (%s)", MsgNum, iMsgAreaNumber, sMsgAreaDesc); }