Move whowas containers into whowas class to avoid all cpp files including cmd_whowas...

[user/henk/code/inspircd.git] / src / cmd_notice.cpp

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 69ca449180c394cd94cb5cb049118ba0a53c0857..df0e518b05aa218b157342800fa0fda40bf81fa4 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -79,7 +79,6 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                                        return CMD_FAILURE;
                                }
                        }
-
                        int MOD_RESULT = 0;
 
                        std::string temp = parameters[1];
@@ -97,7 +96,14 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 
                        if (status)
                        {
-                               chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name, status, parameters[1]);
+                               if (ServerInstance->Config->UndernetMsgPrefix)
+                               {
+                                       chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name, status, parameters[1]);
+                               }
+                               else
+                               {
+                                       chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name, parameters[1]);
+                               }
                        }
                        else
                        {