[srvx-commits] CVS: services/src chanserv.c,1.311,1.312

[Adrian D. <sai...@us...>]

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

Modified Files:
	chanserv.c 
Log Message:
cmd_move: Give DNR reasons to privileged users, like cmd_register does


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.311
retrieving revision 1.312
diff -C2 -r1.311 -r1.312
*** chanserv.c	23 Nov 2002 04:33:23 -0000	1.311
--- chanserv.c	24 Nov 2002 21:55:27 -0000	1.312
***************
*** 1917,1920 ****
--- 1917,1921 ----
      int new_channel = 0, force = 0;
      char reason[MAXLEN];
+     struct do_not_register *dnr;
  
      REQUIRE_PARAMS(2);
***************
*** 1930,1936 ****
      {
  
!         if(!force && chanserv_is_dnr(target->name, NULL))
          {
!             chanserv_notice(user, CSMSG_DNR_CHANNEL_MOVE, argv[1]);
              return 0;
          }
--- 1931,1944 ----
      {
  
!         if(!force && (dnr = chanserv_is_dnr(target->name, NULL)))
          {
!             if(IsPrivileged(user))
!             {
!                 chanserv_notice(user, CSMSG_DNR_INFO, dnr->chan_name, dnr->setter, dnr->reason);
!             }
!             else
!             {
!                 chanserv_notice(user, CSMSG_DNR_CHANNEL_MOVE, argv[1]);
!             }
              return 0;
          }
***************
*** 1950,1966 ****
          }
  
!         for(uData = channel->channel_info->users; uData; uData = uData->next)
          {
!             if((uData->access == ulOwner) && chanserv_is_dnr(NULL, uData->handle))
              {
!                 chanserv_notice(user, CSMSG_DNR_CHANNEL_MOVE, argv[1]);
!                 return 0;
              }
-         }
  
!         if(!force && chanserv_is_dnr(argv[1], NULL))
!         {
!             chanserv_notice(user, CSMSG_DNR_CHANNEL_MOVE, argv[1]);
!             return 0;
          }
  
--- 1958,1991 ----
          }
  
!         if (!force)
          {
!             for(uData = channel->channel_info->users; uData; uData = uData->next)
              {
!                 if((uData->access == ulOwner) && (dnr = chanserv_is_dnr(NULL, uData->handle)))
!                 {
!                     if(IsPrivileged(user))
!                     {
!                         chanserv_notice(user, CSMSG_DNR_INFO, dnr->chan_name, dnr->setter, dnr->reason);
!                     }
!                     else
!                     {
!                         chanserv_notice(user, CSMSG_DNR_CHANNEL_MOVE, argv[1]);
!                     }
!                     return 0;
!                 }
              }
  
!             if((dnr = chanserv_is_dnr(argv[1], NULL)))
!             {
!                 if(IsPrivileged(user))
!                 {
!                     chanserv_notice(user, CSMSG_DNR_INFO, dnr->chan_name, dnr->setter, dnr->reason);
!                 }
!                 else
!                 {
!                     chanserv_notice(user, CSMSG_DNR_CHANNEL_MOVE, argv[1]);
!                 }
!                 return 0;
!             }
          }