calculate the directories in a central manner.

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 1fb0936e629a818857b1cfc6cfdd58a5e9a0c7eb..37649cc4c63f3918d5a8ebd78ae6c7e17cc97ec7 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -5,10 +5,6 @@
  *
  */
 
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
 #include "sysdep.h"
 #include <errno.h>
 #include <stdlib.h>
@@ -757,23 +753,19 @@ int purge_user(char pname[])
        cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
 
        /* remove the user's bio file */
-       snprintf(filename, sizeof filename, 
-#ifndef HAVE_DATA_DIR
-                        "."
-#else
-                        DATA_DIR
-#endif
-                        "/bio/%ld", usbuf.usernum);
+       snprintf(filename, 
+                        sizeof filename, 
+                        "%s/%ld",
+                        ctdl_bio_dir,
+                        usbuf.usernum);
        unlink(filename);
 
        /* remove the user's picture */
-       snprintf(filename, sizeof filename, 
-#ifndef HAVE_DATA_DIR
-                        "."
-#else
-                        DATA_DIR
-#endif
-                        "/userpics/%ld.gif", usbuf.usernum);
+       snprintf(filename, 
+                        sizeof filename, 
+                        "%s/%ld.gif",
+                        ctdl_image_dir,
+                        usbuf.usernum);
        unlink(filename);
 
        return (0);
@@ -1157,7 +1149,7 @@ int CtdlInvtKick(char *iuser, int op) {
        CtdlSetRelationship(&vbuf, &USscratch, &CC->room);
 
        /* post a message in Aide> saying what we just did */
-       snprintf(bbb, sizeof bbb, "%s %s %s> by %s\n",
+       snprintf(bbb, sizeof bbb, "%s has been %s \"%s\" by %s.\n",
                iuser,
                ((op == 1) ? "invited to" : "kicked out of"),
                CC->room.QRname,
@@ -1536,7 +1528,7 @@ void cmd_asup(char *cmdbuf)
        }
 
        if (deleted) {
-               sprintf(notify, "User <%s> deleted by %s\n",
+               sprintf(notify, "User \"%s\" has been deleted by %s.\n",
                        usbuf.fullname, CC->user.fullname);
                aide_message(notify);
        }