Forward port r9782: show IP (not unknown) for unauthed connections

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 70539ddde5fad0efa1c3aa7c0d72715f8ff335d7..db9d90de49a95afea543e11256c24d9cf473a252 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -18,92 +18,26 @@
 
 /** Channel mode +R - unidentified users cannot join
  */
-class AChannel_R : public ModeHandler
+class AChannel_R : public SimpleChannelModeHandler
 {
  public:
-       AChannel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('R'))
-                       {
-                               channel->SetMode('R',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('R'))
-                       {
-                               channel->SetMode('R',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       AChannel_R(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'R') { }
 };
 
 /** User mode +R - unidentified users cannot message
  */
-class AUser_R : public ModeHandler
+class AUser_R : public SimpleUserModeHandler
 {
  public:
-       AUser_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-       {
-               if (adding)
-               {
-                       if (!dest->IsModeSet('R'))
-                       {
-                               dest->SetMode('R',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('R'))
-                       {
-                               dest->SetMode('R',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       AUser_R(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'R') { }
 };
 
 /** Channel mode +M - unidentified users cannot message channel
  */
-class AChannel_M : public ModeHandler
+class AChannel_M : public SimpleChannelModeHandler
 {
  public:
-       AChannel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('M'))
-                       {
-                               channel->SetMode('M',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('M'))
-                       {
-                               channel->SetMode('M',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       AChannel_M(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'M') { }
 };
 
 class ModuleServicesAccount : public Module
@@ -136,7 +70,7 @@ class ModuleServicesAccount : public Module
 
                if (account)
                {
-                       ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick, dest->nick, account->c_str());
+                       ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick.c_str(), dest->nick.c_str(), account->c_str());
                }
        }
 
@@ -156,7 +90,7 @@ class ModuleServicesAccount : public Module
                        
                        if ((c->IsModeSet('M')) && (!account))
                        {
-                               if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
+                               if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
                                {
                                        // user is ulined, can speak regardless
                                        return 0;
@@ -173,14 +107,14 @@ class ModuleServicesAccount : public Module
                        
                        if ((u->modes['R'-65]) && (!account))
                        {
-                               if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
+                               if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
                                {
                                        // user is ulined, can speak regardless
                                        return 0;
                                }
 
                                // user messaging a +R user and is not registered
-                               user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
+                               user->WriteNumeric(477, ""+ user->nick +" "+ u->nick +" :You need to be identified to a registered account to message this user");
                                return 1;
                        }
                }
@@ -203,13 +137,13 @@ class ModuleServicesAccount : public Module
                        {
                                if (!account)
                                {
-                                       if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
+                                       if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
                                        {
                                                // user is ulined, won't be stopped from joining
                                                return 0;
                                        }
                                        // joining a +R channel and not identified
-                                       user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
+                                       user->WriteNumeric(477, user->nick + " " + chan->name + " :You need to be identified to a registered account to join this channel");
                                        return 1;
                                }
                        }
@@ -307,7 +241,7 @@ class ModuleServicesAccount : public Module
                                        dest->Extend("accountname", text);
 
                                        if (IS_LOCAL(dest))
-                                               dest->WriteNumeric(900, "%s %s %s :You are now logged in as %s", dest->nick, dest->GetFullHost(), text->c_str(), text->c_str());
+                                               dest->WriteNumeric(900, "%s %s %s :You are now logged in as %s", dest->nick.c_str(), dest->GetFullHost().c_str(), text->c_str(), text->c_str());
 
                                        AccountData ac;
                                        ac.user = dest;