summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2007-06-03 16:15:43 +0000
committerpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2007-06-03 16:15:43 +0000
commitb54eb58a49f740d3a8f2d1fdd1c228586ef9a1a4 (patch)
tree2af2ea60cc685a9c1d71913cf47a629bb045c9bb /src/modules
parent461839e0f9902888873b88d52183482262da63f7 (diff)
Many changes: Implement Muisje's idea for prefix + separator on action addnick. Switch to empty() checks on strings. Cleanup mem on module unload. Tidyup conf reading.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7226 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_hostchange.cpp37
1 files changed, 22 insertions, 15 deletions
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index d8f0aaf59..803ca8d92 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -32,23 +32,25 @@ typedef std::map<std::string,Host*> hostchanges_t;
class ModuleHostChange : public Module
{
private:
-
-
- ConfigReader *Conf;
hostchanges_t hostchanges;
std::string MySuffix;
+ std::string MyPrefix;
+ std::string MySeparator;
public:
ModuleHostChange(InspIRCd* Me)
: Module(Me)
{
- Conf = new ConfigReader(ServerInstance);
OnRehash(NULL,"");
}
virtual ~ModuleHostChange()
{
- DELETE(Conf);
+ for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
+ {
+ DELETE(i->second);
+ }
+ hostchanges.clear();
}
Priority Prioritize()
@@ -63,19 +65,20 @@ class ModuleHostChange : public Module
virtual void OnRehash(userrec* user, const std::string &parameter)
{
- DELETE(Conf);
- Conf = new ConfigReader(ServerInstance);
- MySuffix = Conf->ReadValue("host","suffix",0);
+ ConfigReader Conf(ServerInstance);
+ MySuffix = Conf.ReadValue("host","suffix",0);
+ MyPrefix = Conf.ReadValue("host","prefix","",0);
+ MySeparator = Conf.ReadValue("host","separator",".",0);
for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
{
DELETE(i->second);
}
hostchanges.clear();
- for (int index = 0; index < Conf->Enumerate("hostchange"); index++)
+ for (int index = 0; index < Conf.Enumerate("hostchange"); index++)
{
- std::string mask = Conf->ReadValue("hostchange","mask",index);
- std::string action = Conf->ReadValue("hostchange","action",index);
- std::string newhost = Conf->ReadValue("hostchange","value",index);
+ std::string mask = Conf.ReadValue("hostchange","mask",index);
+ std::string action = Conf.ReadValue("hostchange","action",index);
+ std::string newhost = Conf.ReadValue("hostchange","value",index);
Host* x = new Host;
x->action = action;
x->newhost = newhost;
@@ -122,11 +125,15 @@ class ModuleHostChange : public Module
complete = complete + old[j];
}
}
- if (complete == "")
+ if (complete.empty())
complete = "i-have-a-lame-nick";
- newhost = complete + "." + MySuffix;
+
+ if (!MyPrefix.empty())
+ newhost = MyPrefix + MySeparator + complete;
+ else
+ newhost = complete + MySeparator + MySuffix;
}
- if (newhost != "")
+ if (!newhost.empty())
{
user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your virtual host: " + newhost);
if (!user->ChangeDisplayedHost(newhost.c_str()))