Links for older and newer blocks of messages in the BBS view have been centered,...

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index c0221dde08d1e96688f515d2ae86fd59221cdced..f1269fa32b85c57ed222c88ea06210e4a7d391d9 100644 (file)
--- 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.
@@ -911,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_DEBUG, "<%s> %d new of %d total messages, oldest=%ld, newest=%ld",
+       syslog(LOG_DEBUG, "room_ops: %s : %d new of %d total messages, oldest=%ld, newest=%ld",
                   CCC->room.QRname, new_messages, total_messages, oldest_message, newest_message
        );
 
@@ -994,7 +997,7 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
        long owner = 0L;
        char actual_old_name[ROOMNAMELEN];
 
-       MSG_syslog(LOG_DEBUG, "CtdlRenameRoom(%s, %s, %d)", old_name, new_name, new_floor);
+       syslog(LOG_DEBUG, "room_ops: CtdlRenameRoom(%s, %s, %d)", old_name, new_name, new_floor);
 
        if (new_floor >= 0) {
                fl = CtdlGetCachedFloor(new_floor);
@@ -1083,11 +1086,11 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
                lgetfloor(&flbuf, old_floor);
                --flbuf.f_ref_count;
                lputfloor(&flbuf, old_floor);
-               MSG_syslog(LOG_DEBUG, "Reference count for floor %d is now %d", old_floor, flbuf.f_ref_count);
+               syslog(LOG_DEBUG, "room_ops: 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);
-               MSG_syslog(LOG_DEBUG, "Reference count for floor %d is now %d", new_floor, flbuf.f_ref_count);
+               syslog(LOG_DEBUG, "room_ops: reference count for floor %d is now %d", new_floor, flbuf.f_ref_count);
        }
 
        /* ...and everybody say "YATTA!" */     
@@ -1106,7 +1109,7 @@ void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf)
        char old_name[ROOMNAMELEN];
        static int seq = 0;
 
-       syslog(LOG_NOTICE, "Scheduling room <%s> for deletion", qrbuf->QRname);
+       syslog(LOG_NOTICE, "room_ops: scheduling room <%s> for deletion", qrbuf->QRname);
 
        safestrncpy(old_name, qrbuf->QRname, sizeof old_name);
        CtdlGetRoom(qrbuf, qrbuf->QRname);
@@ -1139,7 +1142,7 @@ void CtdlDeleteRoom(struct ctdlroom *qrbuf)
        struct floor flbuf;
        char configdbkeyname[25];
 
-       syslog(LOG_NOTICE, "Deleting room <%s>", qrbuf->QRname);
+       syslog(LOG_NOTICE, "room_ops: deleting room <%s>", qrbuf->QRname);
 
        /* Delete the room's network configdb entry */
        netcfg_keyname(configdbkeyname, qrbuf->QRnumber);
@@ -1223,10 +1226,10 @@ unsigned CtdlCreateRoom(char *new_room_name,
        struct floor flbuf;
        visit vbuf;
 
-       MARK_syslog(LOG_DEBUG, "CtdlCreateRoom(name=%s, type=%d, view=%d)", new_room_name, new_room_type, new_room_view);
+       syslog(LOG_DEBUG, "room_ops: CtdlCreateRoom(name=%s, type=%d, view=%d)", new_room_name, new_room_type, new_room_view);
 
        if (CtdlGetRoom(&qrbuf, new_room_name) == 0) {
-               MARK_syslog(LOG_DEBUG, "Cannot create room <%s> - already exists", new_room_name);
+               syslog(LOG_DEBUG, "room_ops: cannot create room <%s> - already exists", new_room_name);
                return(0);
        }