G 2.17

Users of level lamer authing after join will be kicked
Fixed an account expiration issue for users of level lamer
Added command help for commands ged and text to the svn
Invite command problems with friend users fixed (original fix by paul)
Added ticket message support
Caps kick now understands /me and excludes it from the test
Some cleancups
Several fixes related to userlevels, mostly to the new H_FRIEND
Added new command channel to print all channel users

diff --git a/helpmod2/changelist b/helpmod2/changelist
index d855aa5b22d9437e0e1ca7360472e6f48855943d..1728603036b420fbb1a01da7b62abf6b0c70ed78 100644 (file)
--- a/helpmod2/changelist
+++ b/helpmod2/changelist
@@ -376,3 +376,14 @@ Staff can now join ticket using oper only channels
 Added new userlevel friend
 Fixed an ordering problem on the verbose queue
 TODO ticket messages
+
+2.17
+Users of level lamer authing after join will be kicked
+Fixed an account expiration issue for users of level lamer
+Added command help for commands ged and text to the svn
+Invite command problems with friend users fixed (original fix by paul)
+Added ticket message support
+Caps kick now understands /me and excludes it from the test
+Some cleancups
+Several fixes related to userlevels, mostly to the new H_FRIEND
+Added new command channel to print all channel users

diff --git a/helpmod2/commands/listuser b/helpmod2/commands/listuser
index 20346af0486e6b6d68dd5078339bae639defbf62..5fe82aef2a98d45d37723dc2d2e79dc2e4662450 100644 (file)
--- a/helpmod2/commands/listuser
+++ b/helpmod2/commands/listuser
@@ -1,4 +1,5 @@
-Syntax:  listuser [pattern]
+Syntax:  listuser [level] [pattern]
 Example: listuser *
 Lists H accounts based on the pattern.
 If no pattern is specified, all accounts are listed.
+If level is specified then the search is performed only on the users of the given level. Level is an integer from 0 (lamer) to 6 (administrator)

diff --git a/helpmod2/commands/ticket b/helpmod2/commands/ticket
index 0f5e072fac4eb4d17d80fc635524cdadd0a5008f..56b3b99bd56cb96e096aa545ac2c0b6a9e4e38ef 100644 (file)
--- a/helpmod2/commands/ticket
+++ b/helpmod2/commands/ticket
@@ -1,5 +1,6 @@
-Syntax:  ticket channel [nick1] [expiration]
+Syntax:  ticket channel [nick1] [expiration] [message]
 Example: ticket #feds user
 Gives the user an invite ticket for the channel.
 With the ticket, the user can use the invite command to get to the channel.
 Ticket expiration time is optional.
+Message is optional but must be defined as a string with a custom expiration time.

