diff --git a/pm_block_user/pm_block_user.module b/pm_block_user/pm_block_user.module
index cbfeecc..3f9c523 100755
--- a/pm_block_user/pm_block_user.module
+++ b/pm_block_user/pm_block_user.module
@@ -46,7 +46,7 @@ function pm_block_user_menu() {
'page arguments' => array('pm_block_user_list'),
'file' => 'pm_block_user.pages.inc',
'access callback' => 'privatemsg_user_access',
- 'access arguments' => array('read privatemsg'),
+ 'access arguments' => array('receive privatemsg'),
'type' => MENU_LOCAL_TASK,
'weight' => 10,
);
@@ -178,7 +178,7 @@ function theme_pm_block_user_actions($form) {
*/
function _pm_block_user_access($account) {
global $user;
- if (!privatemsg_user_access('read privatemsg', $user)) {
+ if (!privatemsg_user_access('receive privatemsg', $user)) {
return FALSE;
}
// Allow to unblock users that are already blocked but the user is now not
diff --git a/pm_block_user/pm_block_user.test b/pm_block_user/pm_block_user.test
index 5f001d6..af6dbf8 100644
--- a/pm_block_user/pm_block_user.test
+++ b/pm_block_user/pm_block_user.test
@@ -25,9 +25,9 @@ class PrivatemsgBlockUserCase extends PrivatemsgBaseTestCase {
*/
function testRoleBlockRecipient() {
// User id 3, Role id 4.
- $author_user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'access user profiles'));
+ $author_user = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'access user profiles'));
// User id 4, Role id 5.
- $blocked_user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'access user profiles'));
+ $blocked_user = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'access user profiles'));
// User id 5, Role id 6.
$admin_user = $this->drupalCreateUser(array('administer privatemsg settings'));
@@ -89,9 +89,9 @@ class PrivatemsgBlockUserCase extends PrivatemsgBaseTestCase {
function testBlockAndUnblock() {
// Create needed users.
- $user1 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'access user profiles'));
- $user2 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'access user profiles'));
- $user3 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'access user profiles'));
+ $user1 = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'access user profiles'));
+ $user2 = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'access user profiles'));
+ $user3 = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'access user profiles'));
// Set up a simple conversation.
$return = privatemsg_new_thread(array($user2, $user3), $subject = $this->randomName(20), $this->randomString(50), array('author' => $user1));
diff --git a/pm_email_notify/pm_email_notify.module b/pm_email_notify/pm_email_notify.module
index 7d8f128..87176cf 100644
--- a/pm_email_notify/pm_email_notify.module
+++ b/pm_email_notify/pm_email_notify.module
@@ -328,7 +328,7 @@ function pm_email_notify_form_user_profile_form_alter(&$form, &$form_state) {
'#access' => privatemsg_user_access('write privatemsg'),
);
}
- if (privatemsg_user_access('read privatemsg')) {
+ if (privatemsg_user_access('receive privatemsg')) {
if (privatemsg_user_access('set privatemsg e-mail notification level')) {
$form['privatemsg']['pm_email_notify_level'] = array(
'#type' => 'radios',
diff --git a/pm_email_notify/pm_email_notify.test b/pm_email_notify/pm_email_notify.test
index f4b3040..4f8d571 100644
--- a/pm_email_notify/pm_email_notify.test
+++ b/pm_email_notify/pm_email_notify.test
@@ -26,10 +26,10 @@ class PrivatemsgEMailNotifyTestCase extends PrivatemsgBaseTestCase {
function setUp() {
parent::setUp('privatemsg', 'pm_email_notify', 'privatemsg_roles');
- $this->author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'write privatemsg to all roles'));
- $this->recipient = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'set privatemsg e-mail notification level', 'change privatemsg e-mail notification for indirect messages'));
- $this->recipient2 = $this->drupalCreateUser(array('read privatemsg'));
- $this->admin = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'administer privatemsg settings'));
+ $this->author = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'write privatemsg to all roles'));
+ $this->recipient = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'set privatemsg e-mail notification level', 'change privatemsg e-mail notification for indirect messages'));
+ $this->recipient2 = $this->drupalCreateUser(array('receive privatemsg'));
+ $this->admin = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'administer privatemsg settings'));
$this->handledMails = 0;
}
diff --git a/privatemsg.install b/privatemsg.install
index 8bf3892..bbabae6 100644
--- a/privatemsg.install
+++ b/privatemsg.install
@@ -426,3 +426,10 @@ function privatemsg_update_7202() {
)
);
}
+
+/**
+ * Rename "Read private messages" permission to "Receive private messages."
+ */
+function privatemsg_update_7203() {
+ db_update('role_permission')->fields(array('permission' => 'receive privatemsg'))->condition('permission', 'read privatemsg')->execute();
+}
diff --git a/privatemsg.module b/privatemsg.module
index 2ac06e3..94a3776 100755
--- a/privatemsg.module
+++ b/privatemsg.module
@@ -27,9 +27,9 @@ function privatemsg_permission() {
'title' => t('Administer privatemsg'),
'description' => t('Perform maintenance tasks for privatemsg'),
),
- 'read privatemsg' => array(
- 'title' => t('Read private messages'),
- 'description' => t('Read private messages'),
+ 'receive privatemsg' => array(
+ 'title' => t('Receive private messages'),
+ 'description' => t('Receive private messages'),
),
'read all private messages' => array(
'title' => t('Read all private messages'),
@@ -279,7 +279,7 @@ function privatemsg_menu() {
'description' => 'Undo last thread action',
'page callback' => 'privatemsg_undo_action',
'file' => 'privatemsg.pages.inc',
- 'access arguments' => array('read privatemsg'),
+ 'access arguments' => array('receive privatemsg'),
'type' => MENU_CALLBACK,
'menu' => 'user-menu',
);
@@ -321,14 +321,14 @@ function privatemsg_menu_local_tasks_alter(&$data, $router_item, $root_path) {
* Never allows anonymous user access as that doesn't makes sense.
*
* @param $permission
- * Permission string, defaults to read privatemsg
+ * Permission string, defaults to receive privatemsg
*
* @return
* TRUE if user has access, FALSE if not
*
* @ingroup api
*/
-function privatemsg_user_access($permission = 'read privatemsg', $account = NULL) {
+function privatemsg_user_access($permission = 'receive privatemsg', $account = NULL) {
static $disabled_displayed = FALSE;
if ( $account === NULL ) {
global $user;
@@ -369,7 +369,7 @@ function privatemsg_view_access($thread) {
// Count all messages, if there
return FALSE;
}
- if (privatemsg_user_access('read privatemsg') && arg(1) == 'view') {
+ if (privatemsg_user_access('receive privatemsg') && arg(1) == 'view') {
return TRUE;
}
return FALSE;
@@ -1359,7 +1359,7 @@ function privatemsg_form_alter(&$form, &$form_state, $form_id) {
// We have to use user_access() because privatemsg_user_access() would
// return FALSE when privatemsg is disabled.
- if ((user_access('write privatemsg') || user_access('read privatemsg')) && user_access('allow disabling privatemsg') && privatemsg_allow_disable($form['#user'])) {
+ if ((user_access('write privatemsg') || user_access('receive privatemsg')) && user_access('allow disabling privatemsg') && privatemsg_allow_disable($form['#user'])) {
$form['privatemsg']['pm_enable'] = array(
'#type' => 'checkbox',
'#title' => t('Enable private messages'),
@@ -1402,7 +1402,7 @@ function privatemsg_account_fieldset_remove_if_empty($element) {
* Implements hook_user_update().
*/
function privatemsg_user_update(&$edit, $account, $category) {
- if (isset($edit['pm_enable']) && (user_access('write privatemsg') || user_access('read privatemsg')) && user_access('allow disabling privatemsg') && privatemsg_allow_disable($account)) {
+ if (isset($edit['pm_enable']) && (user_access('write privatemsg') || user_access('receive privatemsg')) && user_access('allow disabling privatemsg') && privatemsg_allow_disable($account)) {
$current = privatemsg_is_disabled($account);
$disabled = (int) !$edit['pm_enable'];
$edit['pm_enable'] = NULL;
@@ -1559,7 +1559,7 @@ function _privatemsg_block_menu() {
if (privatemsg_user_access('write privatemsg')) {
$links[] = l(t('Write new message'), 'messages/new');
}
- if (privatemsg_user_access('read privatemsg') || privatemsg_user_access('read all private messages') ) {
+ if (privatemsg_user_access('receive privatemsg') || privatemsg_user_access('read all private messages') ) {
$links[] = l(privatemsg_title_callback(), 'messages');
}
if (count($links)) {
@@ -1985,7 +1985,7 @@ function privatemsg_get_link($recipients, $account = array(), $subject = NULL) {
$validated = array();
foreach ($recipients as $recipient) {
- if (!privatemsg_user_access('read privatemsg', $recipient)) {
+ if (!privatemsg_user_access('receive privatemsg', $recipient)) {
continue;
}
if (variable_get('privatemsg_display_link_self', TRUE) == FALSE && $account->uid == $recipient->uid) {
@@ -2734,6 +2734,9 @@ function privatemsg_recipient_format($recipient, $options = array()) {
/**
* Implements hook_privatemsg_recipient_type_info().
+ *
+ * @return
+ * Todo
*/
function privatemsg_privatemsg_recipient_type_info() {
return array(
@@ -2743,12 +2746,22 @@ function privatemsg_privatemsg_recipient_type_info() {
'load' => 'privatemsg_user_load_multiple',
'format' => 'privatemsg_username',
'autocomplete' => 'privatemsg_user_autocomplete',
+ 'write callback' => '_privatemsg_recipient_user_write_permission',
// Make sure this comes always last.
'#weight' => 50,
),
);
}
+function _privatemsg_recipient_user_write_permission($recipient) {
+ if (is_object($recipient) && isset($recipient->uid)) {
+ return user_access('write privatemsg') && ($recipient->uid == 1 || user_access('read privatemsg', $recipient) || user_access('administer privatemsg settings', $recipient));
+ }
+ else {
+ return TRUE;
+ }
+}
+
/**
* Implements callback_recipient_autocomplete().
*/
@@ -2767,6 +2780,10 @@ function privatemsg_user_autocomplete($fragment, $names, $limit) {
// Return them in an array with the correct recipient key.
$suggestions = array();
foreach ($accounts as $account) {
+ // Only display recipients with permission to read private messages.
+ if (!_privatemsg_recipient_user_write_permission($account)) {
+ continue;
+ }
$account->type = 'user';
$account->recipient = $account->uid;
$suggestions[privatemsg_recipient_key($account)] = $account;
diff --git a/privatemsg.test b/privatemsg.test
index 1363c05..6aa2ba0 100644
--- a/privatemsg.test
+++ b/privatemsg.test
@@ -72,14 +72,14 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
/**
* Test user access to /messages
- * Create user with no 'read privatemsg' permission. Try to access mailbox and see if it gives access denied error
- * Create user with 'read privatemsg' permission. Try to access mailbox and see if it gives allows access
+ * Create user with no 'receive privatemsg' permission. Try to access mailbox and see if it gives access denied error
+ * Create user with 'receive privatemsg' permission. Try to access mailbox and see if it gives allows access
*/
function testPrivatemsgReadPrivatemsgPermission() {
- $user_no_read_msg = $this->drupalCreateUser(); // set up user with default permissions (meaning: no read privatemsg permission
- $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
- $recipient = $this->drupalCreateUser(array('read privatemsg'));
- $no_recipient = $this->drupalCreateUser(array('read privatemsg'));
+ $user_no_read_msg = $this->drupalCreateUser(); // set up user with default permissions (meaning: no receive privatemsg permission
+ $author = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
+ $recipient = $this->drupalCreateUser(array('receive privatemsg'));
+ $no_recipient = $this->drupalCreateUser(array('receive privatemsg'));
$subject = $this->randomName(20);
@@ -89,11 +89,11 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
$this->drupalLogin($user_no_read_msg);
$this->drupalGet('messages');
- $this->assertResponse(403, t('HTTP Response 403: Access to mailbox was blocked to user without "read privatemsg" permission'));
+ $this->assertResponse(403, t('HTTP Response 403: Access to mailbox was blocked to user without "receive privatemsg" permission'));
$this->drupalLogin($no_recipient);
$this->drupalGet('messages');
- $this->assertResponse(200, t('HTTP Response 200: Access to mailbox was authorized to user with "read privatemsg" permission'));
+ $this->assertResponse(200, t('HTTP Response 200: Access to mailbox was authorized to user with "receive privatemsg" permission'));
$this->drupalGet('messages/view/' . $response['message']->thread_id);
$this->assertResponse(403, t('HTTP Response 403: Access to thread is blocked for non-recipients.'));
@@ -112,7 +112,7 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
* Create user with 'write privatemsg' permission. Try to access Write New Message page and see if it gives allows access
*/
function testPrivatemsgWritePrivatemsgPermission() {
- $user_no_write_msg = $this->drupalCreateUser(); // set up user with default permissions (meaning: no read privatemsg permission
+ $user_no_write_msg = $this->drupalCreateUser(); // set up user with default permissions (meaning: no receive privatemsg permission
$this->drupalLogin($user_no_write_msg);
$this->drupalGet('messages/new');
$this->assertResponse(403, t('HTTP Response 403: Access to Write New Message page was blocked to user without "write privatemsg" permission'));
@@ -124,8 +124,8 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
}
function testPaging() {
- $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
- $recipient = $this->drupalCreateUser(array('read privatemsg'));
+ $author = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
+ $recipient = $this->drupalCreateUser(array('receive privatemsg'));
// Set lower values so that we don't need to generate 100's of messages.
variable_set('privatemsg_view_default_amount', 5);
@@ -240,8 +240,9 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
function testWriteReplyPrivatemsg() {
// Create a author and two recipients.
$author = $this->drupalCreateUser(array('write privatemsg', 'select text format for privatemsg', filter_permission_name(filter_format_load('full_html'))));
- $recipient = $this->drupalCreateUser(array('read privatemsg'));
- $recipient2 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $recipient = $this->drupalCreateUser(array('receive privatemsg'));
+ $recipient2 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
+ $recipient3 = $this->drupalCreateUser(array());
// Login author and go to new message form.
$this->drupalLogin($author);
@@ -259,6 +260,12 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
'subject' => $this->randomName(20),
'body[value]' => $this->randomName(100),
);
+ // Recipient with no receive privatemsg permission.
+ $editnoreadpermision = array(
+ 'recipient' => $recipient3->name,
+ 'subject' => $this->randomName(20),
+ 'body[value]' => $this->randomName(100),
+ );
// No recipients.
$editnone = array(
'recipient' => '',
@@ -317,6 +324,9 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
$this->drupalPost('messages/new', $edit2, t('Send message'));
$this->assertText(t('A message has been sent to @recipients.', array('@recipients' => implode(', ', array($recipient->name, $recipient2->name)))), 'Message sent confirmation displayed.');
+ $this->drupalPost('messages/new', $editnoreadpermision, t('Send message'));
+ $this->assertText(t('You must include at least one valid recipient.'), "Message not sent to user without 'receive privatemsg' permission.");
+
$this->drupalPost('messages/new', $editnone, t('Send message'));
$this->assertText(t('To field is required.'), 'Message was not sent.');
@@ -423,9 +433,9 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
*/
function testDisablePrivatemsg() {
$admin_user = $this->drupalCreateUser(array('administer permissions'));
- $enableduser = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg')); // set up user with read/write privatemsg permissions
- $enableduser2 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg')); // set up user with read/write privatemsg permissions
- $disableduser = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'allow disabling privatemsg')); // set up user with read/write privatemsg permissions
+ $enableduser = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg')); // set up user with read/write privatemsg permissions
+ $enableduser2 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg')); // set up user with read/write privatemsg permissions
+ $disableduser = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'allow disabling privatemsg')); // set up user with read/write privatemsg permissions
// Create a message between the users that we can use to test
$return = privatemsg_new_thread(array($disableduser), $this->randomName(20), $this->randomName(100), array('author' => $enableduser));
@@ -502,9 +512,9 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
* Test correct handling of read all permissions.
*/
function testReadAllPermission() {
- $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
- $recipient = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
- $admin = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'read all private messages'));
+ $author = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
+ $recipient = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
+ $admin = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'read all private messages'));
// Create new message.
$edit = array(
@@ -566,8 +576,8 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
* Tests for the flush feature
*/
function testPrivatemsgFlush() {
- $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
- $recipient = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $author = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
+ $recipient = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
// Send 10 messages.
for ($i = 0; $i < 10; $i++) {
@@ -622,10 +632,10 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
function testDelete() {
// Create users.
- $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'delete privatemsg'));
- $recipient = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'delete privatemsg'));
- $recipient2 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'cancel account'));
- $admin = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'delete privatemsg', 'read all private messages'));
+ $author = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'delete privatemsg'));
+ $recipient = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'delete privatemsg'));
+ $recipient2 = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'cancel account'));
+ $admin = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'delete privatemsg', 'read all private messages'));
$dummy = $this->drupalCreateUser(array('cancel account'));
// Create texts.
@@ -782,7 +792,7 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
* Test preview functionality.
*/
function testPreview() {
- $user = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $user = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
// Enable preview button.
variable_set('privatemsg_display_preview_button', TRUE);
@@ -812,10 +822,11 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
* Test autocomplete.
*/
function testAutocomplete() {
- $current = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
- $user1 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
- $user2 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
- $user3 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $current = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
+ $user1 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
+ $user2 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
+ $user3 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
+ $unprivileged_user = $this->drupalCreateUser();
$this->drupalLogin($current);
@@ -824,6 +835,7 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
user_save($user1, array('name' => 'aaaa'));
user_save($user2, array('name' => 'aaab'));
user_save($user3, array('name' => 'bbbb'));
+ user_save($unprivileged_user, array('name' => 'dddd'));
$json = $this->drupalGet('messages/autocomplete/aa');
$autocomplete = (array)json_decode($json);
@@ -831,6 +843,10 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
$this->assertEqual($autocomplete['aaaa, '], 'aaaa');
$this->assertEqual($autocomplete['aaab, '], 'aaab');
+ $json = $this->drupalGet('messages/autocomplete/dd');
+ $autocomplete = (array)json_decode($json);
+ $this->assertEqual(count($autocomplete), 0, t("Autocomplete does not show users without 'receive privatemsg' permission."));
+
$json = $this->drupalGet('messages/autocomplete/bb');
$autocomplete = (array)json_decode($json);
$this->assertEqual(count($autocomplete), 1, t('Autocomplete object contains one suggestion.'));
@@ -847,7 +863,7 @@ class PrivatemsgTestCase extends PrivatemsgBaseTestCase {
// Test XSS protection, create a username and check that the suggestion is
// safe.
- $user4 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $user4 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
$user4 = user_save($user4, array('name' => ""));
$json = $this->drupalGet('messages/autocomplete/drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
- $user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'receive privatemsg'));
+ $user = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
$this->drupalLogin($admin);
@@ -940,8 +956,8 @@ class PrivatemsgFieldsTestCase extends PrivatemsgBaseTestCase {
* Verify that a message with an empty image can be sent.
*/
function testEmptyImage() {
- $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
- $user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'receive privatemsg'));
+ $user = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
$this->drupalLogin($admin);
@@ -1012,8 +1028,8 @@ class PrivatemsgLinksTestCase extends PrivatemsgBaseTestCase {
* Tests author links displayed on nodes and comments.
*/
function testAuthorLinks() {
- $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'administer privatemsg settings', 'create article content', 'create page content'));
- $user = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $admin = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'administer privatemsg settings', 'create article content', 'create page content'));
+ $user = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
$this->drupalLogin($admin);
@@ -1073,8 +1089,8 @@ class PrivatemsgLinksTestCase extends PrivatemsgBaseTestCase {
* Tests menu block.
*/
function testMenuBlock() {
- $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'administer privatemsg settings', 'administer blocks', 'administer menu'));
- $user = $this->drupalCreateUser(array('read privatemsg'));
+ $admin = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'administer privatemsg settings', 'administer blocks', 'administer menu'));
+ $user = $this->drupalCreateUser(array('receive privatemsg'));
// Enable block.
$this->drupalLogin($admin);
@@ -1112,8 +1128,8 @@ class PrivatemsgLinksTestCase extends PrivatemsgBaseTestCase {
* Tests menu block.
*/
function testNewBlock() {
- $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'administer privatemsg settings', 'administer blocks', 'administer menu'));
- $user = $this->drupalCreateUser(array('read privatemsg'));
+ $admin = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'administer privatemsg settings', 'administer blocks', 'administer menu'));
+ $user = $this->drupalCreateUser(array('receive privatemsg'));
// Enable block.
$this->drupalLogin($admin);
@@ -1167,9 +1183,9 @@ class PrivatemsgTokenTestCase extends PrivatemsgBaseTestCase {
* Basic token functionality.
*/
function testBasicTokens() {
- $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'use tokens in privatemsg'));
- $recipient1 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
- $recipient2 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $author = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'use tokens in privatemsg'));
+ $recipient1 = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
+ $recipient2 = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
$this->drupalLogin($author);
@@ -1301,10 +1317,10 @@ class PrivatemsgAPITestCase extends PrivatemsgBaseTestCase {
}
function testPrivatemsgApiNewThread() {
- $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
- $recipient1 = $this->drupalCreateUser(array('read privatemsg'));
- $recipient2 = $this->drupalCreateUser(array('read privatemsg'));
- $recipient3 = $this->drupalCreateUser(array('read privatemsg'));
+ $author = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
+ $recipient1 = $this->drupalCreateUser(array('receive privatemsg'));
+ $recipient2 = $this->drupalCreateUser(array('receive privatemsg'));
+ $recipient3 = $this->drupalCreateUser(array('receive privatemsg'));
// Reset user_access cache
user_access('', $author, TRUE);
@@ -1355,9 +1371,9 @@ class PrivatemsgAPITestCase extends PrivatemsgBaseTestCase {
function testPrivatemsgApiReply() {
$author = $this->drupalCreateUser(array('write privatemsg'));
- $recipient1 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
- $recipient2 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
- $recipient3 = $this->drupalCreateUser(array('read privatemsg'));
+ $recipient1 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
+ $recipient2 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
+ $recipient3 = $this->drupalCreateUser(array('receive privatemsg'));
// Reset user_access cache
user_access('', $author, TRUE);
@@ -1393,15 +1409,15 @@ class PrivatemsgAPITestCase extends PrivatemsgBaseTestCase {
* Test various use cases for privatemsg_get_link().
*/
function testGetLink() {
- $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'write privatemsg to all roles'));
- $author2 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
- $recipient1 = $this->drupalCreateUser(array('read privatemsg'));
- $recipient2 = $this->drupalCreateUser(array('read privatemsg'));
- $recipient3 = $this->drupalCreateUser(array('read privatemsg', 'allow disabling privatemsg'));
+ $author = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'write privatemsg to all roles'));
+ $author2 = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
+ $recipient1 = $this->drupalCreateUser(array('receive privatemsg'));
+ $recipient2 = $this->drupalCreateUser(array('receive privatemsg'));
+ $recipient3 = $this->drupalCreateUser(array('receive privatemsg', 'allow disabling privatemsg'));
$recipient4 = $this->drupalCreateUser();
// Create role with the same name as recipient 2.
- $role = $this->drupalCreateRole(array('read privatemsg'), $recipient2->name);
+ $role = $this->drupalCreateRole(array('receive privatemsg'), $recipient2->name);
$this->drupalLogin($author);
diff --git a/privatemsg_filter/privatemsg_filter.test b/privatemsg_filter/privatemsg_filter.test
index f7e8fc2..09f87b2 100644
--- a/privatemsg_filter/privatemsg_filter.test
+++ b/privatemsg_filter/privatemsg_filter.test
@@ -31,8 +31,8 @@ class PrivatemsgFilterTestCase extends PrivatemsgBaseTestCase {
* Test correct handling of read all permissions.
*/
function testInboxSentHandling() {
- $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'delete privatemsg'));
- $recipient = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $author = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'delete privatemsg'));
+ $recipient = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
// Create new message.
$edit = array(
@@ -144,7 +144,7 @@ class PrivatemsgTagsTestCase extends PrivatemsgBaseTestCase {
* Create and update tags on a single thread.
*/
function testFilterFormSingleThread() {
- $webuser = $this->drupalCreateuser(array('read privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags'));
+ $webuser = $this->drupalCreateuser(array('receive privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags'));
// Create a new thread through the api.
$response = privatemsg_new_thread(array($webuser), $this->randomName(10), $this->randomName(20), array('author' => $webuser));
@@ -189,7 +189,7 @@ class PrivatemsgTagsTestCase extends PrivatemsgBaseTestCase {
function testTagsAdministration() {
// Create users.
- $admin = $this->drupalCreateuser(array('administer privatemsg settings', 'read privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags'));
+ $admin = $this->drupalCreateuser(array('administer privatemsg settings', 'receive privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags'));
// Prepare data.
$private = array(
'tag' => $this->randomName(10),
@@ -285,8 +285,8 @@ class PrivatemsgTagsTestCase extends PrivatemsgBaseTestCase {
* permission.
*/
function testOnlyTaggingPermission() {
- $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
- $webuser = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'tag private messages', 'create private message tags'));
+ $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'receive privatemsg'));
+ $webuser = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg', 'tag private messages', 'create private message tags'));
// Display tag column in thread list.
$this->drupalLogin($admin);
@@ -347,7 +347,7 @@ class PrivatemsgTagsTestCase extends PrivatemsgBaseTestCase {
}
function testInboxTagging() {
- $webuser = $this->drupalCreateuser(array('read privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags'));
+ $webuser = $this->drupalCreateuser(array('receive privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags'));
$admin = $this->drupalCreateUser(array('administer privatemsg settings'));
// Display tag column in thread list.
@@ -455,9 +455,9 @@ class PrivatemsgFilterWidgetTestCase extends PrivatemsgBaseTestCase {
* Generic filter widget tests.
*/
function testAuthorSearch() {
- $user1 = $this->drupalCreateuser(array('read privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags', 'filter private messages'));
- $user2 = $this->drupalCreateuser(array('read privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags', 'filter private messages'));
- $user3 = $this->drupalCreateuser(array('read privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags', 'filter private messages'));
+ $user1 = $this->drupalCreateuser(array('receive privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags', 'filter private messages'));
+ $user2 = $this->drupalCreateuser(array('receive privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags', 'filter private messages'));
+ $user3 = $this->drupalCreateuser(array('receive privatemsg', 'write privatemsg', 'tag private messages', 'create private message tags', 'filter private messages'));
$this->drupalLogin($user2);
$this->drupalGet('messages');
diff --git a/privatemsg_groups/privatemsg_groups.test b/privatemsg_groups/privatemsg_groups.test
index 5b4b12c..0559630 100644
--- a/privatemsg_groups/privatemsg_groups.test
+++ b/privatemsg_groups/privatemsg_groups.test
@@ -26,11 +26,11 @@ class PrivatemsgGroupsTestCase extends DrupalWebTestCase {
// Create group managers for these tests.
$this->group1_manager = $this->drupalCreateUser(array('administer group', 'access content', 'create page content', 'edit own page content',
- 'read privatemsg', 'write privatemsg', 'write privatemsg to all organic groups', 'view organic groups recipients'));
+ 'receive privatemsg', 'write privatemsg', 'write privatemsg to all organic groups', 'view organic groups recipients'));
$this->group2_manager = $this->drupalCreateUser(array('administer group', 'access content', 'create page content', 'edit own page content',
- 'read privatemsg', 'write privatemsg', 'write privatemsg to own organic groups', 'view organic groups recipients'));
+ 'receive privatemsg', 'write privatemsg', 'write privatemsg to own organic groups', 'view organic groups recipients'));
// Create group members for these tests
- $this->user1 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $this->user1 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
// Create group nodes.
$settings = array(
@@ -75,7 +75,7 @@ class PrivatemsgGroupsTestCase extends DrupalWebTestCase {
// Create 26 users (more than are allowed to be process directly).
$users = array();
for ($i = 0; $i < 25; $i++) {
- $users[$i] = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $users[$i] = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
// Add user to group1.
og_group('node', $this->group1->nid, array('entity' => $users[$i]->uid));
}
@@ -126,7 +126,7 @@ class PrivatemsgGroupsTestCase extends DrupalWebTestCase {
// Create 25 users (more than are allowed to be process directly).
$users = array();
for ($i = 0; $i < 25; $i++) {
- $users[$i] = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $users[$i] = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
// Add user to group1.
og_group('node', $this->group1->nid, array('entity' => $users[$i]->uid));
}
@@ -169,7 +169,7 @@ class PrivatemsgGroupsTestCase extends DrupalWebTestCase {
// Attempt to send message to group1 with write to all permission but
// no group permission.
- $user2 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'write privatemsg to all organic groups'));
+ $user2 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'write privatemsg to all organic groups'));
og_group('node', $this->group1->nid, array('entity' => $user2->uid));
$this->drupalLogin($user2);
$this->drupalPost('messages/new', $edit, t('Send message'));
@@ -178,7 +178,7 @@ class PrivatemsgGroupsTestCase extends DrupalWebTestCase {
// Attempt to send message to group1 with write to own permission but
// no group permission.
- $user3 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'write privatemsg to own organic groups'));
+ $user3 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'write privatemsg to own organic groups'));
og_group('node', $this->group1->nid, array('entity' => $user3->uid));
$this->drupalLogin($user3);
$this->drupalPost('messages/new', $edit, t('Send message'));
@@ -191,7 +191,7 @@ class PrivatemsgGroupsTestCase extends DrupalWebTestCase {
og_role_change_permissions($roles[OG_AUTHENTICATED_ROLE], array(
'write privatemsg to group' => 1,
));
- $user4 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'write privatemsg to own organic groups'));
+ $user4 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'write privatemsg to own organic groups'));
og_group('node', $this->group1->nid, array('entity' => $user4->uid));
$this->drupalLogin($user4);
$this->drupalPost('messages/new', $edit, t('Send message'));
@@ -206,7 +206,7 @@ class PrivatemsgGroupsTestCase extends DrupalWebTestCase {
* Test sending message to group using GUI.
*/
function testSendMessageToGroup() {
- $user2 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'view organic groups recipients'));
+ $user2 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'view organic groups recipients'));
og_group('node', $this->group1->nid, array('entity' => $user2->uid));
$group_name = $this->group1->title;
@@ -279,7 +279,7 @@ class PrivatemsgGroupsTestCase extends DrupalWebTestCase {
* Test sending message to group when some members blocked the sender.
*/
function testSendMessageToGroupBlocked() {
- $user2 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $user2 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
// Block admin as user 2.
$this->drupalLogin($user2);
@@ -330,7 +330,7 @@ class PrivatemsgGroupsTestCase extends DrupalWebTestCase {
$this->assertText(t('A message has been sent to @group (group).', array('@group' => $this->group1->title)));
// Add user 2 to the same group now. The user should not see the message.
- $user2 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $user2 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
og_group('node', $this->group1->nid, array('entity' => $user2->uid));
$this->drupalLogin($user2);
diff --git a/privatemsg_limits/privatemsg_limits.test b/privatemsg_limits/privatemsg_limits.test
index 305c88d..cd0578b 100644
--- a/privatemsg_limits/privatemsg_limits.test
+++ b/privatemsg_limits/privatemsg_limits.test
@@ -28,8 +28,8 @@ class PrivatemsgLimitsTestCase extends PrivatemsgBaseTestCase {
* Test sending limits with threads as limits object.
*/
function testSendLimitsMessages() {
- $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
- $user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'receive privatemsg'));
+ $user = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
$this->drupalLogin($admin);
@@ -106,8 +106,8 @@ class PrivatemsgLimitsTestCase extends PrivatemsgBaseTestCase {
* Test sending limits with threads as limits object.
*/
function testSendLimitsThreads() {
- $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
- $user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'receive privatemsg'));
+ $user = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
$this->drupalLogin($admin);
@@ -185,8 +185,8 @@ class PrivatemsgLimitsTestCase extends PrivatemsgBaseTestCase {
* Test receive limit with messages as limits object.
*/
function testReceiveLimitsMessages() {
- $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
- $user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'receive privatemsg'));
+ $user = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
$this->drupalLogin($admin);
@@ -262,8 +262,8 @@ class PrivatemsgLimitsTestCase extends PrivatemsgBaseTestCase {
* Test receive limit with messages as limits object.
*/
function testReceiveLimitsThreads() {
- $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
- $user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'receive privatemsg'));
+ $user = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
$this->drupalLogin($admin);
@@ -344,10 +344,10 @@ class PrivatemsgLimitsTestCase extends PrivatemsgBaseTestCase {
* Test limiting the number of recipients.
*/
function testRecipientsLimits() {
- $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
- $user1 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
- $user2 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
- $user3 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'receive privatemsg'));
+ $user1 = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
+ $user2 = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
+ $user3 = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
$this->drupalLogin($admin);
@@ -410,8 +410,8 @@ class PrivatemsgLimitsTestCase extends PrivatemsgBaseTestCase {
* Tests for limiting the number of messages per thread.
*/
function testNumberOfMessagesBlock() {
- $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
- $user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'receive privatemsg'));
+ $user = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
$this->drupalLogin($admin);
@@ -452,8 +452,8 @@ class PrivatemsgLimitsTestCase extends PrivatemsgBaseTestCase {
* Tests for limiting the number of messages per thread.
*/
function testNumberOfMessagesCreate() {
- $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
- $user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+ $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'receive privatemsg'));
+ $user = $this->drupalCreateUser(array('write privatemsg', 'receive privatemsg'));
$this->drupalLogin($admin);
@@ -486,4 +486,4 @@ class PrivatemsgLimitsTestCase extends PrivatemsgBaseTestCase {
$this->assertNoText($edit['body[value]']);
$this->assertText($reply['body[value]']);
}
-}
\ No newline at end of file
+}
diff --git a/privatemsg_roles/privatemsg_roles.test b/privatemsg_roles/privatemsg_roles.test
index 397beca..de155b7 100644
--- a/privatemsg_roles/privatemsg_roles.test
+++ b/privatemsg_roles/privatemsg_roles.test
@@ -22,8 +22,8 @@ class PrivatemsgRolesTestCase extends PrivatemsgBaseTestCase {
}
function testSendMessagetoRoleAPI() {
- $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'write privatemsg to all roles'));
- $user1 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $admin = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'write privatemsg to all roles'));
+ $user1 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
$user2 = $this->drupalCreateUser();
// Add role of user 1 to user 2;
@@ -44,7 +44,7 @@ class PrivatemsgRolesTestCase extends PrivatemsgBaseTestCase {
}
function testSendMessagetoRoleCron() {
- $user1 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $user1 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
variable_set('privatemsg_recipient_small_threshold', 20);
variable_set('privatemsg_cron_recipient_per_run', 20);
@@ -66,7 +66,7 @@ class PrivatemsgRolesTestCase extends PrivatemsgBaseTestCase {
$recipient->type = 'role';
// Create user with specific role permission.
- $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'write privatemsg to role ' . $recipient->name));
+ $admin = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'write privatemsg to role ' . $recipient->name));
privatemsg_new_thread(array($recipient), $subject = $this->randomName(10), $body = $this->randomName(50), array('author' => $admin));
@@ -103,8 +103,8 @@ class PrivatemsgRolesTestCase extends PrivatemsgBaseTestCase {
}
function testSendMessagetoRoleBatch() {
- $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'write privatemsg to all roles'));
- $user1 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $admin = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'write privatemsg to all roles'));
+ $user1 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
variable_set('privatemsg_recipient_small_threshold', 20);
// Create 25 users (more than are allowed to be process directly).
@@ -138,12 +138,12 @@ class PrivatemsgRolesTestCase extends PrivatemsgBaseTestCase {
}
function testPermission() {
- $user1 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $user1 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
// Update permissions.
$this->checkPermissions(array(), TRUE);
// Give permission to write only a specific role.
$role_name = user_role_load($user1->roles[3])->name;
- $user2 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'write privatemsg to role ' . $role_name));
+ $user2 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'write privatemsg to role ' . $role_name));
$this->drupalLogin($user2);
@@ -158,7 +158,7 @@ class PrivatemsgRolesTestCase extends PrivatemsgBaseTestCase {
}
function testSendMessageToRole() {
- $user1 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $user1 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
$user2 = $this->drupalCreateUser(array('view roles recipients'));
// Add role of user 1 to user 2;
@@ -169,7 +169,7 @@ class PrivatemsgRolesTestCase extends PrivatemsgBaseTestCase {
$this->checkPermissions(array(), TRUE);
$role_name = user_role_load($user1->roles[3])->name;
- $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'view roles recipients', 'write privatemsg to role ' . $role_name));
+ $admin = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'view roles recipients', 'write privatemsg to role ' . $role_name));
$this->drupalLogin($admin);
@@ -238,8 +238,8 @@ class PrivatemsgRolesTestCase extends PrivatemsgBaseTestCase {
}
function testSendMessageToRoleBlocked() {
- $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'write privatemsg to all roles'));
- $user1 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $admin = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'write privatemsg to all roles'));
+ $user1 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
$user2 = $this->drupalCreateUser();
// Add role of user 1 to user 2;
@@ -281,8 +281,8 @@ class PrivatemsgRolesTestCase extends PrivatemsgBaseTestCase {
}
function testNewUser() {
- $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'write privatemsg to all roles'));
- $user1 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $admin = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'write privatemsg to all roles'));
+ $user1 = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
// Send a message to the role of user 1.
$this->drupalLogin($admin);
@@ -310,8 +310,8 @@ class PrivatemsgRolesTestCase extends PrivatemsgBaseTestCase {
* Verify that deleting a user does not leave stale data behind.
*/
function testDeleteUser() {
- $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'write privatemsg to all roles'));
- $user = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
+ $admin = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg', 'write privatemsg to all roles'));
+ $user = $this->drupalCreateUser(array('receive privatemsg', 'write privatemsg'));
// Send a message to the role of user 1.
$role_name = user_role_load(4)->name;