Merge.

[irc/quakenet/newserv.git] / helpmod2 / hchannel.c

diff --git a/helpmod2/hchannel.c b/helpmod2/hchannel.c
index 5dcebf0f183e3e27c9b35bc57db81b02312649d6..1ce77155599652026ac83884e0d57888b9d03628 100644 (file)
--- a/helpmod2/hchannel.c
+++ b/helpmod2/hchannel.c
@@ -1,12 +1,8 @@
 
 #include <stdlib.h>
 #include <assert.h>
-
-#include "../lib/sstring.h"
-#include "../lib/irc_string.h"
-#include "../channel/channel.h"
-#include "../localuser/localuserchannel.h"
-#include "../core/schedule.h"
+#include <string.h>
+#include <ctype.h>
 
 #include "hchannel.h"
 #include "haccount.h"
@@ -50,6 +46,7 @@ hchannel *hchannel_add(const char *cname)
     hchan->censor = NULL;
 
     hchan->htickets = NULL;
+    hchan->ticket_message = NULL;
 
     hchan->last_activity = time(NULL);
     hchan->last_staff_activity = time(NULL);
@@ -105,7 +102,7 @@ int hchannel_del(hchannel *hchan)
     while (hchan->htickets)
         hticket_del(hchan->htickets, hchan);
 
-    localpartchannel(helpmodnick, hchan->real_channel);
+    localpartchannel(helpmodnick, hchan->real_channel, "Channel Removed");
 
     free(hchan);
 
@@ -220,7 +217,7 @@ void hchannel_remove_inactive_users(void)
                    if (huser_on_channel((*hchanuser)->husr, hchan)->flags & H_IDLE_WARNING)
                     {
                         const char *banmask = hban_ban_string((*hchanuser)->husr->real_user, HBAN_HOST);
-                        helpmod_setban(hchan, banmask, time(NULL) + 10 * HDEF_m, MCB_ADD, HNOW);
+                        helpmod_setban(hchan, banmask, time(NULL) + 10 * HDEF_m, MCB_ADD, HLAZY);
 
                         helpmod_kick(hchan, (*hchanuser)->husr, "Please do not idle in %s", hchannel_get_name(hchan));
                         continue;
@@ -229,17 +226,19 @@ void hchannel_remove_inactive_users(void)
                     {
                         helpmod_reply((*hchanuser)->husr, NULL, "You are currently idle in %s. Please part the channel if you have nothing to do there", hchannel_get_name(hchan));
                         huser_on_channel((*hchanuser)->husr, hchan)->flags |= H_IDLE_WARNING;
-                    }
-                }
+                   }
+               }
+                /*hcommit_modes();*/
                 hchanuser = &(*hchanuser)->next;
-            }
+           }
+           hcommit_modes();
         }
         /* Additionally, test if the channel has queue but no idle opers / staff */
         if (hchan->flags & H_QUEUE && hchan->flags & H_QUEUE_TIMEOUT)
         {
             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))
@@ -322,7 +321,7 @@ void hchannels_dnmo(struct huser_struct *husr)
         /*if (on_queue(husr, huserchan) || on_desk(husr, huserchan))*/
         if (huserchan != NULL)
         {
-            hchannel_user *tmp, **hchanuser = &hchan->channel_users;
+            hchannel_user *tmp = NULL, **hchanuser = &hchan->channel_users;
             for (;*hchanuser;hchanuser = &(*hchanuser)->next)
                 if ((*hchanuser)->husr == husr)
                 {
@@ -461,6 +460,60 @@ const char *hchannel_get_state(hchannel* hchan, int mask)
         return "No";
 }
 
+int hchannel_highlight_detection(hchannel *hchan, const char *message)
+{
+    char buffer[512], *buffer_ptr = buffer, *ptr = buffer;
+    int i, matches = 0;
+
+    strcpy(buffer, message);
+
+    /* remove commas */
+    for (i=0;i<512 && buffer[i] != '\0';i++)
+       if (buffer[i] == ',')
+           buffer[i] = ' ';
+
+    /* reset i for loop */
+    i = 0;
+    do
+    {
+       nick *tmp;
+       huser *tmp_huser;
+       huser_channel *tmp_huserchan;
+
+       if (i++ > 6)
+            break;
+
+       while (*buffer_ptr && isspace(*buffer_ptr))
+           buffer_ptr++;
+
+       if (*buffer_ptr == '@')
+            buffer_ptr++;
+
+       if (*buffer_ptr)
+       {
+           ptr = strchr(buffer_ptr, ' ');
+           if (ptr)
+           {
+                *ptr = '\0';
+               ptr++;
+           }
+           if ((tmp = getnickbynick(buffer_ptr)))
+               if ((tmp_huser = huser_get(tmp)))
+                   if ((tmp_huserchan = huser_on_channel(tmp_huser, hchan)))
+                       if ((tmp_huserchan->flags & HCUMODE_OP) && strlen(huser_get_nick(tmp_huser)) > 1)
+                           matches++;
+       }
+       if (ptr == NULL)
+           break;
+       else
+           buffer_ptr = ptr;
+    } while (*ptr);
+
+    if (matches > 2)
+       return 1;
+    else
+       return 0;
+}
 
 const char *hchannel_get_sname(int flag)
 {
@@ -508,7 +561,11 @@ const char *hchannel_get_sname(int flag)
     case 18:
         return "Queue inactivity deactivation";
     case 19:
-        return "Require a ticket to join";
+       return "Require a ticket to join";
+    case 20:
+       return "Send a message on ticket issue";
+    case 21:
+        return "Excessive highlight prevention";
     default:
         return "Error, please contact strutsi";
     }