pissnet/pissircd
1
0
Fork 0
mirror of https://github.com/pissnet/pissircd.git synced 2025-08-13 13:41:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added a bunch more webtv support, send PRIVMSG instead of NOTICE if +V

Browse source
This commit is contained in:
codemastr 2001-08-23 17:44:46 +00:00
parent 08caa076ed
commit d8ba78a6c1
4 changed files with 106 additions and 107 deletions

1
Changes
View file

@ -817,3 +817,4 @@ seen. gmtime warning still there
- Added chasm to /info
- Started work on usermode +V (WebTV mode)
- Some aClient cleanups to reduce memory usage
- Made a bunch of messages check +V and if +V use PRIVMSG instead of NOTICE

81
src/channel.c
View file

@ -1593,8 +1593,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, u_
&& !is_chanowner(cptr, chptr))
{
sendto_one(cptr,
":%s NOTICE %s :*** Channel mode +u can only be set by the channel owner",
me.name, cptr->name);
":%s %s %s :*** Channel mode +u can only be set by the channel owner",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name);
break;
}
@ -1605,8 +1605,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, u_
&& !IsULine(cptr))
{
sendto_one(cptr,
":%s NOTICE %s :*** Only IRCops can set that mode",
me.name, cptr->name);
":%s %s %s :*** Only IRCops can set that mode",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name);
break;
}
goto setthephuckingmode;
@ -1615,8 +1615,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, u_
&& !IsULine(cptr))
{
sendto_one(cptr,
":%s NOTICE %s :*** Only admins can set that mode",
me.name, cptr->name);
":%s %s %s :*** Only admins can set that mode",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name);
break;
}
goto setthephuckingmode;
@ -1629,8 +1629,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, u_
&& !IsULine(cptr))
{
sendto_one(cptr,
":%s NOTICE %s :*** Only admins can set that mode",
me.name, cptr->name);
":%s %s %s :*** Only admins can set that mode",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name);
break;
}
goto setthephuckingmode;
@ -1695,8 +1695,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, u_
&& !is_chanowner(cptr, chptr))
{
sendto_one(cptr,
":%s NOTICE %s :*** Protected users can only be set by the channel owner.",
me.name, cptr->name);
":%s %s %s :*** Protected users can only be set by the channel owner.",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name);
break;
}
@ -1760,8 +1760,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, u_
if (MyClient(cptr))
{
sendto_one(cptr,
":%s NOTICE %s :*** You cannot %s because %s is %s channel owner (+q)",
me.name, cptr->name, xxx,
":%s %s %s :*** You cannot %s because %s is %s channel owner (+q)",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name, xxx,
member->cptr->name, chptr->chname);
}
break;
@ -1774,8 +1774,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, u_
if (MyClient(cptr))
{
sendto_one(cptr,
":%s NOTICE %s :*** You cannot %s because %s is %s protected user (+a)",
me.name, cptr->name, xxx,
":%s %s %s :*** You cannot %s because %s is %s protected user (+a)",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name, xxx,
member->cptr->name, chptr->chname);
}
break;
@ -1928,8 +1928,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, u_
&& !is_chanowner(cptr, chptr))
{
sendto_one(cptr,
":%s NOTICE %s :*** Channel mode +L can only be set by the channel owner",
me.name, cptr->name);
":%s %s %s :*** Channel mode +L can only be set by the channel owner",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name);
break;
}
@ -1937,8 +1937,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, u_
if (!chptr->mode.limit && what == MODE_ADD)
{
sendto_one(cptr,
":%s NOTICE %s :*** Channel mode +l <max> is requried for +L to be set",
me.name, cptr->name);
":%s %s %s :*** Channel mode +l <max> is requried for +L to be set",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name);
break;
}
retval = 1;
@ -1965,8 +1965,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, u_
{
if (MyClient(cptr))
sendto_one(cptr,
":%s NOTICE %s :*** You can't link %s to itself",
me.name, cptr->name,
":%s %s %s :*** You can't link %s to itself",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name,
chptr->chname);
break;
}
@ -1974,8 +1974,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, u_
{
if (MyClient(cptr))
sendto_one(cptr,
":%s NOTICE %s :*** You may only specify 1 channel to link to",
me.name, cptr->name);
":%s %s %s :*** You may only specify 1 channel to link to",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name);
break;
}
if (!IsChannelName(param))
@ -2313,8 +2313,8 @@ static int can_join(aClient *cptr, aClient *sptr, aChannel *chptr, char *key, ch
if ((chptr->mode.mode & MODE_ONLYSECURE) &&
!(sptr->umodes & UMODE_SECURE))
{
sendto_one(sptr, ":%s NOTICE %s :*** Cannot join: %s is a Secure-only channel (+z)",
me.name, sptr->name, chptr->chname);
sendto_one(sptr, ":%s %s %s :*** Cannot join: %s is a Secure-only channel (+z)",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name, chptr->chname);
return (ERR_BANNEDFROMCHAN);
}
if ((chptr->mode.mode & MODE_OPERONLY) && !IsOper(sptr))
@ -2660,8 +2660,8 @@ int channel_link(aClient *cptr, aClient *sptr, int parc, char *parv[])
{
/* bounced too many times */
sendto_one(sptr,
":%s NOTICE %s :*** Couldn't join %s ! - Link setting was too bouncy",
me.name, sptr->name, parv[1]);
":%s %s %s :*** Couldn't join %s ! - Link setting was too bouncy",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name, parv[1]);
return;
}
for (i = 0, name = strtoken(&p, parv[1], ","); name;
@ -3394,8 +3394,8 @@ int m_kick(aClient *cptr, aClient *sptr, int parc, char *parv[])
err_str(ERR_NOSUCHNICK),
me.name, parv[0], user, name);
sendto_one(who,
":%s NOTICE %s :*** Hidden: %s tried to kick you from channel %s (%s)",
me.name, who->name, parv[0],
":%s %s %s :*** Hidden: %s tried to kick you from channel %s (%s)",
me.name, IsWebTV(who) ? "PRIVMSG" : "NOTICE", who->name, parv[0],
chptr->chname, comment);
break;
}
@ -3404,8 +3404,8 @@ int m_kick(aClient *cptr, aClient *sptr, int parc, char *parv[])
&& !IsULine(sptr))
{
sendto_one(sptr,
":%s NOTICE %s :*** You cannot kick people on %s",
me.name, sptr->name, chptr->chname);
":%s %s %s :*** You cannot kick people on %s",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name, chptr->chname);
goto deny;
continue;
}
@ -3440,10 +3440,9 @@ int m_kick(aClient *cptr, aClient *sptr, int parc, char *parv[])
&& who != sptr)
{
sendto_one(sptr,
":%s NOTICE %s :*** You cannot kick %s from %s because %s is channel protected",
me.name, sptr->name,
who->name,
chptr->chname, who->name);
":%s %s %s :*** You cannot kick %s from %s because %s is channel protected",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name,
who->name, chptr->chname, who->name);
goto deny;
continue;
} /* chanprot/chanowner */
@ -3453,8 +3452,8 @@ int m_kick(aClient *cptr, aClient *sptr, int parc, char *parv[])
&& !IsULine(sptr))
{
sendto_one(sptr,
":%s NOTICE %s :*** You cannot kick channel operators on %s if you only are halfop",
me.name, sptr->name, chptr->chname);
":%s %s %s :*** You cannot kick channel operators on %s if you only are halfop",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name, chptr->chname);
goto deny;
} /* halfop */
@ -3464,12 +3463,12 @@ int m_kick(aClient *cptr, aClient *sptr, int parc, char *parv[])
|| IsTechAdmin(sptr)))
{
sendto_one(sptr,
":%s NOTICE %s :*** Cannot kick %s from channel %s (usermode +q)",
me.name, sptr->name,
":%s %s %s :*** Cannot kick %s from channel %s (usermode +q)",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name,
who->name, chptr->chname);
sendto_one(who,
":%s NOTICE %s :*** Q: %s tried to kick you from channel %s (%s)",
me.name, who->name,
":%s %s %s :*** Q: %s tried to kick you from channel %s (%s)",
me.name, IsWebTV(who) ? "PRIVMSG" : "NOTICE", who->name,
parv[0],
chptr->chname, comment);
goto deny;
@ -4522,7 +4521,7 @@ int m_knock(aClient *cptr, aClient *sptr, int parc, char *parv[])
(IsHidden(sptr) ? sptr->user->virthost : sptr->user->realhost),
parv[2] ? parv[2] : "no reason specified");
sendto_one(sptr, ":%s NOTICE %s :Knocked on %s", me.name,
sendto_one(sptr, ":%s %s %s :Knocked on %s", me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE",
sptr->name, chptr->chname);
return 0;
}

