centralized filename calculation

[citadel.git] / citadel / file_ops.c

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index 926d7b357f700afa2143ada8d7b0ec982e3e91ca..e5c442515644b4c5907b70cb5835eacd149c3cd0 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -432,7 +432,7 @@ void cmd_oimg(char *cmdbuf)
                                 "%s/floor.%d.gif",
                                 ctdl_image_dir, which_floor);
        } else if (!strcasecmp(filename, "_roompic_")) {
-               assoc_file_name(pathname, sizeof pathname, &CC->room, "images");
+               assoc_file_name(pathname, sizeof pathname, &CC->room, ctdl_image_dir);
        } else {
                for (a = 0; a < strlen(filename); ++a) {
                        filename[a] = tolower(filename[a]);
@@ -576,7 +576,7 @@ void cmd_uimg(char *cmdbuf)
        }
 
        if ((!strcasecmp(basenm, "_roompic_")) && (is_room_aide())) {
-               assoc_file_name(CC->upl_path, sizeof CC->upl_path, &CC->room, "images");
+               assoc_file_name(CC->upl_path, sizeof CC->upl_path, &CC->room, ctdl_image_dir);
        }
 
        if (strlen(CC->upl_path) == 0) {