RINF command migrated to new data format

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 6a57493763cb1581990ae6e69907a3a4e0c6e873..5b358b609bb88c175dc5c43b95964512e01aab95 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -677,14 +677,9 @@ void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, void *in_data)
                        RNCfg = CtdlGetNetCfgForRoom(qrbuf.QRnumber);
                        if (RNCfg != NULL)
                        {
-                               TRACE;
                                CB(&qrbuf, in_data, RNCfg);
                                FreeRoomNetworkStruct(&RNCfg);
                        }
-                       else
-                       {
-                               TRACE;
-                       }
                }
        }
 }
@@ -831,8 +826,10 @@ void CtdlUserGoto(char *where, int display_result, int transiently,
        /* Check for new mail */
        newmailcount = NewMailCount();
 
-       /* set info to 1 if the user needs to read the room's info file */
-       if (CCC->room.QRinfo > vbuf.v_lastseen) {
+       /* Set info to 1 if the room banner is new since our last visit.
+        * Some clients only want to display it when it changes.
+        */
+       if (CCC->room.msgnum_info > vbuf.v_lastseen) {
                info = 1;
        }
 
@@ -1133,19 +1130,10 @@ void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf)
 void CtdlDeleteRoom(struct ctdlroom *qrbuf)
 {
        struct floor flbuf;
-       char filename[PATH_MAX];
        char configdbkeyname[25];
 
        syslog(LOG_NOTICE, "Deleting room <%s>", qrbuf->QRname);
 
-       /* Delete the info file */
-       assoc_file_name(filename, sizeof filename, qrbuf, ctdl_info_dir);
-       unlink(filename);
-
-       /* Delete the image file */
-       assoc_file_name(filename, sizeof filename, qrbuf, ctdl_image_dir);
-       unlink(filename);
-
        /* Delete the room's network configdb entry */
        netcfg_keyname(configdbkeyname, qrbuf->QRnumber);
        CtdlDelConfig(configdbkeyname);