[cvslog] (2002-02-25 04:37:19 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Sun Feb 24 22:38:01 CST 2002


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2002-02-25 04:37:19 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

Modified files:
     doc/ABOUT doc/UPDATES1.6 src/patch.h src/mod/irc.mod/mode.c

Log message:

fixed bug #254 -- those of you who use protectfriends/ops please test this code out before the 1.6.9 release

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/ABOUT
diff -u eggdrop1.6/doc/ABOUT:1.3 eggdrop1.6/doc/ABOUT:1.4
--- eggdrop1.6/doc/ABOUT:1.3	Tue Jan 15 21:17:59 2002
+++ eggdrop1.6/doc/ABOUT	Sun Feb 24 22:37:08 2002
@@ -65,4 +65,4 @@
 
      _________________________________________________________________
 
-   Copyright (C) 2002 Eggheads Development Team
\ No newline at end of file
+   Copyright (C) 2002 Eggheads Development Team
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.325 eggdrop1.6/doc/UPDATES1.6:1.326
--- eggdrop1.6/doc/UPDATES1.6:1.325	Sun Feb 24 21:39:57 2002
+++ eggdrop1.6/doc/UPDATES1.6	Sun Feb 24 22:37:08 2002
@@ -1,10 +1,12 @@
-$Id: UPDATES1.6,v 1.325 2002/02/25 03:39:57 wcc Exp $
+$Id: UPDATES1.6,v 1.326 2002/02/25 04:37:08 guppy Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.9
 Found by  Fixed by  What...
+Boing     guppy     fixed +protectops from reopping users with only +f and +protectfriends
+                    from reopping users with only +o
           Wcc       made a few cosmetic changes to the configure script
           Wcc       more plural fixes for commands and error messages
 Xerxes    guppy     "channel remove" will not crash the bot anymore if you are removing
Index: eggdrop1.6/src/mod/irc.mod/mode.c
diff -u eggdrop1.6/src/mod/irc.mod/mode.c:1.54 eggdrop1.6/src/mod/irc.mod/mode.c:1.55
--- eggdrop1.6/src/mod/irc.mod/mode.c:1.54	Tue Jan  1 21:46:39 2002
+++ eggdrop1.6/src/mod/irc.mod/mode.c	Sun Feb 24 22:37:09 2002
@@ -4,7 +4,7 @@
  *   channel mode changes and the bot's reaction to them
  *   setting and getting the current wanted channel modes
  *
- * $Id: mode.c,v 1.54 2002/01/02 03:46:39 guppy Exp $
+ * $Id: mode.c,v 1.55 2002/02/25 04:37:09 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -499,32 +499,21 @@
 
     if (glob_master(victim) || chan_master(victim))
       ok = 0;
-    else if ((glob_op(victim) || glob_friend(victim)) && !chan_deop(victim))
+    else if (channel_protectops(chan) && (glob_op(victim) || chan_op(victim)))
       ok = 0;
-    else if (chan_op(victim) || chan_friend(victim))
+    else if (channel_protectfriends(chan) && (glob_friend(victim) ||
+	     chan_friend(victim)))
       ok = 0;
-    if (!ok && !match_my_nick(nick) &&
-       rfc_casecmp(who, nick) && had_op &&
-	!match_my_nick(who)) {	/* added 25mar1996, robey */
-      /* Do we want to reop? */
+    else if (!chan_deop(victim) || (!glob_deop(victim) && !chan_op(victim)))
+      ok = 0;
+
+    /* do we want to reop victim? */
+    if (!ok && had_op && !match_my_nick(nick) && rfc_casecmp(who, nick) && 
+	!match_my_nick(who)) {
       /* Is the deopper NOT a master or bot? */
-      if (!glob_master(user) && !chan_master(user) && !glob_bot(user) &&
-	  /* and is the channel protectops? */
-	  ((channel_protectops(chan) &&
-	    /* and it's not +bitch ... */
-	    (!channel_bitch(chan) ||
-	    /* or the user's a valid op? */
-	     chan_op(victim) || (glob_op(victim) && !chan_deop(victim)))) ||
-	   /* or is the channel protectfriends? */
-           (channel_protectfriends(chan) &&
-	     /* and the users a valid friend? */
-             (chan_friend(victim) || (glob_friend(victim) &&
-				      !chan_deop(victim))))) &&
-       /* and the users not a de-op? */
-       !(chan_deop(victim) || (glob_deop(victim) && !chan_op(victim))))
-	/* Then we'll bless them */
-	add_mode(chan, '+', 'o', who);
-      else if (reversing)
+      if (reversing || (!glob_master(user) && !chan_master(user) && !glob_bot(user) &&
+	  !channel_bitch(chan)))
+	/* Then we'll bless the victim */
 	add_mode(chan, '+', 'o', who);
     }
   }
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.701 eggdrop1.6/src/patch.h:1.702
--- eggdrop1.6/src/patch.h:1.701	Sun Feb 24 21:39:57 2002
+++ eggdrop1.6/src/patch.h	Sun Feb 24 22:37:08 2002
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.701 2002/02/25 03:39:57 wcc Exp $
+ * $Id: patch.h,v 1.702 2002/02/25 04:37:08 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1014608315");		/* current unixtime */
+patch("1014610799");		/* current unixtime */
 /*
  *
  *
  */
-patch("configurecosmetic");
+patch("protectfriendsfix");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list