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

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

diff --git a/modules/m_userhost.c b/modules/m_userhost.c
index c13d2ec17916ca2e804f3d0c34013150292b17e3..108974e740dcc706544b6d5dae307e4425cc537c 100644 (file)
--- a/modules/m_userhost.c
+++ b/modules/m_userhost.c
@@ -30,8 +30,7 @@
 #include "numeric.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
@@ -64,7 +63,7 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
        int cur_len;
        int rl;
 
-       cur_len = ircsprintf(buf, form_str(RPL_USERHOST), me.name, parv[0], "");
+       cur_len = rb_sprintf(buf, form_str(RPL_USERHOST), me.name, source_p->name, "");
        t = buf + cur_len;
 
        for (i = 1; i <= 5; i++)
@@ -82,7 +81,7 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
                         */
                        if(MyClient(target_p) && (target_p == source_p))
                        {
-                               rl = ircsprintf(response, "%s%s=%c%s@%s ",
+                               rl = rb_sprintf(response, "%s%s=%c%s@%s ",
                                                target_p->name,
                                                IsOper(target_p) ? "*" : "",
                                                (target_p->user->away) ? '-' : '+',
@@ -91,7 +90,7 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
                        }
                        else
                        {
-                               rl = ircsprintf(response, "%s%s=%c%s@%s ",
+                               rl = rb_sprintf(response, "%s%s=%c%s@%s ",
                                                target_p->name,
                                                IsOper(target_p) ? "*" : "",
                                                (target_p->user->away) ? '-' : '+',
@@ -100,7 +99,7 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
 
                        if((rl + cur_len) < (BUFSIZE - 10))
                        {
-                               ircsprintf(t, "%s", response);
+                               rb_sprintf(t, "%s", response);
                                t += rl;
                                cur_len += rl;
                        }