Added newuser questions for screenlen, newmail check and newfiles check

ChangeLog

@@ -23,6 +23,9 @@ v0.61.3		25-Jul-2004
 	examples:
 		Fixed 2 spelling errors in the dutch macro templates.
 
+	lang:
+		Added language prompts 26 and 27.
+
 
 v0.61.2		11-Jul-2004 - 25-Jul-2004
 

lang/Language.xref

@@ -24,8 +24,8 @@
 23	change.c			|Select your preferred character set
 24	change.c			|Select character set (Enter to Quit):
 25	change.c			|Character set now set to: 
-26	.c				|
+26	newuser.c			YN|Check for new mail at login [Y/n]: 
-27	.c				|
+27	newuser.c			YN|Check for new files at login [Y/n]: 
 28	.c				|
 29	.c				|
 30	.c				|

lang/dutch.txt

@@ -24,8 +24,8 @@ JN| Is dit juist [j/N]:
 |Kies Uw karakter set
 |Kies karakter set (Enter is Stop): 
 |Karakter set is nu: 
-|
+JN|Kijk voor nieuwe post tijdens login [J/n]: 
-|
+JN|Kijk voor nieuwe bestanden tijdens login [J/n]: 
 |
 |
 |

lang/english.txt

@@ -24,8 +24,8 @@ YN| Is this correct [y/N]:
 |Select your preferred character set
 |Select character set (Enter to Quit): 
 |Character set now set to: 
-|
+YN|Check for new mail at login [Y/n]: 
-|
+YN|Check for new files at login [Y/n]: 
 |
 |
 |

lang/french.txt

@@ -24,8 +24,8 @@ YN| Is this correct [y/N]:
 |Select your preferred character set
 |Select character set (Enter to Quit): 
 |Character set now set to: 
-|
+YN|Check for new mail at login [Y/n]: 
-|
+YN|Check for new files at login [Y/n]: 
 |
 |
 |

lang/galego.txt

@@ -24,8 +24,8 @@ SN|
 |Select your preferred character set
 |Select character set (Enter to Quit): 
 |Character set now set to: 
-|
+YN|Check for new mail at login [Y/n]: 
-|
+YN|Check for new files at login [Y/n]: 
 |
 |
 |

lang/german.txt

@@ -24,8 +24,8 @@ YN| Is this correct [y/N]:
 |Select your preferred character set
 |Select character set (Enter to Quit): 
 |Character set now set to: 
-|
+YN|Check for new mail at login [Y/n]: 
-|
+YN|Check for new files at login [Y/n]: 
 |
 |
 |

lang/germandu.txt

@@ -24,8 +24,8 @@ JN| Ist dies richtig richtig? [<j>a/<N>ein]:
 |Waehle Deinen bevorzugten Zeichensatz
 |Waehle Zeichensatz (beenden mit <ENTER>): 
 |Zeichensatz ist jetzt: 
-|
+YN|Check for new mail at login [Y/n]: 
-|
+YN|Check for new files at login [Y/n]: 
 |
 |
 |

lang/italian.txt

@@ -24,8 +24,8 @@ YN| Is this correct [y/N]:
 |Select your preferred character set
 |Select character set (Enter to Quit): 
 |Character set now set to: 
-|
+YN|Check for new mail at login [Y/n]: 
-|
+YN|Check for new files at login [Y/n]: 
 |
 |
 |

lang/spanish.txt

@@ -24,8 +24,8 @@ SN| Es correcto [s/N]:
 |Select your preferred character set
 |Select character set (Enter to Quit): 
 |Character set now set to: 
-|
+YN|Check for new mail at login [Y/n]: 
-|
+YN|Check for new files at login [Y/n]: 
 |
 |
 |

lib/mbselib.h

