for i in $(srcdir)/modules/* ; do \
rm -f $$i/*.o ;\
done
+ if test -d $(srcdir)/user_modules ; then \
+ for i in $(srcdir)/user_modules/* ; do \
+ rm -f $$i/*.o ;\
+ done \
+ fi
rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
for i in $(srcdir)/modules/* ; do \
rm -f $$i/*.d ;\
done
+ if test -d $(srcdir)/user_modules ; then \
+ for i in $(srcdir)/user_modules/* ; do \
+ rm -f $$i/*.o ;\
+ done \
+ fi
.c.d:
@echo Checking dependencies for $<
snprintf(buf, sizeof buf,
"The global system configuration has been edited by %s.\n",
CC->curr_user);
- aide_message(buf,"Citadel Configuration Manager Message");
+ CtdlAideMessage(buf,"Citadel Configuration Manager Message");
if (!IsEmptyStr(config.c_logpages))
CtdlCreateRoom(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS);
" This log file is no longer in use "
"and may be safely deleted.\n",
*file, strerror(errno));
- aide_message(errmsg, "Database Warning Message");
+ CtdlAideMessage(errmsg, "Database Warning Message");
}
}
free(list);
void CtdlLogPrintf(enum LogLevel loglevel, const char *format, ...);
-/*
- * Fix the interface to aide_message so that it complies with the Coding style
- */
-
-#define CtdlAideMessage(TEXT, SUBJECT) aide_message(TEXT, SUBJECT)
+#define CtdlAideMessage(TEXT, SUBJECT) quickie_message("Citadel",NULL,NULL,AIDEROOM,TEXT,FMT_CITADEL,SUBJECT)
/*
* Hook functions available to modules.
++num_rooms_purged;
}
- if (num_rooms_purged > 0) aide_message(transcript, "Room Autopurger Message");
+ if (num_rooms_purged > 0) CtdlAideMessage(transcript, "Room Autopurger Message");
free(transcript);
CtdlLogPrintf(CTDL_DEBUG, "Purged %d rooms.\n", num_rooms_purged);
}
}
- if (num_users_purged > 0) aide_message(transcript, "User Purge Message");
+ if (num_users_purged > 0) CtdlAideMessage(transcript, "User Purge Message");
free(transcript);
if(users_corrupt_msg)
{
- aide_message(users_corrupt_msg, "User Corruption Message");
+ CtdlAideMessage(users_corrupt_msg, "User Corruption Message");
free (users_corrupt_msg);
users_corrupt_msg = NULL;
}
if(users_zero_msg)
{
- aide_message(users_zero_msg, "User Zero Message");
+ CtdlAideMessage(users_zero_msg, "User Zero Message");
free (users_zero_msg);
users_zero_msg = NULL;
}
file_funambol_msg, strerror(errno));
CtdlLogPrintf(CTDL_ERR, buf);
- aide_message(buf, "External notifier unable to find message template!");
+ CtdlAideMessage(buf, "External notifier unable to find message template!");
goto free;
}
mimetype = GuessMimeByFilename(template, tlen);
file_funambol_msg);
CtdlLogPrintf(CTDL_ERR, buf);
- aide_message(buf, "External notifier unable to load message template!");
+ CtdlAideMessage(buf, "External notifier unable to load message template!");
goto free;
}
// Do substitutions
((ret & QR_PRIVATE) ? " [private]" : ""),
((ret & QR_GUESSNAME) ? " [hidden]" : "")
);
- aide_message(notification_message, "Room Creation Message");
+ CtdlAideMessage(notification_message, "Room Creation Message");
free(notification_message);
}
CtdlLogPrintf(CTDL_DEBUG, "imap_create() completed\n");
parms[3],
CC->curr_user
);
- aide_message(buf, "IMAP folder rename");
+ CtdlAideMessage(buf, "IMAP folder rename");
cprintf("%s OK RENAME completed\r\n", parms[0]);
}
if (strcmp(connected_to, node))
{
snprintf (err_buf, sizeof(err_buf), "Connected to node \"%s\" but I was expecting to connect to node \"%s\".", connected_to, node);
- aide_message(err_buf, "IGNet Networking error.");
+ CtdlAideMessage(err_buf, "IGNet Networking error.");
}
/* Identify ourselves */
);
CtdlLogPrintf(CTDL_WARNING, err_buf);
cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
- aide_message(err_buf, "IGNet Networking.");
+ CtdlAideMessage(err_buf, "IGNet Networking.");
return;
}
);
CtdlLogPrintf(CTDL_WARNING, err_buf);
cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
- aide_message(err_buf, "IGNet Networking.");
+ CtdlAideMessage(err_buf, "IGNet Networking.");
return;
}
snprintf(buf, sizeof buf, "User <%s> (#%ld) has claimed the OpenID URL %s\n",
who->fullname, who->usernum, claimed_id);
- aide_message(buf, "OpenID claim");
+ CtdlAideMessage(buf, "OpenID claim");
CtdlLogPrintf(CTDL_INFO, "%s", buf);
return(0);
}
+void aide_message (char *text, char *subject)
+{
+ quickie_message("Citadel",NULL,NULL,AIDEROOM,text,FMT_CITADEL,subject);
+}
/*
#ifndef MSGBASE_H
#define MSGBASE_H
-#define aide_message(text, subject) quickie_message("Citadel",NULL,NULL,AIDEROOM,text,FMT_CITADEL,subject)
enum {
MSGS_ALL,
int CtdlCheckInternetMailPermission(struct ctdluser *who);
int CtdlIsMe(char *addr, int addr_buf_len);
+/*
+ * Use of aide_message is deprecated.
+ * It has been replaced with CtdlAideMessage.
+ * All parameters remain the same.
+*/
+void aide_message(char *text, char *subject) __attribute__ ((deprecated));
+
+
+
#endif /* MSGBASE_H */
"\"%s\" appears in the file directory for room \"%s\" but is not a regular file. Directories, named pipes, sockets, etc. are not usable in Citadel room directories.\n",
buf, CC->room.QRname
);
- aide_message(buf2, "Unusable data found in room directory");
+ CtdlAideMessage(buf2, "Unusable data found in room directory");
continue; /* not a useable file type so don't show it */
}
safestrncpy(comment, "", sizeof comment);
}
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");
+ CtdlAideMessage(buf, "Room modification Message");
cprintf("%d Ok\n", CIT_OK);
}
snprintf(buf, sizeof buf,
"There is now no room aide for \"%s\".\n",
CC->room.QRname);
- aide_message(buf, "Aide Room Modification");
+ CtdlAideMessage(buf, "Aide Room Modification");
}
cprintf("%d Ok\n", CIT_OK);
}
/* tell the world what we did */
snprintf(msg, sizeof msg, "The room \"%s\" has been deleted by %s.\n",
deleted_room_name, CC->curr_user);
- aide_message(msg, "Room Purger Message");
+ CtdlAideMessage(msg, "Room Purger Message");
cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name);
} else {
cprintf("%d ok to delete.\n", CIT_OK);
((newflags & QR_PASSWORDED) ? " Password: " : ""),
((newflags & QR_PASSWORDED) ? new_room_pass : "")
);
- aide_message(notification_message, "Room Creation Message");
+ CtdlAideMessage(notification_message, "Room Creation Message");
free(notification_message);
cprintf("%d '%s' has been created.\n", CIT_OK, new_room_name);
" If you have already done this, the core dump is likely to be found at %score.%d\n"
,
ctdl_run_dir, ForkedPid);
- aide_message(ChrPtr(CrashMail), "Citadel server process terminated unexpectedly");
+ CtdlAideMessage(ChrPtr(CrashMail), "Citadel server process terminated unexpectedly");
FreeStrBuf(&CrashMail);
}
}
CC->cs_host,
CC->cs_addr
);
- aide_message(buf, "User Creation Notice");
+ CtdlAideMessage(buf, "User Creation Notice");
CtdlLogPrintf(CTDL_NOTICE, "New user <%s> created\n", username);
return (0);
}
((op == 1) ? "invited to" : "kicked out of"),
CC->room.QRname,
CC->user.fullname);
- aide_message(bbb,"User Admin Message");
+ CtdlAideMessage(bbb,"User Admin Message");
return(0);
}
snprintf(notify, SIZ,
"User \"%s\" has been deleted by %s.\n",
usbuf.fullname, CC->user.fullname);
- aide_message(notify, "User Deletion Message");
+ CtdlAideMessage(notify, "User Deletion Message");
}
cprintf("%d Ok", CIT_OK);