diff -rupN b/doc/unreal32docs.de.html a/doc/unreal32docs.de.html
--- b/doc/unreal32docs.de.html 2013-02-16 19:29:39.000000000 -0600
+++ a/doc/unreal32docs.de.html 2013-02-16 19:43:33.000000000 -0600
@@ -3620,10 +3620,6 @@ pidfiles und tunefiles definiert werden
t |
zeigt, dass der User einen /vhost benutzt |
-
- | V |
- WebTV User |
-
v |
Empfängt Rejection Notices, wenn bei DCC File infiziert ist |
diff -rupN b/doc/unreal32docs.html a/doc/unreal32docs.html
--- b/doc/unreal32docs.html 2013-02-16 19:29:39.000000000 -0600
+++ a/doc/unreal32docs.html 2013-02-16 19:44:26.000000000 -0600
@@ -3079,10 +3079,6 @@ files {
Says you are using a /vhost |
- V |
- Marks you as a WebTV user |
-
-
v |
Receives infected DCC Send Rejection notices |
diff -rupN b/help.conf a/help.conf
--- b/help.conf 2013-02-16 19:29:39.000000000 -0600
+++ a/help.conf 2013-02-16 19:30:17.000000000 -0600
@@ -118,7 +118,6 @@ help Umodes {
" R = Allows you to only receive PRIVMSGs/NOTICEs from registered (+r) users";
" S = For Services only. (Protects them)";
" T = Prevents you from receiving CTCPs";
- " V = Marks the client as a WebTV user";
" W = Lets you see when people do a /WHOIS on you (IRC Operators only)";
" ==---------------------------oOo---------------------------==";
};
diff -rupN b/include/dynconf.h a/include/dynconf.h
--- b/include/dynconf.h 2013-02-16 19:29:39.000000000 -0600
+++ a/include/dynconf.h 2013-02-16 19:36:20.000000000 -0600
@@ -65,7 +65,6 @@ struct zConfiguration {
unsigned hide_ulines:1;
unsigned flat_map:1;
unsigned allow_chatops:1;
- unsigned webtv_support:1;
unsigned no_oper_hiding:1;
unsigned ident_check:1;
unsigned fail_oper_warn:1;
@@ -178,7 +177,6 @@ extern MODVAR aConfiguration iConf;
#define ALLOW_CHATOPS iConf.allow_chatops
#define MAXCHANNELSPERUSER iConf.maxchannelsperuser
#define MAXDCCALLOW iConf.maxdccallow
-#define WEBTV_SUPPORT iConf.webtv_support
#define NO_OPER_HIDING iConf.no_oper_hiding
#define DONT_RESOLVE iConf.dont_resolve
#define AUTO_JOIN_CHANS iConf.auto_join_chans
@@ -286,7 +284,6 @@ struct SetCheck {
unsigned has_hide_ulines:1;
unsigned has_flat_map:1;
unsigned has_allow_chatops:1;
- unsigned has_webtv_support:1;
unsigned has_no_oper_hiding:1;
unsigned has_ident_check:1;
unsigned has_fail_oper_warn:1;
@@ -377,7 +374,6 @@ struct SetCheck {
unsigned has_help_channel:1;
unsigned has_stats_server:1;
unsigned has_cloak_keys:1;
- unsigned has_options_webtv_support:1;
unsigned has_options_hide_ulines:1;
unsigned has_options_flat_map:1;
unsigned has_options_show_opermotd:1;
diff -rupN b/makefile.win32 a/makefile.win32
--- b/makefile.win32 2013-02-16 19:29:39.000000000 -0600
+++ a/makefile.win32 2013-02-16 19:31:22.000000000 -0600
@@ -194,7 +194,7 @@ MOD_FILES=SRC/MODULES/L_COMMANDS.C SRC/M
SRC/MODULES/M_SVSNOOP.C SRC/MODULES/M_MKPASSWD.C SRC/MODULES/M_SVSO.C \
SRC/MODULES/M_SVSNICK.C SRC/MODULES/M_ADMINCHAT.C SRC/MODULES/M_AKILL.C \
SRC/MODULES/M_CHGNAME.C SRC/MODULES/M_GUEST.C SRC/MODULES/M_HTM.C SRC/MODULES/M_LAG.C \
- SRC/MODULES/M_MESSAGE.C SRC/MODULES/WEBTV.C SRC/MODULES/M_NACHAT.C SRC/MODULES/M_OPER.C \
+ SRC/MODULES/M_MESSAGE.C SRC/MODULES/M_NACHAT.C SRC/MODULES/M_OPER.C \
SRC/MODULES/M_PINGPONG.C SRC/MODULES/M_QUIT.C SRC/MODULES/M_RAKILL.C SRC/MODULES/M_RPING.C \
SRC/MODULES/M_SENDUMODE.C SRC/MODULES/M_SQLINE.C SRC/MODULES/M_KILL.C \
SRC/MODULES/M_TSCTL.C SRC/MODULES/M_UNKLINE.C SRC/MODULES/M_UNSQLINE.C \
@@ -582,7 +582,7 @@ src/modules/m_lag.dll: src/modules/m_lag
$(CC) $(MODCFLAGS) src/modules/m_lag.c $(MODLFLAGS)
src/modules/m_message.dll: src/modules/m_message.c $(INCLUDES)
- $(CC) $(MODCFLAGS) src/modules/m_message.c src/modules/webtv.c $(MODLFLAGS)
+ $(CC) $(MODCFLAGS) src/modules/m_message.c $(MODLFLAGS)
src/modules/m_nachat.dll: src/modules/m_nachat.c $(INCLUDES)
$(CC) $(MODCFLAGS) src/modules/m_nachat.c $(MODLFLAGS)
diff -rupN b/src/modules/m_message.c a/src/modules/m_message.c
--- b/src/modules/m_message.c 2013-02-16 19:29:39.000000000 -0600
+++ a/src/modules/m_message.c 2013-02-16 19:42:06.000000000 -0600
@@ -55,7 +55,6 @@ DLLFUNC int m_message(aClient *cptr, aCl
DLLFUNC int m_notice(aClient *cptr, aClient *sptr, int parc, char *parv[]);
DLLFUNC int m_private(aClient *cptr, aClient *sptr, int parc, char *parv[]);
-static int webtv_parse(aClient *sptr, char *string);
/* Place includes here */
#define MSG_PRIVATE "PRIVMSG" /* PRIV */
@@ -226,7 +225,6 @@ int ret;
** rev argv 6/91
**
*/
-static int recursive_webtv = 0;
DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int notice)
{
aClient *acptr, *srvptr;
@@ -287,27 +285,15 @@ DLLFUNC int m_message(aClient *cptr, aCl
if (!strcasecmp(nick, "ircd") && MyClient(sptr))
{
ret = 0;
- if (!recursive_webtv)
- {
- recursive_webtv = 1;
- ret = parse(sptr, parv[2], (parv[2] + strlen(parv[2])));
- recursive_webtv = 0;
- }
return ret;
}
if (!strcasecmp(nick, "irc") && MyClient(sptr))
{
- if (!recursive_webtv)
+ if (ret == -99)
{
- recursive_webtv = 1;
- ret = webtv_parse(sptr, parv[2]);
- if (ret == -99)
- {
- ret = parse(sptr, parv[2], (parv[2] + strlen(parv[2])));
- }
- recursive_webtv = 0;
- return ret;
+ ret = parse(sptr, parv[2], (parv[2] + strlen(parv[2])));
}
+ return ret;
}
if (*nick != '#' && (acptr = find_person(nick, NULL)))
@@ -1315,91 +1301,8 @@ struct zMessage {
int maxpara;
};
-/* This really has nothing to do with WebTV yet, but eventually it will, so I figured
- * it's easiest to put it here so why not? -- codemastr
- */
static int ban_version(aClient *cptr, aClient *sptr, int parc, char *parv[]);
-static aMessage webtv_cmds[] =
-{
- {"\1VERSION", ban_version, 1},
- {"\1SCRIPT", ban_version, 1},
- {NULL, 0, 15}
-};
-
-
-static int webtv_parse(aClient *sptr, char *string)
-{
- char *cmd = NULL, *s = NULL;
- int i, n;
- aMessage *message = webtv_cmds;
- static char *para[MAXPARA + 2];
-
- if (!string || !*string)
- {
- sendto_one(sptr, ":IRC %s %s :No command given", MSG_PRIVATE, sptr->name);
- return 0;
- }
-
- n = strlen(string);
- cmd = strtok(string, " ");
- if (!cmd)
- return -99;
-
- for (message = webtv_cmds; message->command; message++)
- if (strcasecmp(message->command, cmd) == 0)
- break;
-
- if (!message->command || !message->func)
- {
-/* sendto_one(sptr, ":IRC %s %s :Sorry, \"%s\" is an unknown command to me",
- MSG_PRIVATE, sptr->name, cmd); */
- /* restore the string*/
- if (strlen(cmd) < n)
- cmd[strlen(cmd)]= ' ';
- return -99;
- }
-
- i = 0;
- s = strtok(NULL, "");
- if (s)
- {
- if (message->maxpara > MAXPARA)
- message->maxpara = MAXPARA; /* paranoid ? ;p */
- for (;;)
- {
- /*
- ** Never "FRANCE " again!! ;-) Clean
- ** out *all* blanks.. --msa
- */
- while (*s == ' ')
- *s++ = '\0';
-
- if (*s == '\0')
- break;
- if (*s == ':')
- {
- /*
- ** The rest is single parameter--can
- ** include blanks also.
- */
- para[++i] = s + 1;
- break;
- }
- para[++i] = s;
- if (i >= message->maxpara)
- break;
- for (; *s != ' ' && *s; s++)
- ;
- }
- }
- para[++i] = NULL;
-
- para[0] = sptr->name;
-
- return (*message->func) (sptr->from, sptr, i, para);
-}
-
int ban_version(aClient *cptr, aClient *sptr, int parc, char *parv[])
{
int len;
diff -rupN b/src/modules/m_whois.c a/src/modules/m_whois.c
--- b/src/modules/m_whois.c 2013-02-16 19:29:39.000000000 -0600
+++ a/src/modules/m_whois.c 2013-02-16 19:37:26.000000000 -0600
@@ -210,8 +210,6 @@ DLLFUNC int m_whois(aClient *cptr, aCli
showchannel = 0;
if (acptr == sptr)
showchannel = 1;
- /* Hey, if you are editting here... don't forget to change the webtv w_whois ;p. */
-
if (showchannel)
{
long access;
diff -rupN b/src/s_conf.c a/src/s_conf.c
--- b/src/s_conf.c 2013-02-16 19:29:39.000000000 -0600
+++ a/src/s_conf.c 2013-02-16 19:35:21.000000000 -0600
@@ -7467,10 +7467,7 @@ int _conf_set(ConfigFile *conf, ConfigEn
}
else if (!strcmp(cep->ce_varname, "options")) {
for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
- if (!strcmp(cepp->ce_varname, "webtv-support")) {
- tempiConf.webtv_support = 1;
- }
- else if (!strcmp(cepp->ce_varname, "hide-ulines")) {
+ if (!strcmp(cepp->ce_varname, "hide-ulines")) {
tempiConf.hide_ulines = 1;
}
else if (!strcmp(cepp->ce_varname, "flat-map")) {
@@ -8230,11 +8227,7 @@ int _test_set(ConfigFile *conf, ConfigEn
}
else if (!strcmp(cep->ce_varname, "options")) {
for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
- if (!strcmp(cepp->ce_varname, "webtv-support"))
- {
- CheckDuplicate(cepp, options_webtv_support, "options::webtv-support");
- }
- else if (!strcmp(cepp->ce_varname, "hide-ulines"))
+ if (!strcmp(cepp->ce_varname, "hide-ulines"))
{
CheckDuplicate(cepp, options_hide_ulines, "options::hide-ulines");
}