diff -u -b og_promote/og_promote.info .og_promote/og_promote.info --- og_promote/og_promote.info 2009-02-07 10:51:03.000000000 -0500 +++ .og_promote/og_promote.info 2009-02-07 10:50:19.000000000 -0500 @@ -3,9 +3,3 @@ description = "Promote users that join certain groups to a special role." dependencies = og package = "Organic groups" - -; Information added by drupal.org packaging script on 2008-11-21 -version = "5.x-1.1" -project = "og_promote" -datestamp = "1227280221" - diff -u -b og_promote/og_promote.module .og_promote/og_promote.module --- og_promote/og_promote.module 2009-02-07 10:51:03.000000000 -0500 +++ .og_promote/og_promote.module 2009-02-07 10:50:20.000000000 -0500 @@ -4,8 +4,8 @@ /** * Implementation of hook_help(). */ -function og_promote_help($path, $arg) { - switch ($path) { +function og_promote_help($section) { + switch ($section) { case 'admin/modules#description': return t('Promote users that join certain groups to a special role.'); case 'admin/settings/og_promote': @@ -16,23 +16,25 @@ /** * Implementation of hook_menu(). */ -function og_promote_menu() { +function og_promote_menu($may_cache) { $items = array(); - $items['admin/og/og_promote'] = array( - 'title' => 'OG promote', - 'description' => 'Choose a role to which members of selected groups will be promoted.', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('og_promote_admin_settings'), - 'access arguments' => array('administer site configuration'), + if ($may_cache) { + $items[] = array( + 'path' => 'admin/og/og_promote', + 'title' => t('OG promote'), + 'description' => t('Choose a role to which members of selected groups will be promoted.'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('og_promote_admin_settings'), + 'access' => user_access('administer site configuration'), 'type' => MENU_NORMAL_ITEM, ); + } return $items; } /** * Implementation of hook_og(). */ - //op, $gid, $uid, $args function og_promote_og($op, $nid, $uid, $args = array()) { if (($role_id = variable_get('og_promote_role', 0)) != 0 && in_array($nid, variable_get('og_promote_groups', array()))) { switch ($op) { @@ -84,39 +86,17 @@ } } if (count($role_names)) { - $form['og_promote_role'] = array( - '#type' => 'radios', - '#title' => t('Roles'), - '#options' => $role_names, - '#default_value' => variable_get('og_promote_role', 0), - '#description' => t('Choose a role that users which become members of the groups below should be promoted to. If the member gets unsubscribed, it will be removed from the role.') - ); + $form['og_promote_role'] = array('#type' => 'radios', '#title' => t('Roles'), '#options' => $role_names, '#default_value' => variable_get('og_promote_role', 0), '#description' => t('Choose a role that users which become members of the groups below should be promoted to. If the member gets unsubscribed, it will be removed from the role.')); } else { - $form['og_promote_role'] = array( - '#type' => 'item', - '#title' => t('No roles'), - '#description' => t('You need to define some additional roles to use this module.') - ); + $form['og_promote_role'] = array('#type' => 'item', '#title' => t('No roles'), '#description' => t('You need to define some additional roles to use this module.')); } $options = og_all_groups_options(); if (count($options)) { - $form['og_promote_groups'] = array( - '#type' => 'checkboxes', - '#title' => t('Groups'), - '#options' => $options, - '#default_value' => variable_get('og_promote_groups', array()), - '#description' => t('The groups that are defined for this site.') - ); + $form['og_promote_groups'] = array('#type' => 'checkboxes', '#title' => t('Groups'), '#options' => $options, '#default_value' => variable_get('og_promote_groups', array()), '#description' => t('The groups that are defined for this site.')); } else { - $form['og_promote_groups'] = array( - '#type' => 'item', - '#title' => t('No groups'), - '#options' => $options, - '#default_value' => variable_get('og_promote_groups', array()), - '#description' => t('You need to create some groups.') - ); + $form['og_promote_groups'] = array('#type' => 'item', '#title' => t('No groups'), '#options' => $options, '#default_value' => variable_get('og_promote_groups', array()), '#description' => t('You need to create some groups.')); } return system_settings_form($form); }