summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xpm_block_user/pm_block_user.module2
-rw-r--r--pm_email_notify/pm_email_notify.module2
-rw-r--r--privatemsg.module12
-rw-r--r--privatemsg_filter/privatemsg_filter.module12
4 files changed, 18 insertions, 10 deletions
diff --git a/pm_block_user/pm_block_user.module b/pm_block_user/pm_block_user.module
index f2a0f92..4940cda 100755
--- a/pm_block_user/pm_block_user.module
+++ b/pm_block_user/pm_block_user.module
@@ -41,7 +41,7 @@ function pm_block_user_menu() {
'weight' => -10,
);
- $items['admin/config/people/messages/block'] = array(
+ $items['admin/config/messaging/privatemsg/block'] = array(
'title' => 'User blocking rules',
'description' => 'Configure rules for which users may block each other.',
'page callback' => 'drupal_get_form',
diff --git a/pm_email_notify/pm_email_notify.module b/pm_email_notify/pm_email_notify.module
index f391270..69b9fab 100644
--- a/pm_email_notify/pm_email_notify.module
+++ b/pm_email_notify/pm_email_notify.module
@@ -10,7 +10,7 @@
* Implementation of hook_menu().
*/
function pm_email_notify_menu() {
- $items['admin/config/people/messages/notify'] = array(
+ $items['admin/config/messaging/privatemsg/notify'] = array(
'title' => 'E-mail notify',
'description' => 'E-mail notification settings',
'page callback' => 'drupal_get_form',
diff --git a/privatemsg.module b/privatemsg.module
index dfe3948..206cfd9 100644
--- a/privatemsg.module
+++ b/privatemsg.module
@@ -187,7 +187,15 @@ function privatemsg_menu() {
'access arguments' => array('write privatemsg'),
'type' => MENU_CALLBACK,
);
- $items['admin/config/people/messages'] = array(
+ $items['admin/config/messaging'] = array(
+ 'title' => 'Messaging',
+ 'description' => 'Messaging systems.',
+ 'page callback' => 'system_admin_menu_block_page',
+ 'access arguments' => array('access administration pages'),
+ 'file' => 'system.admin.inc',
+ 'file path' => drupal_get_path('module', 'system'),
+ );
+ $items['admin/config/messaging/privatemsg'] = array(
'title' => 'Private messages',
'description' => 'Configure private messaging settings.',
'page callback' => 'drupal_get_form',
@@ -196,7 +204,7 @@ function privatemsg_menu() {
'access arguments' => array('administer privatemsg settings'),
'type' => MENU_NORMAL_ITEM,
);
- $items['admin/config/people/messages/default'] = array(
+ $items['admin/config/messaging/privatemsg/default'] = array(
'title' => 'Private messages',
'description' => 'Configure private messaging settings.',
'page callback' => 'drupal_get_form',
diff --git a/privatemsg_filter/privatemsg_filter.module b/privatemsg_filter/privatemsg_filter.module
index ae05f73..fce28f6 100644
--- a/privatemsg_filter/privatemsg_filter.module
+++ b/privatemsg_filter/privatemsg_filter.module
@@ -30,7 +30,7 @@ function privatemsg_filter_permission() {
* Implementation of hook_menu().
*/
function privatemsg_filter_menu() {
- $items['admin/config/people/messages/filter'] = array(
+ $items['admin/config/messaging/privatemsg/filter'] = array(
'title' => 'Filter',
'description' => 'Configure filter settings.',
'page callback' => 'drupal_get_form',
@@ -39,7 +39,7 @@ function privatemsg_filter_menu() {
'access arguments' => array('administer privatemsg settings'),
'type' => MENU_LOCAL_TASK,
);
- $items['admin/config/people/messages/tags'] = array(
+ $items['admin/config/messaging/privatemsg/tags'] = array(
'title' => 'Tags',
'description' => 'Configure tags.',
'page callback' => 'privatemsg_tags_admin',
@@ -47,7 +47,7 @@ function privatemsg_filter_menu() {
'access arguments' => array('administer privatemsg settings'),
'type' => MENU_LOCAL_TASK,
);
- $items['admin/config/people/messages/tags/list'] = array(
+ $items['admin/config/messaging/privatemsg/tags/list'] = array(
'title' => 'List',
'description' => 'Configure tags.',
'page callback' => 'privatemsg_tags_admin',
@@ -56,7 +56,7 @@ function privatemsg_filter_menu() {
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -10,
);
- $items['admin/config/people/messages/tags/add'] = array(
+ $items['admin/config/messaging/privatemsg/tags/add'] = array(
'title' => 'Add',
'description' => 'Configure tags.',
'page callback' => 'drupal_get_form',
@@ -65,7 +65,7 @@ function privatemsg_filter_menu() {
'access arguments' => array('administer privatemsg settings'),
'type' => MENU_LOCAL_TASK,
);
- $items['admin/config/people/messages/tags/edit/%'] = array(
+ $items['admin/config/messaging/privatemsg/tags/edit/%'] = array(
'title' => 'Add',
'description' => 'Configure tags.',
'page callback' => 'drupal_get_form',
@@ -74,7 +74,7 @@ function privatemsg_filter_menu() {
'access arguments' => array('administer privatemsg settings'),
'type' => MENU_CALLBACK,
);
- $items['admin/config/people/messages/tags/delete/%'] = array(
+ $items['admin/config/messaging/privatemsg/tags/delete/%'] = array(
'title' => 'Add',
'description' => 'Configure tags.',
'page callback' => 'drupal_get_form',