mode +c blocks bold (2), colour (3), reverse (22), ansi escape (27), italic (29) (mIRC 7 - ctrl+i), underline (31)
-diff -r 718a91e2ff02 include/channel.h
---- a/include/channel.h
-+++ b/include/channel.h
-@@ -398,6 +398,7 @@
+diff -r 98874e322210 include/channel.h
+--- a/include/channel.h Sat Jul 20 11:59:11 2013 +0100
++++ b/include/channel.h Sat Jul 20 12:00:28 2013 +0100
+@@ -399,6 +399,7 @@
extern struct Membership* find_channel_member(struct Client* cptr, struct Channel* chptr);
extern int member_can_send_to_channel(struct Membership* member, int reveal);
extern int client_can_send_to_channel(struct Client *cptr, struct Channel *chptr, int reveal);
extern void remove_user_from_channel(struct Client *sptr, struct Channel *chptr);
extern void remove_user_from_all_channels(struct Client* cptr);
-diff -r 718a91e2ff02 include/ircd_chattr.h
---- a/include/ircd_chattr.h
-+++ b/include/ircd_chattr.h
+diff -r 98874e322210 include/ircd_chattr.h
+--- a/include/ircd_chattr.h Sat Jul 20 11:59:11 2013 +0100
++++ b/include/ircd_chattr.h Sat Jul 20 12:00:28 2013 +0100
@@ -59,6 +59,8 @@
#define NTL_KTIME 0x20000 /**< Valid character for a k:line time */
#define NTL_CHPFX 0x40000 /**< channel prefix char # & + */
-
#endif /* INCLUDED_ircd_chattr_h */
-diff -r 718a91e2ff02 ircd/channel.c
---- a/ircd/channel.c
-+++ b/ircd/channel.c
+diff -r 98874e322210 ircd/channel.c
+--- a/ircd/channel.c Sat Jul 20 11:59:11 2013 +0100
++++ b/ircd/channel.c Sat Jul 20 12:00:28 2013 +0100
@@ -778,6 +778,75 @@
return member_can_send_to_channel(member, reveal);
}
/** Returns the name of a channel that prevents the user from changing nick.
* if a member and not (opped or voiced) and (banned or moderated), return
* the name of the first channel banned on.
-diff -r 718a91e2ff02 ircd/ircd_relay.c
---- a/ircd/ircd_relay.c
-+++ b/ircd/ircd_relay.c
+diff -r 98874e322210 ircd/ircd_relay.c
+--- a/ircd/ircd_relay.c Sat Jul 20 11:59:11 2013 +0100
++++ b/ircd/ircd_relay.c Sat Jul 20 12:00:28 2013 +0100
@@ -87,7 +87,6 @@
void relay_channel_message(struct Client* sptr, const char* name, const char* text, const int targetc)
{
-
- if ((chptr->mode.mode & MODE_NOCTCP) && ircd_strncmp(text,"\001ACTION ",8))
- for (ch=text;*ch;)
-- if (*ch++==1) {
+- if (*ch++==1) {
- send_reply(sptr, ERR_CANNOTSENDTOCHAN, chptr->chname);
- return;
- }
if ((chptr->mode.mode & MODE_NOPRIVMSGS) &&
check_target_limit(sptr, chptr, chptr->chname, 0))
-diff -r 718a91e2ff02 ircd/m_wallchops.c
---- a/ircd/m_wallchops.c
-+++ b/ircd/m_wallchops.c
+diff -r 98874e322210 ircd/m_wallchops.c
+--- a/ircd/m_wallchops.c Sat Jul 20 11:59:11 2013 +0100
++++ b/ircd/m_wallchops.c Sat Jul 20 12:00:28 2013 +0100
@@ -103,7 +103,6 @@
{
struct Channel *chptr;
if ((chptr->mode.mode & MODE_NOPRIVMSGS) &&
check_target_limit(sptr, chptr, chptr->chname, 0))
-diff -r 718a91e2ff02 ircd/m_wallvoices.c
---- a/ircd/m_wallvoices.c
-+++ b/ircd/m_wallvoices.c
+diff -r 98874e322210 ircd/m_wallvoices.c
+--- a/ircd/m_wallvoices.c Sat Jul 20 11:59:11 2013 +0100
++++ b/ircd/m_wallvoices.c Sat Jul 20 12:00:28 2013 +0100
@@ -102,7 +102,6 @@
{
struct Channel *chptr;
if ((chptr->mode.mode & MODE_NOPRIVMSGS) &&
check_target_limit(sptr, chptr, chptr->chname, 0))
-diff -r 718a91e2ff02 ircd/table_gen.c
---- a/ircd/table_gen.c
-+++ b/ircd/table_gen.c
+diff -r 98874e322210 ircd/table_gen.c
+--- a/ircd/table_gen.c Sat Jul 20 11:59:11 2013 +0100
++++ b/ircd/table_gen.c Sat Jul 20 12:00:28 2013 +0100
@@ -87,6 +87,12 @@
markString(NTL_SPACE, "\011\012\013\014\015\040");
This is designed to stop the spam bots which sit outside a channel, while a spy sits inside, preventing channel operators dealing with the problem.
We currently also block invites, this might not be such a good idea, but these days everyone can get Q.
-diff -r 0543ca28447d include/channel.h
---- a/include/channel.h
-+++ b/include/channel.h
-@@ -462,5 +462,6 @@
+diff -r 5787dbfaa811 include/channel.h
+--- a/include/channel.h Sat Jul 20 11:50:29 2013 +0100
++++ b/include/channel.h Sat Jul 20 11:50:33 2013 +0100
+@@ -463,5 +463,6 @@
extern void free_ban(struct Ban *ban);
extern unsigned int get_channel_marker(void);
+extern int common_chan_count(struct Client *a, struct Client *b, int max);
#endif /* INCLUDED_channel_h */
-diff -r 0543ca28447d include/client.h
---- a/include/client.h
-+++ b/include/client.h
+diff -r 5787dbfaa811 include/client.h
+--- a/include/client.h Sat Jul 20 11:50:29 2013 +0100
++++ b/include/client.h Sat Jul 20 11:50:33 2013 +0100
@@ -90,7 +90,7 @@
#define FlagClr(set,flag) ((set)->bits[FLAGSET_INDEX(flag)] &= ~FLAGSET_MASK(flag))
/* free flags */
#define FREEFLAG_SOCKET 0x0001 /**< socket needs to be freed */
-diff -r 0543ca28447d include/numeric.h
---- a/include/numeric.h
-+++ b/include/numeric.h
+diff -r 5787dbfaa811 include/numeric.h
+--- a/include/numeric.h Sat Jul 20 11:50:29 2013 +0100
++++ b/include/numeric.h Sat Jul 20 11:50:33 2013 +0100
@@ -420,6 +420,7 @@
/* ERR_HTMDISABLED 486 unreal */
#define ERR_ACCOUNTONLY 486 /* QuakeNet/ASUKA extension */
/* ERR_TSLESSCHAN 488 IRCnet extension (?) */
#define ERR_VOICENEEDED 489 /* Undernet extension */
-diff -r 0543ca28447d ircd/channel.c
---- a/ircd/channel.c
-+++ b/ircd/channel.c
+diff -r 5787dbfaa811 ircd/channel.c
+--- a/ircd/channel.c Sat Jul 20 11:50:29 2013 +0100
++++ b/ircd/channel.c Sat Jul 20 11:50:33 2013 +0100
@@ -3819,3 +3819,39 @@
return marker;
+
+ return count;
+}
-diff -r 0543ca28447d ircd/ircd_relay.c
---- a/ircd/ircd_relay.c
-+++ b/ircd/ircd_relay.c
+diff -r 5787dbfaa811 ircd/ircd_relay.c
+--- a/ircd/ircd_relay.c Sat Jul 20 11:50:29 2013 +0100
++++ b/ircd/ircd_relay.c Sat Jul 20 11:50:33 2013 +0100
@@ -310,6 +310,10 @@
if (IsAccountOnly(acptr) && !IsAccount(sptr) && !IsXtraOp(sptr))
- return;
+ return;
+ /* slug: same applies here, since only opers can be +k */
+ if (IsCommonChansOnly(acptr) && !IsXtraOp(sptr) && !common_chan_count(acptr, sptr, 1))
/*
* deliver the message
*/
-diff -r 0543ca28447d ircd/m_invite.c
---- a/ircd/m_invite.c
-+++ b/ircd/m_invite.c
+diff -r 5787dbfaa811 ircd/m_invite.c
+--- a/ircd/m_invite.c Sat Jul 20 11:50:29 2013 +0100
++++ b/ircd/m_invite.c Sat Jul 20 11:50:33 2013 +0100
@@ -171,6 +171,9 @@
return 0;
}
if (check_target_limit(sptr, acptr, cli_name(acptr), 0))
return 0;
-diff -r 0543ca28447d ircd/s_err.c
---- a/ircd/s_err.c
-+++ b/ircd/s_err.c
+diff -r 5787dbfaa811 ircd/s_err.c
+--- a/ircd/s_err.c Sat Jul 20 11:50:29 2013 +0100
++++ b/ircd/s_err.c Sat Jul 20 11:50:33 2013 +0100
@@ -1006,7 +1006,7 @@
/* 486 */
{ ERR_ACCOUNTONLY, "%s :You must be authed in order to message this user -- For details of how to obtain an account visit %s", "486" },
/* 488 */
{ 0 },
/* 489 */
-diff -r 0543ca28447d ircd/s_user.c
---- a/ircd/s_user.c
-+++ b/ircd/s_user.c
+diff -r 5787dbfaa811 ircd/s_user.c
+--- a/ircd/s_user.c Sat Jul 20 11:50:29 2013 +0100
++++ b/ircd/s_user.c Sat Jul 20 11:50:33 2013 +0100
@@ -540,7 +540,8 @@
{ FLAG_NOCHAN, 'n' },
{ FLAG_NOIDLE, 'I' },
ircd/ircd_parser.y
add PRIV_LOCAL_WELCOME PRIV_WELCOME
-diff -r 8bf1b05cdfe7 include/client.h
---- a/include/client.h
-+++ b/include/client.h
+diff -r 9096546c6212 include/client.h
+--- a/include/client.h Sat Jul 20 12:00:51 2013 +0100
++++ b/include/client.h Sat Jul 20 12:00:55 2013 +0100
@@ -142,6 +142,8 @@
PRIV_USER_PRIVACY, /* oper can bypass user privacy +x etc gives i.e. see real ip's */
- PRIV_CHANNEL_PRIVACY, /* oper can bypass channel privacy i.e. can see modes on channels they are not on and channel keys */
+ PRIV_CHANNEL_PRIVACY, /* oper can bypass channel privacy i.e. can see modes on channels they are not on and channel keys */
PRIV_SERVERINFO, /* oper can use /get, /stats, /hash, retrieve remote information */
+ PRIV_WELCOME, /* oper can WELCOME */
+ PRIV_LOCAL_WELCOME, /* oper can local WELCOME */
PRIV_LAST_PRIV /**< number of privileges */
};
-diff -r 8bf1b05cdfe7 include/handlers.h
---- a/include/handlers.h
-+++ b/include/handlers.h
+diff -r 9096546c6212 include/handlers.h
+--- a/include/handlers.h Sat Jul 20 12:00:51 2013 +0100
++++ b/include/handlers.h Sat Jul 20 12:00:55 2013 +0100
@@ -138,6 +138,7 @@
extern int m_version(struct Client*, struct Client*, int, char*[]);
extern int m_wallchops(struct Client*, struct Client*, int, char*[]);
extern int mo_xquery(struct Client*, struct Client*, int, char*[]);
extern int mr_error(struct Client*, struct Client*, int, char*[]);
extern int mr_error(struct Client*, struct Client*, int, char*[]);
-@@ -230,6 +232,7 @@
+@@ -231,6 +233,7 @@
extern int ms_wallops(struct Client*, struct Client*, int, char*[]);
extern int ms_wallusers(struct Client*, struct Client*, int, char*[]);
extern int ms_wallvoices(struct Client*, struct Client*, int, char*[]);
extern int ms_whois(struct Client*, struct Client*, int, char*[]);
extern int ms_xquery(struct Client*, struct Client*, int, char*[]);
extern int ms_xreply(struct Client*, struct Client*, int, char*[]);
-diff -r 8bf1b05cdfe7 include/ircd_features.h
---- a/include/ircd_features.h
-+++ b/include/ircd_features.h
+diff -r 9096546c6212 include/ircd_features.h
+--- a/include/ircd_features.h Sat Jul 20 12:00:51 2013 +0100
++++ b/include/ircd_features.h Sat Jul 20 12:00:55 2013 +0100
@@ -101,6 +101,7 @@
FEAT_IRCD_RES_TIMEOUT,
FEAT_AUTH_TIMEOUT,
FEAT_HIS_STATS_w,
FEAT_HIS_STATS_x,
FEAT_HIS_STATS_y,
-diff -r 8bf1b05cdfe7 include/msg.h
---- a/include/msg.h
-+++ b/include/msg.h
+diff -r 9096546c6212 include/msg.h
+--- a/include/msg.h Sat Jul 20 12:00:51 2013 +0100
++++ b/include/msg.h Sat Jul 20 12:00:55 2013 +0100
@@ -196,6 +196,10 @@
#define TOK_NOTICE "O"
#define CMD_NOTICE MSG_NOTICE, TOK_NOTICE
#define MSG_WALLCHOPS "WALLCHOPS" /* WC */
#define TOK_WALLCHOPS "WC"
#define CMD_WALLCHOPS MSG_WALLCHOPS, TOK_WALLCHOPS
-diff -r 8bf1b05cdfe7 include/numeric.h
---- a/include/numeric.h
-+++ b/include/numeric.h
+diff -r 9096546c6212 include/numeric.h
+--- a/include/numeric.h Sat Jul 20 12:00:51 2013 +0100
++++ b/include/numeric.h Sat Jul 20 12:00:55 2013 +0100
@@ -116,6 +116,7 @@
RPL_STATSGLINE 227 Dalnet
RPL_STATSVLINE 227 unreal */
#define ERR_SILELISTFULL 511 /* Undernet extension */
/* ERR_NOTIFYFULL 512 aircd */
/* ERR_TOOMANYWATCH 512 Numeric List: Dalnet */
-diff -r 8bf1b05cdfe7 include/welcome.h
---- /dev/null
-+++ b/include/welcome.h
+diff -r 9096546c6212 include/welcome.h
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/include/welcome.h Sat Jul 20 12:00:55 2013 +0100
@@ -0,0 +1,86 @@
+#ifndef INCLUDED_welcome_h
+#define INCLUDED_welcome_h
+extern int welcome_memory_count(size_t *we_size);
+
+#endif /* INCLUDED_welcome_h */
-diff -r 8bf1b05cdfe7 ircd/Makefile.in
---- a/ircd/Makefile.in
-+++ b/ircd/Makefile.in
-@@ -186,6 +186,7 @@
+diff -r 9096546c6212 ircd/Makefile.in
+--- a/ircd/Makefile.in Sat Jul 20 12:00:51 2013 +0100
++++ b/ircd/Makefile.in Sat Jul 20 12:00:55 2013 +0100
+@@ -187,6 +187,7 @@
m_wallops.c \
m_wallusers.c \
m_wallvoices.c \
m_who.c \
m_whois.c \
m_whowas.c \
-@@ -215,6 +216,7 @@
+@@ -216,6 +217,7 @@
send.c \
uping.c \
userload.c \
whocmds.c \
whowas.c \
y.tab.c
-@@ -1161,6 +1163,11 @@
+@@ -1162,6 +1164,11 @@
../include/ircd_reply.h ../include/ircd_string.h \
../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
../include/numnicks.h ../include/s_user.h ../include/send.h
m_who.o: m_who.c ../config.h ../include/channel.h ../include/ircd_defs.h \
../include/res.h ../config.h ../include/client.h ../include/dbuf.h \
../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
-@@ -1422,6 +1429,13 @@
+@@ -1423,6 +1430,13 @@
../include/numnicks.h ../include/querycmds.h ../include/ircd_features.h \
../include/s_misc.h ../include/s_stats.h ../include/send.h \
../include/struct.h ../include/sys.h
whocmds.o: whocmds.c ../config.h ../include/whocmds.h \
../include/channel.h ../include/ircd_defs.h ../include/res.h \
../config.h ../include/client.h ../include/dbuf.h ../include/msgq.h \
-diff -r 8bf1b05cdfe7 ircd/client.c
---- a/ircd/client.c
-+++ b/ircd/client.c
+diff -r 9096546c6212 ircd/client.c
+--- a/ircd/client.c Sat Jul 20 12:00:51 2013 +0100
++++ b/ircd/client.c Sat Jul 20 12:00:55 2013 +0100
@@ -177,6 +177,7 @@
FlagSet(&privs_local, PRIV_WHOX);
FlagSet(&privs_local, PRIV_DISPLAY);
#undef P
{ 0, 0 }
};
-diff -r 8bf1b05cdfe7 ircd/ircd_features.c
---- a/ircd/ircd_features.c
-+++ b/ircd/ircd_features.c
+diff -r 9096546c6212 ircd/ircd_features.c
+--- a/ircd/ircd_features.c Sat Jul 20 12:00:51 2013 +0100
++++ b/ircd/ircd_features.c Sat Jul 20 12:00:55 2013 +0100
@@ -366,6 +366,7 @@
F_I(IRCD_RES_TIMEOUT, 0, 4, 0),
F_I(AUTH_TIMEOUT, 0, 9, 0),
F_B(HIS_STATS_w, 0, 1, 0),
F_B(HIS_STATS_x, 0, 1, 0),
F_B(HIS_STATS_y, 0, 1, 0),
-diff -r 8bf1b05cdfe7 ircd/ircd_lexer.l
---- a/ircd/ircd_lexer.l
-+++ b/ircd/ircd_lexer.l
+diff -r 9096546c6212 ircd/ircd_lexer.l
+--- a/ircd/ircd_lexer.l Sat Jul 20 12:00:51 2013 +0100
++++ b/ircd/ircd_lexer.l Sat Jul 20 12:00:55 2013 +0100
@@ -166,6 +166,8 @@
{ "serverinfo", TPRIV_SERVERINFO },
{ "user_privacy", TPRIV_USER_PRIVACY },
{ NULL, 0 }
};
static int ntokens;
-diff -r 8bf1b05cdfe7 ircd/ircd_parser.y
---- a/ircd/ircd_parser.y
-+++ b/ircd/ircd_parser.y
+diff -r 9096546c6212 ircd/ircd_parser.y
+--- a/ircd/ircd_parser.y Sat Jul 20 12:00:51 2013 +0100
++++ b/ircd/ircd_parser.y Sat Jul 20 12:00:55 2013 +0100
@@ -189,6 +189,7 @@
%token TPRIV_CHANSERV TPRIV_XTRA_OPER TPRIV_NOIDLE TPRIV_FREEFORM TPRIV_PARANOID
%token TPRIV_CHECK TPRIV_WALL TPRIV_CLOSE TPRIV_ROUTE TPRIV_ROUTEINFO TPRIV_SERVERINFO
+ TPRIV_LOCAL_WELCOME { $$ = PRIV_LOCAL_WELCOME; } |
+ TPRIV_WELCOME { $$ = PRIV_WELCOME; } |
TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
- yesorno: YES { $$ = 1; } | NO { $$ = 0; };
-diff -r 8bf1b05cdfe7 ircd/m_welcome.c
---- /dev/null
-+++ b/ircd/m_welcome.c
+ yesorno: YES { $$ = 1; } | NO { $$ = 0; };
+diff -r 9096546c6212 ircd/m_welcome.c
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/ircd/m_welcome.c Sat Jul 20 12:00:55 2013 +0100
@@ -0,0 +1,360 @@
+/*
+ * IRC - Internet Relay Chat, ircd/m_welcome.c
+ /* and do it */
+ return welcome_do(cptr, sptr, name, create, lastmod, who, text, flags);
+}
-diff -r 8bf1b05cdfe7 ircd/parse.c
---- a/ircd/parse.c
-+++ b/ircd/parse.c
-@@ -661,6 +661,15 @@
+diff -r 9096546c6212 ircd/parse.c
+--- a/ircd/parse.c Sat Jul 20 12:00:51 2013 +0100
++++ b/ircd/parse.c Sat Jul 20 12:00:55 2013 +0100
+@@ -668,6 +668,15 @@
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
{ m_unregistered, m_not_oper, ms_check, mo_check, m_ignore }
},
/* This command is an alias for QUIT during the unregistered part of
* of the server. This is because someone jumping via a broken web
-diff -r 8bf1b05cdfe7 ircd/s_debug.c
---- a/ircd/s_debug.c
-+++ b/ircd/s_debug.c
+diff -r 9096546c6212 ircd/s_debug.c
+--- a/ircd/s_debug.c Sat Jul 20 12:00:51 2013 +0100
++++ b/ircd/s_debug.c Sat Jul 20 12:00:55 2013 +0100
@@ -50,6 +50,7 @@
#include "send.h"
#include "struct.h"
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
":Hash: client %d(%zu), chan is the same", HASHSIZE,
sizeof(void *) * HASHSIZE);
-diff -r 8bf1b05cdfe7 ircd/s_err.c
---- a/ircd/s_err.c
-+++ b/ircd/s_err.c
+diff -r 9096546c6212 ircd/s_err.c
+--- a/ircd/s_err.c Sat Jul 20 12:00:51 2013 +0100
++++ b/ircd/s_err.c Sat Jul 20 12:00:55 2013 +0100
@@ -486,7 +486,7 @@
/* 226 */
{ RPL_STATSALINE, "%s", "226" },
/* 510 */
{ 0 },
/* 511 */
-diff -r 8bf1b05cdfe7 ircd/s_serv.c
---- a/ircd/s_serv.c
-+++ b/ircd/s_serv.c
+diff -r 9096546c6212 ircd/s_serv.c
+--- a/ircd/s_serv.c Sat Jul 20 12:00:51 2013 +0100
++++ b/ircd/s_serv.c Sat Jul 20 12:00:55 2013 +0100
@@ -57,6 +57,7 @@
#include "struct.h"
#include "sys.h"
/*
* Pass on my client information to the new server
-diff -r 8bf1b05cdfe7 ircd/s_stats.c
---- a/ircd/s_stats.c
-+++ b/ircd/s_stats.c
+diff -r 9096546c6212 ircd/s_stats.c
+--- a/ircd/s_stats.c Sat Jul 20 12:00:51 2013 +0100
++++ b/ircd/s_stats.c Sat Jul 20 12:00:55 2013 +0100
@@ -54,6 +54,7 @@
#include "send.h"
#include "struct.h"
{ 'x', "memusage", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_x,
stats_meminfo, 0,
"List usage information." },
-diff -r 8bf1b05cdfe7 ircd/s_user.c
---- a/ircd/s_user.c
-+++ b/ircd/s_user.c
+diff -r 9096546c6212 ircd/s_user.c
+--- a/ircd/s_user.c Sat Jul 20 12:00:51 2013 +0100
++++ b/ircd/s_user.c Sat Jul 20 12:00:55 2013 +0100
@@ -63,6 +63,7 @@
#include "userload.h"
#include "version.h"
/* TODO: */
/* apply auto sethost if needed */
apply_spoofblock(sptr);
-diff -r 8bf1b05cdfe7 ircd/welcome.c
---- /dev/null
-+++ b/ircd/welcome.c
+diff -r 9096546c6212 ircd/welcome.c
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/ircd/welcome.c Sat Jul 20 12:00:55 2013 +0100
@@ -0,0 +1,877 @@
+/*
+ * IRC - Internet Relay Chat, ircd/welcome.c