X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Froom_ops.c;h=b895fc67dba4adfd7485c2330fed857c5d214770;hb=5e6146dbb2886deed584ae50d67f239963755479;hp=abd5e14b1475020ab63db518e397a49fe5954099;hpb=76de75a4870efa43dd37d959c90e3840fda677cd;p=citadel.git diff --git a/citadel/room_ops.c b/citadel/room_ops.c index abd5e14b1..b895fc67d 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -1,7 +1,7 @@ /* * Server functions which perform operations on room objects. * - * Copyright (c) 1987-2016 by the citadel.org team + * Copyright (c) 1987-2017 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. @@ -38,6 +38,7 @@ int CtdlDoIHavePermissionToReadMessagesInThisRoom(void) { return(om_ok); } + /* * Check to see whether we have permission to post a message in the current * room. Returns a *CITADEL ERROR CODE* and puts a message in errmsgbuf, or @@ -112,6 +113,7 @@ int CtdlDoIHavePermissionToPostInThisRoom( } + /* * Check whether the current user has permission to delete messages from * the current room (returns 1 for yes, 0 for no) @@ -123,6 +125,7 @@ int CtdlDoIHavePermissionToDeleteMessagesFromThisRoom(void) { return(0); } + /* * Retrieve access control information for any user/room pair. * Yes, it has a couple of gotos. If you don't like that, go die in a car fire. @@ -633,7 +636,7 @@ void lputfloor(struct floor *flbuf, int floor_num) /* - * Traverse the room file... + * Iterate through the room table, performing a callback for each room. */ void CtdlForEachRoom(ForEachRoomCallBack CB, void *in_data) { @@ -657,9 +660,9 @@ void CtdlForEachRoom(ForEachRoomCallBack CB, void *in_data) } /* - * Traverse the room file... + * Iterate through the room table, performing a callback for each room that has a netconfig entry. */ -void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, void *in_data, RoomNetCfg filter) +void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, void *in_data) { struct ctdlroom qrbuf; struct cdbdata *cdbqr; @@ -668,21 +671,17 @@ void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, void *in_data, RoomNetC while (cdbqr = cdb_next_item(CDB_ROOMS), cdbqr != NULL) { memset(&qrbuf, 0, sizeof(struct ctdlroom)); - memcpy(&qrbuf, cdbqr->ptr, - ((cdbqr->len > sizeof(struct ctdlroom)) ? - sizeof(struct ctdlroom) : cdbqr->len) - ); + memcpy(&qrbuf, cdbqr->ptr, ((cdbqr->len > sizeof(struct ctdlroom)) ? sizeof(struct ctdlroom) : cdbqr->len)); cdb_free(cdbqr); room_sanity_check(&qrbuf); if (qrbuf.QRflags & QR_INUSE) { - OneRoomNetCfg* RNCfg; + OneRoomNetCfg *RNCfg; RNCfg = CtdlGetNetCfgForRoom(qrbuf.QRnumber); - if ((RNCfg != NULL) && - ((filter == maxRoomNetCfg) || - (RNCfg->NetConfigs[filter] != NULL))) + if (RNCfg != NULL) { CB(&qrbuf, in_data, RNCfg); + FreeRoomNetworkStruct(&RNCfg); } } } @@ -815,8 +814,15 @@ void CtdlUserGoto(char *where, int display_result, int transiently, /* Know the room ... but not if it's the page log room, or if the * caller specified that we're only entering this room transiently. */ - if ((strcasecmp(CCC->room.QRname, CtdlGetConfigStr("c_logpages"))) && (transiently == 0)) - { + int add_room_to_known_list = 1; + if (transiently == 1) { + add_room_to_known_list = 0; + } + char *c_logpages = CtdlGetConfigStr("c_logpages"); + if ( (c_logpages != NULL) && (!strcasecmp(CCC->room.QRname, c_logpages)) ) { + add_room_to_known_list = 0; + } + if (add_room_to_known_list) { vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT; vbuf.v_flags = vbuf.v_flags | V_ACCESS; } @@ -830,8 +836,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; } @@ -906,7 +914,7 @@ void CtdlUserGoto(char *where, int display_result, int transiently, if (retnew != NULL) *retnew = new_messages; if (retoldest != NULL) *retoldest = oldest_message; if (retnewest != NULL) *retnewest = newest_message; - MSG_syslog(LOG_INFO, "<%s> %d new of %d total messages, oldest=%ld, newest=%ld", + syslog(LOG_DEBUG, "<%s> %d new of %d total messages, oldest=%ld, newest=%ld", CCC->room.QRname, new_messages, total_messages, oldest_message, newest_message ); @@ -979,6 +987,7 @@ void convert_room_name_macros(char *towhere, size_t maxlen) { * in *at least* the old name! */ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { + struct CitContext *CCC = CC; int old_floor = 0; struct ctdlroom qrbuf; struct ctdlroom qrtmp; @@ -1008,9 +1017,9 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { ret = crr_room_not_found; } - else if ( (CC->user.axlevel < AxAideU) && (!CC->internal_pgm) - && (CC->user.usernum != qrbuf.QRroomaide) - && ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CC->user.usernum))) ) { + else if ( (CCC->user.axlevel < AxAideU) && (!CCC->internal_pgm) + && (CCC->user.usernum != qrbuf.QRroomaide) + && ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CCC->user.usernum))) ) { ret = crr_access_denied; } @@ -1131,21 +1140,13 @@ 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 config file */ - assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir); - unlink(filename); + /* Delete the room's network configdb entry */ + netcfg_keyname(configdbkeyname, qrbuf->QRnumber); + CtdlDelConfig(configdbkeyname); /* Delete the messages in the room * (Careful: this opens an S_ROOMS critical section!) @@ -1167,7 +1168,6 @@ void CtdlDeleteRoom(struct ctdlroom *qrbuf) } - /* * Check access control for deleting a room */