[srvx-commits] CVS: services/src modcmd.c,1.50,1.51

[Zoot <zo...@us...>]

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

Modified Files:
	modcmd.c 
Log Message:
Merge my version of the suspended channel fix into the tree (add display of suspension reason).


Index: modcmd.c
===================================================================
RCS file: /cvsroot/srvx/services/src/modcmd.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** modcmd.c	25 Jan 2003 00:50:26 -0000	1.50
--- modcmd.c	25 Jan 2003 01:15:28 -0000	1.51
***************
*** 37,41 ****
  #define MCMSG_ACCOUNT_SUSPENDED   "Your account has been suspended."
  #define MCMSG_CHAN_NOT_REGISTERED "%s has not been registered with $C."
! #define MCMSG_CHAN_SUSPENDED      "$b$C$b access to $b%s$b has been temporarily suspended."
  #define MCMSG_NO_CHANNEL_ACCESS   "You lack access to %s."
  #define MCMSG_LOW_CHANNEL_ACCESS  "You lack sufficient access in %s to use this command."
--- 37,41 ----
  #define MCMSG_ACCOUNT_SUSPENDED   "Your account has been suspended."
  #define MCMSG_CHAN_NOT_REGISTERED "%s has not been registered with $C."
! #define MCMSG_CHAN_SUSPENDED      "$b$C$b access to $b%s$b has been temporarily suspended (%s)."
  #define MCMSG_NO_CHANNEL_ACCESS   "You lack access to %s."
  #define MCMSG_LOW_CHANNEL_ACCESS  "You lack sufficient access in %s to use this command."
***************
*** 460,464 ****
                  return 0;
              } else if (IsSuspended(channel->channel_info)) {
!                 if (noisy) send_message(user, bot, MCMSG_CHAN_SUSPENDED, channel->name);
                  return 0;
              }
--- 460,464 ----
                  return 0;
              } else if (IsSuspended(channel->channel_info)) {
!                 if (noisy) send_message(user, bot, MCMSG_CHAN_SUSPENDED, channel->name, channel->channel_info->suspended->reason);
                  return 0;
              }