diff --git a/include/channel_mode.h b/include/channel_mode.h index 015218f..05b275b 100644 --- a/include/channel_mode.h +++ b/include/channel_mode.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: channel_mode.h,v 1.8 2002/09/13 09:17:13 fishwaldo Exp $ + * $Id: channel_mode.h,v 1.9 2002/09/23 10:47:29 fishwaldo Exp $ */ @@ -42,6 +42,8 @@ extern void set_channel_mode_flags( char flags_ptr[4][2], struct Channel *chptr, struct Client *source_p); +#define ADMIN_CHAR ! + /* ** Channel Related macros follow */ diff --git a/include/supported.h b/include/supported.h index 9f249fd..5cacba9 100644 --- a/include/supported.h +++ b/include/supported.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: supported.h,v 1.5 2002/09/16 07:56:55 fishwaldo Exp $ + * $Id: supported.h,v 1.6 2002/09/23 10:47:29 fishwaldo Exp $ */ #ifndef INCLUDED_supported_h @@ -56,7 +56,7 @@ " CALLERID" #define FEATURES2VALUES ConfigServerHide.disable_local_channels ? "#" : "#&", \ - "(aohv)¤@%+", "beI,k,l,imnpstArO", \ + "(aohv)!@%+", "beI,k,l,imnpstArO", \ ServerInfo.network_name, CASEMAP /* diff --git a/modules/core/m_sjoin.c b/modules/core/m_sjoin.c index 5769923..09406f2 100644 --- a/modules/core/m_sjoin.c +++ b/modules/core/m_sjoin.c @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: m_sjoin.c,v 1.9 2002/09/16 09:35:43 fishwaldo Exp $ + * $Id: m_sjoin.c,v 1.10 2002/09/23 10:47:30 fishwaldo Exp $ */ #include "stdinc.h" @@ -62,7 +62,7 @@ _moddeinit(void) mod_del_cmd(&sjoin_msgtab); } -const char *_version = "$Revision: 1.9 $"; +const char *_version = "$Revision: 1.10 $"; #endif /* * ms_sjoin @@ -371,7 +371,7 @@ static void ms_sjoin(struct Client *client_p, for (i = 0; i < 2; i++) { - if (*s == '¤') + if (*s == '!') { fl |= MODE_ADMIN; if (keep_new_modes) diff --git a/modules/m_clearchan.c b/modules/m_clearchan.c index c9282d1..3f49154 100644 --- a/modules/m_clearchan.c +++ b/modules/m_clearchan.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: m_clearchan.c,v 1.2 2002/09/19 05:41:10 fishwaldo Exp $ + * $Id: m_clearchan.c,v 1.3 2002/09/23 10:47:30 fishwaldo Exp $ */ #include "stdinc.h" #include "tools.h" @@ -76,7 +76,7 @@ _moddeinit(void) mod_del_cmd(&clearchan_msgtab); } -char *_version = "$Revision: 1.2 $"; +char *_version = "$Revision: 1.3 $"; /* ** mo_clearchan @@ -131,7 +131,7 @@ static void mo_clearchan(struct Client *client_p, struct Client *source_p, /* SJOIN the user to give them ops, and lock the channel */ sendto_server(client_p, source_p, chptr, NOCAPS, NOCAPS, - LL_ICLIENT, ":%s SJOIN %lu %s +ntsi :¤%s", + LL_ICLIENT, ":%s SJOIN %lu %s +ntsi :!%s", me.name, (unsigned long) (chptr->channelts - 1), chptr->chname, source_p->name); sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s", diff --git a/modules/m_join.c b/modules/m_join.c index 67733a2..a3ff4fe 100644 --- a/modules/m_join.c +++ b/modules/m_join.c @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: m_join.c,v 1.10 2002/09/19 05:41:10 fishwaldo Exp $ + * $Id: m_join.c,v 1.11 2002/09/23 10:47:30 fishwaldo Exp $ */ #include "stdinc.h" @@ -64,7 +64,7 @@ _moddeinit(void) { mod_del_cmd(&join_msgtab); } -const char *_version = "$Revision: 1.10 $"; +const char *_version = "$Revision: 1.11 $"; #endif static void do_join_0(struct Client *client_p, struct Client *source_p); @@ -86,7 +86,6 @@ m_join(struct Client *client_p, { struct Channel *chptr = NULL; struct Channel *root_chptr = NULL; - int joining_vchan = 0; char *name, *key = NULL; char *vkey = NULL; /* !key for vchans */ int i, flags = 0; @@ -300,7 +299,7 @@ m_join(struct Client *client_p, sendto_server(client_p, source_p, chptr, NOCAPS, NOCAPS, LL_ICLIENT, - ":%s SJOIN %lu %s %s %s:¤%s", + ":%s SJOIN %lu %s %s %s :!%s", me.name, (unsigned long) chptr->channelts, chptr->chname, modebuf, parabuf, parv[0]); /* diff --git a/modules/m_ojoin.c b/modules/m_ojoin.c index f5327ea..a9fe077 100644 --- a/modules/m_ojoin.c +++ b/modules/m_ojoin.c @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: m_ojoin.c,v 1.1 2002/09/17 11:03:21 fishwaldo Exp $ + * $Id: m_ojoin.c,v 1.2 2002/09/23 10:47:30 fishwaldo Exp $ */ #include "stdinc.h" @@ -57,7 +57,7 @@ _moddeinit(void) mod_del_cmd(&ojoin_msgtab); } -char *_version = "$Revision: 1.1 $"; +char *_version = "$Revision: 1.2 $"; /* ** mo_ojoin @@ -79,7 +79,7 @@ static void mo_ojoin(struct Client *client_p, struct Client *source_p, /* XXX - we might not have CBURSTed this channel if we are a lazylink * yet. */ - if (*parv[1] == '@' || *parv[1] == '%' || *parv[1] == '+' || *parv[1] == '¤') + if (*parv[1] == '@' || *parv[1] == '%' || *parv[1] == '+' || *parv[1] == '!') { parv[1]++; move_me = 1; @@ -106,12 +106,12 @@ static void mo_ojoin(struct Client *client_p, struct Client *source_p, if (move_me == 1) parv[1]--; - if (*parv[1] == '¤') + if (*parv[1] == '!') { add_user_to_channel(chptr, source_p, CHFL_ADMIN); if (chptr->chname[0] != '&') sendto_server(client_p, source_p, chptr, NOCAPS, NOCAPS, LL_ICLIENT, - ":%s SJOIN %lu %s + :¤%s", me.name, chptr->channelts, + ":%s SJOIN %lu %s + :!%s", me.name, chptr->channelts, chptr->chname, source_p->name); sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s", source_p->name, diff --git a/modules/m_opme.c b/modules/m_opme.c index 42f9a5e..09a5d11 100644 --- a/modules/m_opme.c +++ b/modules/m_opme.c @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: m_opme.c,v 1.1 2002/09/17 11:03:21 fishwaldo Exp $ + * $Id: m_opme.c,v 1.2 2002/09/23 10:47:30 fishwaldo Exp $ */ #include "stdinc.h" #include "tools.h" @@ -56,7 +56,7 @@ _moddeinit(void) mod_del_cmd(&opme_msgtab); } -char *_version = "$Revision: 1.1 $"; +char *_version = "$Revision: 1.2 $"; static int chan_is_opless(struct Channel *chptr) { @@ -155,12 +155,12 @@ static void mo_opme(struct Client *client_p, struct Client *source_p, sendto_server(NULL, source_p, chptr, NOCAPS, CAP_UID, NOFLAGS, ":%s PART %s", source_p->name, parv[1]); sendto_server(NULL, source_p, chptr, CAP_UID, NOCAPS, NOFLAGS, - ":%s SJOIN %ld %s + :¤%s", + ":%s SJOIN %ld %s + :!%s", me.name, (signed long) chptr->channelts, parv[1], source_p->name /* XXX ID(source_p) */ ); sendto_server(NULL, source_p, chptr, NOCAPS, CAP_UID, NOFLAGS, - ":%s SJOIN %ld %s + :¤%s", + ":%s SJOIN %ld %s + :!%s", me.name, (signed long) chptr->channelts, parv[1], source_p->name); sendto_channel_local(ALL_MEMBERS, chptr, diff --git a/modules/m_svscmds.c b/modules/m_svscmds.c index 22bd5a8..8f4fcfa 100644 --- a/modules/m_svscmds.c +++ b/modules/m_svscmds.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: m_svscmds.c,v 1.6 2002/09/23 04:39:32 fishwaldo Exp $ + * $Id: m_svscmds.c,v 1.7 2002/09/23 10:47:30 fishwaldo Exp $ */ /* List of ircd includes from ../include/ */ @@ -133,7 +133,7 @@ _moddeinit(void) /* When we last modified the file (shown in /modlist), this is usually: */ -const char *_version = "$Revision: 1.6 $"; +const char *_version = "$Revision: 1.7 $"; #endif /* @@ -338,11 +338,11 @@ static void ms_svsjoin(struct Client *client_p, struct Client *source_p, return; /* select our modes from parv[2] if they exist... (chanop)*/ - if(*parv[2] == '¤') + if(*parv[2] == '!') { type = CHFL_ADMIN; mode = 'a'; - sjmode = '¤'; + sjmode = '!'; } if(*parv[2] == '@') { @@ -454,7 +454,7 @@ static void ms_svsjoin(struct Client *client_p, struct Client *source_p, /* send out a join, make target_p join chptr */ if (chptr->chname[0] != '&') sendto_server(target_p, target_p, chptr, NOCAPS, NOCAPS, LL_ICLIENT, - ":%s SJOIN %lu %s +nt :¤%s", me.name, + ":%s SJOIN %lu %s +nt :!%s", me.name, (unsigned long) chptr->channelts, chptr->chname, target_p->name); diff --git a/src/channel.c b/src/channel.c index 825e75a..5dcb9c8 100644 --- a/src/channel.c +++ b/src/channel.c @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: channel.c,v 1.12 2002/09/19 05:41:11 fishwaldo Exp $ + * $Id: channel.c,v 1.13 2002/09/23 10:47:30 fishwaldo Exp $ */ #include "stdinc.h" @@ -317,7 +317,7 @@ send_channel_modes(struct Client *client_p, struct Channel *chptr) send_members(client_p, modebuf, parabuf, chptr, &chptr->halfops, "%"); - send_members(client_p, modebuf, parabuf, chptr, &chptr->chanadmins, "¤"); + send_members(client_p, modebuf, parabuf, chptr, &chptr->chanadmins, "!"); send_members(client_p, modebuf, parabuf, chptr, &chptr->voiced, "+"); send_members(client_p, modebuf, parabuf, chptr, &chptr->peons, ""); @@ -850,7 +850,7 @@ channel_chanop_or_voice(struct Channel *chptr, struct Client *target_p) else if (find_user_link(&chptr->voiced, target_p)) return ("+"); else if (find_user_link(&chptr->chanadmins, target_p)) - return ("¤"); + return ("!"); return (""); } diff --git a/src/channel_mode.c b/src/channel_mode.c index 6e70aed..7e52f8e 100644 --- a/src/channel_mode.c +++ b/src/channel_mode.c @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: channel_mode.c,v 1.17 2002/09/21 06:26:13 fishwaldo Exp $ + * $Id: channel_mode.c,v 1.18 2002/09/23 10:47:30 fishwaldo Exp $ */ #include "stdinc.h" @@ -2125,7 +2125,7 @@ set_channel_mode_flags(char flags_ptr[NUMLISTS][2], struct Channel *chptr, flags_ptr[0][0] = '@'; flags_ptr[1][0] = '%'; flags_ptr[2][0] = '+'; - flags_ptr[3][0] = '¤'; + flags_ptr[3][0] = '!'; flags_ptr[4][0] = '\0'; flags_ptr[0][1] = '\0'; diff --git a/src/s_user.c b/src/s_user.c index fa0d253..c46f523 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: s_user.c,v 1.17 2002/09/23 04:39:32 fishwaldo Exp $ + * $Id: s_user.c,v 1.18 2002/09/23 10:47:30 fishwaldo Exp $ */ #include "stdinc.h" @@ -1446,7 +1446,7 @@ oper_up( struct Client *source_p, struct ConfItem *aconf ) if (flags & CHFL_ADMIN) { chptr->channelts = CurrentTime; - sendto_server(NULL, source_p, chptr, NOCAPS, NOCAPS, LL_ICLIENT, ":%s SJOIN %lu %s + :¤%s", me.name, (unsigned long) chptr->channelts, chptr->chname, source_p->name); + sendto_server(NULL, source_p, chptr, NOCAPS, NOCAPS, LL_ICLIENT, ":%s SJOIN %lu %s + :!%s", me.name, (unsigned long) chptr->channelts, chptr->chname, source_p->name); } else { sendto_server(NULL, source_p, chptr, NOCAPS, NOCAPS, LL_ICLIENT, ":%s SJOIN %lu %s + :%s", me.name, (unsigned long) chptr->channelts, chptr->chname, source_p->name); }