From 8419a4151f3ad9864689eecbdfcaa4e6bfb6f142 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Wed, 3 Nov 2004 22:45:41 +0000 Subject: [PATCH] Minor bugfixes to page and chat --- ChangeLog | 7 ++++++- lang/Language.xref | 4 ++-- lang/dutch.txt | 4 ++-- lang/english.txt | 4 ++-- lang/french.txt | 4 ++-- lang/galego.txt | 4 ++-- lang/german.txt | 4 ++-- lang/germandu.txt | 4 ++-- lang/italian.txt | 4 ++-- lang/spanish.txt | 4 ++-- mbsebbs/door.c | 4 ---- mbsebbs/menu.c | 1 + mbsebbs/page.c | 17 +++++++---------- 13 files changed, 32 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4e60654..60b7ad75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,13 +10,18 @@ v0.71.0 27-Oct-2004 Changed layout of raw directory listing to support long filenames. Rewrote terminal i/o. + If a user pages the sysop a hint is displayed to fill in the + reason to chat, language prompt 28. + After forced chat, redisplay the last menu. mbnewusr: Rewrote terminal i/o. lang: Changed width of prompt 261. - + Added prompt 28. + Removed leading spaces of prompt 151. + examples: Fixed logo display. diff --git a/lang/Language.xref b/lang/Language.xref index 61379146..2c9f96d4 100644 --- a/lang/Language.xref +++ b/lang/Language.xref @@ -26,7 +26,7 @@ 25 change.c |Character set now set to: 26 newuser.c YN|Check for new mail at login [Y/n]: 27 newuser.c YN|Check for new files at login [Y/n]: -28 .c | +28 page.c |Enter a short reason for chat 29 .c | 30 .c | 31 .c | @@ -149,7 +149,7 @@ 148 funcs.c |Off 149 newuser.c |User name already exists 150 mail.c |Checking your mail box ... -151 page.c | MBSE BBS Chat +151 page.c |MBSE BBS Chat 152 page.c |The SysOp is currently speaking to somebody else. 153 page.c |Try paging him again in a few minutes ... 154 page.c |You have paged the Sysop the maximum times allowed. diff --git a/lang/dutch.txt b/lang/dutch.txt index f9eda6fe..3e122640 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -26,7 +26,7 @@ JN| Is dit juist [j/N]: |Karakter set is nu: JN|Kijk voor nieuwe post tijdens login [J/n]: JN|Kijk voor nieuwe bestanden tijdens login [J/n]: -| +|Geef een korte reden om te kletsen | | | @@ -149,7 +149,7 @@ JN|berichten, nu de post lezen? [J/n]: |Uit |Gebruikersnaam bestaat al |Even in Uw postbus kijken ... -| MBSE BBS Kletsen +|MBSE BBS Kletsen |De Sysop is nu even met iemand anders in gesprek. |Probeer het opnieuw in enkele minuten ... |U heeft de Sysop meer dan het maximaal aantal keren geroepen. diff --git a/lang/english.txt b/lang/english.txt index 3f0bcc44..05e8dcfc 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -26,7 +26,7 @@ YN| Is this correct [y/N]: |Character set now set to: YN|Check for new mail at login [Y/n]: YN|Check for new files at login [Y/n]: -| +|Enter a short reason for chat | | | @@ -149,7 +149,7 @@ YN|messages, read your mail now? [Y/n]: |Off |User name already exists |Checking your mail box ... -| MBSE BBS Chat +|MBSE BBS Chat |The SysOp is currently speaking to somebody else. |Try paging him again in a few minutes ... |You have paged the Sysop the maximum times allowed. diff --git a/lang/french.txt b/lang/french.txt index da20be9e..4c8c9364 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -26,7 +26,7 @@ YN| Is this correct [y/N]: |Character set now set to: YN|Check for new mail at login [Y/n]: YN|Check for new files at login [Y/n]: -| +|Enter a short reason for chat | | | @@ -149,7 +149,7 @@ ON|messages, les lire maintenant? [O/n]: |Inactif |Ce nom existe déjà |Vérification de la BAL ... -| MBSE BBS Chat +|MBSE BBS Chat |Le SysOp parle a quelqu'un d'autre. |Essayez de le rappeller dans quelques minutes ... |Vous avez appellé le Sysop le maximum de fois permises. diff --git a/lang/galego.txt b/lang/galego.txt index 84d922bf..e1305938 100644 --- a/lang/galego.txt +++ b/lang/galego.txt @@ -26,7 +26,7 @@ SN| |Character set now set to: YN|Check for new mail at login [Y/n]: YN|Check for new files at login [Y/n]: -| +|Enter a short reason for chat | | | @@ -149,7 +149,7 @@ SN|mensaxes, |Des |O nome xa existe |Buscando correo novo ... -| Charla de MBSE BBS +|Charla de MBSE BBS |O Sysop est  falando con outro usuario. |Intenta chamalo de novo dentro de un pouco ... |Xa chamacves moitas veces. diff --git a/lang/german.txt b/lang/german.txt index 374b6822..7d16e662 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -26,7 +26,7 @@ YN| Is this correct [y/N]: |Character set now set to: YN|Check for new mail at login [Y/n]: YN|Check for new files at login [Y/n]: -| +|Enter a short reason for chat | | | @@ -149,7 +149,7 @@ JN|Mitteilungen, moechten Sie jetzt Ihre Post lesen? [J/n]: |Aus |Dieser Benutzername existiert bereits |Suchen nach persoenlichen Mitteilungen, bitte warten ... -| MBSE BBS Chat +|MBSE BBS Chat |Der SysOp spricht gerade mit einem anderen User. |Bitte versuchen Sie es in einigen Minuten nochmals ... |Ihre maximale Anzahl von Sysop-Anrufen ist erreicht. diff --git a/lang/germandu.txt b/lang/germandu.txt index 9e4b0a8a..91fbf546 100644 --- a/lang/germandu.txt +++ b/lang/germandu.txt @@ -26,7 +26,7 @@ JN| Ist dies richtig richtig? [a/ein]: |Zeichensatz ist jetzt: YN|Check for new mail at login [Y/n]: YN|Check for new files at login [Y/n]: -| +|Enter a short reason for chat | | | @@ -149,7 +149,7 @@ JN|Mitteilungen, moechtest Du jetzt Deine Post lesen? [a/ein]: |Aus |Dieser Benutzername existiert bereits |Suchen nach persoenlichen Mitteilungen, bitte warten ... -| MBSE BBS Chat +|MBSE BBS Chat |Der SysOp spricht gerade mit einem anderen User. |Bitte versuche es in einigen Minuten nochmals ... |Ihre maximale Anzahl von Sysop-Anrufen ist erreicht. diff --git a/lang/italian.txt b/lang/italian.txt index 722d948b..6ee33eac 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -26,7 +26,7 @@ YN| Is this correct [y/N]: |Character set now set to: YN|Check for new mail at login [Y/n]: YN|Check for new files at login [Y/n]: -| +|Enter a short reason for chat | | | @@ -149,7 +149,7 @@ SN|nuovi messaggi, vuoi leggere la posta ora? [S/n]: |Off |Nome utente gia' in uso |Sto controllando la tua mail box ... -| MBSE BBS Chat +|MBSE BBS Chat |Il SysOp sta parlando con un altro utente. |Prova a chiamarlo di nuovo fra pochi minuti ... |Hai gia' chiamato il SysOp per il massimo numero di volte consentito. diff --git a/lang/spanish.txt b/lang/spanish.txt index d71ccabd..92151256 100644 --- a/lang/spanish.txt +++ b/lang/spanish.txt @@ -26,7 +26,7 @@ SN| Es correcto [s/N]: |Character set now set to: YN|Check for new mail at login [Y/n]: YN|Check for new files at login [Y/n]: -| +|Enter a short reason for chat | | | @@ -149,7 +149,7 @@ SN|mensajes, |Des |El nombre ya existe |Buscando correo nuevo ... -| Charla de mbsebbs +|Charla de mbsebbs |El Sysop est  hablando con otro usuario. |Intenta llamarlo de nuevo dentro de un rato ... |Ya has llamado muchas veces. diff --git a/mbsebbs/door.c b/mbsebbs/door.c index 4435c88d..b17e4b8d 100644 --- a/mbsebbs/door.c +++ b/mbsebbs/door.c @@ -304,10 +304,6 @@ void ExtDoor(char *Program, int NoDoorsys, int Y2Kdoorsys, int Comport, int NoSu else rc = execute_str((char *)"/bin/sh", (char *)"-c", Program, NULL, NULL, NULL); - /* - * Restore raw mode if needed, some doors put the terminal - * back in cooked mode. - */ rawport(); Altime(0); diff --git a/mbsebbs/menu.c b/mbsebbs/menu.c index bed5bccc..a4fea51d 100644 --- a/mbsebbs/menu.c +++ b/mbsebbs/menu.c @@ -198,6 +198,7 @@ void menu() if (strcmp(buf, "100:1,1;") == 0) { Syslog('+', "Forced sysop/user chat"); Chat(exitinfo.Name, (char *)"#sysop"); + continue; } } } diff --git a/mbsebbs/page.c b/mbsebbs/page.c index 3613c267..164035b8 100644 --- a/mbsebbs/page.c +++ b/mbsebbs/page.c @@ -59,12 +59,15 @@ void Page_Sysop(char *String) Reason = calloc(81, sizeof(char)); clear(); - colour(LIGHTRED, BLACK); /* MBSE BBS Chat */ - Center((char *) Language(151)); + poutCenter(LIGHTRED, BLACK, (char *) Language(151)); if (CFG.iAskReason) { - locate(6, 0); + locate(4, 0); + /* Enter a short reason for chat */ + poutCenter(GREEN, BLACK, (char *)Language(28)); + + locate(6,0); colour(BLUE, BLACK); PUTCHAR(213); for (i = 0; i < 78; i++) @@ -72,6 +75,7 @@ void Page_Sysop(char *String) PUTCHAR(184); Enter(1); + PUTCHAR(' '); colour(LIGHTGRAY, BLACK); for (i = 0; i < 78; i++) PUTCHAR(250); @@ -88,13 +92,6 @@ void Page_Sysop(char *String) colour(LIGHTGRAY, BLACK); GetPageStr(temp, 76); - colour(BLUE, BLACK); - PUTCHAR(212); - for (i = 0; i < 78; i++) - PUTCHAR(205); - PUTCHAR(190); - Enter(1); - if ((strcmp(temp, "")) == 0) return;