[geeklog-cvs] geeklog-1.3/plugins/spamx BlackList.Examine.class.php,1.4,1.5 MTBlackList.Examine.class.php,1.4,1.5 MailAdmin.Action.class.php,1.5,1.6

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/plugins/spamx
In directory www:/tmp/cvs-serv31483

Modified Files:
	BlackList.Examine.class.php MTBlackList.Examine.class.php 
	MailAdmin.Action.class.php 
Log Message:
Added IP address in email notification.


Index: MailAdmin.Action.class.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/plugins/spamx/MailAdmin.Action.class.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MailAdmin.Action.class.php	14 Dec 2004 13:15:20 -0000	1.5
--- MailAdmin.Action.class.php	18 Dec 2004 15:35:02 -0000	1.6
***************
*** 33,39 ****
      function execute($comment)
      {
!         global $result, $_USER, $_CONF, $LANG_SX00, $_SPX_CONF, $comment;
  
!         $msg = sprintf($LANG_SX00['emailmsg'], $_CONF['site_name'], $_USER['uid'], $comment);
  
          COM_mail($_SPX_CONF['notification_email'], 'Spam Comment at ' . $_CONF['site_name'], $msg);
--- 33,45 ----
      function execute($comment)
      {
!         global $result, $_CONF, $_USER, $LANG_SX00, $_SPX_CONF;
  
!         if (isset ($_USER['uid']) && ($_USER['uid'] > 1)) {
!             $uid = $_USER['uid'];
!         } else {
!             $uid = 1;
!         }
!         $uid .= '@' . $_SERVER['REMOTE_ADDR'];
!         $msg = sprintf($LANG_SX00['emailmsg'], $_CONF['site_name'], $uid, $comment);
  
          COM_mail($_SPX_CONF['notification_email'], 'Spam Comment at ' . $_CONF['site_name'], $msg);

Index: BlackList.Examine.class.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/plugins/spamx/BlackList.Examine.class.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BlackList.Examine.class.php	14 Dec 2004 13:15:20 -0000	1.4
--- BlackList.Examine.class.php	18 Dec 2004 15:35:02 -0000	1.5
***************
*** 30,34 ****
      function execute($comment)
      {
!         global $_CONF, $result, $_USER, $_TABLES, $_SERVER, $LANG_SX00;
  
          /**
--- 30,34 ----
      function execute($comment)
      {
!         global $_CONF, $_TABLES, $_USER, $LANG_SX00, $result;
  
          /**

Index: MTBlackList.Examine.class.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/plugins/spamx/MTBlackList.Examine.class.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MTBlackList.Examine.class.php	14 Dec 2004 13:15:20 -0000	1.4
--- MTBlackList.Examine.class.php	18 Dec 2004 15:35:02 -0000	1.5
***************
*** 33,37 ****
      function execute($comment)
      {
!         global $_CONF, $_USER, $_TABLES, $_SERVER, $LANG_SX00;
  
          /**
--- 33,37 ----
      function execute($comment)
      {
!         global $_CONF, $_USER, $_TABLES, $LANG_SX00;
  
          /**