@@ -379,7 +379,7 @@ struct icmp_filter {
  *  Global typedefs.
  *
  */
-typedef enum {YES, NO, ASK, ONLY} ASKTYPE;
+typedef enum {YES, NO, ASK} ASKTYPE;
 typedef enum {LOCALMAIL, NETMAIL, ECHOMAIL, NEWS, LIST} MSGTYPE;
 typedef enum {BOTH, PRIVATE, PUBLIC, RONLY, FTNMOD, USEMOD} MSGKINDSTYPE;
 typedef enum {IGNORE, CREATE, KILL} ORPHANTYPE;
@@ -959,6 +959,7 @@ struct	sysconfig {
 	unsigned	GiveEmail	: 1;	/* Give user email	    */
 	unsigned	AskAddress      : 1;	/* Ask Home Address	    */
 	unsigned	iOneName        : 1;	/* Allow one user name      */
+	unsigned	AskScreenlen	: 1;	/* Ask screenlength	    */
 	unsigned	iCrashLevel;		/* User level for crash mail*/
 	unsigned	iAttachLevel;		/* User level for fileattach*/
 
@@ -989,9 +990,10 @@ struct	sysconfig {
 	char		xNuScreen[50];          /* Obsolete Next User Door  */
 	char		xNuQuote[81];
 
-	int		xSafeFirstDigit;
+	int		AskNewmail;		/* Ask newmail check	    */
-	int		xSafeSecondDigit;
+	int		AskNewfiles;		/* Ask newfiles check	    */
-	int		xSafeThirdDigit;
+	int		xAskDummy;
+
 	int		xSafeMaxTrys;
 	int		xSafeMaxNumber;
 	unsigned	xSafeNumGen  : 1;

mbsebbs/newuser.c

@@ -448,6 +448,7 @@ int newuser()
 
     usrconfig.iTimeLeft    = 20;  /* Set Timeleft in users file to 20 */
 
+    if (CFG.AskScreenlen) {
 	Enter(1);
 	/* Please enter your Screen Length [24]: */
 	pout(LIGHTMAGENTA, BLACK, (char *) Language(64));
@@ -460,7 +461,9 @@ int newuser()
 	    usrconfig.iScreenLen = 24;
 	else
 	    usrconfig.iScreenLen = atoi(temp);
-
+    } else {
+	usrconfig.iScreenLen = 24;
+    }
     TermInit(usrconfig.GraphMode, 80, usrconfig.iScreenLen);
     alarm_on();
 
@@ -470,8 +473,61 @@ int newuser()
 
     sprintf(usrconfig.sProtocol, "%s", (char *) Language(65));
     usrconfig.DoNotDisturb = FALSE;
+
+    switch (CFG.Newmail) {
+	case NO:    usrconfig.Mailscan = FALSE;
+		    break;
+	case YES:   usrconfig.MailScan = TRUE;
+		    break;
+	default:    while (TRUE) {
+			Enter(1);
+			/* Check for new mail at login [Y/n]: */
+			pout(LIGHTRED, BLACK, (char *) Language(26));
+			colour(CFG.InputColourF, CFG.InputColourB);
+			alarm_on();
+			GetstrC(temp, 8);
+
+			if ((toupper(temp[0]) == Keystroke(26, 0)) || (strcmp(temp,"") == 0)) {
 			    usrconfig.MailScan = TRUE;
+			    break;
+			}
+			if (toupper(temp[0]) == Keystroke(26, 1)) {
+			    usrconfig.MailScan = FALSE;
+			    break;
+			}
+			/* Please answer Y or N */
+			pout(WHITE, BLACK, (char *) Language(63));
+		    }
+		    break;
+    }
+
+    switch (CFG.Newfiles) {
+	case NO:    usrconfig.ieFILE = FALSE;
+		    break;
+	case YES:   usrconfig.ieFILE = TRUE;
+		    break;
+	default:    while (TRUE) {
+			Enter(1);
+			/* Check for new files at login [Y/n]: */
+			pout(LIGHTRED, BLACK, (char *) Language(27));
+			colour(CFG.InputColourF, CFG.InputColourB);
+			alarm_on();
+			GetstrC(temp, 8);
+
+			if ((toupper(temp[0]) == Keystroke(27, 0)) || (strcmp(temp,"") == 0)) {
 			    usrconfig.ieFILE = TRUE;
+			    break;
+			}
+			if (toupper(temp[0]) == Keystroke(27, 1)) {
+			    usrconfig.ieFILE = FALSE;
+			    break;
+			}
+			/* Please answer Y or N */
+			pout(WHITE, BLACK, (char *) Language(63));
+		    }
+		    break;
+    }
+
     usrconfig.ieNEWS       = TRUE;
     usrconfig.Cls          = TRUE;
     usrconfig.More         = TRUE;

mbsetup/ledit.c

@@ -1901,6 +1901,50 @@ char *getmagictype(int val)
 
 
 
+char *get_asktype(int val)
+{
+    switch(val) {
+	case	YES:	return (char *)"Yes";
+	case	NO:	return (char *)"No ";
+	case	ASK:	return (char *)"Ask";
+	default:	return (char *)"???";
+    }
+}
+
+
+
+void show_asktype(int y, int x, int val)
+{
+    mvprintw(y, x, get_asktype(val));
+}
+
+
+
+int edit_asktype(int y, int x, int val)
+{
+    int ch;
+
+    showhelp((char *)"Toggle ^Question mode^ with spacebar, press <Enter> whene done.");
+    do {
+	set_color(YELLOW, BLUE);
+	show_asktype(y, x, val);
+
+	ch = readkey(y, x, YELLOW, BLUE);
+
+	if (ch == ' ') {
+	    if (val < ASK)
+		val++;
+	    else
+		val = YES;
+	}
+    } while (ch != KEY_ENTER && ch != '\012');
+    set_color(WHITE, BLACK);
+    show_asktype(y, x, val);
+    return val;
+}
+
+
+
 char *get_sessiontype(int val)
 {
     switch (val) {

mbsetup/ledit.h

@@ -70,6 +70,9 @@ int 		edit_linetype(int, int, int);
 char		*getmagictype(int);
 void		show_magictype(int, int, int);
 int		edit_magictype(int, int, int);
+char		*get_asktype(int, int, int);
+void		show_asktype(int, int, int);
+int		edit_asktype(int, int, int);
 char		*get_sessiontype(int);
 void		show_sessiontype(int, int, int);
 int		edit_sessiontype(int, int, int);

mbtask/mbtask.c

@@ -219,6 +219,9 @@ void load_maincfg(void)
         CFG.iAttachLevel = 100;
         CFG.new_groups = 25;
 	CFG.max_logins = 1;
+	CFG.AskScreenlen = ASK;
+	CFG.AskNewmail = ASK;
+	CFG.AskNewfiles = ASK;
 
         CFG.slow_util = TRUE;
         CFG.iCrashLevel = 100;