[geeklog-cvs] geeklog-1.3/plugins/spamx BlackList.Examine.class.php,1.6,1.7 MTBlackList.Examine.class.php,1.6,1.7

[dhaun at iowaoutdoors.org]

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

Modified Files:
	BlackList.Examine.class.php MTBlackList.Examine.class.php 
Log Message:
Make sure we're displaying uid '1' for anonymous users


Index: BlackList.Examine.class.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/plugins/spamx/BlackList.Examine.class.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BlackList.Examine.class.php	20 Feb 2005 09:51:27 -0000	1.6
--- BlackList.Examine.class.php	24 Mar 2005 13:40:44 -0000	1.7
***************
*** 41,44 ****
--- 41,50 ----
          global $_CONF, $_TABLES, $_USER, $LANG_SX00, $result;
  
+         if (isset ($_USER['uid']) && ($_USER['uid'] > 1)) {
+             $uid = $_USER['uid'];
+         } else {
+             $uid = 1;
+         }
+ 
          /**
           * Include Blacklist Data
***************
*** 53,57 ****
              if (preg_match("#$val#", html_entity_decode ($comment))) {
                  $ans = 1; // quit on first positive match
!                 SPAMX_log($LANG_SX00['foundspam'] . $val . $LANG_SX00['foundspam2'] . $_USER['uid'] . $LANG_SX00['foundspam3'] . $_SERVER['REMOTE_ADDR']);
                  break;
              } 
--- 59,63 ----
              if (preg_match("#$val#", html_entity_decode ($comment))) {
                  $ans = 1; // quit on first positive match
!                 SPAMX_log($LANG_SX00['foundspam'] . $val . $LANG_SX00['foundspam2'] . $uid . $LANG_SX00['foundspam3'] . $_SERVER['REMOTE_ADDR']);
                  break;
              } 

Index: MTBlackList.Examine.class.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/plugins/spamx/MTBlackList.Examine.class.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MTBlackList.Examine.class.php	20 Feb 2005 09:51:27 -0000	1.6
--- MTBlackList.Examine.class.php	24 Mar 2005 13:40:44 -0000	1.7
***************
*** 44,47 ****
--- 44,53 ----
          global $_CONF, $_USER, $_TABLES, $LANG_SX00;
  
+         if (isset ($_USER['uid']) && ($_USER['uid'] > 1)) {
+             $uid = $_USER['uid'];
+         } else {
+             $uid = 1;
+         }
+ 
          /**
           * Include Blacklist Data
***************
*** 56,60 ****
              if (@preg_match("#$val#", html_entity_decode ($comment))) {
                  $ans = 1; // quit on first positive match
!                 SPAMX_log($LANG_SX00['fsc'] . $val . $LANG_SX00['fsc1'] . $_USER['uid'] . $LANG_SX00['fsc2'] . $_SERVER['REMOTE_ADDR']);
                  break;
              } 
--- 62,66 ----
              if (@preg_match("#$val#", html_entity_decode ($comment))) {
                  $ans = 1; // quit on first positive match
!                 SPAMX_log($LANG_SX00['fsc'] . $val . $LANG_SX00['fsc1'] . $uid . $LANG_SX00['fsc2'] . $_SERVER['REMOTE_ADDR']);
                  break;
              }