diff options
| author | attilamolnar <attilamolnar@hush.com> | 2013-06-06 01:07:22 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-06-06 01:07:22 +0200 |
| commit | d9d99cd02dadf34bfcc220734ba0c422f0acb3e6 (patch) | |
| tree | 72a11fab75875b7e4f739ddd203da60e5dcbc851 /src/commands | |
| parent | 8a06d54076551387f83a29360478ee6605e241b6 (diff) | |
| parent | e0ff94b310e9b73ac0131e9df14fb7ca2bf3a878 (diff) | |
Merge insp20
Diffstat (limited to 'src/commands')
| -rw-r--r-- | src/commands/cmd_info.cpp | 15 | ||||
| -rw-r--r-- | src/commands/cmd_loadmodule.cpp | 2 | ||||
| -rw-r--r-- | src/commands/cmd_who.cpp | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/commands/cmd_info.cpp b/src/commands/cmd_info.cpp index 63debd3fe..6e5f2a909 100644 --- a/src/commands/cmd_info.cpp +++ b/src/commands/cmd_info.cpp @@ -64,26 +64,27 @@ static const char* const lines[] = { " Matt Smith, dz, <dz@inspircd.org>", " Daniel De Graaf, danieldg, <danieldg@inspircd.org>", " jackmcbarn, <jackmcbarn@inspircd.org>", + " Attila Molnar, Attila, <attilamolnar@hush.com>", " ", "\2Regular Contributors\2:", - " Majic MacGyver Namegduf Ankit", - " Phoenix Taros", + " Adam SaberUK", " ", "\2Other Contributors\2:", + " ChrisTX Shawn Shutter", + " ", + "\2Former Contributors\2:", " dmb Zaba skenmy GreenReaper", " Dan Jason satmd owine", " Adremelech John2 jilles HiroP", " eggy Bricker AnMaster djGrrr", " nenolod Quension praetorian pippijn", - " Adam", - " ", - "\2Former Contributors\2:", " CC jamie typobox43 Burlex (win32)", " Stskeeps ThaPrince BuildSmart Thunderhacker", - " Skip LeaChim", + " Skip LeaChim Majic MacGyver", + " Namegduf Ankit Phoenix Taros", " ", "\2Thanks To\2:", - " searchirc.com irc-junkie.org Brik", + " searchirc.com irc-junkie.org Brik fraggeln", " ", " Best experienced with: \2An IRC client\2", NULL diff --git a/src/commands/cmd_loadmodule.cpp b/src/commands/cmd_loadmodule.cpp index 9d60613a2..379e597e4 100644 --- a/src/commands/cmd_loadmodule.cpp +++ b/src/commands/cmd_loadmodule.cpp @@ -44,7 +44,7 @@ class CommandLoadmodule : public Command */ CmdResult CommandLoadmodule::Handle (const std::vector<std::string>& parameters, User *user) { - if (ServerInstance->Modules->Load(parameters[0].c_str())) + if (ServerInstance->Modules->Load(parameters[0])) { ServerInstance->SNO->WriteGlobalSno('a', "NEW MODULE: %s loaded %s",user->nick.c_str(), parameters[0].c_str()); user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str()); diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp index c865cf67b..82d541a2a 100644 --- a/src/commands/cmd_who.cpp +++ b/src/commands/cmd_who.cpp @@ -256,7 +256,7 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User * std::string matchtext = ((parameters[0] == "0") ? "*" : parameters[0]); // WHO flags count as a wildcard - bool usingwildcards = ((parameters.size() > 1) || (matchtext.find_first_of("*?") != std::string::npos)); + bool usingwildcards = ((parameters.size() > 1) || (matchtext.find_first_of("*?.") != std::string::npos)); if (parameters.size() > 1) { |