[srvx-commits] CVS: services/src chanserv.c,1.255,1.256 global.c,1.46,1.47 nickserv.c,1.182,1.183 opserv.c,1.252,1.253

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

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv3535/src

Modified Files:
	chanserv.c global.c nickserv.c opserv.c 
Log Message:
make services use simpler/smarter svccmd_send_help() instead of svccmd_send_help_2()
fix !register to only require one argument (in case an existing channel is named)
allow a reason to be specified for ?part


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.255
retrieving revision 1.256
diff -C2 -r1.255 -r1.256
*** chanserv.c	1 Aug 2002 01:23:51 -0000	1.255
--- chanserv.c	1 Aug 2002 03:20:05 -0000	1.256
***************
*** 419,423 ****
  
  #define CHANSERV_FUNC(NAME) MODCMD_FUNC(NAME)
! #define CHANSERV_SYNTAX() 	svccmd_send_help_2(user, chanserv, chanserv_service, argv[0])
  #define REQUIRE_PARAMS(N)	if(argc < N) { \
  	chanserv_notice(user, MSG_MISSING_PARAMS, argv[0]); \
--- 419,423 ----
  
  #define CHANSERV_FUNC(NAME) MODCMD_FUNC(NAME)
! #define CHANSERV_SYNTAX() 	svccmd_send_help(user, chanserv, cmd)
  #define REQUIRE_PARAMS(N)	if(argc < N) { \
  	chanserv_notice(user, MSG_MISSING_PARAMS, argv[0]); \
***************
*** 2376,2380 ****
  
  static int
