Fix antispam block for email sending

yurabakhtin · yurabakhtin · commit 2e1cb2632d5f · 2019-02-26T11:24:25.000+03:00
diff --git a/conf/_application.php b/conf/_application.php
@@ -21,7 +21,7 @@
  * Release date (ISO)
  * @global string
  */
-$app_date = '2019-02-25';
+$app_date = '2019-02-26';
 
 /**
  * Long version string for checking differences
diff --git a/htsrv/anon_unsubscribe.php b/htsrv/anon_unsubscribe.php
@@ -30,6 +30,11 @@
 switch( $type )
 {
 	case 'comment':
+		// Unsubscribe anonymous user from notifications of replies on Items where the user posted a comment:
+
+		// Stop a request from the blocked IP addresses or Domains:
+		antispam_block_request();
+
 		if( !is_email( $anon_email ) )
 		{
 			$Messages->add( 'Your email address is not correct. Probably the unsubscribe link was modified.' );
diff --git a/htsrv/login.php b/htsrv/login.php
@@ -116,6 +116,9 @@
 	case 'resetpassword':
 		// Send password reset request by email:
 
+		// Stop a request from the blocked IP addresses or Domains
+		antispam_block_request();
+
 		global $servertimenow;
 		$login_required = true; // Do not display "Without login.." link on the form
 
diff --git a/htsrv/message_send.php b/htsrv/message_send.php
@@ -520,7 +520,7 @@
 				'message'           => $message,
 				'contact_method'    => $send_contact_method,
 				'additional_fields' => $send_additional_fields,
-				'comment_id'        => $comment_id,
+				'comment_ID'        => $comment_id,
 				'post_id'           => $post_id,
 				'recipient_User'    => $recipient_User,
 				'Comment'           => $Comment,
diff --git a/inc/_core/_misc.funcs.php b/inc/_core/_misc.funcs.php
@@ -3797,9 +3797,6 @@ function send_mail( $to, $to_name, $subject, $message, $from = NULL, $from_name
 	global $mail_log_message;
 	$mail_log_message = NULL;
 
-	// Stop a request from the blocked IP addresses or Domains
-	antispam_block_request();
-
 	global $debug, $app_name, $app_version, $current_locale, $current_charset, $evo_charset, $locales, $Debuglog, $Settings, $demo_mode, $mail_log_insert_ID;
 
 	$message_data = $message;
diff --git a/inc/antispam/model/_antispam.funcs.php b/inc/antispam/model/_antispam.funcs.php
@@ -653,7 +653,7 @@ function antispam_block_by_domain()
 			continue;
 		}
 
-		// Get domain name by current IP adress:
+		// Get domain name by current IP address:
 		$ip_domain = gethostbyaddr( $ip_address );
 
 		if( ! empty( $ip_domain ) &&
diff --git a/skins_email/contact_message_new.html.php b/skins_email/contact_message_new.html.php
@@ -23,7 +23,7 @@
 		'message_footer'   => '',
 		'Blog'             => NULL,
 		'message'          => '',
-		'comment_id'       => NULL,
+		'comment_ID'       => NULL,
 		'post_id'          => NULL,
 		'recipient_User'   => NULL,
 		'Comment'          => NULL,
@@ -36,10 +36,10 @@
 if( !empty( $Blog ) )
 {
 	echo '<p'.emailskin_style( '.p' ).'>';
-	if( !empty( $params['comment_id'] ) )
+	if( !empty( $params['comment_ID'] ) )
 	{ // From comment
 		$CommentCache = & get_CommentCache();
-		$Comment = & $CommentCache->get_by_ID( $params['comment_id'] );
+		$Comment = & $CommentCache->get_by_ID( $params['comment_ID'] );
 		$Item = & $Comment->get_Item();
 		echo sprintf( T_('Message sent from your <a %s>comment</a> on %s.'),
 			'href="'.$Comment->get_permanent_url( '&', '#comments' ).'"'.emailskin_style( '.a' ).'',
diff --git a/skins_email/contact_message_new.txt.php b/skins_email/contact_message_new.txt.php
@@ -24,7 +24,7 @@
 		'message_footer'   => '',
 		'Blog'             => NULL,
 		'message'          => '',
-		'comment_id'       => NULL,
+		'comment_ID'       => NULL,
 		'post_id'          => NULL,
 		'recipient_User'   => NULL,
 		'Comment'          => NULL,
@@ -74,7 +74,7 @@
 $CommentCache = & get_CommentCache();
 $ItemCache = & get_ItemCache();
 
-if( !empty( $params['comment_id'] ) && ( $Comment = & $CommentCache->get_by_ID( $params['comment_id'], false, false ) ) )
+if( !empty( $params['comment_ID'] ) && ( $Comment = & $CommentCache->get_by_ID( $params['comment_ID'], false, false ) ) )
 {
 	echo "\n\n".T_('Message sent from your comment:') . "\n"
 		.$Comment->get_permanent_url();

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,11 @@`
`30`	`30`	`switch( $type )`
`31`	`31`	`{`
`32`	`32`	`case 'comment':`
	`33`	`+ // Unsubscribe anonymous user from notifications of replies on Items where the user posted a comment:`
	`34`	`+`
	`35`	`+ // Stop a request from the blocked IP addresses or Domains:`
	`36`	`+ antispam_block_request();`
	`37`	`+`
`33`	`38`	`if( !is_email( $anon_email ) )`
`34`	`39`	`{`
`35`	`40`	`$Messages->add( 'Your email address is not correct. Probably the unsubscribe link was modified.' );`
Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ function antispam_block_by_domain()`
`653`	`653`	`continue;`
`654`	`654`	`}`
`655`	`655`
`656`		`- // Get domain name by current IP adress:`
	`656`	`+ // Get domain name by current IP address:`
`657`	`657`	`$ip_domain = gethostbyaddr( $ip_address );`
`658`	`658`
`659`	`659`	`if( ! empty( $ip_domain ) &&`