X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Froom_ops.c;h=a39cf314beb8e622168931f112237c787f5a5987;hb=2807ad968981de0aae10473ee5fbd7a4c0d513bd;hp=98c2acc20a936afdce6b1da6dc870bd08d50d289;hpb=655de5af64c89584fbdd0110a27053a9f3bfd138;p=citadel.git diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 98c2acc20..a39cf314b 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-2012 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. @@ -16,7 +16,6 @@ #include #include "citserver.h" - #include "ctdl_module.h" #include "config.h" #include "control.h" @@ -32,7 +31,7 @@ struct floor *floorcache[MAXFLOORS]; int CtdlDoIHavePermissionToReadMessagesInThisRoom(void) { if ( (!(CC->logged_in)) && (!(CC->internal_pgm)) - && (!config.c_guest_logins) + && (!CtdlGetConfigInt("c_guest_logins")) ) { return(om_not_logged_in); } @@ -79,8 +78,8 @@ int CtdlDoIHavePermissionToPostInThisRoom( } - if ((CC->user.axlevel < AxProbU) - && ((CC->room.QRflags & QR_MAILBOX) == 0)) { + if ((CC->user.axlevel < AxProbU) && ((CC->room.QRflags & QR_MAILBOX) == 0)) + { snprintf(errmsgbuf, n, "Need to be validated to enter (except in %s> to sysop)", MAILROOM); return (ERROR + HIGHER_ACCESS_REQUIRED); } @@ -125,7 +124,8 @@ int CtdlDoIHavePermissionToDeleteMessagesFromThisRoom(void) { } /* - * Retrieve access control information for any user/room pair + * 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. */ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf, int *result, int *view) @@ -139,7 +139,7 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf, is_me = 1; } - if ((is_me) && (config.c_guest_logins) && (!CC->logged_in)) { + if ((is_me) && (CtdlGetConfigInt("c_guest_logins")) && (!CC->logged_in)) { is_guest = 1; } @@ -166,7 +166,7 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf, } /* Force the properties of the Aide room */ - if (!strcasecmp(roombuf->QRname, config.c_aideroom)) { + if (!strcasecmp(roombuf->QRname, CtdlGetConfigStr("c_aideroom"))) { if (userbuf->axlevel >= AxAideU) { retval = UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED | UA_REPLYALLOWED; } else { @@ -338,11 +338,12 @@ void room_sanity_check(struct ctdlroom *qrbuf) } /* Listing order of 0 is illegal except for base rooms */ if (qrbuf->QRorder == 0) - if (!(qrbuf->QRflags & QR_MAILBOX) && - strncasecmp(qrbuf->QRname, config.c_baseroom, ROOMNAMELEN) - && - strncasecmp(qrbuf->QRname, config.c_aideroom, ROOMNAMELEN)) + if ( !(qrbuf->QRflags & QR_MAILBOX) + && strncasecmp(qrbuf->QRname, CtdlGetConfigStr("c_baseroom"), ROOMNAMELEN) + && strncasecmp(qrbuf->QRname, CtdlGetConfigStr("c_aideroom"), ROOMNAMELEN) + ) { qrbuf->QRorder = 64; + } } @@ -395,10 +396,11 @@ int CtdlGetRoom(struct ctdlroom *qrbuf, const char *room_name) } } + /* * CtdlGetRoomLock() - same as getroom() but locks the record (if supported) */ -int CtdlGetRoomLock(struct ctdlroom *qrbuf, char *room_name) +int CtdlGetRoomLock(struct ctdlroom *qrbuf, const char *room_name) { register int retval; retval = CtdlGetRoom(qrbuf, room_name); @@ -458,10 +460,8 @@ void b_deleteroom(char *room_name) { */ void CtdlPutRoomLock(struct ctdlroom *qrbuf) { - CtdlPutRoom(qrbuf); end_critical_section(S_ROOMS); - } @@ -550,7 +550,6 @@ void CtdlGetFloor(struct floor *flbuf, int floor_num) */ void lgetfloor(struct floor *flbuf, int floor_num) { - begin_critical_section(S_FLOORTAB); CtdlGetFloor(flbuf, floor_num); } @@ -618,7 +617,6 @@ void CtdlPutFloor(struct floor *flbuf, int floor_num) */ void CtdlPutFloorLock(struct floor *flbuf, int floor_num) { - CtdlPutFloor(flbuf, floor_num); end_critical_section(S_FLOORTAB); @@ -661,9 +659,7 @@ void CtdlForEachRoom(ForEachRoomCallBack CB, void *in_data) /* * Traverse the room file... */ -void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, - void *in_data, - RoomNetCfg filter) +void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, void *in_data, RoomNetCfg filter) { struct ctdlroom qrbuf; struct cdbdata *cdbqr; @@ -682,12 +678,11 @@ void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, { OneRoomNetCfg* RNCfg; RNCfg = CtdlGetNetCfgForRoom(qrbuf.QRnumber); - if ((RNCfg != NULL) && - ((filter == maxRoomNetCfg) || - (RNCfg->NetConfigs[filter] != NULL))) + if ((RNCfg != NULL) && ((filter == maxRoomNetCfg) || (RNCfg->NetConfigs[filter] != NULL))) { CB(&qrbuf, in_data, RNCfg); } + // FIXME free RNCfg } } } @@ -776,13 +771,15 @@ int CtdlIsNonEditable(struct ctdlroom *qrbuf) * specified room exists and is ok to access. */ void CtdlUserGoto(char *where, int display_result, int transiently, - int *retmsgs, int *retnew) + int *retmsgs, int *retnew, long *retoldest, long *retnewest) { struct CitContext *CCC = CC; int a; int new_messages = 0; int old_messages = 0; int total_messages = 0; + long oldest_message = 0; + long newest_message = 0; int info = 0; int rmailflag; int raideflag; @@ -817,8 +814,8 @@ 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, config.c_logpages)) - && (transiently == 0) ) { + if ((strcasecmp(CCC->room.QRname, CtdlGetConfigStr("c_logpages"))) && (transiently == 0)) + { vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT; vbuf.v_flags = vbuf.v_flags | V_ACCESS; } @@ -850,6 +847,11 @@ void CtdlUserGoto(char *where, int display_result, int transiently, if (msglist[a] > 0L) ++total_messages; } + if (total_messages > 0) { + oldest_message = msglist[0]; + newest_message = msglist[num_msgs - 1]; + } + num_sets = num_tokens(vbuf.v_seen, ','); for (s=0; s %d new of %d total messages\n", - CCC->room.QRname, - new_messages, total_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", + CCC->room.QRname, new_messages, total_messages, oldest_message, newest_message + ); CCC->curr_view = (int)vbuf.v_view; @@ -937,7 +940,7 @@ void CtdlUserGoto(char *where, int display_result, int transiently, */ void convert_room_name_macros(char *towhere, size_t maxlen) { if (!strcasecmp(towhere, "_BASEROOM_")) { - safestrncpy(towhere, config.c_baseroom, maxlen); + safestrncpy(towhere, CtdlGetConfigStr("c_baseroom"), maxlen); } else if (!strcasecmp(towhere, "_MAIL_")) { safestrncpy(towhere, MAILROOM, maxlen); @@ -949,7 +952,7 @@ void convert_room_name_macros(char *towhere, size_t maxlen) { safestrncpy(towhere, USERDRAFTROOM, maxlen); } else if (!strcasecmp(towhere, "_BITBUCKET_")) { - safestrncpy(towhere, config.c_twitroom, maxlen); + safestrncpy(towhere, CtdlGetConfigStr("c_twitroom"), maxlen); } else if (!strcasecmp(towhere, "_CALENDAR_")) { safestrncpy(towhere, USERCALENDARROOM, maxlen); @@ -984,8 +987,7 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { long owner = 0L; char actual_old_name[ROOMNAMELEN]; - syslog(LOG_DEBUG, "CtdlRenameRoom(%s, %s, %d)\n", - old_name, new_name, new_floor); + syslog(LOG_DEBUG, "CtdlRenameRoom(%s, %s, %d)", old_name, new_name, new_floor); if (new_floor >= 0) { fl = CtdlGetCachedFloor(new_floor); @@ -1031,8 +1033,9 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { } /* Reject change of floor for baseroom/aideroom */ - if (!strncasecmp(old_name, config.c_baseroom, ROOMNAMELEN) || - !strncasecmp(old_name, config.c_aideroom, ROOMNAMELEN)) { + if (!strncasecmp(old_name, CtdlGetConfigStr("c_baseroom"), ROOMNAMELEN) || + !strncasecmp(old_name, CtdlGetConfigStr("c_aideroom"), ROOMNAMELEN)) + { new_floor = 0; } @@ -1047,13 +1050,11 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { begin_critical_section(S_CONFIG); /* If baseroom/aideroom name changes, update config */ - if (!strncasecmp(old_name, config.c_baseroom, ROOMNAMELEN)) { - safestrncpy(config.c_baseroom, new_name, ROOMNAMELEN); - put_config(); + if (!strncasecmp(old_name, CtdlGetConfigStr("c_baseroom"), ROOMNAMELEN)) { + CtdlSetConfigStr("c_baseroom", new_name); } - if (!strncasecmp(old_name, config.c_aideroom, ROOMNAMELEN)) { - safestrncpy(config.c_aideroom, new_name, ROOMNAMELEN); - put_config(); + if (!strncasecmp(old_name, CtdlGetConfigStr("c_aideroom"), ROOMNAMELEN)) { + CtdlSetConfigStr("c_aideroom", new_name); } end_critical_section(S_CONFIG); @@ -1075,11 +1076,11 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { lgetfloor(&flbuf, old_floor); --flbuf.f_ref_count; lputfloor(&flbuf, old_floor); - syslog(LOG_DEBUG, "Reference count for floor %d is now %d\n", old_floor, flbuf.f_ref_count); + syslog(LOG_DEBUG, "Reference count for floor %d is now %d", old_floor, flbuf.f_ref_count); lgetfloor(&flbuf, new_floor); ++flbuf.f_ref_count; lputfloor(&flbuf, new_floor); - syslog(LOG_DEBUG, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count); + syslog(LOG_DEBUG, "Reference count for floor %d is now %d", new_floor, flbuf.f_ref_count); } /* ...and everybody say "YATTA!" */ @@ -1087,22 +1088,20 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { } - /* - * Asynchronously schedule a room for deletion. The room will appear - * deleted to the user(s), but it won't actually get purged from the - * database until THE DREADED AUTO-PURGER makes its next run. + * Asynchronously schedule a room for deletion. By placing the room into an invalid private namespace, + * the room will appear deleted to the user(s), but the session doesn't need to block while waiting for + * database operations to complete. Instead, the room gets purged when THE DREADED AUTO-PURGER makes + * its next run. Aren't we so clever?!! */ void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf) { char old_name[ROOMNAMELEN]; static int seq = 0; - syslog(LOG_NOTICE, "Scheduling room <%s> for deletion\n", - qrbuf->QRname); + syslog(LOG_NOTICE, "Scheduling room <%s> for deletion", qrbuf->QRname); safestrncpy(old_name, qrbuf->QRname, sizeof old_name); - CtdlGetRoom(qrbuf, qrbuf->QRname); /* Turn the room into a private mailbox owned by a user who doesn't @@ -1116,9 +1115,7 @@ void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf) ); qrbuf->QRflags |= QR_MAILBOX; time(&qrbuf->QRgen); /* Use a timestamp as the new generation number */ - CtdlPutRoom(qrbuf); - b_deleteroom(old_name); } @@ -1133,10 +1130,10 @@ void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf) void CtdlDeleteRoom(struct ctdlroom *qrbuf) { struct floor flbuf; - char filename[100]; - /* TODO: filename magic? does this realy work? */ + char filename[PATH_MAX]; + char configdbkeyname[25]; - syslog(LOG_NOTICE, "Deleting room <%s>\n", qrbuf->QRname); + syslog(LOG_NOTICE, "Deleting room <%s>", qrbuf->QRname); /* Delete the info file */ assoc_file_name(filename, sizeof filename, qrbuf, ctdl_info_dir); @@ -1146,9 +1143,9 @@ void CtdlDeleteRoom(struct ctdlroom *qrbuf) 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!) @@ -1170,7 +1167,6 @@ void CtdlDeleteRoom(struct ctdlroom *qrbuf) } - /* * Check access control for deleting a room */ @@ -1229,11 +1225,10 @@ unsigned CtdlCreateRoom(char *new_room_name, struct floor flbuf; visit vbuf; - syslog(LOG_DEBUG, "CtdlCreateRoom(name=%s, type=%d, view=%d)\n", - new_room_name, new_room_type, new_room_view); + syslog(LOG_DEBUG, "CtdlCreateRoom(name=%s, type=%d, view=%d)", new_room_name, new_room_type, new_room_view); if (CtdlGetRoom(&qrbuf, new_room_name) == 0) { - syslog(LOG_DEBUG, "%s already exists.\n", new_room_name); + syslog(LOG_DEBUG, "Cannot create room <%s> - already exists", new_room_name); return(0); }