cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[svn] Merge old trunk r2212: 

Another handling of SJOINs without nicks:
Propagate them if the channel is +P or the channel
already existed, otherwise remove the channel again
and do not propagate the SJOIN.
This commit is contained in:
jilles 2007-03-28 07:21:37 -07:00
parent 04513cff6c
commit 7201bb21a4
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
jilles 2007/03/28 13:49:57 UTC (20070328-3287)
Log:
Remove channels entirely from /whois on services.
This cannot be overridden with operspy.
Changes: Modified:
+20 -17 trunk/modules/m_whois.c (File Modified)
jilles 2007/03/28 13:11:30 UTC (20070328-3283) jilles 2007/03/28 13:11:30 UTC (20070328-3283)
Log: Log:
Fix /who on channels with ** in their name. Fix /who on channels with ** in their name.

2
include/serno.h
View File

@ -1 +1 @@
#define SERNO "20070328-3283" #define SERNO "20070328-3287"

9
modules/core/m_sjoin.c
View File

@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
* *
* $Id: m_sjoin.c 3131 2007-01-21 15:36:31Z jilles $ * $Id: m_sjoin.c 3289 2007-03-28 14:21:37Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -50,7 +50,7 @@ struct Message sjoin_msgtab = {
mapi_clist_av1 sjoin_clist[] = { &sjoin_msgtab, NULL }; mapi_clist_av1 sjoin_clist[] = { &sjoin_msgtab, NULL };
DECLARE_MODULE_AV1(sjoin, NULL, NULL, sjoin_clist, NULL, NULL, "$Revision: 3131 $"); DECLARE_MODULE_AV1(sjoin, NULL, NULL, sjoin_clist, NULL, NULL, "$Revision: 3289 $");
/* /*
* ms_sjoin * ms_sjoin
@ -556,10 +556,9 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
CheckEmpty(para[2]), CheckEmpty(para[3])); CheckEmpty(para[2]), CheckEmpty(para[3]));
} }
if(!joins && !(chptr->mode.mode & MODE_PERMANENT)) if(!joins && !(chptr->mode.mode & MODE_PERMANENT) && isnew)
{ {
if(isnew) destroy_channel(chptr);
destroy_channel(chptr);
return 0; return 0;
} }