* ---------------------------------------------------
*/
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
static bool kludgeme = false;
User_R* m5;
public:
ModuleServices(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
m1 = new Channel_r(ServerInstance);
virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
{
/* On nickchange, if they have +r, remove it */
- if (user->IsModeSet('r'))
+ if (user->IsModeSet('r') && irc::string(user->nick) != oldnick)
{
const char* modechange[2];
modechange[0] = user->nick;
chanrec* c = (chanrec*)dest;
if ((c->IsModeSet('M')) && (!user->IsModeSet('r')))
{
- if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,"")))
+ if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
{
// user is ulined, can speak regardless
return 0;
};
-class ModuleServicesFactory : public ModuleFactory
-{
- public:
- ModuleServicesFactory()
- {
- }
-
- ~ModuleServicesFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleServices(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleServicesFactory;
-}
-
+MODULE_INIT(ModuleServices)