diff --git a/doc/conf/help/help.conf b/doc/conf/help/help.conf index d593afe6b..bd2e0ceea 100644 --- a/doc/conf/help/help.conf +++ b/doc/conf/help/help.conf @@ -56,7 +56,7 @@ help Opercmds { " ADDMOTD GLINE OPER SHUN"; " ADDOMOTD GLOBOPS OPERMOTD SPAMFILTER"; " GZLINE REHASH SQUIT"; - " CHGHOST HTM RESTART TEMPSHUN"; + " CHGHOST RESTART TEMPSHUN"; " CHGIDENT KILL TRACE"; " CHGNAME KLINE SAJOIN TSCTL"; " CLOSE LAG SAMODE UNDCCDENY"; @@ -935,8 +935,8 @@ help Squit { " Usually used in routing of servers."; " IRC Operator only command."; " -"; - " Syntax: SQUIT "; - " Example: SQUIT leaf.server.net"; + " Syntax: SQUIT [reason]"; + " Example: SQUIT leaf.server.net bye"; }; help Connect { @@ -1073,23 +1073,6 @@ help Tsctl { " TSCTL SVSTIME (Sets the Time on all Servers)"; }; -help Htm { - " Switches the server In & Out of High Traffic Mode"; - " HTM is activated when the server is receiving extremely high amounts of information."; - " IRC Operator only command."; - " -"; - " Syntax: HTM [option]"; - " -"; - " If no option is specified it just displays the current HTM state"; - " If an option is specified it does a more specific task, valid options are:"; - " -"; - " ON - Force HTM to activate"; - " OFF - Force HTM to deactivate"; - " NOISY - Make HTM announce when it is entering/leaving HTM"; - " QUIET - Stop HTM from announcing when it is entering/leaving HTM"; - " TO - Tell HTM at what incoming rate to activate HTM"; -}; - help Svsnick { " Changes the nickname of the user in question."; " Must be sent through an U:Lined server."; diff --git a/doc/conf/help/help.de.conf b/doc/conf/help/help.de.conf index 9efbc7c1e..aefae80be 100644 --- a/doc/conf/help/help.de.conf +++ b/doc/conf/help/help.de.conf @@ -61,7 +61,7 @@ help Opercmds { " ADDMOTD GLINE OPER SHUN"; " ADDOMOTD GLOBOPS OPERMOTD SPAMFILTER"; " CHATOPS GZLINE REHASH SQUIT"; - " CHGHOST HTM RESTART TEMPSHUN"; + " CHGHOST RESTART TEMPSHUN"; " CHGIDENT KILL TRACE"; " CHGNAME KLINE SAJOIN TSCTL"; " CLOSE LAG SAMODE UNDCCDENY"; @@ -1137,24 +1137,6 @@ help Tsctl { " TSCTL SVSTIME (Stellt die Uhrzeit auf allen Servern ein)"; }; -help Htm { - " Schaltet den High Traffic Mode eines Servers an oder aus."; - " HTM wird aktiviert, wenn der Server extrem hohe Datenmengen empfängt."; - " Befehl nur für IrcOps."; - " -"; - " Syntax: HTM [option]"; - " -"; - " Wird keine Option angegeben, wird lediglich der aktuelle HTM Status angezeigt"; - " Wird eine Option angegeben, erfolgen weitere Aktionen, gültige Optionen sind:"; - " -"; - " ON - erzwingt Aktivierung von HTM"; - " OFF - erzwingt Deaktivierung von HTM"; - " NOISY - Bewirkt, dass Änderungen des HTM Status angezeigt werden"; - " QUIET - Stoppt Anzeige der Änderungen des HTM Status"; - " TO - Legt fest, ab welchem Wert eingehender Daten das HTM System"; - " aktiviert wird."; -}; - help Svsnick { " Ändert den Nicknamen des Users, der angegeben wird."; " Muss durch einen U:Lined Server gesendet werden."; diff --git a/doc/conf/help/help.fr.conf b/doc/conf/help/help.fr.conf index 5473ba398..9a576999c 100644 --- a/doc/conf/help/help.fr.conf +++ b/doc/conf/help/help.fr.conf @@ -62,7 +62,7 @@ help Opercmds { " ADDMOTD GLINE OPER SHUN"; " ADDOMOTD GLOBOPS OPERMOTD SPAMFILTER"; " CHATOPS GZLINE REHASH SQUIT"; - " CHGHOST HTM RESTART TEMPSHUN"; + " CHGHOST RESTART TEMPSHUN"; " CHGIDENT KILL TRACE"; " CHGNAME KLINE SAJOIN TSCTL"; " CLOSE LAG SAMODE UNDCCDENY"; @@ -1138,23 +1138,6 @@ help Tsctl { " TSCTL SVSTIME (Applique l'heure à tous les serveurs)"; }; -help Htm { - " Fait basculer le serveur dans ou hors du mode High Traffic"; - " HTM est activé quand un serveur reçoit un très grand nombre d'informations."; - " Commande réservée aux IRC Operateurs."; - " -"; - " Syntaxe : HTM [option]"; - " -"; - " Si aucune option n'est spécifiée, cela affichera juste le status actuel du HTM"; - " Si une option est spécifiée, cela effectuera des tâches plus spécifiques, les options valides sont :"; - " -"; - " ON - Force le HTM à s'activer"; - " OFF - Force le HTM à se désactiver"; - " NOISY - Fait que le HTM annonce quand il entre/quitte le HTM"; - " QUIET - Arrete le fait que le HTM annonce quand il entre/quitte le HTM"; - " TO - Dit au HTM à partir de quel débit d'informations entrantes il doit s'activer."; -}; - help Svsnick { " Change le pseudo de l'utilisateur en question."; " Doit être envoyé à travers un serveur avec U:Line."; diff --git a/doc/conf/help/help.ru.conf b/doc/conf/help/help.ru.conf index 2aa9e66e9..c6bbdddc6 100644 --- a/doc/conf/help/help.ru.conf +++ b/doc/conf/help/help.ru.conf @@ -56,7 +56,7 @@ help Opercmds { " ADDMOTD GLINE OPER SHUN"; " ADDOMOTD GLOBOPS OPERMOTD SPAMFILTER"; " CHATOPS GZLINE REHASH SQUIT"; - " CHGHOST HTM RESTART TEMPSHUN"; + " CHGHOST RESTART TEMPSHUN"; " CHGIDENT KILL TRACE"; " CHGNAME KLINE SAJOIN TSCTL"; " CLOSE LAG SAMODE UNDCCDENY"; @@ -1233,25 +1233,6 @@ help Tsctl { " ñåðâåðàõ)"; }; -help Htm { - " Ïåðåêëþ÷àåò HTM (High Traffic Mode) íà ñåðâåðå."; - " HTM àêòèâèðóåòñÿ, êîãäà ñåðâåð ïîëó÷àåò áîëüøîå êîëè÷åñòâî èíôîðìàöèè."; - " Êîìàíäó ìîãóò èñïîëüçîâàòü òîëüêî IRC îïåðàòîðû."; - " -"; - " Ñèíòàêñèñ: HTM [option]"; - " -"; - " Åñëè íå óêàçàíû äîïîëíèòåëüíûå ïàðàìåòðû, ïðîñòî âûâîäèò"; - " òåêóùåå ñîñòîÿíèå HTM"; - " Äîñòóïíû ñëåäóþùèå ïàðàìåòðû:"; - " -"; - " ON - Âêëþ÷àåò HTM"; - " OFF - Âûêëþ÷àåò HTM"; - " NOISY ? Îáúÿâëÿòü î âêëþ÷åíèè/âûêëþ÷åíèè ðåæèìà HTM"; - " QUIET ? Íå îáúÿâëÿòü î âêëþ÷åíèè/âûêëþ÷åíèè ðåæèìà HTM "; - " TO - Óêàçûâàåò ïðè êàêîì çíà÷åíèè âõîäÿùåãî òðàôèêà"; - " àêòèâèðóåòñÿ HTM"; -}; - help Svsnick { " Ìåíÿåò íèê óêàçàííîìó ïîëüçîâàòåëþ."; " Äîëæíî èñïîëüçîâàòüñÿ ÷åðåç ñåðâåð, îïèñàííûé â U:Lines."; diff --git a/doc/conf/help/help.tr.conf b/doc/conf/help/help.tr.conf index 5081aeeb3..9e5eadbd7 100644 --- a/doc/conf/help/help.tr.conf +++ b/doc/conf/help/help.tr.conf @@ -60,7 +60,7 @@ help Opercmds { " ADDMOTD GLINE OPER SHUN"; " ADDOMOTD GLOBOPS OPERMOTD SPAMFILTER"; " CHATOPS GZLINE REHASH SQUIT"; - " CHGHOST HTM RESTART TEMPSHUN"; + " CHGHOST RESTART TEMPSHUN"; " CHGIDENT KILL TRACE"; " CHGNAME KLINE SAJOIN TSCTL"; " CLOSE LAG SAMODE UNDCCDENY"; @@ -1131,23 +1131,6 @@ help Tsctl { " TSCTL SVSTIME (Tüm serverýn saatini ayarlar)"; }; -help Htm { - " Giriþ çýkýþ Trafik modu için kullanýlýr."; - " HTM yi yüksek miktarda bilgi almak istediðinizde açabilirsiniz."; - " Sadece IRCop'lar kullanabilir."; - " -"; - " Kullanýmý: HTM [özellik]"; - " -"; - " Herhangi bir özellik girilmez ise Aktif HTM durumunu gösterir"; - " Bir özellik girilmiþse farklý görevler yapar, özellikleri aþaðýdakiler gibidir:"; - " -"; - " ON - HTM Aktif kýlar."; - " OFF - HTM Deaktif kýlar."; - " NOISY - HTM ye girildiðinde veya çýkýldýðýnda anons verir."; - " QUIET - HTM ye girildiðinde veya çýkýldýðýnda verilen anonsu kapatýr."; - " TO - Aktif HTM nin gelen derecesini ayarlar."; -}; - help Svsnick { " Bu komut, bir kullanýcýnýn o an kullandýðý nickin baþka bir nicke dönüþtürmesini saðlar."; " Sadece U:Lined (Servisler)'den gönderilebilir."; diff --git a/include/config.h b/include/config.h index a3e2f1e1e..d204e720b 100644 --- a/include/config.h +++ b/include/config.h @@ -251,7 +251,7 @@ * to IRC_USER/IRC_GROUP when those are defined. * * The directory to chroot to is simply DPATH (which is set via ./Config). - * (This may effect the PATH locations above, though you can symlink it) + * (This may affect the PATH locations above, though you can symlink it) * * If you want this, simple change this to '#define CHROOTDIR' and also * look at IRC_USER/IRC_GROUP a few lines below. diff --git a/include/msg.h b/include/msg.h index bd91c0a22..0b9731415 100644 --- a/include/msg.h +++ b/include/msg.h @@ -144,7 +144,7 @@ #define MSG_VHOST "VHOST" #define MSG_BOTMOTD "BOTMOTD" #define MSG_REMGLINE "REMGLINE" /* remove g-line */ -#define MSG_HTM "HTM" + #define MSG_UMODE2 "UMODE2" #define MSG_DCCDENY "DCCDENY" #define MSG_UNDCCDENY "UNDCCDENY" diff --git a/include/numeric.h b/include/numeric.h index ab5e7960e..4bd16cf26 100644 --- a/include/numeric.h +++ b/include/numeric.h @@ -125,7 +125,7 @@ #define ERR_NONONREG 486 #define ERR_NOTFORUSERS 487 -#define ERR_HTMDISABLED 488 + #define ERR_SECUREONLYCHAN 489 #define ERR_NOSWEAR 490 #define ERR_NOOPERHOST 491 diff --git a/include/proto.h b/include/proto.h index 61184bf7c..1a63af60f 100644 --- a/include/proto.h +++ b/include/proto.h @@ -43,9 +43,6 @@ extern void sendto_chanops_butone(aClient *one, aChannel *chptr, char *pattern, extern void sendto_realops(char *pattern, ...) __attribute__((format(printf,1,2))); extern void sendto_channel_ntadmins(aClient *from, aChannel *chptr, char *pattern, ...) __attribute__((format(printf,3,4))); -/* fdlist.c */ -extern EVENT(lcf_check); -extern EVENT(htm_calc); /* ircd.c */ extern EVENT(garbage_collect); extern EVENT(loop_event); diff --git a/src/modules/m_list.c b/src/modules/m_list.c index 99c25d11c..afb05dfdb 100644 --- a/src/modules/m_list.c +++ b/src/modules/m_list.c @@ -64,8 +64,7 @@ MOD_UNLOAD(m_list) } /* Originally from bahamut, modified a bit for Unreal by codemastr - * also Opers can now see +s channels and can still use /list while - * HTM is active -- codemastr */ + * also Opers can now see +s channels -- codemastr */ /* * parv[1] = channel diff --git a/src/modules/m_mode.c b/src/modules/m_mode.c index 0987d69ca..d25a01321 100644 --- a/src/modules/m_mode.c +++ b/src/modules/m_mode.c @@ -1583,7 +1583,11 @@ CMD_FUNC(_m_umode) return 0; } if (acptr != sptr) + { + sendto_one(sptr, err_str(ERR_USERSDONTMATCH), + me.name, sptr->name); return 0; + } if (parc < 3) { diff --git a/src/s_err.c b/src/s_err.c index 54b5da842..2cc605a8a 100644 --- a/src/s_err.c +++ b/src/s_err.c @@ -540,7 +540,7 @@ static char *replies[] = { /* 485 ERR_KILLDENY */ ":%s 485 %s :Cannot kill protected user %s.", /* 486 ERR_NONONREG */ ":%s 486 %s :You must identify to a registered nick to private message %s", /* 487 ERR_NOTFORUSERS */ ":%s 487 %s :%s is a server only command", -/* 488 ERR_HTMDISABLED */ ":%s 488 %s :%s is currently disabled, please try again later.", +/* 488 */ NULL, /* 489 ERR_SECUREONLYCHAN */ ":%s 489 %s %s :Cannot join channel (SSL is required)", /* 490 ERR_NOSWEAR */ ":%s 490 %s :%s does not accept private messages containing swearing.", /* 491 ERR_NOOPERHOST */ ":%s 491 %s :No O-lines for your host",