[srvx-commits] CVS: services/src chanserv.c,1.303,1.304

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

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

Modified Files:
	chanserv.c 
Log Message:
Display the search pattern (if any) supplied by the user when listing channel users.


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.303
retrieving revision 1.304
diff -C2 -r1.303 -r1.304
*** chanserv.c	9 Nov 2002 01:30:45 -0000	1.303
--- chanserv.c	11 Nov 2002 03:20:09 -0000	1.304
***************
*** 245,249 ****
  
  /* Channel userlist */
! #define CSMSG_ACCESS_HEADER	"%s $b%ss:$b"
  #define CSMSG_USER_HEADER	"$b%-*s%-*s%s$b"
  #define CSMSG_USER_DATA		"$b%-*s%-*s$b%s"
--- 245,250 ----
  
  /* Channel userlist */
! #define CSMSG_ACCESS_SEARCH_HDR	"%s $b%ss$b matching %s:"
! #define CSMSG_ACCESS_HEADER	"%s $b%ss$b:"
  #define CSMSG_USER_HEADER	"$b%-*s%-*s%s$b"
  #define CSMSG_USER_DATA		"$b%-*s%-*s$b%s"
***************
*** 3465,3469 ****
  
  static void
! zoot_list(struct userNode *user, struct chanNode *channel, struct listData *list)
  {
      struct userData **users, *found;
--- 3466,3470 ----
  
  static void
! zoot_list(char *search, struct userNode *user, struct chanNode *channel, struct listData *list)
  {
      struct userData **users, *found;
***************
*** 3490,3494 ****
  	    if(list->highest == list->lowest)
  	    {
! 		chanserv_notice(user, CSMSG_ACCESS_HEADER, channel->name, accessNames[display]);
  		chanserv_notice(user, "$bNone.$b");
  		return;
--- 3491,3502 ----
  	    if(list->highest == list->lowest)
  	    {
!                 if(search)
!                 {
!                     chanserv_notice(user, CSMSG_ACCESS_SEARCH_HDR, channel->name, accessNames[display], search);
!                 }
!                 else
!                 {
!                     chanserv_notice(user, CSMSG_ACCESS_HEADER, channel->name, accessNames[display]);
!                 }
  		chanserv_notice(user, "$bNone.$b");
  		return;
***************
*** 3497,3501 ****
  	}
  
! 	chanserv_notice(user, CSMSG_ACCESS_HEADER, channel->name, accessNames[display]);
  	chanserv_notice(user, CSMSG_USER_HEADER, 0, "", list->handleLength+2, "Account:", "Last Seen:");
  
--- 3505,3516 ----
  	}
  
!         if(search)
!         {
!             chanserv_notice(user, CSMSG_ACCESS_SEARCH_HDR, channel->name, accessNames[display], search);
!         }
!         else
!         {
!             chanserv_notice(user, CSMSG_ACCESS_HEADER, channel->name, accessNames[display]);
!         }
  	chanserv_notice(user, CSMSG_USER_HEADER, 0, "", list->handleLength+2, "Account:", "Last Seen:");
  
***************
*** 3533,3537 ****
  
  static void
! def_list(struct userNode *user, struct chanNode *channel, struct listData *list)
  {
      struct userData **users, *found;
--- 3548,3552 ----
  
  static void
! def_list(char *search, struct userNode *user, struct chanNode *channel, struct listData *list)
  {
      struct userData **users, *found;
***************
*** 3540,3544 ****
      unsigned int i;
  
!     chanserv_notice(user, CSMSG_ACCESS_HEADER, channel->name, list->highest == list->lowest ? accessNames[list->lowest] : "user");
      chanserv_notice(user, CSMSG_USER_HEADER, ACCESSLEN, "Access:", list->handleLength, "Account:", "Last Seen:");
  
--- 3555,3566 ----
      unsigned int i;
  
!     if(search)
!     {
!         chanserv_notice(user, CSMSG_ACCESS_SEARCH_HDR, channel->name, list->highest == list->lowest ? accessNames[list->lowest] : "user", search);
!     }
!     else
!     {
!         chanserv_notice(user, CSMSG_ACCESS_HEADER, channel->name, list->highest == list->lowest ? accessNames[list->lowest] : "user");
!     }
      chanserv_notice(user, CSMSG_USER_HEADER, ACCESSLEN, "Access:", list->handleLength, "Account:", "Last Seen:");
  
***************
*** 3602,3606 ****
  cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int argc, unsigned char *argv[], struct svccmd *cmd, enum userLevel display_lowest, enum userLevel display_highest)
  {
!     void (*send_list)(struct userNode *, struct chanNode *, struct listData *);
      struct userData *uData, **users;
      struct chanData *cData;
--- 3624,3628 ----
  cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int argc, unsigned char *argv[], struct svccmd *cmd, enum userLevel display_lowest, enum userLevel display_highest)
  {
!     void (*send_list)(char *, struct userNode *, struct chanNode *, struct listData *);
      struct userData *uData, **users;
      struct chanData *cData;
***************
*** 3652,3656 ****
      lData.handleLength = handleLength < 11 ? 11 : handleLength + 3;
  
!     send_list(user, channel, &lData);
  
      return 1;
--- 3674,3678 ----
      lData.handleLength = handleLength < 11 ? 11 : handleLength + 3;
  
!     send_list(search, user, channel, &lData);
  
      return 1;