System update to UTF-8

This commit is contained in:
Michiel Broek 2007-02-25 20:55:33 +00:00
parent d8683d6303
commit c85c4b901d
2 changed files with 60 additions and 69 deletions

View File

@ -435,21 +435,20 @@ void s_newuser(void)
set_color(CYAN, BLACK); set_color(CYAN, BLACK);
mbse_mvprintw( 7, 6, "1. Access level"); mbse_mvprintw( 7, 6, "1. Access level");
mbse_mvprintw( 8, 6, "2. Cap. Username"); mbse_mvprintw( 8, 6, "2. Cap. Username");
mbse_mvprintw( 9, 6, "3. Ask ANSI"); mbse_mvprintw( 9, 6, "3. Ask Sex");
mbse_mvprintw(10, 6, "4. Ask Sex"); mbse_mvprintw(10, 6, "4. Ask Voicephone");
mbse_mvprintw(11, 6, "5. Ask Voicephone"); mbse_mvprintw(11, 6, "5. Ask Dataphone");
mbse_mvprintw(12, 6, "6. Ask Dataphone"); mbse_mvprintw(12, 6, "6. Telephone scan");
mbse_mvprintw(13, 6, "7. Telephone scan"); mbse_mvprintw(13, 6, "7. Ask Handle");
mbse_mvprintw(14, 6, "8. Ask Handle"); mbse_mvprintw(14, 6, "8. Ask Birth date");
mbse_mvprintw(15, 6, "9. Ask Birth date"); mbse_mvprintw(15, 6, "9.. Ask Location");
mbse_mvprintw(16, 6, "10. Ask Location");
mbse_mvprintw( 8,46, "11. Ask Hot-Keys"); mbse_mvprintw( 8,46, "10. Ask Hot-Keys");
mbse_mvprintw( 9,46, "12. One word names"); mbse_mvprintw( 9,46, "11. One word names");
mbse_mvprintw(10,46, "13. Ask Address"); mbse_mvprintw(10,46, "12. Ask Address");
mbse_mvprintw(11,46, "14. Give email"); mbse_mvprintw(11,46, "13. Give email");
mbse_mvprintw(12,46, "15. Do Newmail"); mbse_mvprintw(12,46, "14. Do Newmail");
mbse_mvprintw(13,46, "16. Do newfiles"); mbse_mvprintw(13,46, "15. Do newfiles");
} }
@ -461,14 +460,13 @@ void e_newuser(void)
set_color(WHITE, BLACK); set_color(WHITE, BLACK);
show_sec( 7,28, CFG.newuser_access); show_sec( 7,28, CFG.newuser_access);
show_bool( 8,28, CFG.iCapUserName); show_bool( 8,28, CFG.iCapUserName);
show_bool( 9,28, CFG.iAnsi); show_bool( 9,28, CFG.iSex);
show_bool(10,28, CFG.iSex); show_bool(10,28, CFG.iVoicePhone);
show_bool(11,28, CFG.iVoicePhone); show_bool(11,28, CFG.iDataPhone);
show_bool(12,28, CFG.iDataPhone); show_bool(12,28, CFG.iTelephoneScan);
show_bool(13,28, CFG.iTelephoneScan); show_bool(13,28, CFG.iHandle);
show_bool(14,28, CFG.iHandle); show_bool(14,28, CFG.iDOB);
show_bool(15,28, CFG.iDOB); show_bool(15,28, CFG.iLocation);
show_bool(16,28, CFG.iLocation);
show_bool( 8,68, CFG.iHotkeys); show_bool( 8,68, CFG.iHotkeys);
show_bool( 9,68, CFG.iOneName); show_bool( 9,68, CFG.iOneName);
@ -477,27 +475,26 @@ void e_newuser(void)
show_asktype(12,68, CFG.AskNewmail); show_asktype(12,68, CFG.AskNewmail);
show_asktype(13,68, CFG.AskNewfiles); show_asktype(13,68, CFG.AskNewfiles);
switch(select_menu(16)) { switch(select_menu(15)) {
case 0: return; case 0: return;
case 1: E_SEC( 7,28, CFG.newuser_access, "1.7.1 NEWUSER SECURITY", s_newuser) case 1: E_SEC( 7,28, CFG.newuser_access, "1.7.1 NEWUSER SECURITY", s_newuser)
case 2: E_BOOL( 8,28, CFG.iCapUserName, "^Capitalize^ username") case 2: E_BOOL( 8,28, CFG.iCapUserName, "^Capitalize^ username")
case 3: E_BOOL( 9,28, CFG.iAnsi, "Ask user if he wants ^ANSI^ colors") case 3: E_BOOL( 9,28, CFG.iSex, "Ask users ^sex^")
case 4: E_BOOL(10,28, CFG.iSex, "Ask users ^sex^") case 4: E_BOOL(10,28, CFG.iVoicePhone, "Ask users ^Voice^ phone number")
case 5: E_BOOL(11,28, CFG.iVoicePhone, "Ask users ^Voice^ phone number") case 5: E_BOOL(11,28, CFG.iDataPhone, "Ask users ^Data^ phone number")
case 6: E_BOOL(12,28, CFG.iDataPhone, "Ask users ^Data^ phone number") case 6: E_BOOL(12,28, CFG.iTelephoneScan, "Perform ^Telephone^ number scan")
case 7: E_BOOL(13,28, CFG.iTelephoneScan, "Perform ^Telephone^ number scan") case 7: E_BOOL(13,28, CFG.iHandle, "Ask users ^handle^")
case 8: E_BOOL(14,28, CFG.iHandle, "Ask users ^handle^") case 8: E_BOOL(14,28, CFG.iDOB, "Ask users ^Date of Birth^")
case 9: E_BOOL(15,28, CFG.iDOB, "Ask users ^Date of Birth^") case 9: E_BOOL(15,28, CFG.iLocation, "Ask users ^Location^")
case 10:E_BOOL(16,28, CFG.iLocation, "Ask users ^Location^")
case 11:E_BOOL( 8,68, CFG.iHotkeys, "Ask user if he wants ^Hot-Keys^") case 10:E_BOOL( 8,68, CFG.iHotkeys, "Ask user if he wants ^Hot-Keys^")
case 12:E_BOOL( 9,68, CFG.iOneName, "Allow ^one word^ (not in Unixmode) usernames") case 11:E_BOOL( 9,68, CFG.iOneName, "Allow ^one word^ (not in Unixmode) usernames")
case 13:E_BOOL(10,68, CFG.AskAddress, "Ask users ^home address^ in 3 lines") case 12:E_BOOL(10,68, CFG.AskAddress, "Ask users ^home address^ in 3 lines")
case 14:E_BOOL(11,68, CFG.GiveEmail, "Give new users an ^private email^ box") case 13:E_BOOL(11,68, CFG.GiveEmail, "Give new users an ^private email^ box")
case 15:CFG.AskNewmail = edit_asktype(12,68,CFG.AskNewmail, case 14:CFG.AskNewmail = edit_asktype(12,68,CFG.AskNewmail,
(char *)"Set ^new mail^ check at login, toggle wit space, Enter when done"); (char *)"Set ^new mail^ check at login, toggle wit space, Enter when done");
break; break;
case 16:CFG.AskNewfiles = edit_asktype(13,68,CFG.AskNewfiles, case 15:CFG.AskNewfiles = edit_asktype(13,68,CFG.AskNewfiles,
(char *)"Set ^new files^ check at login, toggle wit space, Enter when done"); (char *)"Set ^new files^ check at login, toggle wit space, Enter when done");
break; break;
} }
@ -1968,7 +1965,6 @@ int global_doc(FILE *fp, FILE *toc, int page)
fprintf(wp, "<TBODY>\n"); fprintf(wp, "<TBODY>\n");
web_secflags(wp, (char *)"Access level", CFG.newuser_access); web_secflags(wp, (char *)"Access level", CFG.newuser_access);
add_webtable(wp, (char *)"Cap. username", getboolean(CFG.iCapUserName)); add_webtable(wp, (char *)"Cap. username", getboolean(CFG.iCapUserName));
add_webtable(wp, (char *)"Ask ANSI", getboolean(CFG.iAnsi));
add_webtable(wp, (char *)"Ask Sex", getboolean(CFG.iSex)); add_webtable(wp, (char *)"Ask Sex", getboolean(CFG.iSex));
add_webtable(wp, (char *)"Ask Voicephone", getboolean(CFG.iVoicePhone)); add_webtable(wp, (char *)"Ask Voicephone", getboolean(CFG.iVoicePhone));
add_webtable(wp, (char *)"Ask Dataphone", getboolean(CFG.iDataPhone)); add_webtable(wp, (char *)"Ask Dataphone", getboolean(CFG.iDataPhone));
@ -1990,7 +1986,6 @@ int global_doc(FILE *fp, FILE *toc, int page)
addtoc(fp, toc, 1, 8, page, (char *)"New users defaults"); addtoc(fp, toc, 1, 8, page, (char *)"New users defaults");
fprintf(fp, " Access level %s\n", get_secstr(CFG.newuser_access)); fprintf(fp, " Access level %s\n", get_secstr(CFG.newuser_access));
fprintf(fp, " Cap. username %s\n", getboolean(CFG.iCapUserName)); fprintf(fp, " Cap. username %s\n", getboolean(CFG.iCapUserName));
fprintf(fp, " Ask ANSI %s\n", getboolean(CFG.iAnsi));
fprintf(fp, " Ask Sex %s\n", getboolean(CFG.iSex)); fprintf(fp, " Ask Sex %s\n", getboolean(CFG.iSex));
fprintf(fp, " Ask voicephone %s\n", getboolean(CFG.iVoicePhone)); fprintf(fp, " Ask voicephone %s\n", getboolean(CFG.iVoicePhone));
fprintf(fp, " Ask dataphone %s\n", getboolean(CFG.iDataPhone)); fprintf(fp, " Ask dataphone %s\n", getboolean(CFG.iDataPhone));

