formatting and ^M

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

diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index bdbca597e4bd270c7be5fff65d19bbd09efda39e..31e8030f5d0fc470396fdaf95e8c098f8c7ea3a1 100644 (file)
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
@@ -110,7 +111,7 @@ bool cmd_who::whomatch(userrec* user, const char* matchtext)
 
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_who(Instance);
 }
@@ -147,7 +148,7 @@ void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch
                                " " + u->nick + " ";
 
        /* away? */
-       if (*u->awaymsg)
+       if (IS_AWAY(u))
        {
                wholine.append("G");
        }
@@ -311,7 +312,7 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                }
        }
        /* Send the results out */
-       if ((whoresults.size() <= (size_t)ServerInstance->Config->MaxWhoResults) || opt_unlimit)
+       if ((ServerInstance->Config->MaxWhoResults && (whoresults.size() <= (size_t)ServerInstance->Config->MaxWhoResults)) || opt_unlimit)
        {
                for (std::vector<std::string>::const_iterator n = whoresults.begin(); n != whoresults.end(); n++)
                        user->WriteServ(*n);