Merge chanserv-live into default.

[irc/quakenet/newserv.git] / miscreply / admin.c

diff --git a/miscreply/admin.c b/miscreply/admin.c
index 69659a283f4499e285a58e07615cfcafe30e8874..125227a1a28fe1d2fcb1ac09cfb218fd2d6762a9 100644 (file)
--- a/miscreply/admin.c
+++ b/miscreply/admin.c
@@ -1,17 +1,11 @@
 /* admin.c */
 
 #include "miscreply.h"
-#include "numeric.h"
 #include "../irc/irc.h"
 #include "../core/error.h"
-#include "../nick/nick.h"
 
-#include <string.h>
 
 
-
-/* TODO: grab admin info from conf */
-
 /* handle remote admin request
  *
  * <source numeric> ADMIN/AD <target server numeric>
@@ -21,13 +15,8 @@
  */
 int handleadminmsg(void *source, int cargc, char **cargv) {
 
-  nick *snick;                                          /* struct nick for source nick */
-
-  int i;                                                /* index for serverlist[] */
-  char *sourcenum = (char *)source;                     /* source user numeric */
-  char *targetnum = getmynumeric();                     /* target server numeric */
-  char *servernum;                                      /* server numeric parameter */
-  char *servername = myserver->content;                 /* servername */
+  nick *snick;                        /* struct nick for source nick */
+  char *sourcenum = (char *)source;   /* source user numeric */
 
   /* check parameters */
   if (cargc < 1) {
@@ -35,63 +24,33 @@ int handleadminmsg(void *source, int cargc, char **cargv) {
     return CMD_OK;
   }
 
-  /* get the parameter */
-  servernum = cargv[0];
-
-  /* from a server? */
-  if (IsServer(sourcenum))
-    return CMD_OK;
-
   /* find source user */ 
   if (!(snick = miscreply_finduser(sourcenum, "ADMIN")))
     return CMD_OK;
 
-  /* not for me */
-  if (!IsMeNum(servernum)) {
-
-    /* find the server */
-    if ((i = miscreply_findservernum(sourcenum, servernum, "ADMIN")) == -1)
-      return CMD_OK;
-
-    targetnum = longtonumeric(i, 2);
-    servername = serverlist[i].name->content;
-
-    /* tell user */
-    send_snotice(sourcenum, "ADMIN: Server %s is not a real server.", servername);
-    /*
-     * 423 ERR_NOADMININFO "source 423 target server :No administrative info available"
-     *                     "irc.netsplit.net 423 foobar irc.netsplit.net :No administrative info available"
-     */
-    send_reply(targetnum, ERR_NOADMININFO, sourcenum, "%s :No administrative info available", servername);
-  }
-
-  /* for me */
-  else {
-
-    /*
-     * 256 RPL_ADMINME "source 256 target :Administrative info about server"
-     *                 "irc.netsplit.net 256 foobar :Administrative info about irc.netsplit.net"
-     */
-    send_reply(targetnum, RPL_ADMINME, sourcenum, ":Administrative info about %s", servername);
-
-    /*
-     * 257 RPL_ADMINLOC1 "source 257 target :text"
-     *                   "irc.netsplit.net 257 foobar :The NetSplit IRC Network"
-     */
-    send_reply(targetnum, RPL_ADMINLOC1, sourcenum, ":The NetSplit IRC Network");
-
-    /*
-     * 258 RPL_ADMINLOC2 "source 258 target :text"
-     *                   "irc.netsplit.net 258 foobar :NetSplit IRC Server"
-     */
-    send_reply(targetnum, RPL_ADMINLOC2, sourcenum, ":NetSplit IRC Server");
-
-    /*
-     * 259 RPL_ADMINEMAIL "source 259 target :text"
-     *                    "irc.netsplit.net 259 foobar :IRC Admins <mail@host>"
-     */
-    send_reply(targetnum, RPL_ADMINEMAIL, sourcenum, ":IRC Admins <mail@host>");
-  }
+  /*
+   * 256 RPL_ADMINME "source 256 target :Administrative info about server"
+   *                 "irc.netsplit.net 256 foobar :Administrative info about irc.netsplit.net"
+   */
+  irc_send("%s 256 %s :Administrative info about %s", getmynumeric(), sourcenum, myserver->content);
+
+  /*
+   * 257 RPL_ADMINLOC1 "source 257 target :text"
+   *                   "irc.netsplit.net 257 foobar :Located at someplace"
+   */
+  irc_send("%s 257 %s :%s", getmynumeric(), sourcenum, admin1->content);
+
+  /*
+   * 258 RPL_ADMINLOC2 "source 258 target :text"
+   *                   "irc.netsplit.net 258 foobar :NetSplit IRC Server"
+   */
+  irc_send("%s 258 %s :%s", getmynumeric(), sourcenum, admin2->content);
+
+  /*
+   * 259 RPL_ADMINEMAIL "source 259 target :text"
+   *                    "irc.netsplit.net 259 foobar :IRC Admins <mail@host>"
+   */
+  irc_send("%s 259 %s :%s", getmynumeric(), sourcenum, admin3->content);
 
   return CMD_OK;
 }