implement configurable channel modes (closes #31)

[solanum.git] / modules / m_info.c

diff --git a/modules/m_info.c b/modules/m_info.c
index 8d06e76c03ce970351c036b6a24f76e0b3994914..301b964572794a832098c47bcbc63a1a59759c36 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -356,12 +356,6 @@ static struct InfoStruct info_table[] = {
                &ServerInfo.network_name,
                "Network name"
        },
-       {
-               "network_desc",
-               OUTPUT_STRING,
-               &ServerInfo.network_desc,
-               "Network description"
-       },
        {
                "nick_delay",
                OUTPUT_DECIMAL,
@@ -516,7 +510,7 @@ static struct InfoStruct info_table[] = {
                "warn_no_nline",
                OUTPUT_BOOLEAN,
                &ConfigFileEntry.warn_no_nline,
-               "Display warning if connecting server lacks N-line"
+               "Display warning if connecting server lacks connect block"
        },
        {
                "use_propagated_bans",
@@ -787,7 +781,7 @@ send_conf_options(struct Client *source_p)
        {
                if(infoptr->intvalue)
                {
-                       sendto_one(source_p, ":%s %d %s :%-30s %-5d [%-30s]",
+                       sendto_one(source_p, ":%s %d %s :%-30s %-16d [%s]",
                                        get_id(&me, source_p), RPL_INFO,
                                        get_id(source_p, source_p),
                                        infoptr->name, infoptr->intvalue,
@@ -795,7 +789,7 @@ send_conf_options(struct Client *source_p)
                }
                else
                {
-                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                        get_id(&me, source_p), RPL_INFO,
                                        get_id(source_p, source_p),
                                        infoptr->name, infoptr->strvalue,
@@ -810,14 +804,14 @@ send_conf_options(struct Client *source_p)
        {
                switch (info_table[i].output_type)
                {
-                       /*
-                        * For "char *" references
-                        */
+                               /*
+                                * For "char *" references
+                                */
                        case OUTPUT_STRING:
                                {
                                        char *option = *((char **) info_table[i].option);
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                                        get_id(&me, source_p), RPL_INFO,
                                                        get_id(source_p, source_p),
                                                        info_table[i].name,
@@ -833,7 +827,7 @@ send_conf_options(struct Client *source_p)
                                {
                                        char *option = (char *) info_table[i].option;
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                                        get_id(&me, source_p), RPL_INFO,
                                                        get_id(source_p, source_p),
                                                        info_table[i].name,
@@ -849,7 +843,7 @@ send_conf_options(struct Client *source_p)
                                {
                                        int option = *((int *) info_table[i].option);
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5d [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16d [%s]",
                                                        get_id(&me, source_p), RPL_INFO,
                                                        get_id(source_p, source_p),
                                                        info_table[i].name,
@@ -866,7 +860,7 @@ send_conf_options(struct Client *source_p)
                                {
                                        int option = *((int *) info_table[i].option);
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                                        get_id(&me, source_p), RPL_INFO,
                                                        get_id(source_p, source_p),
                                                        info_table[i].name,
@@ -882,7 +876,7 @@ send_conf_options(struct Client *source_p)
                                {
                                        int option = *((int *) info_table[i].option);
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                                        get_id(&me, source_p), RPL_INFO,
                                                        get_id(source_p, source_p),
                                                        info_table[i].name,
@@ -896,7 +890,7 @@ send_conf_options(struct Client *source_p)
                                {
                                        int option = *((int *) info_table[i].option);
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                                        me.name, RPL_INFO, source_p->name,
                                                        info_table[i].name,
                                                        option ? ((option == 1) ? "MASK" : "YES") : "NO",