! cmd_mdel_user(struct userNode *user, struct chanNode *channel, enum userLevel access, unsigned int argc, unsigned char *argv[])
  {
      struct userData *actor, *uData, *next;
--- 2376,2380 ----
  
  static int
! cmd_mdel_user(struct userNode *user, struct chanNode *channel, enum userLevel access, unsigned int argc, unsigned char *argv[], struct svccmd *cmd)
  {
      struct userData *actor, *uData, *next;
***************
*** 2412,2436 ****
  static CHANSERV_FUNC(cmd_mdelowner)
  {
!     return cmd_mdel_user(user, channel, ulOwner, argc, argv);
  }
  
  static CHANSERV_FUNC(cmd_mdelcoowner)
  {
!     return cmd_mdel_user(user, channel, ulCoowner, argc, argv);
  }
  
  static CHANSERV_FUNC(cmd_mdelmaster)
  {
!     return cmd_mdel_user(user, channel, ulMaster, argc, argv);
  }
  
  static CHANSERV_FUNC(cmd_mdelop)
  {
!     return cmd_mdel_user(user, channel, ulOp, argc, argv);
  }
  
  static CHANSERV_FUNC(cmd_mdelpeon)
  {
!     return cmd_mdel_user(user, channel, ulPeon, argc, argv);
  }
  
--- 2412,2436 ----
  static CHANSERV_FUNC(cmd_mdelowner)
  {
!     return cmd_mdel_user(user, channel, ulOwner, argc, argv, cmd);
  }
  
  static CHANSERV_FUNC(cmd_mdelcoowner)
  {
!     return cmd_mdel_user(user, channel, ulCoowner, argc, argv, cmd);
  }
  
  static CHANSERV_FUNC(cmd_mdelmaster)
  {
!     return cmd_mdel_user(user, channel, ulMaster, argc, argv, cmd);
  }
  
  static CHANSERV_FUNC(cmd_mdelop)
  {
!     return cmd_mdel_user(user, channel, ulOp, argc, argv, cmd);
  }
  
  static CHANSERV_FUNC(cmd_mdelpeon)
  {
!     return cmd_mdel_user(user, channel, ulPeon, argc, argv, cmd);
  }
  
***************
*** 6977,6981 ****
      chanserv_module = module_register("ChanServ", CS_LOG, "chanserv.help", chanserv_expand_variable);
      DEFINE_COMMAND(god, 1, MODCMD_REQUIRE_AUTHED, "flags", "+oper,+networkhelper", NULL);
!     DEFINE_COMMAND(register, 2, MODCMD_REQUIRE_AUTHED, "account_flags", "+g", "flags", "+acceptchan", NULL);
      DEFINE_COMMAND(noregister, 2, MODCMD_REQUIRE_AUTHED, "account_flags", "+g", NULL);
      DEFINE_COMMAND(noregisters, 2, MODCMD_REQUIRE_AUTHED, "template", "noregister", NULL);
--- 6977,6981 ----
      chanserv_module = module_register("ChanServ", CS_LOG, "chanserv.help", chanserv_expand_variable);
      DEFINE_COMMAND(god, 1, MODCMD_REQUIRE_AUTHED, "flags", "+oper,+networkhelper", NULL);
!     DEFINE_COMMAND(register, 1, MODCMD_REQUIRE_AUTHED, "account_flags", "+g", "flags", "+acceptchan", NULL);
      DEFINE_COMMAND(noregister, 2, MODCMD_REQUIRE_AUTHED, "account_flags", "+g", NULL);
      DEFINE_COMMAND(noregisters, 2, MODCMD_REQUIRE_AUTHED, "template", "noregister", NULL);

Index: global.c
===================================================================
RCS file: /cvsroot/srvx/services/src/global.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** global.c	30 Jul 2002 02:15:11 -0000	1.46
--- global.c	1 Aug 2002 03:20:06 -0000	1.47
***************
*** 71,75 ****
  #define GMSG_MESSAGE_FORMAT	recipients, from, posted
  
! #define GLOBAL_SYNTAX()   svccmd_send_help_2(user, global, global_service, argv[0])
  #define GLOBAL_FUNC(NAME) MODCMD_FUNC(NAME)
  
--- 71,75 ----
  #define GMSG_MESSAGE_FORMAT	recipients, from, posted
  
! #define GLOBAL_SYNTAX()   svccmd_send_help(user, global, cmd)
  #define GLOBAL_FUNC(NAME) MODCMD_FUNC(NAME)
  

Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.182
retrieving revision 1.183
diff -C2 -r1.182 -r1.183
*** nickserv.c	31 Jul 2002 02:41:50 -0000	1.182
--- nickserv.c	1 Aug 2002 03:20:06 -0000	1.183
***************
*** 232,236 ****
  DEFINE_LIST(handle_info_list, struct handle_info*);
  
! #define NICKSERV_SYNTAX()	svccmd_send_help_2(nickserv, user, nickserv_service, argv[0])
  #define NICKSERV_MIN_PARMS(N) do { \
    (void)argv; \
--- 232,236 ----
  DEFINE_LIST(handle_info_list, struct handle_info*);
  
! #define NICKSERV_SYNTAX()	svccmd_send_help(user, nickserv, cmd)
  #define NICKSERV_MIN_PARMS(N) do { \
    (void)argv; \

Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.252
retrieving revision 1.253
diff -C2 -r1.252 -r1.253
*** opserv.c	1 Aug 2002 00:00:39 -0000	1.252
--- opserv.c	1 Aug 2002 03:20:06 -0000	1.253
***************
*** 275,279 ****
  
  #define OPSERV_FUNC(NAME) MODCMD_FUNC(NAME)
! #define OPSERV_SYNTAX() 	svccmd_send_help_2(opserv, user, opserv_service, argv[0])
  #define OPSERV_NEED_CHANNEL()	do { if (!channel) { \
      opserv_notice(user, MSG_INVALID_CHANNEL); \
--- 275,279 ----
  
  #define OPSERV_FUNC(NAME) MODCMD_FUNC(NAME)
! #define OPSERV_SYNTAX() 	svccmd_send_help(user, opserv, cmd)
  #define OPSERV_NEED_CHANNEL()	do { if (!channel) { \
      opserv_notice(user, MSG_INVALID_CHANNEL); \
***************
*** 569,573 ****
      unsigned int count, n;
  
!     OPSERV_NEED_CHANNEL(); (void)argc;
      for (count=n=0; n<channel->banlist.used; n++) {
  	list[count++] = channel->banlist.list[n]->ban;
--- 569,573 ----
      unsigned int count, n;
  
!     OPSERV_NEED_CHANNEL(); (void)argc; (void)argv;
      for (count=n=0; n<channel->banlist.used; n++) {
  	list[count++] = channel->banlist.list[n]->ban;
***************
*** 588,592 ****
      char buffer[400];
  
!     OPSERV_NEED_CHANNEL(); (void)argc;
      if (irc_make_chanmode(channel, buffer)) {
  	channel->modes = 0;
--- 588,592 ----
      char buffer[400];
  
!     OPSERV_NEED_CHANNEL(); (void)argc; (void)argv;
      if (irc_make_chanmode(channel, buffer)) {
  	channel->modes = 0;
***************
*** 632,636 ****
      unsigned int count, n;
  
!     OPSERV_NEED_CHANNEL(); (void)argc;
      for (count=n=0; n<channel->members.used; n++) {
  	mn = channel->members.list[n];
--- 632,636 ----
      unsigned int count, n;
  
!     OPSERV_NEED_CHANNEL(); (void)argc; (void)argv;
      for (count=n=0; n<channel->members.used; n++) {
  	mn = channel->members.list[n];
***************
*** 1128,1134 ****
  static OPSERV_FUNC(cmd_part)
  {
!     OPSERV_NEED_CHANNEL(); (void)argc;
      opserv_notice(user, OSMSG_LEAVING, channel->name);
!     DelChannelUser(opserv, channel, "Leaving.", 0);
      return 1;
  }
--- 1128,1141 ----
  static OPSERV_FUNC(cmd_part)
  {
!     char *reason;
!     OPSERV_NEED_CHANNEL();
!     if (argc < 2) {
!         reason = "Leaving.";
!     } else {
!         unsplit_string(argv+1, argc-1);
!         reason = argv[1];
!     }
      opserv_notice(user, OSMSG_LEAVING, channel->name);
!     DelChannelUser(opserv, channel, reason, 0);
      return 1;
  }