[srvx-commits] CVS: services/src helpserv.c,1.60,1.61

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

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

Modified Files:
	helpserv.c 
Log Message:
Show the nick/account in the "request dropped" messages (featreq #666532)


Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** helpserv.c	26 Dec 2002 05:06:01 -0000	1.60
--- helpserv.c	13 Jan 2003 01:39:13 -0000	1.61
***************
*** 221,225 ****
  #define HSMSG_NOTIFY_ALLOWAUTH   "The user for request ID#%lu, $b%s$b, has been permitted by %s to authenticate to account $b%s$b without hostmask checking."
  #define HSMSG_NOTIFY_UNALLOWAUTH "The user for request ID#%lu, $b%s$b, has had their ability to authenticate without hostmask checking revoked by %s."
! #define HSMSG_NOTIFY_REQ_DROP    "Request ID#%lu has been $bdropped$b because %s."
  
  /* Presence and request-related messages */
--- 221,225 ----
  #define HSMSG_NOTIFY_ALLOWAUTH   "The user for request ID#%lu, $b%s$b, has been permitted by %s to authenticate to account $b%s$b without hostmask checking."
  #define HSMSG_NOTIFY_UNALLOWAUTH "The user for request ID#%lu, $b%s$b, has had their ability to authenticate without hostmask checking revoked by %s."
! #define HSMSG_NOTIFY_REQ_DROP    "Request ID#%lu (%s%s) has been $bdropped$b because %s."
  
  /* Presence and request-related messages */
***************
*** 3343,3347 ****
                              helpserv_msguser(user, HSMSG_REQ_DROPPED_PART, chan->name, req->id);
  
!                             if (req->helper && (hs->notify >= NOTIFY_DROP)) helpserv_notify(req->helper, HSMSG_NOTIFY_REQ_DROP, req->id, "they have left the help channel");
                          }
                          helpserv_log_request(req, "Dropped");
--- 3343,3347 ----
                              helpserv_msguser(user, HSMSG_REQ_DROPPED_PART, chan->name, req->id);
  
!                             if (req->helper && (hs->notify >= NOTIFY_DROP)) helpserv_notify(req->helper, HSMSG_NOTIFY_REQ_DROP, req->id, "", user->nick, "they have left the help channel");
                          }
                          helpserv_log_request(req, "Dropped");
***************
*** 3430,3434 ****
                  sprintf(buf, "%lu", req->id);
  
!                 if (req->helper && (req->hs->notify >= NOTIFY_DROP)) helpserv_notify(req->helper, HSMSG_NOTIFY_REQ_DROP, req->id, "the user has quit");
  
                  helpserv_log_request(req, "Dropped");
--- 3430,3434 ----
                  sprintf(buf, "%lu", req->id);
  
!                 if (req->helper && (req->hs->notify >= NOTIFY_DROP)) helpserv_notify(req->helper, HSMSG_NOTIFY_REQ_DROP, req->id, "", req->user->nick, "the user has quit");
  
                  helpserv_log_request(req, "Dropped");
***************
*** 3911,3915 ****
  
                  char buf[12];
!                 if (req->helper && (hs->notify >= NOTIFY_DROP)) helpserv_notify(req->helper, HSMSG_NOTIFY_REQ_DROP, req->id, "their account has been unregistered and no online users were authenticated to it");
                  sprintf(buf, "%lu", req->id);
                  helpserv_log_request(req, "Account unregistered");
--- 3911,3915 ----
  
                  char buf[12];
!                 if (req->helper && (hs->notify >= NOTIFY_DROP)) helpserv_notify(req->helper, HSMSG_NOTIFY_REQ_DROP, req->id, "*", req->handle->handle, "their account has been unregistered and no online users were authenticated to it");
                  sprintf(buf, "%lu", req->id);
                  helpserv_log_request(req, "Account unregistered");
***************
*** 3942,3946 ****
  
                      helpserv_notice(user, HSMSG_REQ_DROPPED_UNREG, handle->handle, hs->helpchan->name, req->id);
!                     if (req->helper && (hs->notify >= NOTIFY_DROP)) helpserv_notify(req->helper, HSMSG_NOTIFY_REQ_DROP, req->id, "their account has been unregistered and no online users were authenticated to it");
  
                      sprintf(buf, "%lu", req->id);
--- 3942,3946 ----
  
                      helpserv_notice(user, HSMSG_REQ_DROPPED_UNREG, handle->handle, hs->helpchan->name, req->id);
!                     if (req->helper && (hs->notify >= NOTIFY_DROP)) helpserv_notify(req->helper, HSMSG_NOTIFY_REQ_DROP, req->id, "*", req->handle->handle, "their account has been unregistered and no online users were authenticated to it");
  
                      sprintf(buf, "%lu", req->id);