Convert more modules

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

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 35fb02085c30e9e240418e94104154149b6cd44e..ce1fcfb079c56e189d2bde73d46fec7a3e04026c 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,32 +2,25 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-#include "inspircd.h"
-
-
 static FileReader *quotes = NULL;
 
-std::string q_file = "";
-std::string prefix = "";
-std::string suffix = "";
+std::string q_file;
+std::string prefix;
+std::string suffix;
 
 /* $ModDesc: Provides random Quotes on Connect. */
 
@@ -46,7 +39,7 @@ class cmd_randquote : public command_t
                std::string str;
                int fsize;
 
-               if (q_file == "" || quotes->Exists())
+               if (q_file.empty() || quotes->Exists())
                {
                        fsize = quotes->FileSize();
                        str = quotes->GetLine(rand() % fsize);
@@ -57,7 +50,8 @@ class cmd_randquote : public command_t
                        user->WriteServ("NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
                        return CMD_FAILURE;
                }
-               return CMD_SUCCESS;
+
+               return CMD_LOCALONLY;
        }
 };
 
@@ -85,7 +79,7 @@ class ModuleRandQuote : public Module
        ConfigReader *conf;
  public:
        ModuleRandQuote(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                conf = new ConfigReader(ServerInstance);
@@ -98,7 +92,7 @@ class ModuleRandQuote : public Module
 
                mycommand = NULL;
 
-               if (q_file == "")
+               if (q_file.empty())
                {
                        RandquoteException e("m_randquote: Quotefile not specified - Please check your config.");
                        throw(e);
@@ -161,7 +155,7 @@ class ModuleRandQuoteFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleRandQuoteFactory;
 }