projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finished migrating legacy control record to new config format
[citadel.git]
/
citadel
/
modules
/
ctdlproto
/
serv_user.c
diff --git
a/citadel/modules/ctdlproto/serv_user.c
b/citadel/modules/ctdlproto/serv_user.c
index 7d6b18c6c4e8115f8bbdb845f9660a54af9a17c6..51ea437b7241951c9c7fb7bffe77c8178ddbe421 100644
(file)
--- a/
citadel/modules/ctdlproto/serv_user.c
+++ b/
citadel/modules/ctdlproto/serv_user.c
@@
-240,23
+240,19
@@
void cmd_creu(char *cmdbuf)
}
}
-
/*
* get user parameters
*/
void cmd_getu(char *cmdbuf)
{
/*
* get user parameters
*/
void cmd_getu(char *cmdbuf)
{
-
if (CtdlAccessCheck(ac_logged_in))
return;
CtdlGetUser(&CC->user, CC->curr_user);
if (CtdlAccessCheck(ac_logged_in))
return;
CtdlGetUser(&CC->user, CC->curr_user);
- cprintf("%d 80|24|%d|\n",
- CIT_OK,
- (CC->user.flags & US_USER_SET)
- );
+ cprintf("%d 80|24|%d|\n", CIT_OK, (CC->user.flags & US_USER_SET));
}
}
+
/*
* set user parameters
*/
/*
* set user parameters
*/
@@
-423,7
+419,7
@@
void cmd_gnur(char *argbuf)
return;
}
return;
}
- if ((C
itControl.MMflags
& MM_VALID) == 0) {
+ if ((C
tdlGetConfigInt("MMflags")
& MM_VALID) == 0) {
cprintf("%d There are no unvalidated users.\n", CIT_OK);
return;
}
cprintf("%d There are no unvalidated users.\n", CIT_OK);
return;
}
@@
-451,13
+447,12
@@
void cmd_gnur(char *argbuf)
*/
begin_critical_section(S_CONTROL);
*/
begin_critical_section(S_CONTROL);
- get_control();
- CitControl.MMflags = CitControl.MMflags & (~MM_VALID);
- put_control();
+ int flags;
+ flags = CtdlGetConfigInt("MMflags");
+ flags = flags & (~MM_VALID);
+ CtdlSetConfigInt("MMflags", flags);
end_critical_section(S_CONTROL);
cprintf("%d *** End of registration.\n", CIT_OK);
end_critical_section(S_CONTROL);
cprintf("%d *** End of registration.\n", CIT_OK);
-
-
}
}
@@
-533,9
+528,9
@@
void cmd_chek(char *argbuf)
regis = 1;
if (CC->user.axlevel >= AxAideU) {
regis = 1;
if (CC->user.axlevel >= AxAideU) {
- get_control();
- if (CitControl.MMflags & MM_VALID)
+ if (CtdlGetConfigInt("MMflags") & MM_VALID) {
vali = 1;
vali = 1;
+ }
}
/* check for mail */
}
/* check for mail */