All done.

Modules may now change the privialges each user gets as they join, in OnUserPreJoin. For the first user in, this value defaults to a string  containing "@" otherwise it defaults to a string  containing nothing. If you change it, they get the new prefixes instead, and yes module-based prefixes ARE supported and its all automatically networked.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5327 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index ce2550ba3188d86c43e996f4c7cd79de54374ee3..2cc8935042e2aae28df5d80b47b670e956e170f1 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -158,7 +158,7 @@ class ModuleCBan : public Module
                return 0;
        }
 
-       virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname)
+       virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname, std::string &privs)
        {
                ExpireBans();
        

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 04d0a30337d65a6b8d09edd686fcb46c47d40510..611bb5e03978dd48edc7217c03018ca3ce084fc0 100644 (file)
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -58,7 +58,7 @@ class ModuleDenyChannels : public Module
                List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
        }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                for (int j =0; j < Conf->Enumerate("badchan"); j++)
                {

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 8557ad11f808b016716e85c50c625fbef68b5103..c1c50f2d480cac307f0388f8a39e791b7a80d2e4 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -229,7 +229,7 @@ class ModuleJoinFlood : public Module
                ServerInstance->AddMode(jf, 'j');
        }
        
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (chan)
                {

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index ea97367a029b85a38a671c96c8e91924f8a7ce1c..56322507cf563b19cc328496b2d9eec40caabd99 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -121,7 +121,7 @@ public:
                ServerInstance->AddMode(kr, 'J');
        }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (chan)
                {

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 53d21cae96e70a757791958f677f3fa8f127d8a4..29ce267bc81684cd0a7d838a1c2cb67d912967d7 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -70,7 +70,7 @@ class ModuleOperChans : public Module
                List[I_OnUserPreJoin] = 1;
        }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (!*user->oper)
                {

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 026b2798d7c13af4ec863e4b5ce1e7412c1dec4e..a4aac46d5a4a96af839e7b42f4d8c59d56407653 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -240,7 +240,7 @@ class ModuleOverride : public Module
                return ACR_DEFAULT;
        }
        
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (*user->oper)
                {

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index efd9b8b1c5a4497b2155f2ce4164957889bb8365..2abdabb9a8ba7fd35058f0ebcf361c553cc26d28 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -119,7 +119,7 @@ class ModuleRedirect : public Module
                List[I_OnUserPreJoin] = 1;
        }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (chan)
                {

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 1b7d4104a50bcbacf1c19cd1f870f543f948885a..03d28c3acd3d564ff8d7505e9e13bb6ef0b212f9 100644 (file)
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -64,7 +64,7 @@ class ModuleRestrictChans : public Module
                List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
        }
        
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                irc::string x = cname;
                // user is not an oper and its not in the allow list

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index c949d7f683baed168aa4a4e54919d89351573a32..d783952dbc2f5c2f972327e8c5f1ec2677384a8a 100644 (file)
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -267,7 +267,7 @@ class ModuleServices : public Module
                return OnUserPreMessage(user,dest,target_type,text,status);
        }
        
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (chan)
                {

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 739ad611972370045a242fe012f708fcba8dba0a..66e1898d37442db6094aaaa5571f1d3fb81742fd 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -197,7 +197,7 @@ class ModuleServicesAccount : public Module
                return OnUserPreMessage(user, dest, target_type, text, status);
        }
         
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                std::string *account;
                user->GetExt("accountname", account);

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 1304abe01b2ccea89cfae7b6c7392f5b9c3c7a35..1d48d99add7f14c196f7fcd66eed49e803c059f0 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -87,7 +87,7 @@ class ModuleSSLModes : public Module
                List[I_OnUserPreJoin] = 1;
        }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if(chan && chan->IsModeSet('z'))
                {