[cvslog] (2002-09-28 00:06:39 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Fri Sep 27 19:07:01 CST 2002


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2002-09-28 00:06:39 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

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

Log message:

Fixed cosmetic problems with logging in some irc module commands. Patch by NeoN.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.416 eggdrop1.6/doc/UPDATES1.6:1.417
--- eggdrop1.6/doc/UPDATES1.6:1.416	Fri Sep 27 17:55:20 2002
+++ eggdrop1.6/doc/UPDATES1.6	Fri Sep 27 19:06:29 2002
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.416 2002/09/27 22:55:20 wcc Exp $
+$Id: UPDATES1.6,v 1.417 2002/09/28 00:06:29 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.13
 Found by  Fixed by  What...
+          NeoN      fixed cosmetic problems with logging in some irc module commands
           Mo-Ize    exported tell_bottree() to modues
           BarkerJr  optimized logging functions
 various   Wcc       removed eggdrop.advanced.conf and eggdrop.simple.conf
Index: eggdrop1.6/src/mod/irc.mod/cmdsirc.c
diff -u eggdrop1.6/src/mod/irc.mod/cmdsirc.c:1.42 eggdrop1.6/src/mod/irc.mod/cmdsirc.c:1.43
--- eggdrop1.6/src/mod/irc.mod/cmdsirc.c:1.42	Tue Sep 10 21:14:45 2002
+++ eggdrop1.6/src/mod/irc.mod/cmdsirc.c	Fri Sep 27 19:06:29 2002
@@ -2,7 +2,7 @@
  * chancmds.c -- part of irc.mod
  *   handles commands directly relating to channel interaction
  *
- * $Id: cmdsirc.c,v 1.42 2002/09/11 02:14:45 wcc Exp $
+ * $Id: cmdsirc.c,v 1.43 2002/09/28 00:06:29 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -292,8 +292,8 @@
 	    " %s.\n", chan->dname);
     return;
   }
-  putlog(LOG_CMDS, "*", "#%s# (%s) voice %s %s", dcc[idx].nick,
-	 dcc[idx].u.chat->con_chan, nick, par);
+  putlog(LOG_CMDS, "*", "#%s# (%s) voice %s", dcc[idx].nick,
+	 chan->dname, nick);
   m = ismember(chan, nick);
   if (!m) {
     dprintf(idx, "%s is not on %s.\n", nick, chan->dname);
@@ -327,8 +327,8 @@
 	    " %s.\n", chan->dname);
     return;
   }
-  putlog(LOG_CMDS, "*", "#%s# (%s) devoice %s %s", dcc[idx].nick,
-	 dcc[idx].u.chat->con_chan, nick, par);
+  putlog(LOG_CMDS, "*", "#%s# (%s) devoice %s", dcc[idx].nick,
+	 chan->dname, nick);
   m = ismember(chan, nick);
   if (!m) {
     dprintf(idx, "%s is not on %s.\n", nick, chan->dname);
@@ -362,8 +362,8 @@
 	    chan->dname);
     return;
   }
-  putlog(LOG_CMDS, "*", "#%s# (%s) op %s %s", dcc[idx].nick,
-	 dcc[idx].u.chat->con_chan, nick, par);
+  putlog(LOG_CMDS, "*", "#%s# (%s) op %s", dcc[idx].nick,
+	 chan->dname, nick);
   m = ismember(chan, nick);
   if (!m) {
     dprintf(idx, "%s is not on %s.\n", nick, chan->dname);
@@ -408,8 +408,8 @@
 	    chan->dname);
     return;
   }
-  putlog(LOG_CMDS, "*", "#%s# (%s) halfop %s %s", dcc[idx].nick,
-	 dcc[idx].u.chat->con_chan, nick, par);
+  putlog(LOG_CMDS, "*", "#%s# (%s) halfop %s", dcc[idx].nick,
+	 chan->dname, nick);
   m = ismember(chan, nick);
   if (!m) {
     dprintf(idx, "%s is not on %s.\n", nick, chan->dname);
@@ -455,8 +455,8 @@
 	    chan->dname);
     return;
   }
-  putlog(LOG_CMDS, "*", "#%s# (%s) deop %s %s", dcc[idx].nick,
-	 dcc[idx].u.chat->con_chan, nick, par);
+  putlog(LOG_CMDS, "*", "#%s# (%s) deop %s", dcc[idx].nick,
+	 chan->dname, nick);
   m = ismember(chan, nick);
   if (!m) {
     dprintf(idx, "%s is not on %s.\n", nick, chan->dname);
@@ -506,8 +506,8 @@
 	    chan->dname);
     return;
   }
-  putlog(LOG_CMDS, "*", "#%s# (%s) dehalfop %s %s", dcc[idx].nick,
-	 dcc[idx].u.chat->con_chan, nick, par);
+  putlog(LOG_CMDS, "*", "#%s# (%s) dehalfop %s", dcc[idx].nick,
+	 chan->dname, nick);
   m = ismember(chan, nick);
   if (!m) {
     dprintf(idx, "%s is not on %s.\n", nick, chan->dname);
@@ -621,8 +621,8 @@
 	 nick);
   if (!me_op(chan) && !me_halfop(chan)) {
     if (chan->channel.mode & CHANINV) {
-      dprintf(idx, "I can't help you now because I'm not a channel op or %s",
-	      "halfop on %s.\n", chan->dname);
+      dprintf(idx, "I can't help you now because I'm not a channel op or"
+	      " halfop on %s.\n", chan->dname);
       return;
     }
     if (!channel_active(chan)) {
@@ -651,8 +651,8 @@
   if (!has_oporhalfop(idx, par))
     return;
   chname = newsplit(&par);
-  putlog(LOG_CMDS, "*", "#%s# (%s) channel %s", dcc[idx].nick,
-	 dcc[idx].u.chat->con_chan, chname);
+  putlog(LOG_CMDS, "*", "#%s# (%s) channel", dcc[idx].nick,
+	 !chname[0] ? dcc[idx].u.chat->con_chan : chname);
   if (!chname[0])
     chan = findchan_by_dname(dcc[idx].u.chat->con_chan);
   else
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.832 eggdrop1.6/src/patch.h:1.833
--- eggdrop1.6/src/patch.h:1.832	Fri Sep 27 17:55:20 2002
+++ eggdrop1.6/src/patch.h	Fri Sep 27 19:06:29 2002
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.832 2002/09/27 22:55:20 wcc Exp $
+ * $Id: patch.h,v 1.833 2002/09/28 00:06:29 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1033166988");		/* current unixtime */
+patch("1033171318");		/* current unixtime */
 /*
  *
  *
  */
-patch("exp_tell_bottree");
+patch("irccmds-cosmetic");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list