Removal of ancient SVN ID's part one

[irc/rqf/shadowircd.git] / modules / m_help.c

diff --git a/modules/m_help.c b/modules/m_help.c
index 24c562f341b6bee8b807f2a32fc35f93734f9964..109e599a0e91636350f4d4f4f0886431f8441905 100644 (file)
--- a/modules/m_help.c
+++ b/modules/m_help.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_help.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
@@ -31,7 +30,7 @@
 #include "numeric.h"
 #include "send.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "parse.h"
 #include "modules.h"
 #include "hash.h"
@@ -57,7 +56,6 @@ DECLARE_MODULE_AV1(help, NULL, NULL, help_clist, NULL, NULL, "$Revision: 254 $")
 
 /*
  * m_help - HELP message handler
- *      parv[0] = sender prefix
  */
 static int
 m_help(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
@@ -69,7 +67,6 @@ m_help(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 /*
  * mo_help - HELP message handler
- *      parv[0] = sender prefix
  */
 static int
 mo_help(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
@@ -81,7 +78,6 @@ mo_help(struct Client *client_p, struct Client *source_p, int parc, const char *
 /*
  * mo_uhelp - HELP message handler
  * This is used so that opers can view the user help file without deopering
- *      parv[0] = sender prefix
  */
 static int
 mo_uhelp(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
@@ -96,13 +92,21 @@ dohelp(struct Client *source_p, int flags, const char *topic)
        static const char ntopic[] = "index";
        struct cachefile *hptr;
        struct cacheline *lineptr;
-       dlink_node *ptr;
-       dlink_node *fptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *fptr;
 
        if(EmptyString(topic))
+       {
                topic = ntopic;
+               if(!EmptyString(ServerInfo.helpchan))
+                       sendto_one(source_p, ":%s 525 %s :Official Help Channel: %s",
+                                       me.name, source_p->name, ServerInfo.helpchan);
+               if(!EmptyString(ServerInfo.helpurl))
+                       sendto_one(source_p, ":%s 526 %s :Official Help URL: %s",
+                                       me.name, source_p->name, ServerInfo.helpurl);
+       }
 
-       hptr = irc_dictionary_retrieve(help_dict, topic);
+       hptr = irc_dictionary_retrieve(flags & HELP_OPER ? help_dict_oper : help_dict_user, topic);
 
        if(hptr == NULL || !(hptr->flags & flags))
        {
@@ -118,7 +122,7 @@ dohelp(struct Client *source_p, int flags, const char *topic)
        sendto_one(source_p, form_str(RPL_HELPSTART),
                   me.name, source_p->name, topic, lineptr->data);
 
-       DLINK_FOREACH(ptr, fptr->next)
+       RB_DLINK_FOREACH(ptr, fptr->next)
        {
                lineptr = ptr->data;