diff options
Diffstat (limited to 'src/modules/m_dccallow.cpp')
-rw-r--r-- | src/modules/m_dccallow.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index abcad9de9..a18979878 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -101,7 +101,7 @@ class CommandDccallow : public Command if (i->nickname == target->nick) { dl->erase(i); - user->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", user->nick, user->nick, target->nick); + user->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", user->nick.c_str(), user->nick.c_str(), target->nick.c_str()); break; } } @@ -136,12 +136,12 @@ class CommandDccallow : public Command { if (k->nickname == target->nick) { - user->WriteNumeric(996, "%s %s :%s is already on your DCCALLOW list", user->nick, user->nick, target->nick); + user->WriteNumeric(996, "%s %s :%s is already on your DCCALLOW list", user->nick.c_str(), user->nick.c_str(), target->nick.c_str()); return CMD_FAILURE; } else if (ServerInstance->MatchText(user->GetFullHost(), k->hostmask)) { - user->WriteNumeric(996, "%s %s :You cannot add yourself to your own DCCALLOW list!", user->nick, user->nick); + user->WriteNumeric(996, "%s %s :You cannot add yourself to your own DCCALLOW list!", user->nick.c_str(), user->nick.c_str()); return CMD_FAILURE; } } @@ -172,11 +172,11 @@ class CommandDccallow : public Command if (length > 0) { - user->WriteNumeric(993, "%s %s :Added %s to DCCALLOW list for %ld seconds", user->nick, user->nick, target->nick, length); + user->WriteNumeric(993, "%s %s :Added %s to DCCALLOW list for %ld seconds", user->nick.c_str(), user->nick.c_str(), target->nick.c_str(), length); } else { - user->WriteNumeric(994, "%s %s :Added %s to DCCALLOW list for this session", user->nick, user->nick, target->nick); + user->WriteNumeric(994, "%s %s :Added %s to DCCALLOW list for this session", user->nick.c_str(), user->nick.c_str(), target->nick.c_str()); } /* route it. */ @@ -186,7 +186,7 @@ class CommandDccallow : public Command else { // nick doesn't exist - user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, nick.c_str()); + user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), nick.c_str()); return CMD_FAILURE; } } @@ -195,42 +195,42 @@ class CommandDccallow : public Command void DisplayHelp(User* user) { - user->WriteNumeric(998, "%s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick); - user->WriteNumeric(998, "%s :You may allow DCCs from specific users by specifying a", user->nick); - user->WriteNumeric(998, "%s :DCC allow for the user you want to receive DCCs from.", user->nick); - user->WriteNumeric(998, "%s :For example, to allow the user Brain to send you inspircd.exe", user->nick); - user->WriteNumeric(998, "%s :you would type:", user->nick); - user->WriteNumeric(998, "%s :/DCCALLOW +Brain", user->nick); - user->WriteNumeric(998, "%s :Brain would then be able to send you files. They would have to", user->nick); - user->WriteNumeric(998, "%s :resend the file again if the server gave them an error message", user->nick); - user->WriteNumeric(998, "%s :before you added them to your DCCALLOW list.", user->nick); - user->WriteNumeric(998, "%s :DCCALLOW entries will be temporary by default, if you want to add", user->nick); - user->WriteNumeric(998, "%s :them to your DCCALLOW list until you leave IRC, type:", user->nick); - user->WriteNumeric(998, "%s :/DCCALLOW +Brain 0", user->nick); - user->WriteNumeric(998, "%s :To remove the user from your DCCALLOW list, type:", user->nick); - user->WriteNumeric(998, "%s :/DCCALLOW -Brain", user->nick); - user->WriteNumeric(998, "%s :To see the users in your DCCALLOW list, type:", user->nick); - user->WriteNumeric(998, "%s :/DCCALLOW LIST", user->nick); - user->WriteNumeric(998, "%s :NOTE: If the user leaves IRC or changes their nickname", user->nick); - user->WriteNumeric(998, "%s : they will be removed from your DCCALLOW list.", user->nick); - user->WriteNumeric(998, "%s : your DCCALLOW list will be deleted when you leave IRC.", user->nick); - user->WriteNumeric(999, "%s :End of DCCALLOW HELP", user->nick); + user->WriteNumeric(998, "%s :DCCALLOW [<+|->nick.c_str() [time]] [list] [help]", user->nick.c_str()); + user->WriteNumeric(998, "%s :You may allow DCCs from specific users by specifying a", user->nick.c_str()); + user->WriteNumeric(998, "%s :DCC allow for the user you want to receive DCCs from.", user->nick.c_str()); + user->WriteNumeric(998, "%s :For example, to allow the user Brain to send you inspircd.exe", user->nick.c_str()); + user->WriteNumeric(998, "%s :you would type:", user->nick.c_str()); + user->WriteNumeric(998, "%s :/DCCALLOW +Brain", user->nick.c_str()); + user->WriteNumeric(998, "%s :Brain would then be able to send you files. They would have to", user->nick.c_str()); + user->WriteNumeric(998, "%s :resend the file again if the server gave them an error message", user->nick.c_str()); + user->WriteNumeric(998, "%s :before you added them to your DCCALLOW list.", user->nick.c_str()); + user->WriteNumeric(998, "%s :DCCALLOW entries will be temporary by default, if you want to add", user->nick.c_str()); + user->WriteNumeric(998, "%s :them to your DCCALLOW list until you leave IRC, type:", user->nick.c_str()); + user->WriteNumeric(998, "%s :/DCCALLOW +Brain 0", user->nick.c_str()); + user->WriteNumeric(998, "%s :To remove the user from your DCCALLOW list, type:", user->nick.c_str()); + user->WriteNumeric(998, "%s :/DCCALLOW -Brain", user->nick.c_str()); + user->WriteNumeric(998, "%s :To see the users in your DCCALLOW list, type:", user->nick.c_str()); + user->WriteNumeric(998, "%s :/DCCALLOW LIST", user->nick.c_str()); + user->WriteNumeric(998, "%s :NOTE: If the user leaves IRC or changes their nickname", user->nick.c_str()); + user->WriteNumeric(998, "%s : they will be removed from your DCCALLOW list.", user->nick.c_str()); + user->WriteNumeric(998, "%s : your DCCALLOW list will be deleted when you leave IRC.", user->nick.c_str()); + user->WriteNumeric(999, "%s :End of DCCALLOW HELP", user->nick.c_str()); } void DisplayDCCAllowList(User* user) { // display current DCCALLOW list - user->WriteNumeric(990, "%s :Users on your DCCALLOW list:", user->nick); + user->WriteNumeric(990, "%s :Users on your DCCALLOW list:", user->nick.c_str()); if (user->GetExt("dccallow_list", dl)) { for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c) { - user->WriteNumeric(991, "%s %s :%s (%s)", user->nick, user->nick, c->nickname.c_str(), c->hostmask.c_str()); + user->WriteNumeric(991, "%s %s :%s (%s)", user->nick.c_str(), user->nick.c_str(), c->nickname.c_str(), c->hostmask.c_str()); } } - user->WriteNumeric(992, "%s :End of DCCALLOW list", user->nick); + user->WriteNumeric(992, "%s :End of DCCALLOW list", user->nick.c_str()); } }; @@ -348,17 +348,17 @@ class ModuleDCCAllow : public Module if (defaultaction == "allow") return 0; } - user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick, u->nick, filename.c_str()); - u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick, user->nick, user->ident, user->dhost, filename.c_str()); - u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick); + user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick.c_str(), u->nick.c_str(), filename.c_str()); + u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), filename.c_str()); + u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick.c_str(), user->nick.c_str()); return 1; } } else if ((type == "CHAT") && (blockchat)) { - user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick, u->nick); - u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick, user->nick, user->ident, user->dhost); - u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick); + user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick.c_str(), u->nick.c_str()); + u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str()); + u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick.c_str(), user->nick.c_str()); return 1; } } @@ -381,7 +381,7 @@ class ModuleDCCAllow : public Module { if (iter2->length != 0 && (iter2->set_on + iter2->length) <= ServerInstance->Time()) { - u->WriteNumeric(997, "%s %s :DCCALLOW entry for %s has expired", u->nick, u->nick, iter2->nickname.c_str()); + u->WriteNumeric(997, "%s %s :DCCALLOW entry for %s has expired", u->nick.c_str(), u->nick.c_str(), iter2->nickname.c_str()); iter2 = dl->erase(iter2); } else @@ -413,8 +413,8 @@ class ModuleDCCAllow : public Module if (i->nickname == user->nick) { - u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick, i->nickname.c_str()); - u->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", u->nick, u->nick, i->nickname.c_str()); + u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick.c_str(), i->nickname.c_str()); + u->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", u->nick.c_str(), u->nick.c_str(), i->nickname.c_str()); dl->erase(i); break; } |