From efa07c814f29650c4f389d23c4eb90ece5161edf Mon Sep 17 00:00:00 2001
From: Kenzaburo Ito <prescience@users.sourceforge.net>
Date: Wed, 14 Feb 2001 05:35:59 +0000
Subject: [PATCH] added better email checking

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@200 f5dc347c-c33d-0410-90a0-b07cc1902cb9
---
 config_inc.php |  9 ++++++---
 core_API.php   | 39 +++++++++++++++++++++++++++++----------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/config_inc.php b/config_inc.php
index d570a437de..5c5effc851 100644
--- a/config_inc.php
+++ b/config_inc.php
@@ -79,10 +79,13 @@
 
 	# Allow email
 	$g_enable_email_notification = 1;
+
+	# set to 0 to disable email check
+	$g_validate_email            = 1;
 	#--------------------
 
 	#--------------------
-	# time for coookie to live in seconds
+	# time for 'permanent' cookie to live in seconds
 	$g_cookie_time_length        = 30000000;     # 1 year
 	# time to delay between page redirects
 	$g_wait_time                 = 2;            # in seconds
@@ -344,6 +347,6 @@
 
 	#--------------------
 	#version
-	$g_mantis_version       = "0.14.0";
+	$g_mantis_version = "0.14.0";
 	#--------------------
-?>
\ No newline at end of file
+?>
diff --git a/core_API.php b/core_API.php
index 852a4ab9fc..af54fd78a9 100644
--- a/core_API.php
+++ b/core_API.php
@@ -571,7 +571,7 @@ function print_category_option_list( $p_category="" ) {
 			$row = db_fetch_array( $result );
 			$t_category = $row["category"];
 			if ( $t_category==$p_category ) {
-				PRINT "<option value=\"$t_category\">$t_category";
+				PRINT "<option value=\"$t_category\" SELECTED>$t_category";
 			} else {
 				PRINT "<option value=\"$t_category\">$t_category";
 			}
@@ -1018,8 +1018,7 @@ function index_login_cookie_check( $p_redirect_url="" ) {
 
 			### go to redirect
 			if ( !empty( $p_redirect_url ) ) {
-				#header( "Location: $p_redirect_url" );
-				header( "Location: $g_logout_page" );
+				header( "Location: $p_redirect_url" );
 				exit;
 			}
 			### continue with current page
@@ -1483,7 +1482,6 @@ function email_build_bugnote_message( $p_bug_id ) {
 			$t_message = $t_message."-----------------------------------------------------------------------\n";
 			$t_message = $t_message.$t_note."\n\n";
 		}
-		$t_message = $t_message."-----------------------------------------------------------------------\n";
 
 		$t_message = stripslashes( $t_message );
 		return $t_message;
@@ -1491,14 +1489,22 @@ function email_build_bugnote_message( $p_bug_id ) {
 	### --------------------
 	### Send bug info to reporter and handler
 	function email_bug_info( $p_bug_id, $p_message ) {
-		global $g_mantis_user_table, $g_mantis_bug_table;
+		global $g_mantis_user_table, $g_mantis_bug_table, $g_mantis_project_table;
 
 		### Get Subject
-		$query = "SELECT summary
+		$query = "SELECT project_id, summary
 				FROM $g_mantis_bug_table
 				WHERE id='$p_bug_id'";
 		$result = db_query( $query );
-		$p_subject = db_result( $result, 0, 0 );
+		$row = db_fetch_array( $result );
+		$p_subject = $row["summary"];
+		$t_project_id = $row["project_id"];
+
+		$query = "SELECT name
+				FROM $g_mantis_project_table
+				WHERE id='$t_project_id'";
+		$result = db_query( $query );
+		$t_project_name = db_result( $result, 0, 0 );
 
 		### Get Reporter and Handler IDs
 		$query = "SELECT reporter_id, handler_id
@@ -1524,6 +1530,9 @@ function email_bug_info( $p_bug_id, $p_message ) {
 			$t_handler_email = db_result( $result, 0, 0 );
 		}
 
+		### Build subject
+		$p_subject = "[".$t_project_name." ".$p_bug_id."]: ".$p_subject;
+
 		### build message
 		$t_message = $p_message."\n";
 		$t_message .= email_build_bug_message( $p_bug_id );
@@ -1585,15 +1594,25 @@ function email_send( $p_recipient, $p_subject, $p_message ) {
 	### --------------------
 	# check to see that the format is valid and that the mx record exists
 	function is_valid_email( $p_email ) {
+		global $g_validate_email;
+
+		### if we don't validate then just accept
+		if ( $g_validate_email==0 ) {
+			return true;
+		}
+
 		if (eregi("^[_\.0-9a-z-]+@([0-9a-z][-0-9a-z\.]+)\.([a-z]{2,3}$)", $p_email, $check)) {
 			if (getmxrr($check[1].".".$check[2], $temp)) {
 				return true;
 			} else {
-				return false;
+				$host = substr(strstr($check[0], '@'), 1).".";
+				#### for no mx record... try dns
+				if (checkdnsrr ( $host, "ANY" ))
+					return true;
 			}
-		} else {
-			return false;
 		}
+		### Everything failed.  Bad email.
+		return false;
 	}
 	### --------------------
 	###########################################################################