report_error() cleanup

[irc/rqf/shadowircd.git] / unsupported / m_force.c

diff --git a/unsupported/m_force.c b/unsupported/m_force.c
index 6abe8ee4b5342ce90239fda728d13719a033a04f..20a3ccf40418e54cb8d025b0626dbe7fdce7388e 100644 (file)
--- a/unsupported/m_force.c
+++ b/unsupported/m_force.c
@@ -26,11 +26,10 @@
  *  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: m_force.c 3161 2007-01-25 07:23:01Z nenolod $
+ * $Id: m_force.c 3297 2007-03-28 14:49:48Z jilles $
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
@@ -40,7 +39,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -50,8 +48,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "event.h"
-
 
 static int mo_forcejoin(struct Client *client_p, struct Client *source_p,
                        int parc, const char *parv[]);
@@ -70,7 +66,7 @@ struct Message forcepart_msgtab = {
 
 mapi_clist_av1 force_clist[] = { &forcejoin_msgtab, &forcepart_msgtab, NULL };
 
-DECLARE_MODULE_AV1(force, NULL, NULL, force_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV1(force, NULL, NULL, force_clist, NULL, NULL, "$Revision: 3297 $");
 
 /*
  * m_forcejoin
@@ -90,7 +86,7 @@ mo_forcejoin(struct Client *client_p, struct Client *source_p, int parc, const c
 
        if(!IsOperAdmin(source_p))
        {
-               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "forcejoin");
+               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
                return 0;
        }
 
@@ -219,7 +215,7 @@ mo_forcejoin(struct Client *client_p, struct Client *source_p, int parc, const c
 
                sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +nt", me.name, chptr->chname);
 
-               target_p->localClient->last_join_time = CurrentTime;
+               target_p->localClient->last_join_time = rb_current_time();
                channel_member_names(chptr, target_p, 1);
 
                /* we do this to let the oper know that a channel was created, this will be
@@ -241,7 +237,7 @@ mo_forcepart(struct Client *client_p, struct Client *source_p, int parc, const c
 
        if(!IsOperAdmin(source_p))
        {
-               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "forcepart");
+               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
                return 0;
        }