X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=c1457765d4e6c487eaf60bc064002e7fbe692ab6;hb=2330fc9ddd48c939e894e7e37e9bb2e62eafc38d;hp=9fd3052b7ceb76692f09a55651031603852a0f07;hpb=2cfd118f5463ddcf55ebc9bdd0a80a29021c447c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index 9fd3052b7..c1457765d 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -22,105 +22,135 @@ using namespace std; #include "helperfuncs.h" // Global Vars -/* XXX - should all this be marked static? clear the global namespace, etc. */ -ConfigReader *helpop; -Server *Srv; - -void handle_helpop(char**, int, userrec*); -bool do_helpop(char**, int, userrec*); -void sendtohelpop(userrec*, int, char**); +static ConfigReader *helpop; +static Server *Srv; +bool do_helpop(const char**, int, userrec*); +void sendtohelpop(userrec*, int, const char**); /* $ModDesc: /helpop Command, Works like Unreal helpop */ -void handle_helpop(char **parameters, int pcnt, userrec *user) +class Helpop : public ModeHandler { - char a[MAXBUF]; - std::string output = " "; + public: + Helpop() : ModeHandler('h', 0, 0, false, MODETYPE_USER, true) { } - if (pcnt < 1) + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - do_helpop(NULL,pcnt,user); - return; - } + if (adding) + { + if (!dest->IsModeSet('h')) + { + dest->SetMode('h',true); + return MODEACTION_ALLOW; + } + } + else + { + if (dest->IsModeSet('h')) + { + dest->SetMode('h',false); + return MODEACTION_ALLOW; + } + } - if (parameters[0][0] == '!') - { - // Force send to all +h users - sendtohelpop(user, pcnt, parameters); + return MODEACTION_DENY; } - else if (parameters[0][0] == '?') +}; + +class cmd_helpop : public command_t +{ + public: + cmd_helpop () : command_t("HELPOP",0,1) + { + this->source = "m_helpop.so"; + } + + void Handle (const char** parameters, int pcnt, userrec *user) { - // Force to the helpop system with no forward if not found. - if (do_helpop(parameters, pcnt, user) == false) + char a[MAXBUF]; + std::string output = " "; + + if (!helpop) + return; + + if (pcnt < 1) { - // Not handled by the Database, Tell the user, and bail. - for (int i = 1; output != ""; i++) - { - snprintf(a,MAXBUF,"line%d",i); - output = helpop->ReadValue("nohelp", std::string(a), 0); + do_helpop(NULL,pcnt,user); + return; + } - if(output != "") + if (*parameters[0] == '!') + { + // Force send to all +h users + sendtohelpop(user, pcnt, parameters); + } + else if (*parameters[0] == '?') + { + // Force to the helpop system with no forward if not found. + if (do_helpop(parameters, pcnt, user) == false) + { + // Not handled by the Database, Tell the user, and bail. + for (int i = 1; output != ""; i++) { - Srv->SendTo(NULL,user,"290 "+std::string(user->nick)+" :"+output); + snprintf(a,MAXBUF,"line%d",i); + output = helpop->ReadValue("nohelp", std::string(a), 0); + + if(output != "") + { + Srv->SendTo(NULL,user,"290 "+std::string(user->nick)+" :"+output); + } } } } - } - else - { - // Check with the helpop database, if not found send to +h - if (do_helpop(parameters, pcnt, user) == false) + else { - // Not handled by the Database, Tell the user, and forward. - for (int i = 1; output != ""; i++) - { - snprintf(a,MAXBUF,"line%d",i); - /* XXX - "nohelpo" ? or "nohelp", as above */ - output = helpop->ReadValue("nohelpo", std::string(a), 0); - if (output != "") - { - Srv->SendTo(NULL,user,"290 "+std::string(user->nick)+" :"+output); - } - } - // Forward. - sendtohelpop(user, pcnt, parameters); + // Check with the helpop database, if not found send to +h + if (do_helpop(parameters, pcnt, user) == false) + { + // Not handled by the Database, Tell the user, and forward. + for (int i = 1; output != ""; i++) + { + snprintf(a,MAXBUF,"line%d",i); + /* "nohelpo" for opers "nohelp" for users */ + output = helpop->ReadValue("nohelpo", std::string(a), 0); + if (output != "") + { + Srv->SendTo(NULL,user,"290 "+std::string(user->nick)+" :"+output); + } + } + // Forward. + sendtohelpop(user, pcnt, parameters); + } } } -} +}; -bool do_helpop(char **parameters, int pcnt, userrec *src) + +bool do_helpop(const char** parameters, int pcnt, userrec *src) { - char *search; + char search[MAXBUF]; std::string output = " "; // a fix bought to you by brain :p char a[MAXBUF]; - char lower[MAXBUF]; int nlines = 0; - if (!parameters) + if (!pcnt) { - search = "start"; + strcpy(search,"start"); } else { - search = parameters[0]; + if (*parameters[0] == '?') + parameters[0]++; + strlcpy(search,parameters[0],MAXBUF); } - if (search[0] == '?') - { - search++; - } - - /* XXX - don't we have an strtolower()? if not, might pay to add one.. that works on char *, preferably.. */ - strlcpy(lower, search, MAXBUF); - for (unsigned int t = 0; t < strlen(lower); t++) - lower[t] = tolower(lower[t]); - + strlower(search); for (int i = 1; output != ""; i++) { snprintf(a,MAXBUF,"line%d",i); - output = helpop->ReadValue(lower, a, 0); + output = helpop->ReadValue(search, a, 0); if (output != "") { Srv->SendTo(NULL,src,"290 "+std::string(src->nick)+" :"+output); @@ -132,9 +162,9 @@ bool do_helpop(char **parameters, int pcnt, userrec *src) -void sendtohelpop(userrec *src, int pcnt, char **params) +void sendtohelpop(userrec *src, int pcnt, const char **params) { - char* first = params[0]; + const char* first = params[0]; if (*first == '!') { first++; @@ -148,25 +178,34 @@ void sendtohelpop(userrec *src, int pcnt, char **params) Srv->SendToModeMask("oh",WM_AND,line); } +class HelpopException : public ModuleException +{ + private: + std::string err; + public: + HelpopException(std::string message) : err(message) { } + virtual const char* GetReason() { return err.c_str(); } +}; + class ModuleHelpop : public Module { private: ConfigReader *conf; std::string h_file; + cmd_helpop* mycommand; + Helpop* ho; public: - ModuleHelpop() + ModuleHelpop(Server* Me) + : Module::Module(Me) { - Srv = new Server; + Srv = Me; ReadConfig(); - if (!Srv->AddExtendedMode('h',MT_CLIENT,true,0,0)) - { - Srv->Log(DEFAULT,"Unable to claim the +h usermode."); - return; - } - - Srv->AddCommand("HELPOP",handle_helpop,0,0,"m_helpop.so"); + ho = new Helpop(); + Srv->AddMode(ho, 'h'); + mycommand = new cmd_helpop(); + Srv->AddCommand(mycommand); } virtual void ReadConfig() @@ -176,8 +215,9 @@ class ModuleHelpop : public Module if (h_file == "") { - log(DEFAULT,"m_helpop: Helpop file not Specified."); - return; + helpop = NULL; + HelpopException e("Missing helpop file"); + throw(e); } helpop = new ConfigReader(h_file); @@ -185,32 +225,28 @@ class ModuleHelpop : public Module (helpop->ReadValue("nohelpo", "line1", 0) == "") || (helpop->ReadValue("start", "line1", 0) == "")) { - log(DEFAULT,"m_helpop: Helpop file is missing important entries. Please check the example conf."); - return; + HelpopException e("m_helpop: Helpop file is missing important entries. Please check the example conf."); + throw(e); } } - - virtual void OnRehash() + void Implements(char* List) { - delete conf; - delete helpop; - - ReadConfig(); + List[I_OnRehash] = List[I_OnWhois] = 1; } - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + virtual void OnRehash(const std::string ¶meter) { - if ((modechar == 'h') && (type == MT_CLIENT)) - { - return 1; - } - return 0; + DELETE(conf); + if (helpop) + DELETE(helpop); + + ReadConfig(); } virtual void OnWhois(userrec* src, userrec* dst) { - if (strchr(dst->modes,'h')) + if (dst->IsModeSet('h')) { Srv->SendTo(NULL,src,"310 "+std::string(src->nick)+" "+std::string(dst->nick)+" :is available for help."); } @@ -218,9 +254,9 @@ class ModuleHelpop : public Module virtual ~ModuleHelpop() { - delete Srv; - delete conf; - delete helpop; + DELETE(conf); + DELETE(helpop); + DELETE(ho); } virtual Version GetVersion() @@ -240,9 +276,9 @@ class ModuleHelpopFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(Server* Me) { - return new ModuleHelpop; + return new ModuleHelpop(Me); } };