Review and optimize

[user/henk/code/inspircd.git] / src / modules / m_alias.cpp

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index a0d361e78b7f668728f29023ea8934c346d5cf17..57532fc6b9fcff54d1de4e27f5c63a5dda37b282 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -40,8 +40,6 @@ class ModuleAlias : public Module
                ConfigReader *MyConf;
                std::vector<Alias> Aliases;
 
-               /* XXX - small issue, why is this marked public when it's not (really) intended for external use
-                * Fixed 30/11/05 by Brain as suggestion by w00t */
                virtual void ReadAliases()
                {
                        Aliases.clear();
@@ -95,18 +93,16 @@ class ModuleAlias : public Module
                        
                        for (unsigned int i = 0; i < Aliases.size(); i++)
                        {
-                               log(DEBUG,"Check against alias %s: %s",Aliases[i].text.c_str(),c.c_str());
                                if (Aliases[i].text == c)
                                {
                                        if (Aliases[i].requires != "")
                                        {
                                                u = Srv->FindNick(Aliases[i].requires);
-                                       }
-                               
-                                       if ((Aliases[i].requires != "") && (!u))
-                                       {
-                                               Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
-                                               return 1;
+                                               if (!u)
+                                               {
+                                                       Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
+                                                       return 1;
+                                               }
                                        }
                                        if (Aliases[i].uline)
                                        {
@@ -118,28 +114,26 @@ class ModuleAlias : public Module
                                                }
                                        }
 
-                                       std::stringstream stuff(Aliases[i].replace_with);
-                                       for (int j = 1; j < pcnt; j++)
+                                       std::string n = "";
+                                       for (int j = 0; j < pcnt; j++)
                                        {
                                                if (j)
-                                                       stuff << " ";
-                                               stuff << parameters[j];
-                                       }
-
-                                       std::vector<std::string> items;
-                                       while (!stuff.eof())
-                                       {
-                                               std::string data;
-                                               stuff >> data;
-                                               items.push_back(data);
+                                                       n = n + " ";
+                                               n = n + parameters[j];
                                        }
+                                       /* Final param now in n as one string */
+                                       std::stringstream stuff(Aliases[i].replace_with);
 
-                                       char* para[127];
+                                       std::string cmd = "";
+                                       std::string target = "";
+                                       stuff >> cmd;
+                                       stuff >> target;
 
-                                       for (unsigned int j = 1; j < items.size(); j++)
-                                               para[j-1] = (char*)items[j].c_str();
+                                       char* para[2];
+                                       para[0] = (char*)target.c_str();
+                                       para[1] = (char*)n.c_str();
 
-                                       Srv->CallCommandHandler(items[0],para,items.size()-1,user);
+                                       Srv->CallCommandHandler(cmd,para,2,user);
                                        return 1;
                                }
                        }