*** empty log message ***

[citadel.git] / citadel / routines.c

diff --git a/citadel/routines.c b/citadel/routines.c
index fd96cbaeacfff21aa8fc851dc4131b062a1fa6c7..7bb82394998967c00d41b0655727239ed3c76f2e 100644 (file)
--- a/citadel/routines.c
+++ b/citadel/routines.c
@@ -107,7 +107,7 @@ void edituser(CtdlIPC *ipc)
 {
        char buf[SIZ];
        char who[USERNAME_SIZE];
-       struct usersupp *user = NULL;
+       struct user *user = NULL;
        int newnow = 0;
        int r;                          /* IPC response code */
 
@@ -134,6 +134,11 @@ void edituser(CtdlIPC *ipc)
        }
 
        user->axlevel = intprompt("Access level", user->axlevel, 0, 6);
+
+       user->flags = set_attr(ipc, user->flags,
+               "Permission to send/receive Internet mail",
+               US_INTERNET, 0);
+
        if (boolprompt("Ask user to register again", !(user->flags & US_REGIS)))
                user->flags &= ~US_REGIS;
        else
@@ -159,7 +164,7 @@ void edituser(CtdlIPC *ipc)
  * yes or no.  Yes=1 and No=0, unless 'backwards' is set to a nonzero value
  * in which case No=1 and Yes=0.
  */
-int set_attr(CtdlIPC *ipc, int sval, char *prompt, unsigned int sbit, int backwards)
+int set_attr(CtdlIPC *ipc, unsigned int sval, char *prompt, unsigned int sbit, int backwards)
 {
        int a;
        int temp;
@@ -199,7 +204,7 @@ int set_attr(CtdlIPC *ipc, int sval, char *prompt, unsigned int sbit, int backwa
 void enter_config(CtdlIPC *ipc, int mode)
 {
        char buf[SIZ];
-       struct usersupp *user = NULL;
+       struct user *user = NULL;
        int r;                          /* IPC response code */
 
        r = CtdlIPCGetConfig(ipc, &user, buf);
@@ -326,17 +331,6 @@ int pattern(char *search, char *patn) {
 }
 
 
-/* display internal error as defined in errmsgs */
-/*
-void interr(int errnum) {
-       scr_printf("*** INTERNAL ERROR %d\n"
-               "(Press any key to continue)\n", errnum);
-       inkey();
-       logoff(errnum);
-}
-*/
-
-
 void strproc(char *string)
 {
        int a;
@@ -388,28 +382,27 @@ char *strerror(int e)
 #endif
 
 
-void progress(long int curr, long int cmax)
+void progress(unsigned long curr, unsigned long cmax)
 {
-       static long dots_printed;
-       long a;
-
-       if (curr==0) {
-               scr_printf(".......................................");
-               scr_printf(".......................................\r");
-               scr_flush();
-               dots_printed = 0;
-       }
-       else if (curr==cmax) {
-               scr_printf("\r%79s\n","");
-       }
-       else {
-               a=(curr * 100) / cmax;
-               a=a*78; a=a/100;
-               while (dots_printed < a) {
-                       scr_printf("*");
-                       ++dots_printed;
-                       scr_flush();
-               }
+       static char dots[] =
+               "**************************************************";
+       char dots_printed[51];
+       char fmt[42];
+       unsigned long a;
+
+       if (curr >= cmax) {
+               sln_printf("\r%79s\r","");
+               status_line(serv_info.serv_humannode, serv_info.serv_bbs_city,
+                       room_name, secure, 0);
+       } else {
+               /* a will be range 0-50 rather than 0-100 */
+               a=(curr * 50) / cmax;
+               sprintf(fmt, "[%%s%%%lds] %%3ld%%%% %%10ld/%%10ld\r", 50 - a);
+               strncpy(dots_printed, dots, a);
+               dots_printed[a] = 0;
+               sln_printf(fmt, dots_printed, "",
+                               curr * 100 / cmax, curr, cmax);
+               sln_flush();
        }
 }