Use the new data format for RoomInfo in spoolcontrol (what is this for?)

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 4ae077862c857a8e0ef58770a017bacc205de25b..b27068ecba02851360b21e16ac93df0de5a63f1b 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -1,7 +1,7 @@
 /* 
  * Server functions which perform operations on user objects.
  *
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2016 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License, version 3.
@@ -529,8 +529,8 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
 
        /* If a "master user" is defined, handle its authentication if specified */
        CC->is_master = 0;
-       if (    (strlen(CtdlGetConfigStr("c_master_user")) > 0) && 
-               (strlen(CtdlGetConfigStr("c_master_pass")) > 0) &&
+       if (    (!IsEmptyStr(CtdlGetConfigStr("c_master_user"))) && 
+               (!IsEmptyStr(CtdlGetConfigStr("c_master_pass"))) &&
                (authname != NULL) &&
                (!strcasecmp(authname, CtdlGetConfigStr("c_master_user"))) )
        {
@@ -968,7 +968,6 @@ int CtdlTryPassword(const char *password, long len)
  */
 int purge_user(char pname[])
 {
-       char filename[64];
        struct ctdluser usbuf;
        char usernamekey[USERNAME_SIZE];
 
@@ -1016,22 +1015,6 @@ int purge_user(char pname[])
        /* delete the userlog entry */
        cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
 
-       /* remove the user's bio file */
-       snprintf(filename, 
-                        sizeof filename, 
-                        "%s/%ld",
-                        ctdl_bio_dir,
-                        usbuf.usernum);
-       unlink(filename);
-
-       /* remove the user's picture */
-       snprintf(filename, 
-                        sizeof filename, 
-                        "%s/%ld.gif",
-                        ctdl_image_dir,
-                        usbuf.usernum);
-       unlink(filename);
-
        return (0);
 }