Fixed broken link in contact message notification email and added dis…

…closure note to email address when responding to anonymous comment
b2evolution · Apr 6, 2018 · a0161fa · a0161fa
1 parent 42ac278
commit a0161fa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/skins_email/contact_message_new.txt.php b/skins_email/contact_message_new.txt.php
@@ -65,29 +65,28 @@
 {
 	$session_ID = $Session->ID;
 }
-echo sprintf( T_('Session ID').': %s', $session_ID );
+echo sprintf( T_('Session ID').': %s', $session_ID ) . "\n";
 
 // show sender email address
 echo sprintf( T_( 'By replying, your email will go directly to %s.' ), $params['sender_address'] );
 
 // show additional message info
-if( !empty( $Blog ) )
-{
-	if( !empty( $params['comment_id'] ) )
-	{
-		echo "\n\n".T_('Message sent from your comment:') . "\n"
-			.url_add_param( $Blog->get('url'), 'p='.$params['post_id'].'#'.$params['comment_id'], '&' );
-	}
-	elseif( !empty( $params['post_id'] ) )
-	{
-		echo "\n\n".T_('Message sent from your post:') . "\n"
-			.url_add_param( $Blog->get('url'), 'p='.$params['post_id'], '&' );
-	}
-	else
-	{
-		echo "\n\n".sprintf( T_('Message sent through the contact form on %s.'), $Blog->get('shortname') ). "\n";
+$CommentCache = & get_CommentCache();
+$ItemCache = & get_ItemCache();
 
-	}
+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();
+}
+elseif( !empty( $params['post_id'] ) && ( $Item = & $ItemCache->get_by_ID( $params['post_id'], false, false ) ) )
+{
+	echo "\n\n".T_('Message sent from your post:') . "\n"
+		.$Item->get_permanent_url();
+}
+elseif( ! empty( $Blog ) )
+{
+	echo "\n\n".sprintf( T_('Message sent through the contact form on %s.'), $Blog->get('shortname') ). "\n";
 }
 
 if( ! empty( $recipient_User ) )

diff --git a/skins_fallback_v6/_contact_msg.form.php b/skins_fallback_v6/_contact_msg.form.php
@@ -118,7 +118,7 @@
 				'required'  => $Blog->get_setting( 'msgform_require_name' ),
 			) );
 		$Form->text_input( $dummy_fields['email'], $email_author_address, 40, T_('Email'),
-			T_('Your email address. (Will <strong>not</strong> be displayed on this site.)'), array(
+			T_('Your email address. (Will <strong>not</strong> be displayed on this site BUT it will be sent to the person you are contacting, otherwise they would not be able to reply to you.)'), array(
 				'maxlength' => 150,
 				'class'     => 'wide_input',
 				'required'  => true,