View File

@ -4,7 +4,7 @@
* Purpose ...............: Edit Users * Purpose ...............: Edit Users
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2006 * Copyright (C) 1997-2007
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -286,15 +286,14 @@ void Screen2(void)
mbse_mvprintw( 7,63, "14. Language"); mbse_mvprintw( 7,63, "14. Language");
mbse_mvprintw( 8,63, "15. Hotkeys"); mbse_mvprintw( 8,63, "15. Hotkeys");
mbse_mvprintw( 9,63, "16. Color"); mbse_mvprintw( 9,63, "16. Silent");
mbse_mvprintw(10,63, "17. Silent"); mbse_mvprintw(10,63, "17. CLS");
mbse_mvprintw(11,63, "18. CLS"); mbse_mvprintw(11,63, "18. More");
mbse_mvprintw(12,63, "19. More"); mbse_mvprintw(12,63, "19. Editor");
mbse_mvprintw(13,63, "20. Editor"); mbse_mvprintw(13,63, "20. MailScan");
mbse_mvprintw(14,63, "21. MailScan"); mbse_mvprintw(14,63, "21. ShowNews");
mbse_mvprintw(15,63, "22. ShowNews"); mbse_mvprintw(15,63, "22. NewFiles");
mbse_mvprintw(16,63, "23. NewFiles"); mbse_mvprintw(16,63, "23. Emacs");
mbse_mvprintw(17,63, "24. Emacs");
} }
@ -321,15 +320,14 @@ void Fields2(void)
snprintf(temp, 4, "%c",usrconfig.iLanguage); snprintf(temp, 4, "%c",usrconfig.iLanguage);
show_str( 7,76,1, temp); show_str( 7,76,1, temp);
show_bool( 8,76, usrconfig.HotKeys); show_bool( 8,76, usrconfig.HotKeys);
show_bool( 9,76, usrconfig.GraphMode); show_bool( 9,76, usrconfig.DoNotDisturb);
show_bool(10,76, usrconfig.DoNotDisturb); show_bool(10,76, usrconfig.Cls);
show_bool(11,76, usrconfig.Cls); show_bool(11,76, usrconfig.More);
show_bool(12,76, usrconfig.More); show_msgeditor(12,76, usrconfig.MsgEditor);
show_msgeditor(13,76, usrconfig.MsgEditor); show_bool(13,76, usrconfig.MailScan);
show_bool(14,76, usrconfig.MailScan); show_bool(14,76, usrconfig.ieNEWS);
show_bool(15,76, usrconfig.ieNEWS); show_bool(15,76, usrconfig.ieFILE);
show_bool(16,76, usrconfig.ieFILE); show_bool(16,76, usrconfig.FSemacs);
show_bool(17,76, usrconfig.FSemacs);
} }
@ -342,7 +340,7 @@ int EditUsrRec2(void)
Screen2(); Screen2();
for (;;) { for (;;) {
Fields2(); Fields2();
j = select_menu(24); j = select_menu(23);
switch(j) { switch(j) {
case 0: return 0; case 0: return 0;
case 1: E_STR( 6,17,35,usrconfig.sHandle, "The ^Handle^ of this user") case 1: E_STR( 6,17,35,usrconfig.sHandle, "The ^Handle^ of this user")
@ -416,16 +414,15 @@ int EditUsrRec2(void)
Screen2(); Screen2();
break; break;
case 15:E_BOOL( 8,76,usrconfig.HotKeys, "Is user using ^HotKeys^ for menus") case 15:E_BOOL( 8,76,usrconfig.HotKeys, "Is user using ^HotKeys^ for menus")
case 16:E_BOOL( 9,76,usrconfig.GraphMode, "Is user using ^ANSI^ colors") case 16:E_BOOL( 9,76,usrconfig.DoNotDisturb, "User will not be ^disturbed^")
case 17:E_BOOL(10,76,usrconfig.DoNotDisturb, "User will not be ^disturbed^") case 17:E_BOOL(10,76,usrconfig.Cls, "Send ^ClearScreen code^ to users terminal")
case 18:E_BOOL(11,76,usrconfig.Cls, "Send ^ClearScreen code^ to users terminal") case 18:E_BOOL(11,76,usrconfig.More, "User uses the ^More prompt^")
case 19:E_BOOL(12,76,usrconfig.More, "User uses the ^More prompt^") case 19:usrconfig.MsgEditor = edit_msgeditor(12,76,usrconfig.MsgEditor);
case 20:usrconfig.MsgEditor = edit_msgeditor(13,76,usrconfig.MsgEditor);
break; break;
case 21:E_BOOL(14,76,usrconfig.MailScan, "Don't check for ^new mail^") case 20:E_BOOL(13,76,usrconfig.MailScan, "Don't check for ^new mail^")
case 22:E_BOOL(15,76,usrconfig.ieNEWS, "Show ^News Bulletins^ when logging in") case 21:E_BOOL(14,76,usrconfig.ieNEWS, "Show ^News Bulletins^ when logging in")
case 23:E_BOOL(16,76,usrconfig.ieFILE, "Show ^New Files^ when logging in") case 22:E_BOOL(15,76,usrconfig.ieFILE, "Show ^New Files^ when logging in")
case 24:E_BOOL(17,76,usrconfig.FSemacs, "Use ^Emacs^ or Wordstart shorcut keys in FS editor") case 23:E_BOOL(16,76,usrconfig.FSemacs, "Use ^Emacs^ or Wordstart shorcut keys in FS editor")
} }
} }
} }
@ -734,7 +731,6 @@ void users_doc(void)
snprintf(temp, 4, "%c", usrconfig.iLanguage); snprintf(temp, 4, "%c", usrconfig.iLanguage);
add_webtable(wp, (char *)"Language", temp); add_webtable(wp, (char *)"Language", temp);
add_webtable(wp, (char *)"Use hotkeys", getboolean(usrconfig.HotKeys)); add_webtable(wp, (char *)"Use hotkeys", getboolean(usrconfig.HotKeys));
add_webtable(wp, (char *)"ANSI mode", getboolean(usrconfig.GraphMode));
add_webtable(wp, (char *)"Do not disturb", getboolean(usrconfig.DoNotDisturb)); add_webtable(wp, (char *)"Do not disturb", getboolean(usrconfig.DoNotDisturb));
add_webtable(wp, (char *)"Clear Screen", getboolean(usrconfig.Cls)); add_webtable(wp, (char *)"Clear Screen", getboolean(usrconfig.Cls));
add_webtable(wp, (char *)"More prompt", getboolean(usrconfig.More)); add_webtable(wp, (char *)"More prompt", getboolean(usrconfig.More));