79
src/s_serv.c
View file

@ -286,8 +286,8 @@ int m_squit(cptr, sptr, parc, parv)
if (acptr->user)
{
sendto_one(sptr,
":%s NOTICE :*** Cannot do fake kill by SQUIT !!!",
me.name);
":%s %s %s :*** Cannot do fake kill by SQUIT !!!",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name);
sendto_ops
("%s tried to do a fake kill using SQUIT (%s (%s))",
sptr->name, acptr->name, comment);
@ -584,8 +584,8 @@ int m_server(cptr, sptr, parc, parv)
sendto_one(cptr, err_str(ERR_ALREADYREGISTRED),
me.name, parv[0]);
sendto_one(cptr,
":%s NOTICE %s :*** Sorry, but your IRC program doesn't appear to support changing servers.",
me.name, cptr->name);
":%s %s %s :*** Sorry, but your IRC program doesn't appear to support changing servers.",
me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name);
sptr->since += 7;
return 0;
}
@ -2543,8 +2543,8 @@ int m_stats(cptr, sptr, parc, parv)
#endif
if (!IsServer(acptr) && !IsMe(acptr) && IsAnOper(acptr))
sendto_one(acptr,
":%s NOTICE %s :*** %s did a /stats L on you! IP may have been shown",
me.name, acptr->name, sptr->name);
":%s %s %s :*** %s did a /stats L on you! IP may have been shown",
me.name, IsWebTV(acptr) ? "PRIVMSG" : "NOTICE", acptr->name, sptr->name);
}
else if (!strchr(acptr->name, '.'))
sendto_one(sptr, Lformat, me.name,
@ -2740,8 +2740,8 @@ int m_stats(cptr, sptr, parc, parv)
continue;
if (!IsListening(acptr))
continue;
sendto_one(sptr, ":%s NOTICE %s :*** Listener on %s:%i, clients %i. is %s",
me.name, sptr->name,
sendto_one(sptr, ":%s %s %s :*** Listener on %s:%i, clients %i. is %s",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name,
((ConfigItem_listen *)acptr->class)->ip,
((ConfigItem_listen *)acptr->class)->port,
((ConfigItem_listen *)acptr->class)->clients,
@ -2779,11 +2779,11 @@ int m_stats(cptr, sptr, parc, parv)
case 's':
if (IsOper(sptr))
{
sendto_one(sptr, ":%s NOTICE %s :*** SCACHE:",
me.name, sptr->name);
sendto_one(sptr, ":%s %s %s :*** SCACHE:",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name);
list_scache(sptr);
sendto_one(sptr, ":%s NOTICE %s :*** NS:", me.name,
sptr->name);
sendto_one(sptr, ":%s %s %s :*** NS:", me.name,
IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name);
ns_stats(sptr);
}
break;
@ -3298,8 +3298,8 @@ void load_tunefile(void)
if ((acptr = find_server_quick(parv[1])))
{
sendto_one(sptr, ":%s NOTICE %s :*** Connect: Server %s %s %s.",
me.name, parv[0], parv[1], "already exists from",
sendto_one(sptr, ":%s %s %s :*** Connect: Server %s %s %s.",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], parv[1], "already exists from",
acptr->from->name);
return 0;
}
@ -3313,8 +3313,8 @@ void load_tunefile(void)
if (!aconf)
{
sendto_one(sptr,
"NOTICE %s :*** Connect: Server %s is not configured for linking",
parv[0], parv[1]);
":%s %s %s :*** Connect: Server %s is not configured for linking", me.name,
IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], parv[1]);
return 0;
}
/*
@ -3328,14 +3328,15 @@ void load_tunefile(void)
if ((port = atoi(parv[2])) <= 0)
{
sendto_one(sptr,
"NOTICE %s :*** Connect: Illegal port number", parv[0]);
":%s %s %s :*** Connect: Illegal port number", me.name,
IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0]);
return 0;
}
}
else if (port <= 0 && (port = PORTNUM) <= 0)
{
sendto_one(sptr, ":%s NOTICE %s :*** Connect: missing port number",
me.name, parv[0]);
sendto_one(sptr, ":%s %s %s :*** Connect: missing port number",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0]);
return 0;
}
@ -3344,8 +3345,8 @@ void load_tunefile(void)
if (deny->flag.type == CRULE_ALL && !match(deny->mask, aconf->servername)
&& crule_eval(deny->rule)) {
sendto_one(sptr,
"NOTICE %s :Connect: Disallowed by connection rule",
parv[0]);
":%s %s %s :Connect: Disallowed by connection rule",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0]);
return 0;
}
}
@ -3369,21 +3370,21 @@ void load_tunefile(void)
{
case 0:
sendto_one(sptr,
":%s NOTICE %s :*** Connecting to %s[%s].",
me.name, parv[0], aconf->servername, aconf->hostname);
":%s %s %s :*** Connecting to %s[%s].",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], aconf->servername, aconf->hostname);
break;
case -1:
sendto_one(sptr, ":%s NOTICE %s :*** Couldn't connect to %s.",
me.name, parv[0], aconf->servername);
sendto_one(sptr, ":%s %s %s :*** Couldn't connect to %s.",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], aconf->servername);
break;
case -2:
sendto_one(sptr, ":%s NOTICE %s :*** Hostname %s is unknown for server %s.",
me.name, parv[0], aconf->hostname, aconf->servername);
sendto_one(sptr, ":%s %s %s :*** Hostname %s is unknown for server %s.",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], aconf->hostname, aconf->servername);
break;
default:
sendto_one(sptr,
":%s NOTICE %s :*** Connection to %s failed: %s",
me.name, parv[0], aconf->servername, strerror(retval));
":%s %s %s :*** Connection to %s failed: %s",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], aconf->servername, strerror(retval));
}
aconf->port = tmpport;
return 0;
@ -3480,8 +3481,8 @@ int m_addline(aClient *cptr, aClient *sptr, int parc, char *parv[])
return 0;
}
/* Display what they wrote too */
sendto_one(sptr, ":%s NOTICE %s :*** Wrote (%s) to ircd.conf",
me.name, parv[0], text);
sendto_one(sptr, ":%s %s %s :*** Wrote (%s) to ircd.conf",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], text);
fprintf(conf, "// Added by %s\n", make_nick_user_host(sptr->name,
sptr->user->username, sptr->user->realhost));
/* for (i=1 ; i<parc ; i++)
@ -3530,8 +3531,8 @@ int m_addmotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
{
return 0;
}
sendto_one(sptr, ":%s NOTICE %s :*** Wrote (%s) to file: ircd.motd",
me.name, parv[0], text);
sendto_one(sptr, ":%s %s %s :*** Wrote (%s) to file: ircd.motd",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], text);
/* for (i=1 ; i<parc ; i++)
{
if (i!=parc-1)
@ -3577,8 +3578,8 @@ int m_addomotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
{
return 0;
}
sendto_one(sptr, ":%s NOTICE %s :*** Wrote (%s) to OperMotd",
me.name, parv[0], text);
sendto_one(sptr, ":%s %s %s :*** Wrote (%s) to OperMotd",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], text);
/* for (i=1 ; i<parc ; i++)
{
if (i!=parc-1)
@ -4745,8 +4746,8 @@ int m_die(cptr, sptr, parc, parv)
continue;
if (IsClient(acptr))
sendto_one(acptr,
":%s NOTICE %s :Server Terminating. %s",
me.name, acptr->name, sptr->name);
":%s %s %s :Server Terminating. %s",
me.name, IsWebTV(acptr) ? "PRIVMSG" : "NOTICE", acptr->name, sptr->name);
else if (IsServer(acptr))
sendto_one(acptr, ":%s ERROR :Terminated by %s",
me.name, get_client_name(sptr, TRUE));
@ -4880,8 +4881,8 @@ int localdie(void)
continue;
if (IsClient(acptr))
sendto_one(acptr,
":%s NOTICE %s :Server Terminated by local console",
me.name, acptr->name);
":%s %s %s :Server Terminated by local console",
me.name, IsWebTV(acptr) ? "PRIVMSG" : "NOTICE", acptr->name);
else if (IsServer(acptr))
sendto_one(acptr,
":%s ERROR :Terminated by local console", me.name);

52
src/s_user.c
View file

@ -614,8 +614,8 @@ int m_remgline(aClient *cptr, aClient *sptr, int parc, char *parv[])
return 0;
sendto_one(sptr,
":%s NOTICE %s :*** Please use /gline -mask instead of /Remgline",
me.name, sptr->name);
":%s %s %s :*** Please use /gline -mask instead of /Remgline",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name);
}
extern char cmodestring[512];
@ -2373,11 +2373,9 @@ int m_whois(cptr, sptr, parc, parv)
if (IsWhois(acptr) && (sptr != acptr))
{
sendto_one(acptr,
":%s NOTICE %s :*** %s (%s@%s) did a /whois on you.",
me.name, acptr->name, sptr->name,
sptr->user->username,
IsHidden(acptr) ? sptr->
user->virthost : sptr->user->realhost);
":%s %s %s :*** %s (%s@%s) did a /whois on you.",
me.name, IsWebTV(acptr) ? "PRIVMSG" : "NOTICE", acptr->name, sptr->name,
sptr->user->username, IsHidden(acptr) ? sptr->user->virthost : sptr->user->realhost);
}
sendto_one(sptr, rpl_str(RPL_WHOISUSER), me.name,
@ -2806,8 +2804,8 @@ int m_kill(cptr, sptr, parc, parv)
continue;
}
sendto_one(sptr,
":%s NOTICE %s :*** KILL changed from %s to %s",
me.name, parv[0], nick, acptr->name);
":%s %s %s :*** KILL changed from %s to %s",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], nick, acptr->name);
chasing = 1;
}
if ((!MyConnect(acptr) && MyClient(cptr) && !OPCanGKill(cptr))
@ -2841,8 +2839,8 @@ int m_kill(cptr, sptr, parc, parv)
if (!IsServer(sptr) && (kcount > MAXKILLS))
{
sendto_one(sptr,
":%s NOTICE %s :*** Too many targets, kill list was truncated. Maximum is %d.",
me.name, parv[0], MAXKILLS);
":%s %s %s :*** Too many targets, kill list was truncated. Maximum is %d.",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], MAXKILLS);
break;
}
if (!IsServer(cptr))
@ -3212,8 +3210,8 @@ int m_mkpasswd(cptr, sptr, parc, parv)
if (useable == 0)
{
sendto_one(sptr,
":%s NOTICE %s :*** Encryption's MUST be atleast 1 character in length",
me.name, parv[0]);
":%s %s %s :*** Encryption's MUST be atleast 1 character in length",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0]);
return 0;
}
srandom(TStime());
@ -3229,14 +3227,14 @@ int m_mkpasswd(cptr, sptr, parc, parv)
if ((strchr(saltChars, salt[0]) == NULL)
|| (strchr(saltChars, salt[1]) == NULL))
{
sendto_one(sptr, ":%s NOTICE %s :*** Illegal salt %s", me.name,
parv[0], salt);
sendto_one(sptr, ":%s %s %s :*** Illegal salt %s", me.name,
IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], salt);
return 0;
}
sendto_one(sptr, ":%s NOTICE %s :*** Encryption for [%s] is %s",
me.name, parv[0], parv[1], crypt(parv[1], salt));
sendto_one(sptr, ":%s %s %s :*** Encryption for [%s] is %s",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0], parv[1], crypt(parv[1], salt));
return 0;
}
@ -3247,8 +3245,8 @@ int m_mkpasswd(cptr, sptr, parc, parv)
char *parv[];
{
sendto_one(sptr,
":%s NOTICE %s :*** Encryption is disabled on UnrealIRCD-win32",
me.name, parv[0]);
":%s %s %s :*** Encryption is disabled on UnrealIRCD-win32",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", parv[0]);
return 0;
}
@ -3289,8 +3287,8 @@ int m_oper(cptr, sptr, parc, parv)
if (SVSNOOP)
{
sendto_one(sptr,
":%s NOTICE %s :*** This server is in NOOP mode, you cannot /oper",
me.name, sptr->name);
":%s %s %s :*** This server is in NOOP mode, you cannot /oper",
me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name);
return 0;
}
@ -3653,8 +3651,8 @@ int m_oper(cptr, sptr, parc, parv)
sendto_one(sptr, err_str(ERR_PASSWDMISMATCH), me.name, parv[0]);
if (FAILOPER_WARN)
sendto_one(sptr,
":%s NOTICE %s :*** Your attempt has been logged.", me.name,
sptr->name);
":%s %s %s :*** Your attempt has been logged.", me.name,
IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name);
sendto_realops
("Failed OPER attempt by %s (%s@%s) using UID %s [NOPASSWORD]",
parv[0], sptr->user->username, sptr->sockhost, name);
@ -4604,8 +4602,8 @@ int m_sajoin(cptr, sptr, parc, parv)
parv[0] = parv[1];
parv[1] = parv[2];
sendto_one(acptr,
":%s NOTICE %s :*** You were forced to join %s", me.name,
acptr->name, parv[2]);
":%s %s %s :*** You were forced to join %s", me.name,
IsWebTV(acptr) ? "PRIVMSG" : "NOTICE", acptr->name, parv[2]);
(void)m_join(acptr, acptr, 2, parv);
}
else
@ -4686,8 +4684,8 @@ int m_sapart(cptr, sptr, parc, parv)
parv[1] = parv[2];
parv[2] = NULL;
sendto_one(acptr,
":%s NOTICE %s :*** You were forced to part %s", me.name,
acptr->name, parv[1]);
":%s %s %s :*** You were forced to part %s", me.name,
IsWebTV(acptr) ? "PRIVMSG" : "NOTICE", acptr->name, parv[1]);
(void)m_part(acptr, acptr, 2, parv);
}
else