diff -ubBwr --exclude=uploads --exclude=images --exclude=images_pcf --exclude=config.php --exclude=languages/polish --exclude=settings.php Upload/inc/languages/english/member.lang.php forum/inc/languages/english/member.lang.php --- Upload/inc/languages/english/member.lang.php 2006-12-04 11:39:42.000000000 +0100 +++ forum/inc/languages/english/member.lang.php 2006-12-13 10:18:10.000000000 +0100 @@ -154,4 +154,5 @@ $l['error_regimageinvalid'] = "The image verification code that you entered was incorrect. Please enter the code exactly how it appears in the image."; $l['error_hideemail'] = "The recipient has chosen to hide his/her e-mail address."; +$l['error_cannot_receive_emails'] = "This account cannot receive e-mails. Possibly because it was suspended or it is waiting for activation" ; // KK: spam_email_send2_unactivated.bug ?> diff -ubBwr --exclude=uploads --exclude=images --exclude=images_pcf --exclude=config.php --exclude=languages/polish --exclude=settings.php Upload/member.php forum/member.php --- Upload/member.php 2006-12-04 11:39:43.000000000 +0100 +++ forum/member.php 2006-12-13 10:20:02.000000000 +0100 @@ -1370,13 +1391,21 @@ } if($mybb->input['uid']) { - $query = $db->simple_select(TABLE_PREFIX."users", "username, hideemail", "uid='".intval($mybb->input['uid'])."'"); +// $query = $db->simple_select(TABLE_PREFIX."users", "username, hideemail", "uid='".intval($mybb->input['uid'])."'"); + $query = $db->simple_select(TABLE_PREFIX."users", "username, hideemail, usergroup", "uid='".intval($mybb->input['uid'])."'"); // KK: spam_email_send2_unactivated.bug $emailto = $db->fetch_array($query); if(!$emailto['username']) { error($lang->error_invalidpmrecipient); } + // KK: spam_email_send2_unactivated.bug + $usergroup_4_awaiting_activation = 5 ; + if ($emailto['usergroup'] == $usergroup_4_awaiting_activation) + { + error($lang->error_cannot_receive_emails); + } + // KK^ if($emailto['hideemail'] != "no") { error($lang->error_hideemail); }