#define Block 4096
#define MAXLOGSEARCHLENGTH 10000
-struct userNode *chanserv;
+extern struct userNode *chanserv;
struct logDestination;
{ "MSG_INVALID_FACILITY", "$b%s$b is an invalid log facility." },
{ "MSG_INVALID_SEVERITY", "$b%s$b is an invalid severity level." },
- { "LAST_RESULTS", "$b%s$b] %s %s $b%s$b %s" },
+ { "LAST_RESULTS", "$b%s]$b %s %s $b%s$b %s" },
{ "LAST_ERROR", "%s:%s" },
{ "LAST_COMMAND_LOG", "Channel Events for %s" },
{ "LAST_LINE", "----------------------------------------" },
unsigned int matched = 0;
if (discrim->type) {
- static volatile struct logEntry *last;
struct logEntry *entry;
- for (entry = discrim->type->log_oldest, last = NULL;
+ for (entry = discrim->type->log_oldest;
entry;
- last = entry, entry = entry->next) {
+ entry = entry->next) {
verify(entry);
if (entry_match(discrim, entry)) {
esf(entry, data);
char serv[NICKLEN+1];
char buf[MAXLEN];
char myservc[MAXLEN];
+ char mynuhbuf[MAXLEN];
char* mychan;
char* mynuh;
+ char* mynick;
+ char* myacc;
char* mycommand;
char* myrest;
char* datestr;
datestr = (char *) mysep(&LogLine, "]");
mywho = (char *) mysep(&LogLine, " ");
- mynuh = (char *) mysep(&LogLine, " ");
+ if (user->handle_info && ((user->handle_info->opserv_level > 0) || IsOper(user)))
+ mynuh = (char *) mysep(&LogLine, " ");
+ else {
+ mynick = (char *) mysep(&LogLine, "!");
+ mysep(&LogLine, "@");
+ mysep(&LogLine, ":");
+ myacc = (char *) mysep(&LogLine, " ");
+ sprintf(mynuhbuf, "%s:%s", mynick, myacc);
+ mynuh = mynuhbuf;
+ }
mycommand = (char *) mysep(&LogLine, " ");
myrest = (char *) mysep(&LogLine, "\0");
myserva = (char *) mysep(&mywho, ":");