Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

[irc/rqf/shadowircd.git] / modules / m_topic.c

diff --git a/modules/m_topic.c b/modules/m_topic.c
index e81ce2ca2740f43e33f6ebed6f4b6ab010004c3b..ff72fb4c23559e6b0cf7b7da04f51ae5450e6b5a 100644 (file)
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -105,6 +105,8 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
        /* setting topic */
        if(parc > 2)
        {
+               char topic_info[USERHOST_REPLYLEN];
+
                msptr = find_channel_membership(chptr, source_p);
 
                if(msptr == NULL)
@@ -114,9 +116,25 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
                        return 0;
                }
 
-               if((chptr->mode.mode & MODE_TOPICLIMIT) == 0 || is_any_op(msptr) || IsOverride(source_p))
+               if(MyClient(source_p) && (chptr->mode.mode & MODE_TOPICLIMIT) && !is_chanop(msptr))
                {
-                       char topic_info[USERHOST_REPLYLEN];
+                       if(IsOverride(source_p))
+                       {
+                               sendto_wallops_flags(UMODE_WALLOP, &me,
+                                               "%s is overriding TOPIC on [%s]",
+                                               get_oper_name(source_p), chptr->chname);
+                               sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+                                               ":%s WALLOPS :%s is overriding TOPIC on [%s]",
+                                               me.name, get_oper_name(source_p), chptr->chname);
+                       }
+                       else
+                       {
+                               sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+                                               me.name, source_p->name, parv[1]);
+                               return 0;
+                       }
+
+               }
 
                        if(ConfigChannel.host_in_topic)
                                rb_sprintf(topic_info, "%s!%s@%s",
@@ -135,11 +153,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
                                        source_p->name, source_p->username,
                                        source_p->host, chptr->chname,
                                        chptr->topic == NULL ? "" : chptr->topic);
-               }
-               else
-                       sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-                                       get_id(&me, source_p),
-                                       get_id(source_p, source_p), name);
+
        }
        else if(MyClient(source_p))
        {