Move OnSync{Channel,Network,User} to ServerEventListener.

[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 6d8e3a1c64cbab135466443f2d62bc18ddf2937b..791186414d3a895e3d0685f5c29a3bafc38eb4d3 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -73,8 +73,7 @@ class ModuleAlias : public Module
        {
                ConfigTag* fantasy = ServerInstance->Config->ConfValue("fantasy");
                AllowBots = fantasy->getBool("allowbots", false);
-               std::string fpre = fantasy->getString("prefix");
-               fprefix = fpre.empty() ? "!" : fpre;
+               fprefix = fantasy->getString("prefix", "!", 1, ServerInstance->Config->Limits.MaxLine);
 
                Aliases.clear();
                ConfigTagList tags = ServerInstance->Config->ConfTags("alias");
@@ -285,7 +284,7 @@ class ModuleAlias : public Module
                        {
                                if (isdigit(newline[i+1]))
                                {
-                                       int len = ((i + 2 < newline.length()) && (newline[i+2] == '-')) ? 3 : 2;
+                                       size_t len = ((i + 2 < newline.length()) && (newline[i+2] == '-')) ? 3 : 2;
                                        std::string var = newline.substr(i, len);
                                        result.append(GetVar(var, original_line));
                                        i += len - 1;
@@ -297,7 +296,7 @@ class ModuleAlias : public Module
                                }
                                else if (!newline.compare(i, 5, "$host", 5))
                                {
-                                       result.append(user->host);
+                                       result.append(user->GetRealHost());
                                        i += 4;
                                }
                                else if (!newline.compare(i, 5, "$chan", 5))
@@ -313,7 +312,7 @@ class ModuleAlias : public Module
                                }
                                else if (!newline.compare(i, 6, "$vhost", 6))
                                {
-                                       result.append(user->dhost);
+                                       result.append(user->GetDisplayedHost());
                                        i += 5;
                                }
                                else if (!newline.compare(i, 12, "$requirement", 12))