Decide that it wasn't quite appropriate :(

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

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index a1a8581a26c2ea8dd82204da60cafd7f5136a00b..0d18ac1e4331a173d99de3c1a2a9d13fdea617d2 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -25,6 +25,15 @@ using namespace std;
 
 /* $ModDesc: Provides user and channel +G mode */
 
+class CensorException : public ModuleException
+{
+ public:
+       virtual char* GetReason()
+       {
+               return "Could not find <censor file=\"\"> definition in your config file!";
+       }
+};
+
 class ModuleCensor : public Module
 {
  Server *Srv;
@@ -52,9 +61,8 @@ class ModuleCensor : public Module
                MyConf = new ConfigReader(Censorfile);
                if ((Censorfile == "") || (!MyConf->Verify()))
                {
-                       printf("Error, could not find <censor file=\"\"> definition in your config file!");
-                       log(DEFAULT,"Error, could not find <censor file=\"\"> definition in your config file!");
-                       return;
+                       CensorException e;
+                       throw(e);
                }
                Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile);
                Srv->AddExtendedMode('G',MT_CHANNEL,false,0,0);
@@ -157,9 +165,8 @@ class ModuleCensor : public Module
                MyConf = new ConfigReader(Censorfile);
                if ((Censorfile == "") || (!MyConf->Verify()))
                {
-                       // bail if the user forgot to create a config file
-                       printf("Error, could not find <censor file=\"\"> definition in your config file!\n");
-                       log(DEFAULT,"Error, could not find <censor file=\"\"> definition in your config file!");
+                       CensorException e;
+                       throw(e);
                }
                Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile);
        }