Changeset 2155 for trunk

Timestamp:

Oct 30, 2007, 12:39:41 AM (17 years ago)

Author:

rvelices

Message:

• send status code 403 when attempt to enter a user comment, but comments are disabled
• don't increase hit count when a comment is posted
• remove the check of user ip agains spamhaus.org when a comment is entered (my conclusion is that is useless)

Location:

trunk

Files:

• include/config_default.inc.php (modified) (1 diff)
• include/functions_comment.inc.php (modified) (5 diffs)
• include/functions_url.inc.php (modified) (2 diffs)
• include/picture_comment.inc.php (modified) (1 diff)
• picture.php (modified) (1 diff)

trunk/include/config_default.inc.php

@@ -94 +94 @@
 // maximum number of links in a comment before it is qualified spam
 $conf['comment_spam_max_links'] = 3;
-
-// if the ip address of a comenteer is in spamhaus.org block list, the
-// comment is qualified spam
-$conf['comment_spam_check_ip'] = false;
 
 // calendar_datefield : date field of table "images" used for calendar

trunk/include/functions_comment.inc.php

@@ -31 +31 @@
 {
   global $conf;
-  
+
   $time = time();
 
@@ -69 +69 @@
     $link_count++;
   }
-  
+
   if ( $link_count>$conf['comment_spam_max_links'] )
     return $my_action;
-
-  if ( isset($comment['ip']) and $conf['comment_spam_check_ip'] 
-      and $_SERVER["SERVER_ADDR"] != $comment['ip']  
-    )
-  {
-    $rev_ip = implode( '.', array_reverse( explode('.',$comment['ip']) ) );
-    $lookup = $rev_ip . '.sbl-xbl.spamhaus.org.';
-    $res = gethostbyname( $lookup );
-    if ( $lookup != $res )
-      return $my_action;
-  }
 
   return $action;
@@ -101 +90 @@
 {
   global $conf, $user;
-  
-  $comm = array_merge( $comm, 
+
+  $comm = array_merge( $comm,
     array(
       'ip' => $_SERVER['REMOTE_ADDR'],
@@ -162 +151 @@
     $comment_action='reject';
   }
-  
+
   if ($comment_action!='reject' and $conf['anti-flood_time']>0 )
   { // anti-flood system
@@ -193 +182 @@
     "'.($comment_action=='validate' ? 'true':'false').'",
     '.($comment_action=='validate' ? 'NOW()':'NULL').',
-    '.$comm['image_id'].'      
+    '.$comm['image_id'].'
   )
 ';

trunk/include/functions_url.inc.php

@@ -253 +253 @@
   if ( !isset($params['category'] ) )
   {// make urls shorter ...
-    unset( $params['flat'] ); 
+    unset( $params['flat'] );
   }
   $url .= make_section_in_url($params);
@@ -623 +623 @@
  * parses start, flat and chronology from url tokens
 */
-function parse_well_known_params_url($tokens, $i)
+function parse_well_known_params_url($tokens, &$i)
 {
   $page = array();

trunk/include/picture_comment.inc.php

@@ -88 +88 @@
     );
 }
-
+elseif ( isset($_POST['content']) )
+{
+  set_status_header(403);
+  die('ugly spammer');
+}
 
 if ($page['show_comments'])

trunk/picture.php

@@ -245 +245 @@
 
 // incrementation of the number of hits, we do this only if no action
-if (trigger_event('allow_increment_element_hit_count', true) )
+if (trigger_event('allow_increment_element_hit_count', !isset($_POST['content']) ) )
 {
   $query = '