added FEAT_CHMODE_A_NOSET to prevent +a from being set by users

[ircu2.10.12-pk.git] / ircd / m_join.c

diff --git a/ircd/m_join.c b/ircd/m_join.c
index db04f6788ebf16ca4cfd6a954517ddb94ec7d21a..63c93d55d6bc2244f1a666bd685c3a0078be24f3 100644 (file)
--- a/ircd/m_join.c
+++ b/ircd/m_join.c
@@ -216,6 +216,8 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
         err = ERR_CHANNELISFULL;
       else if ((chptr->mode.mode & MODE_REGONLY) && !IsAccount(sptr))
         err = ERR_NEEDREGGEDNICK;
+      else if ((chptr->mode.mode & MODE_SSLCHAN) && !IsSSL(sptr))
+        err = ERR_SSLCHANNEL;
       else if (find_ban(sptr, chptr->banlist))
         err = ERR_BANNEDFROMCHAN;
       else if (*chptr->mode.key && (!key || strcmp(key, chptr->mode.key)))
@@ -252,6 +254,7 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
         case ERR_BANNEDFROMCHAN: err = 'b'; break;
         case ERR_BADCHANNELKEY:  err = 'k'; break;
         case ERR_NEEDREGGEDNICK: err = 'r'; break;
+        case ERR_SSLCHANNEL:     err = 'S'; break;
         default: err = '?'; break;
         }
         /* send accountability notice */
@@ -262,7 +265,7 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
         override = 1;
       }
       
-      if(!err && !override && !IsInvited(sptr, chptr) && chptr->mode.access && chptr->mode.access > 0 && chptr->mode.access < 500 && feature_bool(FEAT_CHMODE_A_ENABLE)) {
+      if(!err && !override && !IsInvited(sptr, chptr) && chptr->mode.access && chptr->mode.access > 0 && chptr->mode.access <= 500 && feature_bool(FEAT_CHMODE_A_ENABLE)) {
         //We have to check the users channel access...
         struct Client *acptr;
         if(feature_str(FEAT_CHMODE_A_TARGET) && (acptr = FindUser(feature_str(FEAT_CHMODE_A_TARGET))) && IsNetServ(acptr) && IsService(cli_user(acptr)->server)) {
@@ -303,6 +306,8 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
             err2 = ERR_CHANNELISFULL;
           else if ((chptrb->mode.mode & MODE_REGONLY) && !IsAccount(sptr))
             err2 = ERR_NEEDREGGEDNICK;
+          else if ((chptrb->mode.mode & MODE_SSLCHAN) && !IsSSL(sptr))
+            err2 = ERR_SSLCHANNEL;
           else if (find_ban(sptr, chptrb->banlist))
             err2 = ERR_BANNEDFROMCHAN;
           else if (*chptrb->mode.key && (!key || strcmp(key, chptrb->mode.key)))
@@ -320,17 +325,26 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
          }
          
       if (err) {
-        switch(err) {
-          case ERR_NEEDREGGEDNICK:
-            send_reply(sptr, 
-                       ERR_NEEDREGGEDNICK, 
-                       chptr->chname, 
-                       feature_str(FEAT_URLREG));            
-            break;
-          default:
+        const char *error = NULL;
+        if (err == ERR_CHANNELISFULL)
+            error = feature_str(FEAT_ERR_CHANNELISFULL);
+        else if (err == ERR_INVITEONLYCHAN)
+            error = feature_str(FEAT_ERR_INVITEONLYCHAN);
+        else if (err == ERR_BANNEDFROMCHAN)
+            error = feature_str(FEAT_ERR_BANNEDFROMCHAN);
+        else if (err == ERR_BADCHANNELKEY)
+            error = feature_str(FEAT_ERR_BADCHANNELKEY);
+        else if (err == ERR_NEEDREGGEDNICK)
+            error = feature_str(FEAT_ERR_NEEDREGGEDNICK);
+        else if (err == ERR_SSLCHANNEL)
+            error = feature_str(FEAT_ERR_SSLCHANNEL);
+        else if (err == ERR_JOINACCESS)
+            error = feature_str(FEAT_ERR_JOINACCESS);
+        
+        if (error)
+            send_reply(sptr, err, chptr->chname, error);
+        else
             send_reply(sptr, err, chptr->chname);
-            break;
-        }
         continue;
       }