diff --git a/helpmod2/hchannel.c b/helpmod2/hchannel.c
index 2fee5eda15f34bebb7b86e4cfe534711a98c7635..875d7144f14fa96ab24b7a49614c92ef51421c08 100644 (file)
--- a/helpmod2/hchannel.c
+++ b/helpmod2/hchannel.c
@@ -246,7 +246,7 @@ void hchannel_remove_inactive_users(void)
         {
             hchannel_user *tmp;
             for (tmp = hchan->channel_users;tmp;tmp = tmp->next)
-                if (huser_get_level(tmp->husr) > H_PEON)
+                if (huser_get_level(tmp->husr) >= H_TRIAL)
                 {
                     huser_channel *huserchan = huser_on_channel(tmp->husr, hchan);
                     if ((time(NULL) - huserchan->last_activity < HELPMOD_QUEUE_TIMEOUT) && (huserchan->last_activity != tmp->time_joined))

diff --git a/helpmod2/hcommands.c b/helpmod2/hcommands.c
index c33d9117ad55c5542998964d8c1861008cc9d003..6666cecd6634d9fd49ca483dfe2f396597a60e28 100644 (file)
--- a/helpmod2/hcommands.c
+++ b/helpmod2/hcommands.c
@@ -897,7 +897,7 @@ static void helpmod_cmd_term_find_general (huser *sender, channel* returntype, i
         helpmod_reply(sender, returntype, "No term found matching '%s'", argv[0]);
         return;
     }
-    if (returntype != NULL && huser_get_level(sender) > H_PEON)
+    if (returntype != NULL && huser_get_level(sender) >= H_TRIAL)
     {
         HCHANNEL_VERIFY_AUTHORITY(hchan, sender);
 
@@ -1123,7 +1123,7 @@ void helpmod_cmd_term (huser *sender, channel* returntype, char* ostr, int argc,
             helpmod_reply(sender, returntype, "No term found matching '%s'", argv[1]);
             return;
         }
-        if (returntype != NULL && huser_get_level(sender) > H_PEON)
+        if (returntype != NULL && huser_get_level(sender) >= H_TRIAL)
             helpmod_message_channel(hchannel_get_by_channel(returntype), "(%s): %s", htrm->name->content, htrm->description->content);
         else
             helpmod_reply(sender, returntype, "(%s): %s", htrm->name->content, htrm->description->content);
@@ -2277,7 +2277,7 @@ static void helpmod_cmd_invite (huser *sender, channel *returntype, char* arg, i
         return;
     }
 
-    if (huser_get_level(sender) == H_PEON || huser_get_level(sender) == H_FRIEND)
+    if (huser_get_level(sender) < H_STAFF)
     {
         hticket *htick;
         hchan = hchannel_get_by_name(argv[0]);
@@ -2347,6 +2347,7 @@ static void helpmod_cmd_ticket (huser *sender, channel* returntype, char* ostr,
     hchannel *hchan;
     huser *husr;
     hticket *htick;
+    const char *message = NULL;
 
     if (argc < 1)
     {
@@ -2392,12 +2393,17 @@ static void helpmod_cmd_ticket (huser *sender, channel* returntype, char* ostr,
         helpmod_reply(sender, returntype, "Cannot issue a ticket: User %s does not require a ticket", argv[1]);
         return;
     }
-    if (argc >= 3)
+    if (argc > 3)
     {
-        int tmp;
+       int tmp;
         tmp = helpmod_read_strtime(argv[2]);
         if (tmp > HDEF_m && tmp < 2 * HDEF_M)
-            expiration = tmp;
+           expiration = tmp;
+    }
+    if (argc >= 4 && strlen(argv[3]) < 128)
+    {
+       if (argv[3][0] != '\0')
+            message = argv[3];
     }
 
     htick = hticket_get(huser_get_auth(husr), hchan);
@@ -2405,7 +2411,7 @@ static void helpmod_cmd_ticket (huser *sender, channel* returntype, char* ostr,
     if (htick != NULL)
         htick->time_expiration = time(NULL) + expiration;
     else
-        hticket_add(huser_get_auth(husr), time(NULL) + expiration, hchan);
+        hticket_add(huser_get_auth(husr), time(NULL) + expiration, hchan, message);
 
     helpmod_reply(sender, returntype, "Issued an invite ticket to user %s for channel %s expiring in %s", huser_get_nick(husr), hchannel_get_name(hchan), helpmod_strtime(expiration));
     helpmod_reply(husr, NULL, "You have been issued an invite ticket for channel %s. This ticket is valid for a period of %s. You can use my invite command to get to the channel now. Type /msg %s invite %s",hchannel_get_name(hchan), helpmod_strtime(HTICKET_EXPIRATION_TIME), helpmodnick->nick, hchannel_get_name(hchan));
@@ -2517,9 +2523,7 @@ static void helpmod_cmd_showticket (huser *sender, channel* returntype, char* os
     int i;
 
     DEFINE_HCHANNEL;
-/*
-    HCHANNEL_VERIFY_AUTHORITY(hchan, sender);
-*/
+
     if (argc > H_CMD_MAX_ARGS)
         argc = H_CMD_MAX_ARGS;
 
@@ -2546,8 +2550,11 @@ static void helpmod_cmd_showticket (huser *sender, channel* returntype, char* os
         {
             helpmod_reply(sender, returntype, "Cannot show the ticket: User %s does not have a valid ticket for channel %s", argv[i], hchannel_get_name(hchan));
             continue;
-        }
-        helpmod_reply(sender, returntype, "User %s has a ticket for channel %s expiring in %s", argv[i], hchannel_get_name(hchan), helpmod_strtime(htick->time_expiration - time(NULL)));
+       }
+       if (htick->message == NULL)
+           helpmod_reply(sender, returntype, "User %s has a ticket for channel %s expiring in %s. No message is attached.", argv[i], hchannel_get_name(hchan), helpmod_strtime(htick->time_expiration - time(NULL)));
+       else
+           helpmod_reply(sender, returntype, "User %s has a ticket for channel %s expiring in %s. With message: %s", argv[i], hchannel_get_name(hchan), helpmod_strtime(htick->time_expiration - time(NULL)), htick->message->content);
     }
 }
 
@@ -3266,7 +3273,7 @@ static void helpmod_cmd_text (huser *sender, channel* returntype, char* ostr, in
        {
            if (!fgets(buffer, 512, in))
                 break;
-           if (returntype != NULL && huser_get_level(sender) > H_PEON)
+           if (returntype != NULL && huser_get_level(sender) >= H_TRIAL)
                helpmod_message_channel(hchannel_get_by_channel(returntype), "%s", buffer);
            else
                helpmod_reply(sender, returntype, "%s", buffer);
@@ -3450,6 +3457,30 @@ static void helpmod_cmd_evilhack2 (huser *sender, channel* returntype, char* ost
     helpmod_reply(sender, returntype, "Evilhack2 done: Swapped %d and %d", first, second);
 }
 
+static void helpmod_cmd_channel (huser *sender, channel* returntype, char* ostr, int argc, char *argv[])
+{
+    hchannel *hchan;
+    hchannel_user *hchanuser;
+
+    DEFINE_HCHANNEL;
+
+    if (hchan == NULL)
+    {
+       helpmod_reply(sender, returntype, "Can not show channel: Channel not specified");
+        return;
+    }
+
+    HCHANNEL_VERIFY_AUTHORITY(hchan, sender);
+
+    helpmod_reply(sender, returntype, "Users for channel %s", hchannel_get_name(hchan));
+    helpmod_reply(sender, returntype, "Nick             Account          User level               Idle time");
+
+    for (hchanuser = hchan->channel_users;hchanuser;hchanuser=hchanuser->next)
+       helpmod_reply(sender, returntype, "%-16s %-16s %-24s %s",hchanuser->husr->real_user->nick,hchanuser->husr->account?hchanuser->husr->account->name->content:"-",hlevel_name(huser_get_level(hchanuser->husr)), helpmod_strtime(time(NULL)-huser_on_channel(hchanuser->husr, hchan)->last_activity));
+
+    helpmod_reply(sender, returntype, "Listed %d users for channel %s", hchannel_count_users(hchan, H_ANY), hchannel_get_name(hchan));
+}
+
 /* old H stuff */
 void helpmod_cmd_load (huser *sender, channel *returntype, char* arg, int argc, char *argv[])
 {
@@ -3624,6 +3655,7 @@ void hcommands_add(void)
     hcommand_add("friend", H_STAFF, helpmod_cmd_friend, "Sets the userlevel of the target to friend (lvl 2)");
     hcommand_add("trial", H_OPER, helpmod_cmd_trial, "Sets the userlevel of the target to trial staff (lvl 3)");
     hcommand_add("staff", H_OPER, helpmod_cmd_staff, "Sets the userlevel of the target to staff (lvl 4)");
+
     hcommand_add("oper", H_OPER, helpmod_cmd_oper, "Sets the userlevel of the target to oper (lvl 5)");
     hcommand_add("admin", H_ADMIN, helpmod_cmd_admin, "Sets the userlevel of the target to admin (lvl 6)");
     hcommand_add("deluser", H_OPER, helpmod_cmd_deluser, "Removes an account from " HELPMOD_NICK);
@@ -3699,6 +3731,7 @@ void hcommands_add(void)
     hcommand_add("rating", H_TRIAL, helpmod_cmd_rating, "Simple rating for the current week");
     hcommand_add("writedb", H_OPER, helpmod_cmd_writedb, "Writes the " HELPMOD_NICK " database to disk");
 
+    hcommand_add("channel", H_TRIAL, helpmod_cmd_channel, "Gives a list of all channel users");
     /*hcommand_add("megod", H_PEON, helpmod_cmd_megod, "Gives you userlevel 4, if you see this in the final version, please kill strutsi");*/
     /*hcommand_add("test", H_PEON, helpmod_cmd_test, "Gives you userlevel 4, if you see this in the final version, please kill strutsi");*/
 }

diff --git a/helpmod2/hconf.c b/helpmod2/hconf.c
index 0e287f77b3ba5ee7ac7e17e6b1499cd56e1643a3..2de5ba2ac36b8e13121d9ef9a00a5783df751d72 100644 (file)
--- a/helpmod2/hconf.c
+++ b/helpmod2/hconf.c
@@ -830,7 +830,22 @@ int helpmod_config_read_ticket(FILE *in)
         return -1;
 
     if (tmp > time(NULL))
-        hticket_add(buf3, tmp, hchannel_get_by_name(buf2));
+    {
+       if (hconf_version < HELPMOD_VERSION_2_17)
+           hticket_add(buf3, tmp, hchannel_get_by_name(buf2), NULL);
+       else
+       {
+           fgets(ptr = buf, 256, in);
+           if (feof(in))
+               return -1;
+           helpmod_line_fix(&ptr);
+
+           if (*ptr == '\0')
+               hticket_add(buf3, tmp, hchannel_get_by_name(buf2), NULL);
+           else
+                hticket_add(buf3, tmp, hchannel_get_by_name(buf2), ptr);
+       }
+    }
 
     return 0;
 }
@@ -840,6 +855,10 @@ int helpmod_config_write_ticket(FILE *out, hticket *htick, hchannel *hchan)
     fprintf(out, "\t%s\n", hchannel_get_name(hchan));
     fprintf(out, "\t%s\n", htick->authname);
     fprintf(out, "\t%u\n", (unsigned int)htick->time_expiration);
+    if (htick->message)
+       fprintf(out, "\t%s\n", htick->message->content);
+    else
+        fprintf(out, "\n");
 
     return 0;
 }

diff --git a/helpmod2/helpmod.h b/helpmod2/helpmod.h
index 0f3511a7a70c15098863e1ae7b1ef02a989f1dc5..5adbd676796944b9cc3fc147991e63f4dc1ec0e4 100644 (file)
--- a/helpmod2/helpmod.h
+++ b/helpmod2/helpmod.h
@@ -12,8 +12,8 @@
 /* configuration */
 
 /* These should always be equal */
-#define HELPMOD_VERSION_INTERNAL HELPMOD_VERSION_2_16
-#define HELPMOD_VERSION "2.16"
+#define HELPMOD_VERSION_INTERNAL HELPMOD_VERSION_2_17
+#define HELPMOD_VERSION "2.17"
 
 #define HELPMOD_USER_TIMEOUT 1200
 

diff --git a/helpmod2/hhooks.c b/helpmod2/hhooks.c
index 42043cd2e0e9aba22fa69da488a54cad1c5647bb..7971c7eed3e0592c9091aaf077e259f8f468b39e 100644 (file)
--- a/helpmod2/hhooks.c
+++ b/helpmod2/hhooks.c
@@ -75,10 +75,10 @@ static void helpmod_hook_join(int unused, void *args)
         return;
     }
 
-    if (huser_get_level(husr) > H_PEON && (huser_get_account_flags(husr) & H_AUTO_OP) && hchannel_authority(hchan, husr))
+    if (huser_get_level(husr) >= H_STAFF && (huser_get_account_flags(husr) & H_AUTO_OP) && hchannel_authority(hchan, husr))
         helpmod_channick_modes(husr, hchan ,MC_OP,HNOW);
 
-    if (huser_get_level(husr) > H_PEON && (huser_get_account_flags(husr) & H_AUTO_VOICE) && hchannel_authority(hchan, husr))
+    if (huser_get_level(husr) >= H_TRIAL && (huser_get_account_flags(husr) & H_AUTO_VOICE) && hchannel_authority(hchan, husr))
         helpmod_channick_modes(husr, hchan, MC_VOICE,HNOW);
 
     if (hchan->flags & H_WELCOME && *hchan->real_channel->index->name->content)
@@ -120,7 +120,9 @@ static void helpmod_hook_channel_newnick(int unused, void *args)
     if (hchan->flags & H_PASSIVE)
         return;
 
-    if (huser_get_level(husr) == H_LAMER || (huser_get_level(husr) == H_PEON && hban_check(nck)))
+    huser_activity(husr, NULL);
+
+    if (huser_get_level(husr) == H_LAMER || (huser_get_level(husr) <= H_TRIAL && hban_check(nck)))
     {
         hban *hb = hban_check(nck);
 
@@ -252,7 +254,6 @@ static void helpmod_hook_channel_deopped(int unused, void *args)
     assert(huserchan != NULL);
 
     huserchan->flags &= ~HCUMODE_OP;
-
 }
 
 static void helpmod_hook_channel_voiced(int unused, void *args)
@@ -342,7 +343,11 @@ static void helpmod_hook_nick_account(int unused, void *args)
     if (husr == NULL)
         return;
     else
-        husr->account = haccount_get_by_name(nck->authname);
+       husr->account = haccount_get_by_name(nck->authname);
+
+    if (huser_get_level(husr) == H_LAMER)
+       while (husr->hchannels)
+           helpmod_kick(husr->hchannels->hchan, husr, "Your presence on channel %s is not wanted", hchannel_get_name(husr->hchannels->hchan));
 }
 
 static void helpmod_hook_server_newserver(int unused, void *args)

diff --git a/helpmod2/hlamer.c b/helpmod2/hlamer.c
index abf8303cb2126963b6ea95cebb300d46b1881c76..7824987af74665fe41a755be1d4af4337ffb4a6b 100644 (file)
--- a/helpmod2/hlamer.c
+++ b/helpmod2/hlamer.c
@@ -79,27 +79,7 @@ static int hlc_violation_handle(hchannel *hchan, huser* husr, int violation)
     {
        const char *banmask = hban_ban_string(husr->real_user, HBAN_HOST);
        char reason_buffer[128];
-        /*
-       switch (violation)
-       {
-       case HLC_CAPS:
-           hban_add(banmask, "Excessive use of capital letters", time(NULL) + HLC_DEFAULT_BANTIME, 0);
-           break;
-       case HLC_REPEAT:
-           hban_add(banmask, "Excessive repeating", time(NULL) + HLC_DEFAULT_BANTIME, 0);
-           break;
-       case HLC_CHARACTER_REPEAT:
-           hban_add(banmask, "Excessive improper use of language", time(NULL) + HLC_DEFAULT_BANTIME, 0);
-           break;
-       case HLC_FLOOD:
-           hban_add(banmask, "Excessive flooding", time(NULL) + HLC_DEFAULT_BANTIME, 0);
-           break;
-       case HLC_SPAM:
-           hban_add(banmask, "Excessive spamming", time(NULL) + HLC_DEFAULT_BANTIME, 0);
-           break;
-       }
-       */
-       sprintf(reason_buffer, "Excessive violations: %s", hlc_get_violation_name(violation));
+        sprintf(reason_buffer, "Excessive violations: %s", hlc_get_violation_name(violation));
        hban_add(banmask, reason_buffer, time(NULL) + HLC_DEFAULT_BANTIME, 0);
 
        if (IsAccount(husr->real_user))
@@ -109,50 +89,12 @@ static int hlc_violation_handle(hchannel *hchan, huser* husr, int violation)
     }
     if (husr->lc[violation] >= hchan->lc_profile->tolerance_kick) /* get rid of the thing */
     {
-   /*     switch (violation)
-       {
-       case HLC_CAPS:
-           helpmod_kick(hchan, husr, "Channel rule violation: Excessive use of capital letters");
-           break;
-       case HLC_REPEAT:
-           helpmod_kick(hchan, husr, "Channel rule violation: Repeating");
-           break;
-       case HLC_CHARACTER_REPEAT:
-           helpmod_kick(hchan, husr, "Channel rule violation: Improper use of language");
-           break;
-       case HLC_FLOOD:
-           helpmod_kick(hchan, husr, "Channel rule violation: Flooding");
-           break;
-       case HLC_SPAM:
-           helpmod_kick(hchan, husr, "Channel rule violation: Spamming");
-           break;
-           }
-           */
        helpmod_kick(hchan, husr, "Channel rule violation: %s", hlc_get_violation_name(violation));
        return !0;
     }
     if (husr->lc[violation] >= hchan->lc_profile->tolerance_warn) /* get rid of the thing */
     {
-/*     switch (violation)
-       {
-       case HLC_CAPS:
-           helpmod_reply(husr, NULL, "You are violating the channel rule of %s : Excessive use of capital letters", hchannel_get_name(hchan));
-           break;
-       case HLC_REPEAT:
-           helpmod_reply(husr, NULL, "You are violating the channel rule of %s : Repeating", hchannel_get_name(hchan));
-           break;
-       case HLC_CHARACTER_REPEAT:
-           helpmod_reply(husr, NULL, "You are violating the channel rule of %s : Improper use of language", hchannel_get_name(hchan));
-           break;
-       case HLC_FLOOD:
-           helpmod_reply(husr, NULL, "You are violating the channel rule of %s : Flooding", hchannel_get_name(hchan));
-           break;
-       case HLC_SPAM:
-           helpmod_reply(husr, NULL, "You are violating the channel rule of %s : Spamming", hchannel_get_name(hchan));
-           break;
-           }
-           */
-       helpmod_reply(husr, NULL, "You are violating the channel rule of %s : %s. Continuos violation of this rule will result in you being removed from %s", hchannel_get_name(hchan), hlc_get_violation_name(violation), hchannel_get_name(hchan));
+       helpmod_reply(husr, NULL, "You are violating the channel rule of %s : %s. Continuous violation of this rule will result in you being removed from %s", hchannel_get_name(hchan), hlc_get_violation_name(violation), hchannel_get_name(hchan));
     }
     return 0;
 
@@ -164,6 +106,10 @@ static int hlc_check_caps(hlc_profile *hlc_prof, huser *husr, const char *line)
     int noncaps = 0;
     int i;
 
+    /* Handle the thing sent with /me */
+    if (!strncmp(line, "\0x01ACTION", 6 + 1))
+        line+=(6 + 1);
+
     for (i = 0;line[i];i++)
     {
         if (isalpha(line[i]))

diff --git a/helpmod2/hqueue.c b/helpmod2/hqueue.c
index c76a5489a9c06d72040afde4598fe7fb245f2af5..808507214d2e73ad974aa4b42a05f86fda094728 100644 (file)
--- a/helpmod2/hqueue.c
+++ b/helpmod2/hqueue.c
@@ -210,7 +210,6 @@ void helpmod_queue_handler (huser *sender, channel* returntype, hchannel *hchan,
                    if (huser_get_level(hchanuser->husr) == H_PEON && huserchan->flags & HCUMODE_VOICE)
                        helpmod_channick_modes(hchanuser->husr, hchan, MC_DEVOICE, HLAZY);
                }
-
            }
 
        }

diff --git a/helpmod2/hticket.c b/helpmod2/hticket.c
index 8f7e31f9bc17fbf1d279d52c2bb30b6f2d2fdd08..1425995903eecdc22a1e4c3880d35e6a6f7c93c9 100644 (file)
--- a/helpmod2/hticket.c
+++ b/helpmod2/hticket.c
@@ -23,7 +23,9 @@ hticket *hticket_del(hticket *htick, struct hchannel_struct *hchan)
     for (ptr = &hchan->htickets;*ptr;ptr = &(*ptr)->next)
         if (*ptr == htick)
         {
-            hticket *tmp = (*ptr)->next;
+           hticket *tmp = (*ptr)->next;
+           if ((*ptr)->message)
+                freesstring((*ptr)->message);
             free(*ptr);
             *ptr = tmp;
             return NULL;
@@ -32,7 +34,7 @@ hticket *hticket_del(hticket *htick, struct hchannel_struct *hchan)
     return htick;
 }
 
-hticket *hticket_add(const char *authname, time_t expiration, struct hchannel_struct *hchan)
+hticket *hticket_add(const char *authname, time_t expiration, struct hchannel_struct *hchan, const char *message)
 {
     hticket *tmp = hticket_get(authname, hchan), **ptr;
 
@@ -47,6 +49,11 @@ hticket *hticket_add(const char *authname, time_t expiration, struct hchannel_st
     strcpy(tmp->authname, authname);
     tmp->time_expiration = expiration;
 
+    if (message == NULL)
+       tmp->message = NULL;
+    else
+        tmp->message = getsstring(message, strlen(message));
+
     /* find the correct position */
     for (ptr = &hchan->htickets;*ptr && (*ptr)->time_expiration >= expiration;ptr = &(*ptr)->next);
 

diff --git a/helpmod2/hticket.h b/helpmod2/hticket.h
index 293c6d8961573a2510a1577f47d540a8fad51abe..9e5c45fa7b0fa52e16cb245922da19ca0ad169e5 100644 (file)
--- a/helpmod2/hticket.h
+++ b/helpmod2/hticket.h
@@ -5,9 +5,11 @@
 
 #include <time.h>
 
-#include "hdef.h"
 #include "../irc/irc_config.h"
 #include "../nick/nick.h"
+#include "../lib/sstring.h"
+
+#include "hdef.h"
 
 #define HTICKET_EXPIRATION_TIME (2 * HDEF_d)
 
@@ -15,12 +17,13 @@ typedef struct hticket_struct
 {
     char authname[ACCOUNTLEN +1];
     time_t time_expiration;
+    sstring *message;
     struct hticket_struct *next;
 } hticket;
 
 hticket *hticket_get(const char *, struct hchannel_struct*);
 hticket *hticket_del(hticket *, struct hchannel_struct*);
-hticket *hticket_add(const char *, time_t expiration, struct hchannel_struct*);
+hticket *hticket_add(const char *, time_t expiration, struct hchannel_struct*, const char *);
 int hticket_count(void);
 void hticket_remove_expired(void);
 

diff --git a/helpmod2/hversions.h b/helpmod2/hversions.h
index 9a6ede8ac2cbbf029a7d066ee96ea4e1e010665b..a7ccaac78a890a519c5943e747d855681f7c4ae2 100644 (file)
--- a/helpmod2/hversions.h
+++ b/helpmod2/hversions.h
@@ -18,5 +18,7 @@
 
 #define HELPMOD_VERSION_2_16 16 /* January 2006*/
 
+#define HELPMOD_VERSION_2_17 17 /* Late January 2006*/
+
 
 #endif