summaryrefslogtreecommitdiff
path: root/modules/commands/ns_set_misc.cpp
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2011-10-26 15:29:45 -0400
committerAdam <Adam@anope.org>2011-10-26 15:29:45 -0400
commitbf66336e2c7a34aa62f86681f2d20078b2be99a8 (patch)
treea6b8abe4136ef13378504857a9c611719f8f3d9d /modules/commands/ns_set_misc.cpp
parentc79a57545259695f961cf79326a6eb8f78255cbc (diff)
Bug #1347, fixed incorrect param parsing in cs_set_misc
Diffstat (limited to 'modules/commands/ns_set_misc.cpp')
-rw-r--r--modules/commands/ns_set_misc.cpp26
1 files changed, 17 insertions, 9 deletions
diff --git a/modules/commands/ns_set_misc.cpp b/modules/commands/ns_set_misc.cpp
index a9b93083d..adf63e9d7 100644
--- a/modules/commands/ns_set_misc.cpp
+++ b/modules/commands/ns_set_misc.cpp
@@ -13,13 +13,13 @@
#include "module.h"
-struct MiscData : Anope::string, ExtensibleItem, Serializable<MiscData>
+struct NSMiscData : Anope::string, ExtensibleItem, Serializable<NSMiscData>
{
NickCore *nc;
Anope::string name;
Anope::string data;
- MiscData(NickCore *ncore, const Anope::string &n, const Anope::string &d) : nc(ncore), name(n), data(d)
+ NSMiscData(NickCore *ncore, const Anope::string &n, const Anope::string &d) : nc(ncore), name(n), data(d)
{
}
@@ -40,10 +40,17 @@ struct MiscData : Anope::string, ExtensibleItem, Serializable<MiscData>
if (nc == NULL)
return;
- nc->Extend(data["name"].astr(), new MiscData(nc, data["name"].astr(), data["data"].astr()));
+ nc->Extend(data["name"].astr(), new NSMiscData(nc, data["name"].astr(), data["data"].astr()));
}
};
+static Anope::string GetAttribute(const Anope::string &command)
+{
+ size_t sp = command.rfind(' ');
+ if (sp != Anope::string::npos)
+ return command.substr(sp + 1);
+ return command;
+}
class CommandNSSetMisc : public Command
{
@@ -63,15 +70,16 @@ class CommandNSSetMisc : public Command
}
NickCore *nc = na->nc;
- Anope::string key = "ns_set_misc:" + source.command.replace_all_cs(" ", "_");
+ Anope::string scommand = GetAttribute(source.command);
+ Anope::string key = "ns_set_misc:" + scommand;
nc->Shrink(key);
if (!param.empty())
{
- nc->Extend(key, new MiscData(nc, key, param));
- source.Reply(CHAN_SETTING_CHANGED, source.command.c_str(), nc->display.c_str(), param.c_str());
+ nc->Extend(key, new NSMiscData(nc, key, param));
+ source.Reply(CHAN_SETTING_CHANGED, scommand.c_str(), nc->display.c_str(), param.c_str());
}
else
- source.Reply(CHAN_SETTING_UNSET, source.command.c_str(), nc->display.c_str());
+ source.Reply(CHAN_SETTING_UNSET, scommand.c_str(), nc->display.c_str());
return;
}
@@ -111,7 +119,7 @@ class NSSetMisc : public Module
Implementation i[] = { I_OnNickInfo };
ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
- Serializable<MiscData>::Alloc.Register("NSMisc");
+ Serializable<NSMiscData>::Alloc.Register("NSMisc");
}
void OnNickInfo(CommandSource &source, NickAlias *na, bool ShowHidden)
@@ -124,7 +132,7 @@ class NSSetMisc : public Module
if (list[i].find("ns_set_misc:") != 0)
continue;
- MiscData *data = na->nc->GetExt<MiscData *>(list[i]);
+ NSMiscData *data = na->nc->GetExt<NSMiscData *>(list[i]);
if (data)
source.Reply(" %s: %s", list[i].substr(12).replace_all_cs("_", " ").c_str(), data->data.c_str());
}