ircd: implement EXTENDCHANS, based on ircd-seven (with some improvements from chatircd)

[solanum.git] / modules / m_info.c

diff --git a/modules/m_info.c b/modules/m_info.c
index bd2171afb385598853bf4e900206d8056e55002d..202716a658ef9afc0353d8a0d1cb3143ea3399f6 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -119,7 +119,7 @@ static struct InfoStruct info_table[] = {
                "client_exit",
                OUTPUT_BOOLEAN,
                &ConfigFileEntry.client_exit,
-               "Prepend 'Client Exit:' to user QUIT messages"
+               "Prepend 'Quit:' to user QUIT messages"
        },
        {
                "client_flood_max_lines",
@@ -242,6 +242,12 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.fname_serverlog,
                "Server connect/disconnect log file"
        },
+       {
+               "fname_killlog",
+               OUTPUT_STRING,
+               &ConfigFileEntry.fname_killlog,
+               "KILL log file"
+       },
        {
                "fname_klinelog",
                OUTPUT_STRING,
@@ -350,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,
@@ -407,7 +407,7 @@ static struct InfoStruct info_table[] = {
        {
                "reject_after_count",
                OUTPUT_DECIMAL,
-               &ConfigFileEntry.reject_after_count,   
+               &ConfigFileEntry.reject_after_count,
                "Client rejection threshold setting",
        },
        {
@@ -479,13 +479,13 @@ static struct InfoStruct info_table[] = {
        {
                "throttle_count",
                OUTPUT_DECIMAL,
-               &ConfigFileEntry.throttle_count, 
+               &ConfigFileEntry.throttle_count,
                "Connection throttle threshold",
        },
        {
                "throttle_duration",
                OUTPUT_DECIMAL,
-               &ConfigFileEntry.throttle_duration, 
+               &ConfigFileEntry.throttle_duration,
                "Connection throttle duration",
        },
        {
@@ -510,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",
@@ -584,6 +584,12 @@ static struct InfoStruct info_table[] = {
                &ConfigChannel.max_chans_per_user,
                "Maximum number of channels a user can join",
        },
+       {
+               "max_chans_per_user_large",
+               OUTPUT_DECIMAL,
+               &ConfigChannel.max_chans_per_user_large,
+               "Maximum extended number of channels a user can join",
+       },
        {
                "no_create_on_split",
                OUTPUT_BOOLEAN_YN,
@@ -752,11 +758,11 @@ send_birthdate_online_time(struct Client *source_p)
 {
        char tbuf[26]; /* this needs to be 26 - see ctime_r manpage */
        sendto_one(source_p, ":%s %d %s :Birth Date: %s, compile # %s",
-                       get_id(&me, source_p), RPL_INFO, 
+                       get_id(&me, source_p), RPL_INFO,
                        get_id(source_p, source_p), creation, generation);
 
        sendto_one(source_p, ":%s %d %s :On-line since %s",
-                       get_id(&me, source_p), RPL_INFO, 
+                       get_id(&me, source_p), RPL_INFO,
                        get_id(source_p, source_p), rb_ctime(startup_time, tbuf, sizeof(tbuf)));
 }
 
@@ -781,18 +787,18 @@ 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, 
+                                       infoptr->name, infoptr->intvalue,
                                        infoptr->desc);
                }
                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, 
+                                       infoptr->name, infoptr->strvalue,
                                        infoptr->desc);
                }
        }
@@ -804,14 +810,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,
@@ -827,7 +833,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,
@@ -843,7 +849,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,
@@ -860,7 +866,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,
@@ -876,7 +882,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,
@@ -890,7 +896,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",
@@ -908,7 +914,7 @@ send_conf_options(struct Client *source_p)
 }
 
 /* info_spy()
- * 
+ *
  * input        - pointer to client
  * output       - none
  * side effects - hook doing_info is called