39d38
<   /* JDH
41,42d39
<   */
<   return array('access site-wide contact form', 'administer site-wide contact form', 'access personal contact forms');
123,124c120
<   /*  JDH OLD CODE
<     return
---
>   return
130,137d125
<     NEW CODE	*/
<   return
<     $account &&
<     ($user->uid || user_access('access personal contact forms')) &&
< 	(
<       ($user->uid != $account->uid && $account->contact) ||
<       user_access('administer users')
<     );
199,209c187
<       /*JDH Contact Module Patch
< 	   *OLD Code
< 	  $message['body'][] = t("!name (!name-url) has sent you a message via your contact form (!form-url) at !site.", array('!name' => $user->name, '!name-url' => url("user/$user->uid", array('absolute' => TRUE, 'language' => $language)), '!form-url' => url($_GET['q'], array('absolute' => TRUE, 'language' => $language)), '!site' => variable_get('site_name', 'Drupal')), $language->language);
< 		New Code Begin */
< 	  if ($user->uid) {
<     	$message['body'][] = t("!name (!name-url) has sent you a message via your contact form (!form-url) at !site.", array('!name' => $user->name, '!name-url' => url("user/$user->uid", array('absolute' => TRUE, 'language' => $language)), '!form-url' => url($_GET['q'], array('absolute' => TRUE, 'language' => $language)), '!site' => variable_get('site_name', 'Drupal')), $language->language);		
<       }
<       else {	
< 		$message['body'][] = t("!name (!name-url) has sent you a message via your contact form (!form-url) at !site.", array('!name' => $params['name'], '!name-url' => $params['mail'], '!form-url' => url($_GET['q'], array('absolute' => TRUE, 'language' => $language)), '!site' => variable_get('site_name', 'Drupal')), $language->language);	
<       }
< 	  /*New Code end*/
---
>       $message['body'][] = t("!name (!name-url) has sent you a message via your contact form (!form-url) at !site.", array('!name' => $user->name, '!name-url' => url("user/$user->uid", array('absolute' => TRUE, 'language' => $language)), '!form-url' => url($_GET['q'], array('absolute' => TRUE, 'language' => $language)), '!site' => variable_get('site_name', 'Drupal')), $language->language);