[srvx-commits] CVS: services/src global.c,1.59,1.60

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

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

Modified Files:
	global.c 
Log Message:
Bail early in global_message() if Global was disabled

Index: global.c
===================================================================
RCS file: /cvsroot/srvx/services/src/global.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** global.c	26 Sep 2003 15:16:58 -0000	1.59
--- global.c	3 Oct 2003 02:42:27 -0000	1.60
***************
*** 344,348 ****
  	{
  	    user = curr_helpers.list[n];
!             if (IsOper(user)) continue;
  	    notice_target(user->nick, message);
  	}
--- 344,349 ----
  	{
  	    user = curr_helpers.list[n];
!             if (IsOper(user))
!                 continue;
  	    notice_target(user->nick, message);
  	}
***************
*** 355,369 ****
      struct globalMessage *message;
  
!     if(!targets)
!     {
  	return;
-     }
  
      message = message_add(targets | MESSAGE_OPTION_SOURCELESS, now, 0, "", text);
- 
      if(!message)
-     {
  	return;
-     }
  
      message_send(message);
--- 356,365 ----
      struct globalMessage *message;
  
!     if(!targets || !global)
  	return;
  
      message = message_add(targets | MESSAGE_OPTION_SOURCELESS, now, 0, "", text);
      if(!message)
  	return;
  
      message_send(message);