* ---------------------------------------------------
*/
+#include "inspircd.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "inspircd.h"
#include "wildcard.h"
-#include <vector>
/* $ModDesc: Provides aliases of commands. */
public:
ModuleAlias(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
ReadAliases();
- pars.resize(127);
+ pars.resize(MAXPARAMETERS);
}
void Implements(char* List)
int index = *(varname.begin()) - 48;
varname.erase(varname.begin());
bool everything_after = (varname == "-");
- std::string word = "";
+ std::string word;
for (int j = 0; j < index; j++)
word = ss.GetToken();
continue;
}
- if ((Aliases[i].operonly) && (!*user->oper))
+ if ((Aliases[i].operonly) && (!IS_OPER(user)))
return 0;
- if (Aliases[i].requires != "")
+ if (!Aliases[i].requires.empty())
{
u = ServerInstance->FindNick(Aliases[i].requires);
if (!u)
return 1;
}
}
- if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
+ if ((u != NULL) && (!Aliases[i].requires.empty()) && (Aliases[i].uline))
{
if (!ServerInstance->ULine(u->server))
{
SearchAndReplace(newline, "\r", "$");
irc::tokenstream ss(newline);
- const char* parv[127];
+ const char* parv[MAXPARAMETERS];
int x = 0;
- while (ss.GetToken(pars[x]))
+ while (ss.GetToken(pars[x]) && x < MAXPARAMETERS)
{
parv[x] = pars[x].c_str();
x++;
}
};
-
-class ModuleAliasFactory : public ModuleFactory
-{
- public:
- ModuleAliasFactory()
- {
- }
-
- ~ModuleAliasFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleAlias(Me);
- }
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleAliasFactory;
-}
-
+MODULE_INIT(ModuleAlias)