projects
/
ircu2.10.12-pk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added gnutls backend and moved backend code into new files
[ircu2.10.12-pk.git]
/
ircd
/
m_part.c
diff --git
a/ircd/m_part.c
b/ircd/m_part.c
index 020b97a0bf0ba32db759a711c44b2bd1692a0412..bc34ce93572eb3433536ef5fcecb1a61f9a09ae3 100644
(file)
--- a/
ircd/m_part.c
+++ b/
ircd/m_part.c
@@
-85,13
+85,14
@@
#include "client.h"
#include "hash.h"
#include "ircd.h"
#include "client.h"
#include "hash.h"
#include "ircd.h"
+#include "ircd_log.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "numeric.h"
#include "numnicks.h"
#include "send.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "numeric.h"
#include "numnicks.h"
#include "send.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
#include <string.h>
/*
#include <string.h>
/*
@@
-110,7
+111,7
@@
int m_part(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
char *p = 0;
char *name;
char *p = 0;
char *name;
-
cli_flags(sptr) &= ~FLAGS_TS8
;
+
ClrFlag(sptr, FLAG_TS8)
;
/* check number of arguments */
if (parc < 2 || parv[1][0] == '\0')
/* check number of arguments */
if (parc < 2 || parv[1][0] == '\0')
@@
-139,13
+140,16
@@
int m_part(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
assert(!IsZombie(member)); /* Local users should never zombie */
assert(!IsZombie(member)); /* Local users should never zombie */
- if (!member_can_send_to_channel(member))
+ if (!member_can_send_to_channel(member
, 0
))
{
flags |= CHFL_BANNED;
/* Remote clients don't want to see a comment either. */
parts.jb_comment = 0;
}
{
flags |= CHFL_BANNED;
/* Remote clients don't want to see a comment either. */
parts.jb_comment = 0;
}
+ if (IsDelayedJoin(member))
+ flags |= CHFL_DELAYED;
+
joinbuf_join(&parts, chptr, flags); /* part client from channel */
}
joinbuf_join(&parts, chptr, flags); /* part client from channel */
}
@@
-168,7
+172,7
@@
int ms_part(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
char *p = 0;
char *name;
char *p = 0;
char *name;
-
cli_flags(sptr) &= ~FLAGS_TS8
;
+
ClrFlag(sptr, FLAG_TS8)
;
/* check number of arguments */
if (parc < 2 || parv[1][0] == '\0')
/* check number of arguments */
if (parc < 2 || parv[1][0] == '\0')
@@
-194,6
+198,9
@@
int ms_part(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
if (IsZombie(member)) /* figure out special flags... */
flags |= CHFL_ZOMBIE;
if (IsZombie(member)) /* figure out special flags... */
flags |= CHFL_ZOMBIE;
+ if (IsDelayedJoin(member))
+ flags |= CHFL_DELAYED;
+
/* part user from channel */
joinbuf_join(&parts, chptr, flags);
}
/* part user from channel */
joinbuf_join(&parts, chptr, flags);
}