#include "genstamp.h"
#include "threads.h"
#include "citadel_ldap.h"
+#include "context.h"
#include "ctdl_module.h"
*
*/
int rename_user(char *oldname, char *newname) {
- struct CitContext *cptr;
int retcode = RENAMEUSER_OK;
struct ctdluser usbuf;
char oldnamekey[USERNAME_SIZE];
char newnamekey[USERNAME_SIZE];
- /* We cannot rename a user who is currently logged in */
- for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
- if (!strcasecmp(cptr->user.fullname, oldname)) {
- return(RENAMEUSER_LOGGED_IN);
- }
- }
-
/* Create the database keys... */
makeuserkey(oldnamekey, oldname);
makeuserkey(newnamekey, newname);
/* Lock up and get going */
begin_critical_section(S_USERS);
+ /* We cannot rename a user who is currently logged in */
+ if (CtdlIsUserLoggedIn(oldname)) {
+ end_critical_section(S_USERS);
+ return RENAMEUSER_LOGGED_IN;
+ }
+
if (CtdlGetUser(&usbuf, newname) == 0) {
retcode = RENAMEUSER_ALREADY_EXISTS;
}
*/
void logout(void)
{
- struct CitContext *CCC = CC; /* CachedCitContext - performance boost */
+ CtdlUserLogout();
+}
+
+
+void CtdlUserLogout(void)
+{
+ CitContext *CCC = CC; /* CachedCitContext - performance boost */
/*
* If there is a download in progress, abort it.
*/
char filename[64];
struct ctdluser usbuf;
char usernamekey[USERNAME_SIZE];
- struct CitContext *ccptr;
- int user_is_logged_in = 0;
makeuserkey(usernamekey, pname);
* set the access level to 0, and let the account get swept up
* during the next purge.
*/
- user_is_logged_in = 0;
- begin_critical_section(S_SESSION_TABLE);
- for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
- if (ccptr->user.usernum == usbuf.usernum) {
- user_is_logged_in = 1;
- }
- }
- end_critical_section(S_SESSION_TABLE);
- if (user_is_logged_in == 1) {
+ if (CtdlIsUserLoggedInByNum(usbuf.usernum)) {
CtdlLogPrintf(CTDL_WARNING, "User <%s> is logged in; not deleting.\n", pname);
usbuf.axlevel = 0;
CtdlPutUser(&usbuf);
}
CtdlLogPrintf(CTDL_NOTICE, "Deleting user <%s>\n", pname);
+/*
+ * FIXME:
+ * This should all be wrapped in a S_USERS mutex.
+ * Without the mutex the user could log in before we get to the next function
+ * That would truly mess things up :-(
+ * I would like to see the S_USERS start before the CtdlIsUserLoggedInByNum() above
+ * and end after the user has been deleted from the database, below.
+ * Question is should we enter the EVT_PURGEUSER whilst S_USERS is active?
+ */
+
/* Perform any purge functions registered by server extensions */
PerformUserHooks(&usbuf, EVT_PURGEUSER);
-/*
- * Check to see if the user who we just sent mail to is logged in. If yes,
- * bump the 'new mail' counter for their session. That enables them to
- * receive a new mail notification without having to hit the database.
- */
-void BumpNewMailCounter(long which_user) {
- struct CitContext *ptr;
-
- begin_critical_section(S_SESSION_TABLE);
-
- for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
- if (ptr->user.usernum == which_user) {
- ptr->newmail += 1;
- }
- }
-
- end_critical_section(S_SESSION_TABLE);
-}
-
-
/*
* Count the number of new mail messages the user has
*/