Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv27807/src
Modified Files:
nickserv.c
Log Message:
use Global to announce account merges
Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -C2 -r1.177 -r1.178
*** nickserv.c 4 Jul 2002 03:46:26 -0000 1.177
--- nickserv.c 7 Jul 2002 21:25:40 -0000 1.178
***************
*** 40,43 ****
--- 40,44 ----
#include "conf.h"
#include "dict.h"
+ #include "global.h"
#include "hash.h"
#include "helpfile.h"
***************
*** 236,239 ****
--- 237,241 ----
#define NSMSG_CANNOT_MERGE_SELF "You cannot merge account $b%s$b with itself."
#define NSMSG_HANDLES_MERGED "Merged account $b%s$b into $b%s$b."
+ #define NSMSG_HANDLES_MERGED_G "%s (%s) merged account %s into %s."
#define NSMSG_NICK_OWNED "%s is a registered nick - you must auth to account %s or change your nick, or the owner may disconnect you."
***************
*** 2511,2514 ****
--- 2513,2517 ----
struct chanList *cList, *cListNext;
unsigned int ii, jj;
+ char buffer[MAXLEN];
NICKSERV_MIN_PARMS(3);
***************
*** 2603,2607 ****
--- 2606,2612 ----
/* Notify of success. */
+ sprintf(buffer, NSMSG_HANDLES_MERGED_G, user->nick, user->handle_info->handle, hi_from->handle, hi_to->handle);
nickserv_notice(user, NSMSG_HANDLES_MERGED, hi_from->handle, hi_to->handle);
+ global_message(MESSAGE_RECIPIENT_STAFF, buffer);
/* Unregister the "from" handle. */
|
