*
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include "citserver.h"
#include "control.h"
#include "tools.h"
+#include "citadel_dirs.h"
struct floor *floorcache[MAXFLOORS];
/*
* Back-back-end for all room listing commands
*/
-void list_roomname(struct ctdlroom *qrbuf, int ra, int view)
+void list_roomname(struct ctdlroom *qrbuf, int ra, int current_view, int default_view)
{
char truncated_roomname[ROOMNAMELEN];
}
/* ...and now the other parameters */
- cprintf("|%u|%d|%d|%d|%d|%d|\n",
+ cprintf("|%u|%d|%d|%d|%d|%d|%d|%ld|\n",
qrbuf->QRflags,
(int) qrbuf->QRfloor,
(int) qrbuf->QRorder,
(int) qrbuf->QRflags2,
ra,
- view
+ current_view,
+ default_view,
+ qrbuf->QRmtime
);
}
if ((( ra & (UA_KNOWN | UA_ZAPPED)))
&& ((qrbuf->QRfloor == (FloorBeingSearched))
|| ((FloorBeingSearched) < 0)))
- list_roomname(qrbuf, ra, view);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lrms(char *argbuf)
if ((( ra & (UA_KNOWN)))
&& ((qrbuf->QRfloor == (FloorBeingSearched))
|| ((FloorBeingSearched) < 0)))
- list_roomname(qrbuf, ra, view);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lkra(char *argbuf)
&& ((qrbuf->QRflags & QR_MAILBOX) == 0)
&& ((qrbuf->QRfloor == (FloorBeingSearched))
|| ((FloorBeingSearched) < 0)))
- list_roomname(qrbuf, ra, view);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lprm(char *argbuf)
&& (ra & UA_HASNEWMSGS)
&& ((qrbuf->QRfloor == (FloorBeingSearched))
|| ((FloorBeingSearched) < 0)))
- list_roomname(qrbuf, ra, view);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lkrn(char *argbuf)
&& ((ra & UA_HASNEWMSGS) == 0)
&& ((qrbuf->QRfloor == (FloorBeingSearched))
|| ((FloorBeingSearched) < 0)))
- list_roomname(qrbuf, ra, view);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lkro(char *argbuf)
&& (ra & UA_ZAPPED)
&& ((qrbuf->QRfloor == (FloorBeingSearched))
|| ((FloorBeingSearched) < 0)))
- list_roomname(qrbuf, ra, view);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lzrm(char *argbuf)
int s;
char setstr[128], lostr[64], histr[64];
long lo, hi;
+ int is_trash = 0;
/* If the supplied room name is NULL, the caller wants us to know that
* it has already copied the room record into CC->room, so
get_mm();
cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
if (cdbfr != NULL) {
- msglist = malloc(cdbfr->len);
- memcpy(msglist, cdbfr->ptr, cdbfr->len);
+ msglist = (long *) cdbfr->ptr;
+ cdbfr->ptr = NULL; /* usergoto() now owns this memory */
num_msgs = cdbfr->len / sizeof(long);
cdb_free(cdbfr);
}
safestrncpy(truncated_roomname, &truncated_roomname[11], sizeof truncated_roomname);
}
+ if (!strcasecmp(truncated_roomname, USERTRASHROOM)) {
+ is_trash = 1;
+ }
+
if (retmsgs != NULL) *retmsgs = total_messages;
if (retnew != NULL) *retnew = new_messages;
lprintf(CTDL_DEBUG, "<%s> %d new of %d total messages\n",
CC->curr_view = (int)vbuf.v_view;
if (display_result) {
- cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|\n",
+ cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|%d|\n",
CIT_OK, CtdlCheckExpress(),
truncated_roomname,
(int)new_messages,
(int)newmailcount,
(int)CC->room.QRfloor,
(int)vbuf.v_view,
- (int)CC->room.QRdefaultview
+ (int)CC->room.QRdefaultview,
+ (int)is_trash
);
}
}
+/*
+ * Handle some of the macro named rooms
+ */
+void convert_room_name_macros(char *towhere, size_t maxlen) {
+ if (!strcasecmp(towhere, "_BASEROOM_")) {
+ safestrncpy(towhere, config.c_baseroom, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_MAIL_")) {
+ safestrncpy(towhere, MAILROOM, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_TRASH_")) {
+ safestrncpy(towhere, USERTRASHROOM, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_BITBUCKET_")) {
+ safestrncpy(towhere, config.c_twitroom, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_CALENDAR_")) {
+ safestrncpy(towhere, USERCALENDARROOM, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_TASKS_")) {
+ safestrncpy(towhere, USERTASKSROOM, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_CONTACTS_")) {
+ safestrncpy(towhere, USERCONTACTSROOM, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_NOTES_")) {
+ safestrncpy(towhere, USERNOTESROOM, maxlen);
+ }
+}
+
+
/*
* cmd_goto() - goto a new room
*/
getuser(&CC->user, CC->curr_user);
- if (!strcasecmp(towhere, "_BASEROOM_"))
- safestrncpy(towhere, config.c_baseroom, sizeof towhere);
-
- if (!strcasecmp(towhere, "_MAIL_"))
- safestrncpy(towhere, MAILROOM, sizeof towhere);
-
- if (!strcasecmp(towhere, "_BITBUCKET_"))
- safestrncpy(towhere, config.c_twitroom, sizeof towhere);
-
+ /*
+ * Handle some of the macro named rooms
+ */
+ convert_room_name_macros(towhere, sizeof towhere);
/* First try a regular match */
c = getroom(&QRscratch, towhere);
char tempfilename[PATH_MAX];
if (CtdlAccessCheck(ac_logged_in)) return;
- tmpnam(tempfilename);
+ CtdlMakeTempFileName(tempfilename, sizeof tempfilename);
getroom(&CC->room, CC->room.QRname);
getuser(&CC->user, CC->curr_user);
cprintf("%d not here.\n", ERROR + HIGHER_ACCESS_REQUIRED);
return;
}
- cprintf("%d %s|%s/files/%s\n",
- LISTING_FOLLOWS, config.c_fqdn, CTDLDIR, CC->room.QRdirname);
-
- snprintf(buf, sizeof buf, "ls %s/files/%s >%s 2> /dev/null",
- CTDLDIR, CC->room.QRdirname, tempfilename);
- system(buf);
-
- snprintf(buf, sizeof buf, "%s/files/%s/filedir", CTDLDIR, CC->room.QRdirname);
+ cprintf("%d %s|%s/%s\n",
+ LISTING_FOLLOWS,
+ config.c_fqdn,
+ ctdl_file_dir,
+ CC->room.QRdirname);
+
+ snprintf(buf, sizeof buf,
+ "ls %s/%s >%s 2>/dev/null",
+ ctdl_file_dir,
+ CC->room.QRdirname,
+ tempfilename);
+ system(buf);
+
+ snprintf(buf, sizeof buf,
+ "%s/%s/filedir",
+ ctdl_file_dir,
+ CC->room.QRdirname);
fd = fopen(buf, "r");
if (fd == NULL)
fd = fopen("/dev/null", "r");
while (fgets(flnm, sizeof flnm, ls) != NULL) {
flnm[strlen(flnm) - 1] = 0;
if (strcasecmp(flnm, "filedir")) {
- snprintf(buf, sizeof buf, "%s/files/%s/%s",
- CTDLDIR, CC->room.QRdirname, flnm);
+ snprintf(buf, sizeof buf,
+ "%s/%s/%s",
+ ctdl_file_dir,
+ CC->room.QRdirname,
+ flnm);
stat(buf, &statbuf);
safestrncpy(comment, "", sizeof comment);
fseek(fd, 0L, 0);
ret = crr_room_not_found;
}
- else if ( (CC->user.axlevel < 6)
+ else if ( (CC->user.axlevel < 6) && (!CC->internal_pgm)
&& (CC->user.usernum != qrbuf.QRroomaide)
&& ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CC->user.usernum))) ) {
ret = crr_access_denied;
/* Create a room directory if necessary */
if (CC->room.QRflags & QR_DIRECTORY) {
- snprintf(buf, sizeof buf, "./files/%s", CC->room.QRdirname);
+ snprintf(buf, sizeof buf,"%s/%s",
+ ctdl_file_dir,
+ CC->room.QRdirname);
mkdir(buf, 0755);
}
- snprintf(buf, sizeof buf, "%s> edited by %s\n", CC->room.QRname, CC->curr_user);
- aide_message(buf);
+ snprintf(buf, sizeof buf, "The room \"%s\" has been edited by %s.\n",
+ CC->room.QRname, CC->curr_user);
+ aide_message(buf, "Room modification Message");
cprintf("%d Ok\n", CIT_OK);
}
if (post_notice == 1) {
if (strlen(usbuf.fullname) > 0)
snprintf(buf, sizeof buf,
- "%s is now room aide for %s>\n",
+ "%s is now the room aide for \"%s\".\n",
usbuf.fullname, CC->room.QRname);
else
snprintf(buf, sizeof buf,
- "There is now no room aide for %s>\n",
+ "There is now no room aide for \"%s\".\n",
CC->room.QRname);
- aide_message(buf);
+ aide_message(buf, "Aide Room Modification");
}
cprintf("%d Ok\n", CIT_OK);
}
-/*
- * Generate an associated file name for a room
- */
-void assoc_file_name(char *buf, size_t n,
- struct ctdlroom *qrbuf, const char *prefix)
-{
- snprintf(buf, n, "./%s/%ld", prefix, qrbuf->QRnumber);
-}
-
/*
* retrieve info file for this room
*/
char buf[SIZ];
FILE *info_fp;
- assoc_file_name(filename, sizeof filename, &CC->room, "info");
+ assoc_file_name(filename, sizeof filename, &CC->room, ctdl_info_dir);
info_fp = fopen(filename, "r");
if (info_fp == NULL) {
{
struct floor flbuf;
char filename[100];
+ /* TODO: filename magic? does this realy work? */
lprintf(CTDL_NOTICE, "Deleting room <%s>\n", qrbuf->QRname);
/* Delete the info file */
- assoc_file_name(filename, sizeof filename, qrbuf, "info");
+ assoc_file_name(filename, sizeof filename, qrbuf, ctdl_info_dir);
unlink(filename);
/* Delete the image file */
- assoc_file_name(filename, sizeof filename, qrbuf, "images");
+ 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, "netconfigs");
+ assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
unlink(filename);
/* Delete the messages in the room
* (Careful: this opens an S_ROOMS critical section!)
*/
- CtdlDeleteMessages(qrbuf->QRname, 0L, "");
+ CtdlDeleteMessages(qrbuf->QRname, NULL, 0, "", 0);
/* Flag the room record as not in use */
lgetroom(qrbuf, qrbuf->QRname);
}
/* Can't delete your Mail> room */
- if (!strcasecmp(&qr->QRname[12], MAILROOM)) return(0);
+ if (!strcasecmp(&qr->QRname[11], MAILROOM)) return(0);
/* Otherwise it's ok */
return(1);
usergoto(config.c_baseroom, 0, 0, NULL, NULL);
/* tell the world what we did */
- snprintf(msg, sizeof msg, "%s> killed by %s\n",
+ snprintf(msg, sizeof msg, "The room \"%s\" has been deleted by %s.\n",
deleted_room_name, CC->curr_user);
- aide_message(msg);
+ aide_message(msg, "Room Purger Message");
cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name);
} else {
cprintf("%d ok to delete.\n", CIT_OK);
/* Grant the creator access to the room unless the avoid_access
* parameter was specified.
*/
- if (avoid_access == 0) {
- lgetuser(&CC->user, CC->curr_user);
+ if ( (CC->logged_in) && (avoid_access == 0) ) {
CtdlGetRelationship(&vbuf, &CC->user, &qrbuf);
vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
vbuf.v_flags = vbuf.v_flags | V_ACCESS;
CtdlSetRelationship(&vbuf, &CC->user, &qrbuf);
- lputuser(&CC->user);
}
/* resume our happy day */
if (CtdlAccessCheck(ac_logged_in)) return;
- if (CC->user.axlevel < config.c_createax) {
+ if (CC->user.axlevel < config.c_createax || CC->internal_pgm) {
cprintf("%d You need higher access to create rooms.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
return;
/* post a message in Aide> describing the new room */
notification_message = malloc(1024);
snprintf(notification_message, 1024,
- "%s> created by %s%s%s%s%s%s\n",
+ "A new room called \"%s\" has been created by %s%s%s%s%s%s\n",
new_room_name,
CC->user.fullname,
((newflags & QR_MAILBOX) ? " [personal]" : ""),
((newflags & QR_PASSWORDED) ? " Password: " : ""),
((newflags & QR_PASSWORDED) ? new_room_pass : "")
);
- aide_message(notification_message);
+ aide_message(notification_message, "Room Creation Message");
free(notification_message);
cprintf("%d '%s' has been created.\n", CIT_OK, new_room_name);
cprintf("%d Ok.\n", CIT_OK);
return;
}
- assoc_file_name(infofilename, sizeof infofilename, &CC->room, "info");
+ assoc_file_name(infofilename, sizeof infofilename, &CC->room, ctdl_info_dir);
lprintf(CTDL_DEBUG, "opening\n");
fp = fopen(infofilename, "w");
lprintf(CTDL_DEBUG, "checking\n");