[srvx-commits] CVS: services/src chanserv.c,1.333,1.334

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19308/src

Modified Files:
	chanserv.c 
Log Message:
move !merge access check into modcmd
if the last person is leaving a channel, null out cData->channel
make !cunsuspend not inherit the REGCHAN flag


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.333
retrieving revision 1.334
diff -C2 -r1.333 -r1.334
*** chanserv.c	24 Jan 2003 22:53:37 -0000	1.333
--- chanserv.c	25 Jan 2003 00:46:38 -0000	1.334
***************
*** 2260,2264 ****
  {
      struct chanNode *target;
-     struct userData *uData;
      char reason[MAXLEN];
  
--- 2260,2263 ----
***************
*** 2291,2300 ****
      }
  
-     if(!(uData = GetChannelUser(target->channel_info, user->handle_info)) || (uData->access < ulOwner))
-     {
- 	chanserv_notice(user, CSMSG_ACCESS_REQUIRED, "owner", target->name);
- 	return 0;
-     }
- 
      /* Merge the channel structures and associated data. */
      merge_channel(channel->channel_info, target->channel_info);
--- 2290,2293 ----
***************
*** 6284,6288 ****
      (void)reason;
      cData = channel->channel_info;
!     if(!cData || IsSuspended(cData) || IsLocal(user)) return;
  
      if((cData->flags & CHANNEL_DYNAMIC_LIMIT) && !channel->join_flooded)
--- 6277,6287 ----
      (void)reason;
      cData = channel->channel_info;
!     if(!cData) return;
!     if(channel->members.used == 0)
!     {
!         cData->channel = NULL;
!         return;
!     }
!     if(IsSuspended(cData) || IsLocal(user)) return;
  
      if((cData->flags & CHANNEL_DYNAMIC_LIMIT) && !channel->join_flooded)
***************
*** 7217,7226 ****
      DEFINE_COMMAND(move, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "template", "register", NULL);
      DEFINE_COMMAND(csuspend, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
!     DEFINE_COMMAND(cunsuspend, 2, MODCMD_REQUIRE_AUTHED, "template", "csuspend", NULL);
      DEFINE_COMMAND(createnote, 5, 0, "access", "800", NULL);
      DEFINE_COMMAND(removenote, 2, 0, "access", "800", NULL);
  
      DEFINE_COMMAND(unregister, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "access", "owner", "flags", "+loghostmask", NULL);
!     DEFINE_COMMAND(merge, 2, MODCMD_REQUIRE_AUTHED, "access", "owner", NULL);
  
      DEFINE_COMMAND(adduser, 3, MODCMD_REQUIRE_CHANUSER, "access", "master", NULL);
--- 7216,7225 ----
      DEFINE_COMMAND(move, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "template", "register", NULL);
      DEFINE_COMMAND(csuspend, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
!     DEFINE_COMMAND(cunsuspend, 2, MODCMD_REQUIRE_AUTHED, "flags", "+helping", NULL);
      DEFINE_COMMAND(createnote, 5, 0, "access", "800", NULL);
      DEFINE_COMMAND(removenote, 2, 0, "access", "800", NULL);
  
      DEFINE_COMMAND(unregister, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "access", "owner", "flags", "+loghostmask", NULL);
!     DEFINE_COMMAND(merge, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "access", "owner", NULL);
  
      DEFINE_COMMAND(adduser, 3, MODCMD_REQUIRE_CHANUSER, "access", "master", NULL);