- Patch #60483 by budda, Morbus, webchick et al: hide contact tab for users...

- Patch #60483 by budda, Morbus, webchick et al: hide contact tab for users who have option disabled.

modules/contact.module

@@ -101,6 +101,8 @@ function contact_menu($may_cache) {
   }
   else {
     if (arg(0) == 'user' && is_numeric(arg(1))) {
+      $account = user_load(array('uid' => arg(1)));
+      if ($account->contact || user_access('administer users')) {
         global $user;
         $items[] = array('path' => 'user/'. arg(1) .'/contact',
           'title' => t('contact'),
@@ -111,6 +113,7 @@ function contact_menu($may_cache) {
         );
       }
     }
+  }
 
   return $items;
 }
@@ -317,17 +320,7 @@ function contact_mail_user() {
   global $user;
 
   if ($account = user_load(array('uid' => arg(1)))) {
-    $admin_access = user_access('administer users');
-    if (!$account->status && !$admin_access) {
-      drupal_access_denied();
-    }
-    else if (!$account->contact && !$admin_access) {
-      $output = t('%name is not accepting e-mails.', array('%name' => $account->name));
-    }
-    else if (!$user->uid) {
-      $output = t('Please <a href="%login">login</a> or <a href="%register">register</a> to send %name a message.', array('%login' => url('user/login'), '%register' => url('user/register'), '%name' => $account->name));
-    }
-    else if (!valid_email_address($user->mail)) {
+    if (!valid_email_address($user->mail)) {
       $output = t('You need to provide a valid e-mail address to contact other users. Please update your <a href="%url">user information</a> and try again.', array('%url' => url("user/$user->uid/edit")));
     }
     else if (!flood_is_allowed('contact', variable_get('contact_hourly_threshold', 3))) {

modules/contact/contact.module

@@ -101,6 +101,8 @@ function contact_menu($may_cache) {
   }
   else {
     if (arg(0) == 'user' && is_numeric(arg(1))) {
+      $account = user_load(array('uid' => arg(1)));
+      if ($account->contact || user_access('administer users')) {
         global $user;
         $items[] = array('path' => 'user/'. arg(1) .'/contact',
           'title' => t('contact'),
@@ -111,6 +113,7 @@ function contact_menu($may_cache) {
         );
       }
     }
+  }
 
   return $items;
 }
@@ -317,17 +320,7 @@ function contact_mail_user() {
   global $user;
 
   if ($account = user_load(array('uid' => arg(1)))) {
-    $admin_access = user_access('administer users');
-    if (!$account->status && !$admin_access) {
-      drupal_access_denied();
-    }
-    else if (!$account->contact && !$admin_access) {
-      $output = t('%name is not accepting e-mails.', array('%name' => $account->name));
-    }
-    else if (!$user->uid) {
-      $output = t('Please <a href="%login">login</a> or <a href="%register">register</a> to send %name a message.', array('%login' => url('user/login'), '%register' => url('user/register'), '%name' => $account->name));
-    }
-    else if (!valid_email_address($user->mail)) {
+    if (!valid_email_address($user->mail)) {
       $output = t('You need to provide a valid e-mail address to contact other users. Please update your <a href="%url">user information</a> and try again.', array('%url' => url("user/$user->uid/edit")));
     }
     else if (!flood_is_allowed('contact', variable_get('contact_hourly_threshold', 3))) {