missing file

[irc/quakenet/newserv.git] / control / control.c

diff --git a/control/control.c b/control/control.c
index 741fa079b1ed4e2474da3ceed675cc67d23b62ff..7a00f0e02f30e82ae3ad33d1342218fb289b0693 100644 (file)
--- a/control/control.c
+++ b/control/control.c
@@ -133,15 +133,15 @@ void handlestats(int hooknum, void *arg) {
 }
 
 int controlstatus(void *sender, int cargc, char **cargv) {
-  unsigned long level=5;
-
+  unsigned long level=999;
   hooknick=(nick *)sender;
   
   if (cargc>0) {
     level=strtoul(cargv[0],NULL,10);
   }
-  
+
   registerhook(HOOK_CORE_STATSREPLY,&handlestats);
+
   triggerhook(HOOK_CORE_STATSREQUEST,(void *)level);
   deregisterhook(HOOK_CORE_STATSREPLY,&handlestats);
   return CMD_OK;
@@ -198,10 +198,17 @@ int controlwhois(void *sender, int cargc, char **cargv) {
   if (target->umodes) {
     controlreply((nick *)sender,"Umode(s)  : %s",printflags(target->umodes,umodeflags));
   }
+  if (IsOper(target) && target->opername)
+    controlreply((nick *)sender,"Opered as : %s",target->opername->content);
   if (IsAccount(target)) {
     controlreply((nick *)sender,"Account   : %s",target->authname);
     if (target->accountts) 
       controlreply((nick *)sender,"AccountTS : %ld",target->accountts);
+    if (target->auth)  {
+      controlreply((nick *)sender,"UserID    : %ld",target->auth->userid);
+      if (target->auth->flags) 
+        controlreply((nick *)sender,"AccFlags  : %s",printflags(target->auth->flags,accountflags));
+    }
   }
 
   hooknick=(nick *)sender;
@@ -325,7 +332,7 @@ int die(void *sender, int cargc, char **cargv) {
     return CMD_USAGE;
   }
 
-  controlwall(0,0,"DIE from %s: %s",((nick *)sender)->nick, cargv[0]);
+  controlwall(NO_OPER,NL_OPERATIONS,"DIE from %s: %s",((nick *)sender)->nick, cargv[0]);
   
   newserv_shutdown_pending=1;
   
@@ -338,7 +345,7 @@ int controlchannel(void *sender, int cargc, char **cargv) {
   chanban *cbp;
   char buf[BUFSIZE];
   char buf2[12];
-  int i,j;
+  int i,j, ops=0, voice=0;
   char timebuf[30];
 
   if (cargc<1)
@@ -360,6 +367,8 @@ int controlchannel(void *sender, int cargc, char **cargv) {
     controlreply((nick *)sender,"Topic   : %s",cp->topic->content);
     strftime(timebuf, 30, "%d/%m/%y %H:%M", localtime(&(cp->topictime)));
     controlreply((nick *)sender,"T-time  : %ld [%s]",cp->topictime,timebuf);
+  } else { 
+    controlreply((nick *)sender,"Topic   : (none)");
   }
   controlreply((nick *)sender,"Mode(s) : %s %s%s%s",printflags(cp->flags,cmodeflags),IsLimit(cp)?buf2:"",
     IsLimit(cp)?" ":"",IsKey(cp)?cp->key->content:"");
@@ -380,6 +389,10 @@ int controlchannel(void *sender, int cargc, char **cargv) {
         break;
     }
     if (cp->users->content[j]!=nouser) {      
+      if (cp->users->content[j]&CUMODE_OP)
+        ops++;
+      else if (cp->users->content[j]&CUMODE_VOICE) 
+        voice++;
       np=getnickbynumeric(cp->users->content[j]);
       sprintf(&buf[i*18],"%c%c%-15s ",cp->users->content[j]&CUMODE_VOICE?'+':' ',
         cp->users->content[j]&CUMODE_OP?'@':' ', np?np->nick:"!BUG-NONICK!");
@@ -388,7 +401,7 @@ int controlchannel(void *sender, int cargc, char **cargv) {
         buf[i*18]=' ';
     }
   }
-
+  controlreply((nick *)sender, "Users   : Opped: %d, Voiced: %d", ops,voice);
   for (cbp=cp->bans;cbp;cbp=cbp->next) {
     controlreply((nick *)sender,"Ban     : %s",bantostringdebug(cbp));
   }
@@ -594,3 +607,15 @@ void controlnoticeopers(flag_t permissionlevel, flag_t noticelevel, char *format
       if (IsOper(np))
         controlnotice(np, "%s", broadcast);
 }
+
+void controlnswall(int noticelevel, char *format, ...) {
+  char broadcast[512];
+  va_list va;
+
+  va_start(va, format);
+  vsnprintf(broadcast, sizeof(broadcast), format, va);
+  va_end(va);
+
+  controlwall(NO_OPER, noticelevel, "%s", broadcast);
+}
+