? .git ? add_privatemsg_integration_module.patch ? remove_privatemsg_integration_from_api_and_ui.patch ? user_relationship_privatemsg ? user_relationship_privatemsg.tar.gz ? user_relationship_privatemsg_0.patch Index: user_relationships_api/user_relationships_api.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/user_relationships_api/Attic/user_relationships_api.module,v retrieving revision 1.1.6.3 diff -u -p -r1.1.6.3 user_relationships_api.module --- user_relationships_api/user_relationships_api.module 9 Feb 2011 00:30:28 -0000 1.1.6.3 +++ user_relationships_api/user_relationships_api.module 13 Feb 2011 22:51:04 -0000 @@ -12,12 +12,11 @@ define('UR_OK', 0x0); define('UR_BANNED', 0x1); -// Pre Loading files that will be required in this module -foreach (array('api', 'actions', 'socnet') as $file) { - module_load_include("inc", "user_relationships_api", "user_relationships_api.{$file}"); -} -if (module_exists('privatemsg')) { - module_load_include('inc', 'user_relationships_api', 'user_relationships_api.privatemsg'); +/** + * Implements hook_init(). + */ +function user_relationships_api_init() { + module_load_include("inc", "user_relationships_api", "user_relationships_api.api"); } /** @@ -131,7 +130,8 @@ function _user_relationships_generate_qu } } if (!empty($limit)) { - $query->range(0, $limit); + $offset = !empty($offset) ? $offset : 0; + $query->range($offset, $limit); } if (!empty($only_count)) { return $count; Index: user_relationships_api/user_relationships_api.privatemsg.inc =================================================================== RCS file: user_relationships_api/user_relationships_api.privatemsg.inc diff -N user_relationships_api/user_relationships_api.privatemsg.inc --- user_relationships_api/user_relationships_api.privatemsg.inc 9 Feb 2011 00:30:28 -0000 1.1.4.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,76 +0,0 @@ -innerJoin('user_relationships', 'ur', 'u.uid = ur.requestee_id'); - $query - ->condition('ur.approved', 1) - ->condition('ur.requester_id', $user->uid); -} - - -/** - * Blocks messages to users that are not in relationships with sender. - * @see hook_privatemsg_block_message() - */ -function user_relationships_api_privatemsg_block_message($author, $recipients) { - // Check if $author needs to be restricted. - if (!user_relationships_api_privatemsg_restrict($author)) { - return; - } - - $blocked = array(); - foreach ($recipients as $recipient) { - if (isset($recipient->type) && $recipient->type != 'user' && $recipient->type != 'hidden') { - continue; - } - //block if user is only receiving pm's from his relationships, and author is not one of them - $user_setting = isset($recipient->data['user_relationships_allow_private_message']) ? $recipient->data['user_relationships_allow_private_message'] : 'on all users'; - if ( - (variable_get('user_relationships_restrict_privatemsg', 'all') == 'relationships' - || (variable_get('user_relationships_restrict_privatemsg', 'all') == 'all_overridable' - && $user_setting == 'on in relations')) - && !module_invoke_all('socnet_is_related', $author->uid, $recipient->recipient) - ) { - $blocked[] = array( - 'recipient' => privatemsg_recipient_key($recipient), - 'message' => t('!name does not have an established relationship with you.', array('!name' => privatemsg_recipient_format($recipient))), - ); - } - } - return $blocked; -} - -function user_relationships_api_privatemsg_restrict($author, $check_permission = TRUE) { - //#522078 admin killswitch, always ignore this for user 1. - if (($check_permission && variable_get('user_relationships_restrict_privatemsg', 'all') == 'all') || $author->uid == 1) { - return FALSE; - } - - $exlude_roles = array_filter(variable_get('user_relationships_privatemsg_role_exclusions', array())); - // First, make sure that we have a user object with roles, and then check if - // the users does have any of the exluded roles. - if (!empty($author->roles) || $author = user_load($author->uid)) { - $is_excluded = array_intersect(array_keys($author->roles), $exlude_roles); - if (!empty($is_excluded)) { - return FALSE; - } - } - return TRUE; -} Index: user_relationships_ui/user_relationships_ui.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/user_relationships_ui/Attic/user_relationships_ui.admin.inc,v retrieving revision 1.1.4.2 diff -u -p -r1.1.4.2 user_relationships_ui.admin.inc --- user_relationships_ui/user_relationships_ui.admin.inc 14 Jan 2011 23:28:12 -0000 1.1.4.2 +++ user_relationships_ui/user_relationships_ui.admin.inc 13 Feb 2011 22:51:05 -0000 @@ -56,37 +56,6 @@ function user_relationships_ui_settings( 'is_numeric' => array('msg' => t('The relationships per page setting is not an integer')) ))) ); - if (module_exists('privatemsg')) { - $form['privatemsg'] = array( - '#type' => 'fieldset', - '#title' => t('Private Message Integration'), - '#description' => t('Configure integration with the Private Message module. These settings apply to all users except the default admin user.'), - '#group' => 'settings', - ); - $form['privatemsg']['user_relationships_restrict_privatemsg'] = array( - '#type' => 'radios', - '#title' => t('Permitted message recipients'), - '#default_value' => variable_get('user_relationships_restrict_privatemsg', 'all'), - '#options' => array( - 'all' => t('Allow sending messages to all users'), - 'all_overridable' => t('Allow sending messages to all users, but provide users with an option to only receive messages from their confirmed relationships.'), - 'relationships' => t('Only allow sending messages between confirmed relationships.'), - ), - ); - $form['privatemsg']['user_relationships_privatemsg_autocomplete_alter'] = array( - '#type' => 'checkbox', - '#title' => t('Only suggest confirmed relationships as message recipients'), - '#description' => t('When sending a private message, only display confirmed relationships in the "To" autocomplete field.'), - '#default_value' => variable_get('user_relationships_privatemsg_autocomplete_alter', 0), - ); - $form['privatemsg']['user_relationships_privatemsg_role_exclusions'] = array( - '#type' => 'checkboxes', - '#options' => user_roles(TRUE), - '#default_value' => variable_get('user_relationships_privatemsg_role_exclusions', array()), - '#title' => t('Role exceptions'), - '#description' => t('Any roles checked below are exempt from the above restrictions and may send private messages to all users.'), - ); - } $form['positioning'] = array( '#type' => 'fieldset', '#title' => t('AJAX Popup Positioning'), Index: user_relationships_ui/user_relationships_ui.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/user_relationships_ui/Attic/user_relationships_ui.module,v retrieving revision 1.1.6.3 diff -u -p -r1.1.6.3 user_relationships_ui.module --- user_relationships_ui/user_relationships_ui.module 9 Feb 2011 00:30:28 -0000 1.1.6.3 +++ user_relationships_ui/user_relationships_ui.module 13 Feb 2011 22:51:08 -0000 @@ -755,25 +755,6 @@ function user_relationships_ui_form_alte } } } - //#257748 #458046 for adding the functionality of allowing/disallowing private messages. - if (variable_get('user_relationships_restrict_privatemsg', 'all') == 'all_overridable' - && user_access('maintain own relationships', $form['#user']) - && module_exists('privatemsg') - ) { //check if privatemsg is installed - $options = drupal_map_assoc(array('on in relations', 'on all users')); - $form['privatemsg']['user_relationships_allow_private_message'] = array( - '#type' => 'radios', - '#title' => t('Allow private messages from...'), - '#description' => t('Choose who can send you private messages.'), - '#options' => array('on all users' => t('Everyone'), 'on in relations' => t('Only those who have an established relationship with me')), - '#default_value' => isset($form['#user']->data['user_relationships_allow_private_message'])? $form['#user']->data['user_relationships_allow_private_message'] : 'on all users', - '#states' => array( - 'visible' => array( - ':input[name="pm_enable"]' => array('checked' => TRUE), - ), - ), - ); - } // No options have been set so don't display it if (isset($form['user_relationships_ui_settings']) && sizeof($form['user_relationships_ui_settings']) == 3) {