[svn] Merge old trunk r2065,r2067:

[irc/rqf/shadowircd.git] / extensions / m_ojoin.c

diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 0e401e326b7d54a612719d0d5979812edfcdae4f..f07ea475ceaa09f92f98dd09606d6400047af89d 100644 (file)
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -16,7 +16,7 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: m_ojoin.c 3121 2007-01-02 13:23:04Z jilles $
+ *   $Id: m_ojoin.c 3297 2007-03-28 14:49:48Z jilles $
  */
 
 #include "stdinc.h"
@@ -49,7 +49,7 @@ struct Message ojoin_msgtab = {
 
 mapi_clist_av1 ojoin_clist[] = { &ojoin_msgtab, NULL };
 
-DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3121 $");
+DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3297 $");
 
 /*
 ** mo_ojoin
@@ -65,7 +65,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
        /* admins only */
        if(!IsOperAdmin(source_p))
        {
-               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "ojoin");
+               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
                return 0;
        }
 
@@ -84,8 +84,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 
        if(IsMember(source_p, chptr))
        {
-               sendto_one(source_p, ":%s NOTICE %s :Please part %s before using OJOIN",
-                          me.name, source_p->name, parv[1]);
+               sendto_one_notice(source_p, ":Please part %s before using OJOIN", parv[1]);
                return 0;
        }