[srvx-commits] CVS: services/src chanserv.c,1.261,1.262

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

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

Modified Files:
	chanserv.c 
Log Message:
make "/msg chanserv access" show access in all channels, and say so
  (not just ones where infoline is set)


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -C2 -r1.261 -r1.262
*** chanserv.c	4 Aug 2002 23:17:12 -0000	1.261
--- chanserv.c	5 Aug 2002 01:26:05 -0000	1.262
***************
*** 289,293 ****
  #define CSMSG_IS_CHANSERV	"$b$C$b is the $bchannel service bot$b."
  #define CSMSG_ACCESS_SELF_ONLY  "You may only see the list of infolines for yourself (by using $b%s$b with no arguments)."
! #define CSMSG_INFOLINE_LIST     "Showing all infolines for account $b%s$b:"
  #define CSMSG_USER_NO_ACCESS    "%s lacks access to %s."
  #define CSMSG_USER_HAS_ACCESS	"%s is %s $b%s$b in %s."
--- 289,293 ----
  #define CSMSG_IS_CHANSERV	"$b$C$b is the $bchannel service bot$b."
  #define CSMSG_ACCESS_SELF_ONLY  "You may only see the list of infolines for yourself (by using $b%s$b with no arguments)."
! #define CSMSG_INFOLINE_LIST     "Showing all channel entries for account $b%s$b:"
  #define CSMSG_USER_NO_ACCESS    "%s lacks access to %s."
  #define CSMSG_USER_HAS_ACCESS	"%s is %s $b%s$b in %s."
***************
*** 3286,3292 ****
          chanserv_notice(user, CSMSG_INFOLINE_LIST, target_handle->handle);
          for (cList = target_handle->channels; cList; cList = cList->next) {
!             if(!cList->user->info) continue;
              chanName = cList->channel->channel ? cList->channel->channel->name : cList->channel->suspended->name;
!             chanserv_notice(user, "[%s (%s)] %s", chanName, accessNames[cList->user->access], cList->user->info);
          }
          return 1;
--- 3286,3297 ----
          chanserv_notice(user, CSMSG_INFOLINE_LIST, target_handle->handle);
          for (cList = target_handle->channels; cList; cList = cList->next) {
!             if(cList->user->access == ulHelper) continue;
              chanName = cList->channel->channel ? cList->channel->channel->name : cList->channel->suspended->name;
!             if(cList->user->info)
!             {
!                 chanserv_notice(user, "[%s (%s)] %s", chanName, accessNames[cList->user->access], cList->user->info);
!             } else {
!                 chanserv_notice(user, "[%s (%s)]", chanName, accessNames[cList->user->access]);
!             }
          }
          return 1;