i = i << 1;
j++;
}
- syslog(9, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
+ syslog(LOG_DEBUG, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
FreeStrBuf(&QRVec);
}
i = i << 1;
j++;
}
- syslog(9, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
+ syslog(LOG_DEBUG, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
FreeStrBuf(&QR2Vec);
}
StrBuf *Line;
StrBuf *TmpBuf;
int malias = 0;
+ int malias_set_default = 0;
char sepchar = '|';
int Done;
strcat(line, bstr("suffix"));
}
else if (havebstr("alias")) {
- malias = 1;
- sepchar = ',';
- strcat(line, bstr("prefix"));
- strcat(line, ",");
- strcat(line, "room_");
- strcat(line, ChrPtr(WC->CurRoom.name));
+ const char *domain;
+ domain = bstr("aliasdomain");
+ if ((domain == NULL) || IsEmptyStr(domain))
+ {
+ malias_set_default = 1;
+ strcpy(line, bstr("prefix"));
+ strcat(line, bstr("default_aliasdomain"));
+ }
+ else
+ {
+ malias = 1;
+ sepchar = ',';
+ strcat(line, bstr("prefix"));
+ if (!IsEmptyStr(domain))
+ {
+ strcat(line, "@");
+ strcat(line, domain);
+ }
+ strcat(line, ",");
+ strcat(line, "room_");
+ strcat(line, ChrPtr(WC->CurRoom.name));
+ }
}
else {
output_headers(1, 1, 1, 0, 0, 0);
if (StrLength(Line) == 0)
continue;
- extract_token(cmpa0, ChrPtr(Line), 0, sepchar, sizeof cmpa0);
- extract_token(cmpa1, ChrPtr(Line), 1, sepchar, sizeof cmpa1);
- if ( (strcasecmp(cmpa0, cmpb0)) || (strcasecmp(cmpa1, cmpb1)) )
+ if (malias_set_default)
{
- StrBufAppendBufPlain(Line, HKEY("\n"), 0);
- StrBufAppendBuf(TmpBuf, Line, 0);
+ if (strncasecmp(ChrPtr(Line), HKEY("roommailalias|")) != 0)
+ {
+ StrBufAppendBufPlain(Line, HKEY("\n"), 0);
+ StrBufAppendBuf(TmpBuf, Line, 0);
+ }
+ }
+ else
+ {
+ extract_token(cmpa0, ChrPtr(Line), 0, sepchar, sizeof cmpa0);
+ extract_token(cmpa1, ChrPtr(Line), 1, sepchar, sizeof cmpa1);
+ if ( (strcasecmp(cmpa0, cmpb0)) || (strcasecmp(cmpa1, cmpb1)) )
+ {
+ StrBufAppendBufPlain(Line, HKEY("\n"), 0);
+ StrBufAppendBuf(TmpBuf, Line, 0);
+ }
}
}
}
}
REGISTERTokenParamDefine(rssclient);
REGISTERTokenParamDefine(participate);
+ REGISTERTokenParamDefine(roommailalias);