Index: og_user_roles.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og_user_roles/og_user_roles.install,v retrieving revision 1.2 diff -u -p -r1.2 og_user_roles.install --- og_user_roles.install 23 May 2009 02:40:41 -0000 1.2 +++ og_user_roles.install 23 May 2009 02:44:20 -0000 @@ -2,38 +2,28 @@ // $Id: og_user_roles.install,v 1.2 2009/05/23 02:40:41 sun Exp $ function og_user_roles_install() { - drupal_install_schema('og_user_roles'); - - drupal_set_message(t('OG User Roles module enabled. Please see the included README file for further installation instructions.')); - } /** * Implementation of hook_uninstall(). */ function og_user_roles_uninstall() { - drupal_uninstall_schema('og_user_roles'); - // Delete variables + // Delete variables. db_query("DELETE FROM {variable} WHERE name LIKE 'og_user_roles_%%'"); - - drupal_set_message(t('OG User Roles module successfully uninstalled')); } function og_user_roles_schema() { - - $schema = array(); - $schema['og_users_roles'] = array( 'fields' => array( - 'ogr_id' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), - 'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), - 'rid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), - 'gid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), + 'ogr_id' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), + 'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), + 'rid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), + 'gid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), ), - 'primary key' => array('uid','rid','gid'), + 'primary key' => array('uid', 'rid', 'gid'), ); $schema['multinode_access'] = array( @@ -59,9 +49,7 @@ function og_user_roles_schema() { 'length' => 5, 'description' => t('Order in which this module is to be processed.'), ), - 'checkstatus' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), - 'module' => array( 'type' => 'varchar', 'length' => 60, Index: og_user_roles.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og_user_roles/og_user_roles.module,v retrieving revision 1.2 diff -u -p -r1.2 og_user_roles.module --- og_user_roles.module 23 May 2009 02:40:41 -0000 1.2 +++ og_user_roles.module 23 May 2009 02:56:42 -0000 @@ -12,13 +12,13 @@ function og_user_roles_help($path, $arg) { switch ($path) { case 'admin/og/og_user_roles': - return '

'. t('Allows group administrators to add members into Drupal system roles which are restricted to the group.') .'

'; + return '

' . t('Allows group administrators to add members into Drupal system roles which are restricted to the group.') . '

'; } } /** * Implementation of hook_perm(). - * + * * Modification as per: http://drupal.org/node/192747 * Added 'administer og_user_roles' * @@ -36,7 +36,6 @@ function og_user_roles_access($op, $node if ($op == 'create') { return user_access('create og_subgroups'); } - } /** @@ -51,7 +50,7 @@ function og_user_roles_admin_settings() foreach ($group_types as $type) { $types[$type] = node_get_types('name', $type); } - + // Get list of roles, not counting authenticated and anonymous user $all_roles = user_roles(); foreach ($all_roles as $rid => $role) { @@ -61,10 +60,10 @@ function og_user_roles_admin_settings() } // If no assignable roles, advise user to add some. - // Modification as per: http://drupal.org/node/167373 + // Modification as per: http://drupal.org/node/167373 if (!count($roles)) { - $form['og_user_roles'] = array( - '#value' => '

'. t('No assignable roles were found. Please create at least one role under !roles.', array('!roles' => l(t('Administer >> User management >> Roles'), 'admin/user/roles'))) .'

', + $form['og_user_roles'] = array( + '#value' => '

' . t('No assignable roles were found. Please create at least one role under !roles.', array('!roles' => l(t('Administer >> User management >> Roles'), 'admin/user/roles'))) . '

', ); return $form; } @@ -122,7 +121,6 @@ function og_user_roles_admin_settings() '#default_value' => variable_get("ogur_founder_value_$type", 0), '#description' => t('Select the role you wish to use as the "founder" role for group type %type_name.', array('%type_name' => $name)), ); - } $form['og_user_roles_role_perm'] = array( @@ -151,7 +149,7 @@ function og_user_roles_admin_settings()

Each record is on a separate line. Each line contains the permission required to be able to assign a role, and the assignable role that permission allows. Each permission and role on a line is separated by a | .'), - ); + ); $form['og_user_roles_regcode_gid_default'] = array( '#type' => 'fieldset', @@ -175,12 +173,10 @@ function og_user_roles_admin_settings() $form['og_user_roles_regcode_gid_default']['og_user_roles_assign_regcode_gid_text'] = array( '#type' => 'radios', '#title' => t('Textfield or Textarea?'), - '#options' => array( - 'textfield' => t('textfield'), - 'textarea' => t('textarea'), + 'textfield' => t('textfield'), + 'textarea' => t('textarea'), ), - '#default_value' => variable_get('og_user_roles_assign_regcode_gid_text', 'textarea'), '#description' => t('When a group admin edits a group node, should the field in which the registration codes are to be entered be a textarea or a textfield?'), ); @@ -190,7 +186,7 @@ function og_user_roles_admin_settings() '#title' => t('Allow group admins to approve new signups.'), '#collapsible' => TRUE, '#collapsed' => TRUE, - '#description' => t('If user registration to your site requires administrator approval and you allow users to subscribe to groups at registration, then you can optionally allow the administrator(s) of the group(s) to which the user is subscribing to approve the signup request. This will require that the administrator of each group that you wish to give this privilege have a role which includes the administer users permission. (Note that this feature requires ' . l("mimemail.module", "http://www.drupal.org/project/mimemail") . ' to be installed)' ), + '#description' => t('If user registration to your site requires administrator approval and you allow users to subscribe to groups at registration, then you can optionally allow the administrator(s) of the group(s) to which the user is subscribing to approve the signup request. This will require that the administrator of each group that you wish to give this privilege have a role which includes the administer users permission. (Note that this feature requires ' . l("mimemail.module", "http://www.drupal.org/project/mimemail") . ' to be installed)'), ); $form['og_user_roles_approval']['og_user_roles_approval_default'] = array( '#type' => 'checkbox', @@ -303,19 +299,19 @@ function og_user_roles_admin_settings() '#description' => t('Specify here the node IDs of nodes which you want placed into all groups, each separated by a comma. Structure your entries like this:

63,20

Each node ID separated by a comma. Note that this process is completed at the next scheduled cron run. New and existing groups are only updated when cron is run. A log of updated groups is also written. Also removing the node from here does NOT remove it from the group. If you wish to remove nodes that have been placed into groups here, you must do that manually.'), - ); + ); $form['og_user_roles_tac_og_default'] = array( '#type' => 'fieldset', '#title' => t('TAC / OG Access Control Integration.'), ); - // Check to see if taxonomy_access is installed. + // Check to see if taxonomy_access is installed. $taxonomy_access = "not installed"; $disabled = 1; if (module_exists("taxonomy_access")) { $disabled = 0; - $taxonomy_access = 'installed'; + $taxonomy_access = 'installed'; } $form['og_user_roles_tac_og_default']['og_user_roles_tac_og_value'] = array( @@ -362,7 +358,7 @@ function og_user_roles_admin_settings() '#title' => t('Clear the user_access() and cache_menu caches for user?'), '#default_value' => variable_get('og_user_roles_clear_cache_value', 0), '#description' => t($description), - ); + ); $form['og_user_roles_test'] = array( '#type' => 'fieldset', @@ -383,13 +379,13 @@ function og_user_roles_admin_settings() '#description' => t('Give group admins control of the display of OGUR and default OG create links in the groups menu.'), '#collapsible' => TRUE, '#collapsed' => TRUE, - ); + ); $form['og_user_roles_menu_options']['og_user_roles_menu_options_enabled'] = array( '#type' => 'checkbox', '#title' => t('Enable menu control?'), '#default_value' => variable_get('og_user_roles_menu_options_enabled', 1), '#description' => t("This will add two form elements, inside a field set, to the OG node's edit page, enabling this feature."), - ); + ); $form['og_user_roles_logo'] = array( '#type' => 'fieldset', @@ -397,27 +393,27 @@ function og_user_roles_admin_settings() '#description' => t('Group admins can upload a logo for their group. Here you enter the maximum width and height attributes for Group Logos.'), '#collapsible' => TRUE, '#collapsed' => TRUE, - ); + ); $form['og_user_roles_logo']['og_user_roles_logo_enabled'] = array( '#type' => 'checkbox', '#title' => t('Enable group logo?'), '#default_value' => variable_get('og_user_roles_logo_enabled', 1), '#description' => t("This will add a text box onto the OG node's edit page, enabling this feature."), - ); + ); $form['og_user_roles_logo']['og_user_roles_logo_width'] = array( '#type' => 'textfield', '#size' => 10, '#title' => t('Maximum width for display of group logo?'), '#default_value' => variable_get('og_user_roles_logo_width', '135'), '#description' => t('Enter the maximum pixel (px) width at which group logos will be displayed'), - ); + ); $form['og_user_roles_logo']['og_user_roles_logo_height'] = array( '#type' => 'textfield', '#size' => 10, '#title' => t('Maximum height for display of group logo?'), '#default_value' => variable_get('og_user_roles_logo_height', '113'), '#description' => t('Enter the maximum pixel (px) height at which group logos will be displayed'), - ); + ); $form['og_user_roles_counter'] = array( '#type' => 'textfield', @@ -448,11 +444,12 @@ function og_user_roles_multinode() { global $user; if (isset($uid)) { $account = user_load(array('uid' => $uid)); - } else { + } + else { $account = $user; - $uid = $user->uid; + $uid = $user->uid; } - + // Get whatever is stored in multinode table. $existing = array(); $result = db_query("SELECT * FROM {multinode_access}"); @@ -462,9 +459,9 @@ function og_user_roles_multinode() { // Get all rule realms from node_access table. $result = db_query("SELECT DISTINCT realm FROM {node_access}"); - while ($row = db_fetch_object($result)) { + while ($row = db_fetch_object($result)) { $rules[] = $row->realm; - } + } // Get all rule realms from modules. User doing this should have grants in all modules affected. $op = 'view'; @@ -472,21 +469,21 @@ function og_user_roles_multinode() { foreach ($mrules as $realm => $grants) { $rules[] = $realm; } - + // Get only unique values $rules = array_unique($rules); - + // Sort the rule realms asort($rules); $form = array('#tree' => TRUE); foreach ($rules as $realm) { - $form[$realm]['checkbox'] = array('#type' => 'checkbox', '#default_value' => (isset($existing[$realm]->realm) ? 1 : 0)); - $form[$realm]['realm'] = array('#type' => 'textfield', '#size' => 25, '#disabled' => TRUE, '#value' => check_plain($realm), '#default_value' => $realm); - $form[$realm]['group'] = array('#type' => 'textfield', '#size' => 5, '#default_value' => (isset($existing[$realm]->groupname) ? $existing[$realm]->groupname : '') ); - $form[$realm]['logic'] = array('#type' => 'select', '#default_value' => (isset($existing[$realm]->logic) ? $existing[$realm]->logic : 'AND'), '#options' => array('AND' => 'AND', 'OR' => 'OR') ); - $form[$realm]['weight'] = array('#type' => 'select', '#default_value' => (isset($existing[$realm]->weight) ? $existing[$realm]->weight : '0'), '#options' => array('0' => '0', '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9') ); - $form[$realm]['check'] = array('#type' => 'select', '#default_value' => (isset($existing[$realm]->checkstatus) ? $existing[$realm]->checkstatus : '0'), '#options' => array('0' => '0', '1' => '1') ); + $form[$realm]['checkbox'] = array('#type' => 'checkbox', '#default_value' => (isset($existing[$realm]->realm) ? 1 : 0)); + $form[$realm]['realm'] = array('#type' => 'textfield', '#size' => 25, '#disabled' => TRUE, '#value' => check_plain($realm), '#default_value' => $realm); + $form[$realm]['group'] = array('#type' => 'textfield', '#size' => 5, '#default_value' => (isset($existing[$realm]->groupname) ? $existing[$realm]->groupname : '')); + $form[$realm]['logic'] = array('#type' => 'select', '#default_value' => (isset($existing[$realm]->logic) ? $existing[$realm]->logic : 'AND'), '#options' => array('AND' => 'AND', 'OR' => 'OR')); + $form[$realm]['weight'] = array('#type' => 'select', '#default_value' => (isset($existing[$realm]->weight) ? $existing[$realm]->weight : '0'), '#options' => array('0' => '0', '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9')); + $form[$realm]['check'] = array('#type' => 'select', '#default_value' => (isset($existing[$realm]->checkstatus) ? $existing[$realm]->checkstatus : '0'), '#options' => array('0' => '0', '1' => '1')); } $form['submit'] = array('#type' => 'submit', '#value' => t('Save changes')); @@ -494,35 +491,35 @@ function og_user_roles_multinode() { $form['#theme'] = 'og_user_roles_multinode'; return $form; - } /** - * Theme function to render the table for the og_user_roles_multinode + * Theme function to render the table for the og_user_roles_multinode * Multinode access UI */ function theme_og_user_roles_multinode($form) { $output .= "\n

\n"; - $output .= '
'. t('Here you can configure multinode access. You can only modify values here if TAC/OG Integration is ON. If you turn TAC/OG Integration ON, then later wish to turn it off, you must first UNCHECK all items here (otherwise, multinode access will continue).') ."
\n"; + $output .= '
' . t('Here you can configure multinode access. You can only modify values here if TAC/OG Integration is ON. If you turn TAC/OG Integration ON, then later wish to turn it off, you must first UNCHECK all items here (otherwise, multinode access will continue).') . "
\n"; $header = array(t(''), t('Realm'), t('Group'), t('Logic'), t('Weight'), t('Check')); $rows = array(); foreach (element_children($form) as $i) { $block = &$form[$i]; $rows[] = array(drupal_render($block['checkbox']), drupal_render($block['realm']), - drupal_render($block['group']), drupal_render($block['logic']), - drupal_render($block['weight']), drupal_render($block['check']), - ); + drupal_render($block['group']), drupal_render($block['logic']), + drupal_render($block['weight']), drupal_render($block['check']), + ); } $output .= theme('table', $header, $rows, array('id' => 'og-roles-multinode-table')); - // This is an OGUR restriction: Do not show "submit" button if + // This is an OGUR restriction: Do not show "submit" button if // TAC/OG Integration not turned on. if (variable_get('og_user_roles_tac_og_value', 0) == 1) { $output .= drupal_render($form['submit']); - } else { - $output .= '
'. t('TAC/OG Integration is OFF.') ."
\n"; + } + else { + $output .= '
' . t('TAC/OG Integration is OFF.') . "
\n"; } $output .= "
\n"; @@ -535,13 +532,13 @@ function theme_og_user_roles_multinode($ */ function og_user_roles_multinode_submit($form, &$form_state) { // Erase all existing settings - db_query ("DELETE FROM {multinode_access}"); + db_query("DELETE FROM {multinode_access}"); // Insert new settings foreach ($form_state['values'] as $block) { if ($block['checkbox'] == 1) { db_query("INSERT INTO {multinode_access} (realm, groupname, logic, weight, checkstatus) VALUES ('%s','%s','%s','%s',%d)", $block['realm'], $block['group'], $block['logic'], $block['weight'], $block['check']); - } + } } drupal_set_message(t('The multinode access settings have been updated.')); cache_clear_all(); @@ -552,142 +549,143 @@ function og_user_roles_multinode_submit( */ function og_user_roles_menu() { global $user; - + $items = array(); - $items['admin/og/og_user_roles'] = array( - 'title' => 'Organic groups user roles', - 'description' => 'Allows group administrators to add members into group roles. Also edit multinode access configuration.', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('og_user_roles_admin_settings'), - 'access callback' => 'user_access', - 'access arguments' => array('administer og_user_roles'), - ); - $items['admin/og/og_user_roles/settings'] = array( - 'title' => t('General'), - 'description' => t('Allows group administrators to add members into group roles.'), - 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10 - ); - $items['admin/og/og_user_roles/multinode'] = array( - 'title' => t('Configure multinode UI'), - 'page callback' => 'drupal_get_form', - 'page arguments' => array('og_user_roles_multinode'), - 'access callback' => 'user_access', - 'access arguments' => array('administer site configuration'), - 'weight' => 10, - 'type' => MENU_LOCAL_TASK, - ); - $items['node/ognodeadd'] = array( - 'title' => 'Create content', - 'page callback' => 'og_user_roles_ognodeadd', - 'access callback' => 'user_is_logged_in', - 'type' => MENU_CALLBACK - ); - $items['node/ogtermedit'] = array( - 'title' => 'Edit term', - 'page callback' => 'og_user_roles_ogtermedit', - 'access callback' => 'user_is_logged_in', - 'type' => MENU_CALLBACK - ); - $items['node/ogmodr8'] = array( - 'title' => 'View modr8 log', - 'page callback' => 'og_user_roles_ogmodr8', - 'access callback' => 'user_is_logged_in', - 'type' => MENU_CALLBACK - ); - $items['oguseredit/%'] = array( - 'title' => 'Edit user', - 'page callback' => 'og_user_roles_oguseredit', - 'page arguments' => array(1), - 'access callback' => 'user_is_logged_in', - 'type' => MENU_CALLBACK - ); - $items['ogusermanage/%'] = array( - 'title' => 'Manage users', - 'page callback' => 'og_user_roles_user_manage', + $items['admin/og/og_user_roles'] = array( + 'title' => 'Organic groups user roles', + 'description' => 'Allows group administrators to add members into group roles. Also edit multinode access configuration.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('og_user_roles_admin_settings'), + 'access callback' => 'user_access', + 'access arguments' => array('administer og_user_roles'), + ); + $items['admin/og/og_user_roles/settings'] = array( + 'title' => t('General'), + 'description' => t('Allows group administrators to add members into group roles.'), + 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, + ); + $items['admin/og/og_user_roles/multinode'] = array( + 'title' => t('Configure multinode UI'), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('og_user_roles_multinode'), + 'access callback' => 'user_access', + 'access arguments' => array('administer site configuration'), + 'weight' => 10, + 'type' => MENU_LOCAL_TASK, + ); + $items['node/ognodeadd'] = array( + 'title' => 'Create content', + 'page callback' => 'og_user_roles_ognodeadd', + 'access callback' => 'user_is_logged_in', + 'type' => MENU_CALLBACK, + ); + $items['node/ogtermedit'] = array( + 'title' => 'Edit term', + 'page callback' => 'og_user_roles_ogtermedit', + 'access callback' => 'user_is_logged_in', + 'type' => MENU_CALLBACK, + ); + $items['node/ogmodr8'] = array( + 'title' => 'View modr8 log', + 'page callback' => 'og_user_roles_ogmodr8', + 'access callback' => 'user_is_logged_in', + 'type' => MENU_CALLBACK, + ); + $items['oguseredit/%'] = array( + 'title' => 'Edit user', + 'page callback' => 'og_user_roles_oguseredit', + 'page arguments' => array(1), + 'access callback' => 'user_is_logged_in', + 'type' => MENU_CALLBACK, + ); + $items['ogusermanage/%'] = array( + 'title' => 'Manage users', + 'page callback' => 'og_user_roles_user_manage', + 'page arguments' => array(1), + 'access callback' => 'user_is_logged_in', + 'type' => MENU_CALLBACK, + ); + $items['og/regcode'] = array( + 'title' => 'Enter registration code', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('og_user_roles_register'), + 'access callback' => 'user_access', + 'access arguments' => array('use registration codes'), + 'weight' => 10, + 'type' => MENU_LOCAL_TASK, + ); + $items['og/regcode/confirm/%'] = array( + 'title' => 'Confirm registration code', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('og_user_roles_register_confirm'), + 'access callback' => 'user_access', + 'access arguments' => array('use registration codes'), + 'weight' => 10, + 'type' => MENU_LOCAL_TASK, + ); + // + // Not sure if putting $user->uid in array will work here + // + $items['oglogo'] = array( + 'title' => 'Group Logo', + 'page callback' => 'og_user_roles_oglogo', + 'callback arguments' => array($user->uid), + 'access callback' => 'user_access', + 'access arguments' => array('access print'), + 'type' => MENU_CALLBACK, + ); + + // modr8 modification - using my own access callback + if (module_exists('modr8')) { + $items['node/%/ogmodr8'] = array( + 'title' => 'Moderate', + 'page callback' => 'og_user_roles_modr8_page', 'page arguments' => array(1), - 'access callback' => 'user_is_logged_in', - 'type' => MENU_CALLBACK - ); - $items['og/regcode'] = array( - 'title' => 'Enter registration code', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('og_user_roles_register'), - 'access callback' => 'user_access', - 'access arguments' => array('use registration codes'), - 'weight' => 10, - 'type' => MENU_LOCAL_TASK, - ); - $items['og/regcode/confirm/%'] = array( - 'title' => 'Confirm registration code', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('og_user_roles_register_confirm'), - 'access callback' => 'user_access', - 'access arguments' => array('use registration codes'), - 'weight' => 10, + 'access callback' => 'og_user_roles_modr8_access', + 'access arguments' => array(1, 'moderate content'), + 'weight' => 5, 'type' => MENU_LOCAL_TASK, - ); - // - // Not sure if putting $user->uid in array will work here - // - $items['oglogo'] = array( - 'title' => 'Group Logo', - 'page callback' => 'og_user_roles_oglogo', - 'callback arguments' => array($user->uid), - 'access callback' => 'user_access', - 'access arguments' => array('access print'), - 'type' => MENU_CALLBACK ); + } - // modr8 modification - using my own access callback - if (module_exists('modr8')) { - $items['node/%/ogmodr8'] = array( - 'title' => 'Moderate', - 'page callback' => 'og_user_roles_modr8_page', - 'page arguments' => array(1), - 'access callback' => 'og_user_roles_modr8_access', - 'access arguments' => array(1, 'moderate content'), - 'weight' => 5, - 'type' => MENU_LOCAL_TASK); - } - - // Add another tab to the group subscribers page for admins to - // configure member roles - // Modified og_user_roles_allowed to apply user_access('configure member roles') - $items['og/users/%/roles'] = array( - 'title' => 'Configure member roles', - 'page callback' => 'og_user_roles_page', - 'page arguments' => array(2), - 'access callback' => 'og_user_roles_is_allowed', - 'access arguments' => array(2), - 'weight' => 5, - 'type' => MENU_LOCAL_TASK - ); + // Add another tab to the group subscribers page for admins to + // configure member roles + // Modified og_user_roles_allowed to apply user_access('configure member roles') + $items['og/users/%/roles'] = array( + 'title' => 'Configure member roles', + 'page callback' => 'og_user_roles_page', + 'page arguments' => array(2), + 'access callback' => 'og_user_roles_is_allowed', + 'access arguments' => array(2), + 'weight' => 5, + 'type' => MENU_LOCAL_TASK, + ); - // Add another tab to the group subscribers page for admins to - // configure restricted member roles - // Modified og_user_roles_allowed to apply user_access('configure restricted member roles') - $items['og/users/%/restricted_roles'] = array( - 'title' => 'Configure restricted member roles', - 'page callback' => 'og_user_roles_restricted_page', - 'page arguments' => array(2), - 'access callback' => 'og_user_roles_restricted_is_allowed', - 'access arguments' => array(2), - 'weight' => 5, - 'type' => MENU_LOCAL_TASK - ); + // Add another tab to the group subscribers page for admins to + // configure restricted member roles + // Modified og_user_roles_allowed to apply user_access('configure restricted member roles') + $items['og/users/%/restricted_roles'] = array( + 'title' => 'Configure restricted member roles', + 'page callback' => 'og_user_roles_restricted_page', + 'page arguments' => array(2), + 'access callback' => 'og_user_roles_restricted_is_allowed', + 'access arguments' => array(2), + 'weight' => 5, + 'type' => MENU_LOCAL_TASK, + ); - // Add another tab to the group subscribers page for admins to - // manage users - $items['og/users/%/manage'] = array( - 'title' => 'Manage users', - 'page callback' => 'og_user_roles_user_manage', - 'page arguments' => array(2), - 'access callback' => 'user_access', - 'access arguments' => array('administer users'), - 'weight' => 6, - 'type' => MENU_LOCAL_TASK - ); + // Add another tab to the group subscribers page for admins to + // manage users + $items['og/users/%/manage'] = array( + 'title' => 'Manage users', + 'page callback' => 'og_user_roles_user_manage', + 'page arguments' => array(2), + 'access callback' => 'user_access', + 'access arguments' => array('administer users'), + 'weight' => 6, + 'type' => MENU_LOCAL_TASK, + ); return $items; } @@ -720,10 +718,11 @@ function og_user_roles_page($gid) { drupal_set_message(t('No roles have been assigned as group roles yet.')); } - drupal_set_title(t('Subscribers') .': '. l($node->title, "node/$node->nid")); - + drupal_set_title(t('Subscribers') . ': ' . l($node->title, "node/$node->nid")); + return $output; } + /** * Menu callback; displays members and role selection */ @@ -751,38 +750,37 @@ function og_user_roles_restricted_page($ drupal_set_message(t('Either no roles have been set up as group roles yet or you do not have access to assign any of the available roles.')); } - drupal_set_title(t('Subscribers') .': '. l($node->title, "node/$node->nid")); + drupal_set_title(t('Subscribers') . ': ' . l($node->title, "node/$node->nid")); return $output; } - /** * Menu callback; displays the modr8 content moderation form for a single node. */ function og_user_roles_modr8_page($nid) { - require_once drupal_get_path('module', 'modr8'). '/modr8_admin.inc'; - -// $count_sql = db_rewrite_sql('SELECT COUNT(*) FROM {node} n WHERE n.status = 1 AND n.moderate = 1 AND n.nid = '.$nid); -// $page_sql = db_rewrite_sql('SELECT n.nid FROM {node} n WHERE n.status = 1 AND n.moderate = 1 AND n.nid = '.$nid.' ORDER BY n.changed DESC'); + require_once drupal_get_path('module', 'modr8') . '/modr8_admin.inc'; + + // $count_sql = db_rewrite_sql('SELECT COUNT(*) FROM {node} n WHERE n.status = 1 AND n.moderate = 1 AND n.nid = '.$nid); + // $page_sql = db_rewrite_sql('SELECT n.nid FROM {node} n WHERE n.status = 1 AND n.moderate = 1 AND n.nid = '.$nid.' ORDER BY n.changed DESC'); $is_published = ''; if (!user_access('administer nodes')) { // Users who don't have the 'administer nodes' permission can only see published nodes. $is_published = 'n.status = 1 AND '; } - $count_sql = db_rewrite_sql('SELECT COUNT(*) FROM {node} n WHERE '. $is_published .' n.moderate = 1 AND n.nid = '.$nid); - $page_sql = db_rewrite_sql('SELECT n.nid FROM {node} n WHERE '. $is_published .' n.moderate = 1 AND n.nid = '.$nid.' ORDER BY n.changed DESC'); - $result = pager_query($page_sql, variable_get('modr8_nodes_per_page', 10), 0, $count_sql); + $count_sql = db_rewrite_sql('SELECT COUNT(*) FROM {node} n WHERE ' . $is_published . ' n.moderate = 1 AND n.nid = ' . $nid); + $page_sql = db_rewrite_sql('SELECT n.nid FROM {node} n WHERE ' . $is_published . ' n.moderate = 1 AND n.nid = ' . $nid . ' ORDER BY n.changed DESC'); + $result = pager_query($page_sql, variable_get('modr8_nodes_per_page', 10), 0, $count_sql); $result_count = pager_query($page_sql, 10, 0, $count_sql); - + $output = ''; if (db_fetch_object($result_count)) { $output .= drupal_get_form('modr8_form', $result); $output .= theme('pager'); } else { - $output .= '

'. t('@items in moderation', array('@items' => format_plural(0, '1 post', '@count posts'))). '

'; + $output .= '

' . t('@items in moderation', array('@items' => format_plural(0, '1 post', '@count posts'))) . '

'; } return $output; } @@ -791,18 +789,19 @@ function og_user_roles_modr8_page($nid) * Form for user roles page. */ function og_user_roles_page_form($form_values, $gid, $roles, $result) { - $form['user_roles'] = array('#tree' => TRUE); // Make sure form array isn't flattened + // Make sure form array isn't flattened + $form['user_roles'] = array('#tree' => TRUE); while ($account = db_fetch_object($result)) { $form['user_roles']['users'][$account->uid] = array( '#type' => 'value', - '#value' => $account->uid + '#value' => $account->uid, ); - $title = theme('username', $account) .' ('. l(t('unsubscribe'), "og/unsubscribe/$gid/$account->uid", array('query' => "destination=og/users/$gid")) .')'; + $title = theme('username', $account) . ' (' . l(t('unsubscribe'), "og/unsubscribe/$gid/$account->uid", array('query' => "destination=og/users/$gid")) . ')'; $form['user_roles']['roles'][$account->uid] = array( -// '#type' => 'checkbox_columns', + // '#type' => 'checkbox_columns', '#type' => 'checkboxes', '#title' => $title, '#default_value' => _og_user_roles_get_roles($account->uid, $roles), @@ -831,7 +830,7 @@ function og_user_roles_page_form_submit( foreach ($roles as $rid => $checked) { $exists = db_result(db_query("SELECT * FROM {og_users_roles} WHERE uid = %d AND rid = %d AND gid = %d", $uid, $rid, $gid)); if ($checked && !$exists) { - $ogr_id = variable_get('og_user_roles_counter', 0) + 1; + $ogr_id = variable_get('og_user_roles_counter', 0) + 1; variable_set('og_user_roles_counter', $ogr_id); db_query("INSERT INTO {og_users_roles} (uid, rid, gid, ogr_id) VALUES (%d, %d, %d, %d)", $uid, $rid, $gid, $ogr_id); $args['rid'] = $rid; @@ -862,7 +861,9 @@ function og_user_roles_get_roles() { // If this user has 'configure member roles' permission, then he has // global role access for this group. - if (user_access('configure member roles')) return user_roles(); + if (user_access('configure member roles')) { + return user_roles(); + } // If user does not have 'configure member roles' permission, // then get roles he has access to assign, if applicable @@ -871,10 +872,10 @@ function og_user_roles_get_roles() { foreach ($roleperms as $perm => $roles) { // If the user has this permission, then put the roles up on the form if (user_access($perm)) { - foreach ($roles as $role) { - $rid = db_result(db_query("SELECT rid FROM {role} WHERE name = '%s'", $role)); + foreach ($roles as $role) { + $rid = db_result(db_query("SELECT rid FROM {role} WHERE name = '%s'", $role)); $output[$rid] = $role; - } + } } } } @@ -887,6 +888,7 @@ function og_user_roles_get_roles() { * * @param $table * Plain text table from variable_get('og_user_roles_permissions', '') + * * @return * Array containing permissions and roles assignable by those permissions. */ @@ -900,10 +902,10 @@ function og_user_roles_get_role_permissi $table_line = explode('|', $table_item); if (!empty($table_line[0])) { $output[$table_line[0]][] = trim($table_line[1]); - } - } - } // end foreach - } // end $table if + } + } + } + } return $output; } @@ -936,7 +938,7 @@ function _og_user_roles_get_roles($uid, */ function theme_og_user_roles_page_form($form) { $output .= "\n
\n"; - $output .= '
'. t('Here you can assign group roles to members. This will give that member the permissions of that role in this group. It will apply to all posts within this group and will only apply to posts within this group.') ."
\n"; + $output .= '
' . t('Here you can assign group roles to members. This will give that member the permissions of that role in this group. It will apply to all posts within this group and will only apply to posts within this group.') . "
\n"; $header[] = array('data' => t('Roles'), 'colspan' => 2); $rows = array(); @@ -962,6 +964,7 @@ function theme_og_user_roles_page_form($ * * @param $nid * A node ID + * * @return boolean * TRUE if this group type allows roles to be assigned, otherwise FALSE */ @@ -980,6 +983,7 @@ function og_user_roles_is_allowed($nid) * * @param $nid * A node ID + * * @return boolean * TRUE if this group type allows roles to be assigned, otherwise FALSE */ @@ -1007,7 +1011,7 @@ function og_user_roles_role_join($uid, $ // Modification. http://drupal.org/node/174773 // Check to see if this user doesn't already have this role in this group; // If not, then assign it. - $sql = "SELECT COUNT(*) FROM {og_users_roles} WHERE uid = %d AND rid = %d and gid = %d"; + $sql = "SELECT COUNT(*) FROM {og_users_roles} WHERE uid = %d AND rid = %d and gid = %d"; $result = db_query($sql, $uid, $rid, $gid); $output = (db_result($result)); @@ -1046,8 +1050,12 @@ function og_user_roles_role_delete($uid, * Remove og_user_roles variables for a group node that has been deleted. */ function og_user_roles_variable_remove($gid) { - if (variable_get('og_user_roles_basicgrouprole_value_' . $gid, 0)) variable_del('og_user_roles_basicgrouprole_value_' . $gid); - if (variable_get('og_user_roles_assign_basicgrouprole_' . $gid, 0)) variable_del('og_user_roles_assign_basicgrouprole_' . $gid); + if (variable_get('og_user_roles_basicgrouprole_value_' . $gid, 0)) { + variable_del('og_user_roles_basicgrouprole_value_' . $gid); + } + if (variable_get('og_user_roles_assign_basicgrouprole_' . $gid, 0)) { + variable_del('og_user_roles_assign_basicgrouprole_' . $gid); + } } /** @@ -1055,7 +1063,7 @@ function og_user_roles_variable_remove($ * Creates multiple checkbox columns */ function expand_checkbox_columns($element) { - $value = is_array($element['#value']) ? $element['#value'] : array(); + $value = is_array($element['#value']) ? $element['#value'] : array(); $element['#type'] = 'checkboxes'; $element['#tree'] = TRUE; @@ -1073,9 +1081,9 @@ function expand_checkbox_columns($elemen '#title' => $choice, '#default_value' => in_array($key, $value), '#attributes' => $element['#attributes'], - '#prefix' => '
', + '#prefix' => '
', '#suffix' => '
', - '#return_value' => $choice + '#return_value' => $choice, ); } $column++; @@ -1083,7 +1091,6 @@ function expand_checkbox_columns($elemen } return $element; - } /** @@ -1094,7 +1101,7 @@ function og_user_roles_elements() { $type['checkbox_columns'] = array( '#input' => TRUE, '#process' => array('expand_checkbox_columns' => array()), - '#tree' => TRUE + '#tree' => TRUE, ); return $type; @@ -1104,146 +1111,146 @@ function og_user_roles_elements() { * Implementation of hook_default_view_views(). */ function og_user_roles_views_default_views() { - - $view = new view; - $view->name = 'OGURRoles'; - $view->description = 'OGUR role(s) that current user has in each group'; - $view->tag = 'ogur'; - $view->view_php = ''; - $view->base_table = 'node'; + $view = new view; + $view->name = 'OGURRoles'; + $view->description = 'OGUR role(s) that current user has in each group'; + $view->tag = 'ogur'; + $view->view_php = ''; + $view->base_table = 'node'; $view->is_cacheable = FALSE; - $view->api_version = 2; - $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */ + $view->api_version = 2; + /* Edit this to true to make a default view disabled initially */ + $view->disabled = FALSE; $handler = $view->new_display('default', 'Defaults', 'default'); $handler->override_option('fields', array( - 'nid' => array( - 'label' => 'Group ID', - 'alter' => array( - 'alter_text' => 0, - 'text' => '', - 'make_link' => 0, - 'path' => '', - 'alt' => '', - 'prefix' => '', - 'suffix' => '', - 'help' => '', - 'trim' => 0, - 'max_length' => '', - 'word_boundary' => 1, - 'ellipsis' => 1, - 'html' => 0, - ), - 'link_to_node' => 1, - 'exclude' => 0, - 'id' => 'nid', - 'table' => 'node', - 'field' => 'nid', - 'relationship' => 'none', - ), - 'title' => array( - 'label' => 'Title', - 'alter' => array( - 'alter_text' => 0, - 'text' => '', - 'make_link' => 0, - 'path' => '', - 'alt' => '', - 'prefix' => '', - 'suffix' => '', - 'help' => '', - 'trim' => 0, - 'max_length' => '', - 'word_boundary' => 1, - 'ellipsis' => 1, - 'html' => 0, - ), - 'link_to_node' => 1, - 'exclude' => 0, - 'id' => 'title', - 'table' => 'node', - 'field' => 'title', - 'relationship' => 'none', - ), - 'rid_all' => array( - 'label' => 'Roles', - 'alter' => array( - 'alter_text' => 0, - 'text' => '', - 'make_link' => 0, - 'path' => '', - 'alt' => '', - 'prefix' => '', - 'suffix' => '', - 'help' => '', - 'trim' => 0, - 'max_length' => '', - 'word_boundary' => 1, - 'ellipsis' => 1, - 'html' => 0, - ), - 'type' => 'separator', - 'separator' => ', ', - 'empty' => '', - 'exclude' => 0, - 'id' => 'rid_all', - 'table' => 'og_users_roles', - 'field' => 'rid_all', - 'relationship' => 'none', - ), - )); + 'nid' => array( + 'label' => 'Group ID', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'html' => 0, + ), + 'link_to_node' => 1, + 'exclude' => 0, + 'id' => 'nid', + 'table' => 'node', + 'field' => 'nid', + 'relationship' => 'none', + ), + 'title' => array( + 'label' => 'Title', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'html' => 0, + ), + 'link_to_node' => 1, + 'exclude' => 0, + 'id' => 'title', + 'table' => 'node', + 'field' => 'title', + 'relationship' => 'none', + ), + 'rid_all' => array( + 'label' => 'Roles', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'html' => 0, + ), + 'type' => 'separator', + 'separator' => ', ', + 'empty' => '', + 'exclude' => 0, + 'id' => 'rid_all', + 'table' => 'og_users_roles', + 'field' => 'rid_all', + 'relationship' => 'none', + ), + )); $handler->override_option('filters', array( - 'type_groups' => array( - 'operator' => 'in', - 'value' => array( - 'group' => 'group', - ), - 'group' => '0', - 'exposed' => FALSE, - 'expose' => array( - 'operator' => FALSE, - 'label' => '', - ), - 'id' => 'type_groups', - 'table' => 'og', - 'field' => 'type_groups', - 'relationship' => 'none', - ), - 'ricg' => array( - 'operator' => '=', - 'value' => '', - 'group' => '0', - 'exposed' => FALSE, - 'expose' => array( - 'operator' => FALSE, - 'label' => '', - ), - 'id' => 'ricg', - 'table' => 'og_users_roles', - 'field' => 'ricg', - 'relationship' => 'none', - ), - )); + 'type_groups' => array( + 'operator' => 'in', + 'value' => array( + 'group' => 'group', + ), + 'group' => '0', + 'exposed' => FALSE, + 'expose' => array( + 'operator' => FALSE, + 'label' => '', + ), + 'id' => 'type_groups', + 'table' => 'og', + 'field' => 'type_groups', + 'relationship' => 'none', + ), + 'ricg' => array( + 'operator' => '=', + 'value' => '', + 'group' => '0', + 'exposed' => FALSE, + 'expose' => array( + 'operator' => FALSE, + 'label' => '', + ), + 'id' => 'ricg', + 'table' => 'og_users_roles', + 'field' => 'ricg', + 'relationship' => 'none', + ), + )); $handler->override_option('access', array( - 'type' => 'none', - )); + 'type' => 'none', + )); $handler->override_option('items_per_page', 0); $handler->override_option('distinct', 0); $handler->override_option('style_plugin', 'table'); $handler = $view->new_display('page', 'Page', 'page_1'); $handler->override_option('path', 'og/ogurroles'); $handler->override_option('menu', array( - 'type' => 'none', - 'title' => '', - 'description' => '', - 'weight' => 0, - 'name' => 'navigation', - )); + 'type' => 'none', + 'title' => '', + 'description' => '', + 'weight' => 0, + 'name' => 'navigation', + )); $handler->override_option('tab_options', array( - 'type' => 'none', - 'title' => '', - 'description' => '', - 'weight' => 0, - )); + 'type' => 'none', + 'title' => '', + 'description' => '', + 'weight' => 0, + )); $views[$view->name] = $view; @@ -1254,7 +1261,7 @@ function og_user_roles_views_default_vie * Implementation of hook_views_data() */ function og_user_roles_views_data() { - $data['og_users_roles']['table']['group'] = t('OGUR Groups'); + $data['og_users_roles']['table']['group'] = t('OGUR Groups'); $data['og_users_roles']['table']['join'] = array( 'node' => array( 'left_field' => 'nid', @@ -1282,11 +1289,11 @@ function og_user_roles_views_data() { ), 'argument' => array( 'title' => t('Group node'), -// 'handler' => 'og_views_handler_argument_og_group_nid', + // 'handler' => 'og_views_handler_argument_og_group_nid', 'handler' => 'ogur_handler_argument_og_users_roles_gid', 'help' => t('Members are filtered for a specific group.'), ), - ); + ); $data['og_users_roles']['uid'] = array( 'title' => t('OGUR group member'), // 'help' => t('foo') @@ -1335,7 +1342,7 @@ function og_user_roles_views_data() { 'handler' => 'ogur_handler_filter_og_users_roles_ricg', ), ); - + return $data; } @@ -1382,10 +1389,10 @@ function views_handler_filter_group() { $list = array(); $list = og_get_types('group'); -// Modification as per: http://drupal.org/node/184357 + // Modification as per: http://drupal.org/node/184357 $group_types = implode("','", $list); - $vids = array(); - $result = db_query("SELECT n.nid, n.title FROM {node} n WHERE n.type IN ('".$group_types."') ORDER BY n.title"); + $vids = array(); + $result = db_query("SELECT n.nid, n.title FROM {node} n WHERE n.type IN ('" . $group_types . "') ORDER BY n.title"); while ($obj = db_fetch_object($result)) { $vids[$obj->nid] = $obj->title; } @@ -1395,7 +1402,7 @@ function views_handler_filter_group() { /** * Based on og_handler_filter_picg - * Should restrict queries that use og_users_roles table to the current group. + * Should restrict queries that use og_users_roles table to the current group. * * @return void **/ @@ -1407,13 +1414,14 @@ function og_user_roles_handler_filter($o /** * views_handler * Create list of roles for this group type -*/ + */ function og_user_roles_filter_role() { $node = og_get_group_context(); $roles = array(); if ($node->type) { $group = $node->type; - } else { + } + else { $group = 'group'; } // Get roles associated with this group. We rebuild the associative @@ -1426,7 +1434,7 @@ function og_user_roles_filter_role() { } } return $roles; -} +} /** * Created to check a view before I execute it. Needed for OG Home Pages with multiple @@ -1438,7 +1446,8 @@ function og_user_roles_checkview($viewna $items = views_build_view('items', $view, $args, 4, 5); if ($items['items']) { $result = 1; - } else { + } + else { $result = 0; } return $result; @@ -1457,13 +1466,14 @@ function og_user_roles_boot() { // Added here as per hook_init() suggestion: http://api.drupal.org/api/function/hook_init/5 // Don't call og_user_roles_all_roles unless this user is logged in if ($user->uid > 0) { - $roles = og_user_roles_all_roles($user); // This returns normal $user->roles and includes OG roles if any + // This returns normal $user->roles and includes OG roles if any + $roles = og_user_roles_all_roles($user); $user->roles = $roles; if (variable_get('og_user_roles_clear_cache_value', 0) == 1) { - cache_clear_all($user->uid, 'cache_menu', TRUE); - // Clear the user_access $perm cache - user_access('', NULL, TRUE); - } + cache_clear_all($user->uid, 'cache_menu', TRUE); + // Clear the user_access $perm cache + user_access('', NULL, TRUE); + } } // Looking for this format: http://www.scbbs.com/node/add/link?gids[]=29 @@ -1471,95 +1481,97 @@ function og_user_roles_boot() { if ($user->uid > 0) { // Bootstrap if arg() doesn't exist if ((!function_exists('arg') || !function_exists('node_load')) && $user->uid > 0) { - drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); // http://drupal.org/node/273068 + // http://drupal.org/node/273068 + drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); } // Modification as per: http://drupal.org/node/183860 - // Further modification: changed og_user_roles_theme() to og_user_roles_determine_context() + // Further modification: changed og_user_roles_theme() to og_user_roles_determine_context() og_user_roles_determine_context(); - /** + /** * Modules exempted from ognodeadd: - * Originally for ad module: http://drupal.org/node/183081 - * Added minutes module: http://drupal.org/node/184102 - */ - $exempted = array('ad','minutes'); + * Originally for ad module: http://drupal.org/node/183081 + * Added minutes module: http://drupal.org/node/184102 + */ + $exempted = array('ad', 'minutes'); $orig_query = $_SERVER['QUERY_STRING']; - // Get rid of Create Content 'node/add?gids[]' - $pattern = '/q\=.*node\/add\&gids\[\]\=(\d+)/i'; - $orig_query = preg_replace($pattern, "", $orig_query); - // Get rid of Create Content 'node/ognodeadd&gids[]' - $pattern = '/q\=.*node\/ognodeadd\&gids\[\]\=(\d+)/i'; - $orig_query = preg_replace($pattern, "", $orig_query); - // Get rid of Create Content 'node/ognodeadd&type=' - $pattern = '/q\=.*node\/ognodeadd\&type\=(\w+)/i'; - $orig_query = preg_replace($pattern, "", $orig_query); - // Get rid of 'node/add followed by &' - $pattern = '/q\=.*node\/add\/[^\&]+\&/i'; - $orig_query = preg_replace($pattern, "", $orig_query); - // Get rid of 'node/add followed which ends the line' - $pattern = '/q\=.*node\/add\/[^\&]+$/i'; - $orig_query = preg_replace($pattern, "", $orig_query); - // Get rid of 'gids[]=' + // Get rid of Create Content 'node/add?gids[]' + $pattern = '/q\=.*node\/add\&gids\[\]\=(\d+)/i'; + $orig_query = preg_replace($pattern, "", $orig_query); + // Get rid of Create Content 'node/ognodeadd&gids[]' + $pattern = '/q\=.*node\/ognodeadd\&gids\[\]\=(\d+)/i'; + $orig_query = preg_replace($pattern, "", $orig_query); + // Get rid of Create Content 'node/ognodeadd&type=' + $pattern = '/q\=.*node\/ognodeadd\&type\=(\w+)/i'; + $orig_query = preg_replace($pattern, "", $orig_query); + // Get rid of 'node/add followed by &' + $pattern = '/q\=.*node\/add\/[^\&]+\&/i'; + $orig_query = preg_replace($pattern, "", $orig_query); + // Get rid of 'node/add followed which ends the line' + $pattern = '/q\=.*node\/add\/[^\&]+$/i'; + $orig_query = preg_replace($pattern, "", $orig_query); + // Get rid of 'gids[]=' // Modified to include original query: http://drupal.org/node/381570 -// $pattern = '/.*gids\[\]\=(\d+)[\&]?/i'; - $pattern = '/[\?|\&]gids\[\]\=(\d+)[\&]?/i'; - $orig_query = preg_replace($pattern, "", $orig_query); - // Get rid of 'node/ognodeadd' - $pattern = '/q\=.*node\/ognodeadd/i'; - $orig_query = preg_replace($pattern, "", $orig_query); - // Get rid of '&' if it starts a line - $pattern = '/^\&/i'; - $orig_query = preg_replace($pattern, "", $orig_query); + // $pattern = '/.*gids\[\]\=(\d+)[\&]?/i'; + $pattern = '/[\?|\&]gids\[\]\=(\d+)[\&]?/i'; + $orig_query = preg_replace($pattern, "", $orig_query); + // Get rid of 'node/ognodeadd' + $pattern = '/q\=.*node\/ognodeadd/i'; + $orig_query = preg_replace($pattern, "", $orig_query); + // Get rid of '&' if it starts a line + $pattern = '/^\&/i'; + $orig_query = preg_replace($pattern, "", $orig_query); // If this is a group node/add, re-direct to ognodeadd - if (arg(0) == 'node' && arg(1) == 'add' && isset($_REQUEST['gids']) && (!in_array(arg(2), $exempted)) ) { - + if (arg(0) == 'node' && arg(1) == 'add' && isset($_REQUEST['gids']) && (!in_array(arg(2), $exempted))) { + $gids = $_GET['gids']; - $gid = intval(current($_REQUEST['gids'])); + $gid = intval(current($_REQUEST['gids'])); $type = arg(2); $path = 'node/ognodeadd'; if ($type == 'og_user_roles_subgroup') { - $type = variable_get('og_user_roles_create_subgroup_value', ''); // change OG Subgroups type to 'group' + // change OG Subgroups type to 'group' + $type = variable_get('og_user_roles_create_subgroup_value', ''); } - $query = 'type='. $type .'&gids[]='. $gid; + $query = 'type=' . $type . '&gids[]=' . $gid; // Modification as per: http://drupal.org/node/156568 if (arg(0) == 'node' && arg(1) == 'add' && arg(2) == 'forum' && is_numeric(arg(3))) { - $query = 'type='. $type .'&gids[]='. $gid .'&tid='. intval(arg(3)); + $query = 'type=' . $type . '&gids[]=' . $gid . '&tid=' . intval(arg(3)); } // Modification to make it work with module "Relativity" // http://drupal.org/node/166253 if (module_exists('relativity')) { - if (arg(3) == 'parent' && is_numeric(arg(4))) { - $query .= '&parent_node='.arg(4); + if (arg(3) == 'parent' && is_numeric(arg(4))) { + $query .= '&parent_node=' . arg(4); } elseif (!empty($_GET['parent_node'])) { - $query .= '&parent_node='.$_GET['parent_node']; + $query .= '&parent_node=' . $_GET['parent_node']; } } // Modification for book module - http://drupal.org/node/180243 - // this: http://www.scbbs.com/node/add/book/parent/225&gids[]=29 - // becomes this: http://www.scbbs.com/node/ognodeadd/0/parent/225?type=book&gids[]=29 + // this: http://www.scbbs.com/node/add/book/parent/225&gids[]=29 + // becomes this: http://www.scbbs.com/node/ognodeadd/0/parent/225?type=book&gids[]=29 if (module_exists('book') && $type == 'book' && arg(3) == 'parent' && is_numeric(arg(4))) { - $path .= '/book/parent/'. arg(4); + $path .= '/book/parent/' . arg(4); } -// if ($orig_query) $query = $query . '&' . $orig_query; + // if ($orig_query) { $query = $query . '&' . $orig_query; } if ($orig_query) { - // If the original query and the new query both contain gids[], then - // eliminate the one in the new query. - if (preg_match('/gids\[\]/', $query) && preg_match('/gids\[\]/', $orig_query)) { + // If the original query and the new query both contain gids[], then + // eliminate the one in the new query. + if (preg_match('/gids\[\]/', $query) && preg_match('/gids\[\]/', $orig_query)) { $pattern = '/\&gids\[\]\=(\d+)/i'; $query = preg_replace($pattern, "", $query); - } + } $query = $query . '&' . $orig_query; - } + } drupal_goto($path, $query); } @@ -1567,21 +1579,21 @@ function og_user_roles_boot() { // If this is a group node/add/forum with no gids, re-direct to ognodeadd and include gids if (arg(0) == 'node' && arg(1) == 'add' && arg(2) == 'forum' && is_numeric(arg(3)) && (!isset($_REQUEST['gids']))) { $type = arg(2); - $tid = intval(arg(3)); - $gid = og_user_roles_gid_from_tid($tid); + $tid = intval(arg(3)); + $gid = og_user_roles_gid_from_tid($tid); // Hijack only if there is a gid value; // Modificaton as per http://drupal.org/node/194214 - if (!empty($gid) && $gid != 0) { + if (!empty($gid) && $gid != 0) { $path = 'node/ognodeadd'; - $query = 'type='. $type .'&gids[]='. $gid .'&tid='. $tid; -// if ($orig_query) $query = $query . '&' . $orig_query; + $query = 'type=' . $type . '&gids[]=' . $gid . '&tid=' . $tid; + // if ($orig_query) { $query = $query . '&' . $orig_query; } if ($orig_query) { - // If the original query and the new query both contain gids[], then - // eliminate the one in the new query. - if (preg_match('/gids\[\]/', $query) && preg_match('/gids\[\]/', $orig_query)) { + // If the original query and the new query both contain gids[], then + // eliminate the one in the new query. + if (preg_match('/gids\[\]/', $query) && preg_match('/gids\[\]/', $orig_query)) { $pattern = '/\&gids\[\]\=(\d+)/i'; $query = preg_replace($pattern, "", $query); - } + } $query = $query . '&' . $orig_query; } drupal_goto($path, $query); @@ -1591,8 +1603,8 @@ function og_user_roles_boot() { // Modification as per: http://drupal.org/node/174959 // If this is a non-group node/add, but og_last session cookie is set // then re-direct to ognodeadd - // But, make sure you don't redirect for omitted nodes. - if (arg(0) == 'node' && arg(1) == 'add' && isset($_SESSION['og_last']) && (!is_null(arg(2))) && (!in_array(arg(2), $exempted)) ) { + // But, make sure you don't redirect for omitted nodes. + if (arg(0) == 'node' && arg(1) == 'add' && isset($_SESSION['og_last']) && (!is_null(arg(2))) && (!in_array(arg(2), $exempted))) { $gid = $_SESSION['og_last']; @@ -1600,47 +1612,48 @@ function og_user_roles_boot() { $path = 'node/ognodeadd'; // Modification as per: http://drupal.org/node/178610 - // Need to make sure this node $type supports adding a group item + // Need to make sure this node $type supports adding a group item $og_audience_required = variable_get('og_audience_required', FALSE); $og_omitted = variable_get('og_omitted', array()); - // Added re: http://drupal.org/node/178610#comment-1158470 - // Also: http://drupal.org/node/333860#comment-1119905 - $og_permitted = og_is_group_post_type($type); - if ($og_permitted && $og_audience_required && (!in_array($type, $og_omitted)) ) { + // Added re: http://drupal.org/node/178610#comment-1158470 + // Also: http://drupal.org/node/333860#comment-1119905 + $og_permitted = og_is_group_post_type($type); + if ($og_permitted && $og_audience_required && (!in_array($type, $og_omitted))) { if ($type == 'og_user_roles_subgroup') { - $type = variable_get('og_user_roles_create_subgroup_value', ''); // change OG Subgroups type to 'group' + // change OG Subgroups type to 'group' + $type = variable_get('og_user_roles_create_subgroup_value', ''); } - $query = 'type='. $type .'&gids[]='. $gid; + $query = 'type=' . $type . '&gids[]=' . $gid; // Modification to make it work with module "Relativity" // http://drupal.org/node/166253 if (module_exists('relativity')) { if (arg(3) == 'parent' && is_numeric(arg(4))) { - $query .= '&parent_node='.arg(4); + $query .= '&parent_node=' . arg(4); } elseif (!empty($_GET['parent_node'])) { - $query .= '&parent_node='.$_GET['parent_node']; + $query .= '&parent_node=' . $_GET['parent_node']; } } // Modification for book module - http://drupal.org/node/180243 - // this: http://www.scbbs.com/node/add/book/parent/225&gids[]=29 - // becomes this: http://www.scbbs.com/node/ognodeadd/0/parent/225?type=book&gids[]=29 + // this: http://www.scbbs.com/node/add/book/parent/225&gids[]=29 + // becomes this: http://www.scbbs.com/node/ognodeadd/0/parent/225?type=book&gids[]=29 if (module_exists('book') && $type == 'book' && arg(3) == 'parent' && is_numeric(arg(4))) { - $path .= '/book/parent/'. arg(4); + $path .= '/book/parent/' . arg(4); } -// if ($orig_query) $query = $query . '&' . $orig_query; + // if ($orig_query) { $query = $query . '&' . $orig_query; } if ($orig_query) { - // If the original query and the new query both contain gids[], then - // eliminate the one in the new query. - if (preg_match('/gids\[\]/', $query) && preg_match('/gids\[\]/', $orig_query)) { + // If the original query and the new query both contain gids[], then + // eliminate the one in the new query. + if (preg_match('/gids\[\]/', $query) && preg_match('/gids\[\]/', $orig_query)) { $pattern = '/\&gids\[\]\=(\d+)/i'; $query = preg_replace($pattern, "", $query); - } + } $query = $query . '&' . $orig_query; - } + } drupal_goto($path, $query); } } @@ -1650,29 +1663,29 @@ function og_user_roles_boot() { // og_vocab terms. If this is an og_vocab term edit: // a. Get the group and tid // b. re-direct to destination - // c. from destination, redirect to ogtermedit + // c. from destination, redirect to ogtermedit if (module_exists('og_vocab')) { - if (arg(0) == 'admin' && arg(1) == 'content' && arg(2) == 'taxonomy' && arg(3) == 'edit' && arg(4) == 'term' && is_numeric(arg(5)) && isset($_REQUEST['destination'])) { + if (arg(0) == 'admin' && arg(1) == 'content' && arg(2) == 'taxonomy' && arg(3) == 'edit' && arg(4) == 'term' && is_numeric(arg(5)) && isset($_REQUEST['destination'])) { $destination = $_GET['destination']; - $tid = arg(5); - $gid = og_user_roles_gid_from_og_vocab_tid($tid); + $tid = arg(5); + $gid = og_user_roles_gid_from_og_vocab_tid($tid); - $query = '&gids[]='. $gid .'&tid='. $tid . '&newdestination=' . $destination; + $query = '&gids[]=' . $gid . '&tid=' . $tid . '&newdestination=' . $destination; // Re-direct to destination if $gid > 0 if ($gid > 0) { drupal_goto($destination, $query); - } + } } // This is the destination path for og_vocab term edit redirection above - if (arg(0) == 'node' && is_numeric(arg(1)) && arg(2) == 'og' && arg(3) == 'vocab' && arg(4) == 'terms' && is_numeric(arg(5)) && isset($_REQUEST['gids']) && isset($_REQUEST['tid']) ) { - $destination = $_GET['newdestination']; - $tid = $_GET['tid']; - $gids = $_GET['gids']; - $gid = intval(current($_REQUEST['gids'])); - $path = 'node/ogtermedit'; + if (arg(0) == 'node' && is_numeric(arg(1)) && arg(2) == 'og' && arg(3) == 'vocab' && arg(4) == 'terms' && is_numeric(arg(5)) && isset($_REQUEST['gids']) && isset($_REQUEST['tid'])) { + $destination = $_GET['newdestination']; + $tid = $_GET['tid']; + $gids = $_GET['gids']; + $gid = intval(current($_REQUEST['gids'])); + $path = 'node/ogtermedit'; - $query = 'gids[]='. $gid .'&tid='. $tid . '&destination=' . $destination; + $query = 'gids[]=' . $gid . '&tid=' . $tid . '&destination=' . $destination; // Re-direct to ogtermedit drupal_goto($path, $query); @@ -1680,116 +1693,116 @@ function og_user_roles_boot() { } // Modification for modr8: http://drupal.org/node/162649 // This allows a group role with "moderate content" permission to view - // the modr8_log for events related to nodes he has access to. + // the modr8_log for events related to nodes he has access to. if (module_exists('modr8')) { - if (arg(0) == 'admin' && arg(1) == 'logs' && arg(2) == 'modr8' && arg(3) == 'event' && is_numeric(arg(4)) ) { + if (arg(0) == 'admin' && arg(1) == 'logs' && arg(2) == 'modr8' && arg(3) == 'event' && is_numeric(arg(4))) { $event = arg(4); - $gid = og_user_roles_gid_from_modr8_event($event); - $path = 'node/ogmodr8'; - $query = 'gids[]='. $gid .'&event='. $event; + $gid = og_user_roles_gid_from_modr8_event($event); + $path = 'node/ogmodr8'; + $query = 'gids[]=' . $gid . '&event=' . $event; // Re-direct to destination if $gid > 0 if ($gid > 0) { drupal_goto($path, $query); - } + } } - } + } // Modification for ad module: http://drupal.org/node/183081 // Add groupID if we are in group context. if (module_exists('ad')) { - if (arg(0) == 'node' && arg(1) == 'add' && arg(2) == 'ad' && (arg(3) == 'image' || arg(3) == 'text') && isset($_SESSION['og_last']) && (!isset($_REQUEST['gids'])) ) { -// $gid = $_SESSION['og_last']; -// $uri_request_id = request_uri(); -// $this_url = parse_url($uri_request_id); -// $this_path = $this_url[path]; -// $this_path = ltrim($this_path, "\/"); -// $path = $this_path; + if (arg(0) == 'node' && arg(1) == 'add' && arg(2) == 'ad' && (arg(3) == 'image' || arg(3) == 'text') && isset($_SESSION['og_last']) && (!isset($_REQUEST['gids']))) { + // $gid = $_SESSION['og_last']; + // $uri_request_id = request_uri(); + // $this_url = parse_url($uri_request_id); + // $this_path = $this_url[path]; + // $this_path = ltrim($this_path, "\/"); + // $path = $this_path; - $gid = $_SESSION['og_last']; + $gid = $_SESSION['og_last']; $uri_request_id = request_uri(); - $this_url = parse_url($uri_request_id); - $this_path = $this_url[path]; - $base_path_len = strlen(base_path()); - $this_path2 = substr($this_path, $base_path_len); - $path = $this_path2; + $this_url = parse_url($uri_request_id); + $this_path = $this_url[path]; + $base_path_len = strlen(base_path()); + $this_path2 = substr($this_path, $base_path_len); + $path = $this_path2; - $query = 'gids[]='. $gid; + $query = 'gids[]=' . $gid; // Only add if $gid > 0 if ($gid > 0) { drupal_goto($path, $query); - } + } } - } + } // Modification for minutes module: http://drupal.org/node/184102 // Add groupID if we are in group context. if (module_exists('minutes')) { - if (arg(0) == 'node' && arg(1) == 'add' && arg(2) == 'minutes' && is_numeric(arg(3)) && isset($_SESSION['og_last']) && (!isset($_REQUEST['gids'])) ) { -// $gid = $_SESSION['og_last']; -// $uri_request_id = request_uri(); -// $this_url = parse_url($uri_request_id); -// $this_path = $this_url[path]; -// $this_path = ltrim($this_path, "\/"); -// $path = $this_path; + if (arg(0) == 'node' && arg(1) == 'add' && arg(2) == 'minutes' && is_numeric(arg(3)) && isset($_SESSION['og_last']) && (!isset($_REQUEST['gids']))) { + // $gid = $_SESSION['og_last']; + // $uri_request_id = request_uri(); + // $this_url = parse_url($uri_request_id); + // $this_path = $this_url[path]; + // $this_path = ltrim($this_path, "\/"); + // $path = $this_path; - $gid = $_SESSION['og_last']; + $gid = $_SESSION['og_last']; $uri_request_id = request_uri(); - $this_url = parse_url($uri_request_id); - $this_path = $this_url[path]; - $base_path_len = strlen(base_path()); - $this_path2 = substr($this_path, $base_path_len); - $path = $this_path2; + $this_url = parse_url($uri_request_id); + $this_path = $this_url[path]; + $base_path_len = strlen(base_path()); + $this_path2 = substr($this_path, $base_path_len); + $path = $this_path2; - $query = 'gids[]='. $gid; + $query = 'gids[]=' . $gid; // Only add if $gid > 0 if ($gid > 0) { drupal_goto($path, $query); - } + } } - } + } // Modification user edit // If this is going to http://clients.brixrealtyinc.com/user/76 // But the referrer is http://clients.brixrealtyinc.com/oguseredit/76/edit?gids[]=47 // Then redirect back to referrer. - // As a result of http://drupal.org/node/176662 this can only be done if the - // "Allow group admins to approve users" setting is checked on. + // As a result of http://drupal.org/node/176662 this can only be done if the + // "Allow group admins to approve users" setting is checked on. if (variable_get('og_user_roles_approval_default', 0) === 1 && ((!user_access('access administration pages')) && (arg(0) == 'user' && is_numeric(arg(1)) && arg(1) != 1) || (arg(0) == 'admin' && arg(1) == 'user' && arg(2) == 'user'))) { - $ref = $_SERVER["HTTP_REFERER"]; - $ref_url = parse_url($ref); - $ref_path = $ref_url[path]; + $ref = $_SERVER["HTTP_REFERER"]; + $ref_url = parse_url($ref); + $ref_path = $ref_url[path]; $ref_query = $ref_url[query]; - $ref_arg = explode('/', $ref_path); + $ref_arg = explode('/', $ref_path); -// drupal_set_message('ref_query = ' . $ref_query); + // drupal_set_message('ref_query = ' . $ref_query); // Hijack only if the referrer contains oguseredit; if ($ref_arg[1] == 'oguseredit' && arg(2) != 'user') { // If user clicks delete from user edit screen. Gets you to the - // "delete" confirmation. + // "delete" confirmation. if (arg(2) == 'delete') { - $temp = substr($ref_path, 1); - $path = str_replace("/edit", "/delete", $temp); + $temp = substr($ref_path, 1); + $path = str_replace("/edit", "/delete", $temp); $query = $ref_query; drupal_goto($path, $query); - } + } // If user clicks "submit" from user edit screen - just takes you back - // to the same edit screen. + // to the same edit screen. if ($ref_arg[3] == 'edit') { $path = substr($ref_path, 1); $query = $ref_query; drupal_goto($path, $query); - } + } // If user clicks "delete" or "cancel" from delete confirmation screen. - // Takes you to group home page. + // Takes you to group home page. if ($ref_arg[3] == 'delete') { parse_str($ref_query); $gid = $gids[0]; $path = 'node/' . $gid; drupal_goto($path); - } + } } } // If this is a group relativity or book module node/add, re-direct to ognodeadd - if (arg(0) == 'node' && arg(1) == 'add' && is_numeric(arg(4)) && (!in_array(arg(2), $exempted)) ) { - + if (arg(0) == 'node' && arg(1) == 'add' && is_numeric(arg(4)) && (!in_array(arg(2), $exempted))) { + $type = arg(2); $path = 'node/ognodeadd'; @@ -1797,25 +1810,25 @@ function og_user_roles_boot() { $nid = (int)arg(4); $gid = og_user_roles_getgid($nid, $user->uid); - $query = 'type='. $type .'&gids[]='. $gid; + $query = 'type=' . $type . '&gids[]=' . $gid; // Modification to make it work with module "Relativity" // http://drupal.org/node/166253 // http://drupal.org/node/227978 if (module_exists('relativity')) { if (arg(3) == 'parent') { - $query .= '&parent_node='.arg(4); + $query .= '&parent_node=' . arg(4); } elseif (!empty($_GET['parent_node'])) { - $query .= '&parent_node='.$_GET['parent_node']; + $query .= '&parent_node=' . $_GET['parent_node']; } } // Book module as per: http://drupal.org/node/228386 if (module_exists('book') && $type == 'book' && arg(3) == 'parent' && is_numeric(arg(4))) { - $path .= '/book/parent/'. arg(4); + $path .= '/book/parent/' . arg(4); } - $query = 'type='. $type .'&gids[]='. $gid .'&tid='. $tid; - drupal_goto($path, $query); + $query = 'type=' . $type . '&gids[]=' . $gid . '&tid=' . $tid; + drupal_goto($path, $query); } } } @@ -1829,84 +1842,96 @@ function og_user_roles_boot() { function og_user_roles_user($op, &$edit, &$user, $category = NULL) { if ($op == 'insert') { - // Registration Code - if (isset($edit['og_user_roles_regcode']) && variable_get('og_user_roles_assign_regcode_gid', 0) == 1) { //only present during registration + // Registration Code + // only present during registration + if (isset($edit['og_user_roles_regcode']) && variable_get('og_user_roles_assign_regcode_gid', 0) == 1) { $gid = og_user_roles_gid_from_regcode($edit['og_user_roles_regcode']); if ($gid > 0) { $node = node_load($gid); $title = $node->title; - $return = og_save_subscription($gid, $user->uid, array('is_active' => 1)); // as per http://drupal.org/node/156224 - drupal_set_message(t('Subscription request to ' . l($title, 'node/'. $gid) . ' approved.')); + // as per http://drupal.org/node/156224 + $return = og_save_subscription($gid, $user->uid, array('is_active' => 1)); + drupal_set_message(t('Subscription request to ' . l($title, 'node/' . $gid) . ' approved.')); // Delete this registration code if 'delete_regcode' is set - if (variable_get('og_user_roles_delete_regcode_' . $gid, 0) == 1) og_user_roles_delete_regcode($gid, $edit['og_user_roles_regcode']); + if (variable_get('og_user_roles_delete_regcode_' . $gid, 0) == 1) { + og_user_roles_delete_regcode($gid, $edit['og_user_roles_regcode']); + } // Places all new registration code group subscribers into default regcode role. - if (variable_get('og_user_roles_assign_regcoderole_' . $gid, 0)) { // check to see if this variable exists - if (variable_get('og_user_roles_assign_regcode_gid', 0) == 1 && variable_get('og_user_roles_assign_regcoderole_' . $gid, 0) == 1 ) { + // check to see if this variable exists + if (variable_get('og_user_roles_assign_regcoderole_' . $gid, 0)) { + if (variable_get('og_user_roles_assign_regcode_gid', 0) == 1 && variable_get('og_user_roles_assign_regcoderole_' . $gid, 0) == 1) { $rid = variable_get('og_user_roles_regcoderole_value_' . $gid, 0); - og_user_roles_role_join($user->uid, $rid, $gid); // assign user to group role in that group + // assign user to group role in that group + og_user_roles_role_join($user->uid, $rid, $gid); } } } } // If site requires admin approval and group admins are allowed to approve users - // Variable "user_register" values: 0 = Admin Only, 1 = No Admin Approval, 2 = Admin Approval + // Variable "user_register" values: 0 = Admin Only, 1 = No Admin Approval, 2 = Admin Approval if (variable_get('og_user_roles_approval_default', 0) == 1 && (variable_get('user_register', 1) == 2 || ($user->status == 0))) { - watchdog('new_user: status', 'user->status = ' . $user->status, WATCHDOG_NOTICE); + watchdog('new_user: status', 'user->status = ' . $user->status, WATCHDOG_NOTICE); if (is_array($edit['og_register'])) { $sender = variable_get('site_mail', ''); $edit_test1 = $edit['og_register']; foreach (array_keys(array_filter($edit['og_register'])) as $gid) { watchdog('new_user: gid', 'gid = ' . $gid, WATCHDOG_NOTICE); - $node = node_load($gid); - $group = check_plain($node->title); + $node = node_load($gid); + $group = check_plain($node->title); $subject = t('User @user pending account approval. Subscription request to : @group', array('@user' => $user->name, '@group' => $group)); - if (variable_get('og_user_roles_approval_default', 0) == 1) { + if (variable_get('og_user_roles_approval_default', 0) == 1) { $view_user = "oguseredit/$user->uid"; - }else{ + } + else { $view_user = "user/$user->uid"; - } + } $message = "The registration application for user " . l($user->name, $view_user, array('query' => "gids[]=$gid", 'absolute' => TRUE)) . " is pending approval. You are the administrator for at least one of the groups to which this user has also applied to subscribe : " . l($group, "node/$gid", array('absolute' => TRUE)) . ".

You can click " . l("here", "$view_user/edit", array('query' => "gids[]=$gid", 'absolute' => TRUE)) . " to Activate, Block or Delete the user. (Don't forget to first log into group for which you are admin.)"; $result = db_query("SELECT uid FROM {og_uid} WHERE is_admin = 1 AND nid = %d", $gid); while ($obj = db_fetch_object($result)) { - $recipient_uid = $obj->uid; + $recipient_uid = $obj->uid; $recipient_user = user_load(array('uid' => $recipient_uid)); - $recipient = $recipient_user->mail; - if (module_exists('mimemail')) mimemail($sender, $recipient, $subject, $message); - } // end while + $recipient = $recipient_user->mail; + if (module_exists('mimemail')) { + mimemail($sender, $recipient, $subject, $message); + } + } + // end while } - } - } + } + } // If site admin opted to create a default role if (variable_get('og_user_roles_assign_default', 0) == 1) { // Check to see if this user doesn't already have this role; // If not, then assign it. - $rid = variable_get('og_user_roles_default_value', 0); - $sql = "SELECT COUNT(*) FROM {users_roles} WHERE uid = %d AND rid = %d"; + $rid = variable_get('og_user_roles_default_value', 0); + $sql = "SELECT COUNT(*) FROM {users_roles} WHERE uid = %d AND rid = %d"; $result = db_query($sql, $user->uid, $rid); $output = (db_result($result)); if ($output == 0) { - // Modified as per: http://drupal.org/node/372700 - $edit['roles'][$rid] = $rid; -// db_query('INSERT INTO {users_roles} (uid, rid) VALUES (%d, %d)', $user->uid, $rid); + // Modified as per: http://drupal.org/node/372700 + $edit['roles'][$rid] = $rid; + // db_query('INSERT INTO {users_roles} (uid, rid) VALUES (%d, %d)', $user->uid, $rid); } } } if ($op == 'validate') { // Registration Code - if (isset($edit['og_user_roles_regcode'])) { //only present during registration + // only present during registration + if (isset($edit['og_user_roles_regcode'])) { if (variable_get('og_user_roles_assign_regcode_gid', 0) == 1 && $edit['og_user_roles_regcode'] != '') { $gid = og_user_roles_gid_from_regcode($edit['og_user_roles_regcode']); if ($gid == 0) { if (variable_get('og_user_roles_assign_regcode_gid_required', 0) == 1) { - $explanation = 'Not a valid group registration code. If you do not have a registration code, please contact the site administrator. You can not register on this site without a valid registration code.'; - } else { + $explanation = 'Not a valid group registration code. If you do not have a registration code, please contact the site administrator. You can not register on this site without a valid registration code.'; + } + else { $explanation = 'Not a valid group registration code. If you do not have a registration code, please make sure the Group registration code box is empty.'; - } + } form_set_error('og_user_roles_regcode', $explanation); } @@ -1917,33 +1942,36 @@ function og_user_roles_user($op, &$edit, // Add the group roles to $user->roles if this is a group // This should only be effective until the next global $user call if ($op == 'load') { - $roles = og_user_roles_all_roles($user); // This returns normal $user->roles and includes OG roles if any + // This returns normal $user->roles and includes OG roles if any + $roles = og_user_roles_all_roles($user); $user->roles = $roles; - } // end $op load + } + // end $op load // Remove user info from og_users_roles table if ($op == 'delete') { - db_query("DELETE FROM {og_users_roles} WHERE uid = %d", $user->uid); // delete all records for this user - } // end $op delete + // delete all records for this user + db_query("DELETE FROM {og_users_roles} WHERE uid = %d", $user->uid); + } + // end $op delete // Add the group roles to user's account display if ($op == 'view') { - $uid = $user->uid; - $view = views_get_view('OGURRoles'); - $args = array($uid); + $uid = $user->uid; + $view = views_get_view('OGURRoles'); + $args = array($uid); $value = $view->execute_display('default', $args); - + $user->content['summary']['ogur'] = array( '#type' => 'item', '#title' => t('Group Roles'), '#value' => $value, '#attributes' => array('class' => 'og_groups'), - // Only show list of groups to self (user/) and admins. + // Only show list of groups to self (user/) and admins. '#access' => user_access('administer organic groups') || $user->uid == arg(1), ); - - } // end $op view - + } + // end $op view } /** @@ -1967,17 +1995,20 @@ function og_user_roles_og($op, $nid, $ui // -Bibo if (variable_get('og_user_roles_assign_basicgrouprole', 0) == 1) { $rid = variable_get('og_user_roles_basicgrouprole_value', 0); - og_user_roles_role_join($uid, $rid, $nid); // assign user to group role in that group + // assign user to group role in that group + og_user_roles_role_join($uid, $rid, $nid); } // --- Modification - 2007-09-20 - as per: http://drupal.org/node/177016 // Places all new group subscribers into default role. // Same as above, except these settings are set by Group Admin in the // group node. So, the variables are set by group. - if (variable_get('og_user_roles_assign_basicgrouprole_' . $nid, 0)) { // check to see if this variable exists - if (variable_get('og_user_roles_assign_basicgrouprole_gid', 0) == 1 && variable_get('og_user_roles_assign_basicgrouprole_' . $nid, 0) == 1 ) { + // check to see if this variable exists + if (variable_get('og_user_roles_assign_basicgrouprole_' . $nid, 0)) { + if (variable_get('og_user_roles_assign_basicgrouprole_gid', 0) == 1 && variable_get('og_user_roles_assign_basicgrouprole_' . $nid, 0) == 1) { $rid = variable_get('og_user_roles_basicgrouprole_value_' . $nid, 0); - og_user_roles_role_join($uid, $rid, $nid); // assign user to group role in that group + // assign user to group role in that group + og_user_roles_role_join($uid, $rid, $nid); } } @@ -1986,46 +2017,51 @@ function og_user_roles_og($op, $nid, $ui $admin = $args['is_admin']; if (variable_get('og_user_roles_assign_admingrouprole', 0) == 1 && $admin == 1) { $rid = variable_get('og_user_roles_admingrouprole_value', 0); - og_user_roles_role_join($uid, $rid, $nid); // assign user to group role in that group + // assign user to group role in that group + og_user_roles_role_join($uid, $rid, $nid); } $user = user_load(array('uid' => $uid)); -// $node = node_load($nid); + // $node = node_load($nid); // --- Modification - 2008-05-20 - as per: http://drupal.org/node/259956 $node = db_fetch_object(db_query("SELECT type, title FROM {node} WHERE nid=%d", $nid)); // --- Modification - 2008-03-10 - as per: http://drupal.org/node/229715 // Places all new group subscribers into default role per group type. $type = $node->type; - if (variable_get('ogur_assign_typegrouprole_' . $type, 0)) { - if (variable_get('ogur_assign_typegrouprole_' . $type, 0) == 1) { + if (variable_get('ogur_assign_typegrouprole_' . $type, 0)) { + if (variable_get('ogur_assign_typegrouprole_' . $type, 0) == 1) { $rid = variable_get('ogur_typegrouprole_value_' . $type, 0); - og_user_roles_role_join($uid, $rid, $nid); // assign user to group role in that group + // assign user to group role in that group + og_user_roles_role_join($uid, $rid, $nid); } } // Send notification of new og subscription to administrators of group; if (variable_get('og_user_roles_notify_default', 0) == 1 && module_exists('mimemail')) { - $group = check_plain($node->title); - $sender = variable_get('site_mail', ''); + $group = check_plain($node->title); + $sender = variable_get('site_mail', ''); $subject = t('User @user added to group: @group', array('@user' => $user->name, '@group' => $group)); if (variable_get('og_user_roles_approval_default', 0) == 1) { $view_user = "oguseredit/$user->uid"; - }else{ + } + else { $view_user = "user/$user->uid"; - } + } // http://www.scbbs.com/node/135/219#comment-219 $message = "User " . l($user->name, $view_user, array('query' => "gids[]=$nid", 'absolute' => TRUE)) . " added to group: " . l($group, "node/$nid", array('absolute' => TRUE)); $result = db_query("SELECT uid FROM {og_uid} WHERE is_admin = 1 AND nid = %d", $nid); while ($obj = db_fetch_object($result)) { - $recipient_uid = $obj->uid; + $recipient_uid = $obj->uid; $recipient_user = user_load(array('uid' => $recipient_uid)); - $recipient = $recipient_user->mail; + $recipient = $recipient_user->mail; mimemail($sender, $recipient, $subject, $message); // drupal_mail('og_user_roles_new_subscription', $recipient, $subject, $message, $sender); - } // end while - } // end if + } + // end while + } + // end if break; case 'user update': @@ -2034,11 +2070,13 @@ function og_user_roles_og($op, $nid, $ui $admin = $args['is_admin']; if (variable_get('og_user_roles_assign_admingrouprole', 0) == 1 && $admin === 0) { $rid = variable_get('og_user_roles_admingrouprole_value', 0); - og_user_roles_role_delete($uid, $rid, $nid); // delete this admin role for this user in this group (if it exists) + // delete this admin role for this user in this group (if it exists) + og_user_roles_role_delete($uid, $rid, $nid); } if (variable_get('og_user_roles_assign_admingrouprole', 0) == 1 && $admin === 1) { $rid = variable_get('og_user_roles_admingrouprole_value', 0); - og_user_roles_role_join($uid, $rid, $nid); // assign user to group role in that group + // assign user to group role in that group + og_user_roles_role_join($uid, $rid, $nid); } break; @@ -2046,7 +2084,7 @@ function og_user_roles_og($op, $nid, $ui // Remove all roles for this user in this group if he is being unsubscribed; og_user_roles_role_leave($uid, $nid); break; - } // end switch + } } /** @@ -2058,14 +2096,14 @@ function og_user_roles_node_info() { return array( 'og_user_roles_subgroup' => array( - 'name' => t('Subgroup'), - 'module' => 'og_user_roles', + 'name' => t('Subgroup'), + 'module' => 'og_user_roles', 'description' => t('Create a basic subgroup.'), - 'help' => t('Create a basic subgroup.'), - 'body_label' => t('Description'), + 'help' => t('Create a basic subgroup.'), + 'body_label' => t('Description'), ), ); - } // end if + } } /** @@ -2078,7 +2116,6 @@ function og_user_roles_nodeapi(&$node, $ case 'access': break; -// case 'submit': case 'presave': break; @@ -2086,50 +2123,54 @@ function og_user_roles_nodeapi(&$node, $ // If this is a group node, put the group creator into a group role upon creation; if (og_is_group_type($node->type)) { - $type = $node->type; + $type = $node->type; if (variable_get("ogur_assign_founder_$type", 0) == 1) { // Get the requisite data - $uid = $node->uid; // user ID + // user ID + $uid = $node->uid; $rid = variable_get("ogur_founder_value_$type", 0); - $gid = $node->nid; // group ID - og_user_roles_role_join($uid, $rid, $gid); // assign user to group role in that group + // group ID + $gid = $node->nid; + // assign user to group role in that group + og_user_roles_role_join($uid, $rid, $gid); } } // Create a subgroup record for this group // 'ognodeadd' is my node add callback, so I know if this node is a group and // here, then we need to process it node as a subgroup if ($node->type == variable_get('og_user_roles_create_subgroup_value', '') && arg(1) == 'ognodeadd') { - $gids = $_GET['gids']; - $gid = $gids[0]; + $gids = $_GET['gids']; + $gid = $gids[0]; $subgroup = $node->nid; -// See http://drupal.org/node/432544 -// $sql = 'INSERT INTO {og_ancestry} (nid,group_nid,is_public) VALUES (%d,%d,0)'; + // See http://drupal.org/node/432544 + // $sql = 'INSERT INTO {og_ancestry} (nid,group_nid,is_public) VALUES (%d,%d,0)'; $sql = 'INSERT INTO {og_ancestry} (nid,group_nid) VALUES (%d,%d)'; db_query($sql, $subgroup, $gid); // This table no longer supported in og_subgroups 6.x. - // if (module_exists('og_subgroups')) db_query('INSERT INTO {og_subgroups} (gid, parent) VALUES (%d, %d)', $subgroup, $gid); + // if (module_exists('og_subgroups')) db_query('INSERT INTO {og_subgroups} (gid, parent) { VALUES (%d, %d)', $subgroup, $gid); } } - break; case 'update': // Modification. 2007-09-24 as per: http://drupal.org/node/178257 // If this is a group node, put the group creator into a group role upon creation - // OR when the group node is updated. If user already is in that role in the group, - // the og_user_roles_role_join command will ignore the request. + // OR when the group node is updated. If user already is in that role in the group, + // the og_user_roles_role_join command will ignore the request. if (og_is_group_type($node->type)) { - $type = $node->type; + $type = $node->type; if (variable_get("ogur_assign_founder_$type", 0) == 1) { - // If this is a group node + // If this is a group node // Get the requisite data - $uid = $node->uid; // user ID + // user ID + $uid = $node->uid; $rid = variable_get("ogur_founder_value_$type", 0); - $gid = $node->nid; // group ID - og_user_roles_role_join($uid, $rid, $gid); // assign user to group role in that group + // group ID + $gid = $node->nid; + // assign user to group role in that group + og_user_roles_role_join($uid, $rid, $gid); } } - break; case 'validate': @@ -2137,9 +2178,11 @@ function og_user_roles_nodeapi(&$node, $ $uid = $user->uid; if ($node->type) { $type = $node->type; - } elseif (arg(1) == 'add') { + } + elseif (arg(1) == 'add') { $type = arg(2); - } elseif (arg(1) == 'ognodeadd') { + } + elseif (arg(1) == 'ognodeadd') { $type = $_GET['type']; } // Check to see if this is a group post; @@ -2147,47 +2190,47 @@ function og_user_roles_nodeapi(&$node, $ if ($group_node = og_get_group_context()) { // If this is a node that can be posted into groups if (og_is_group_post_type($type)) { - // Does this node have groups? + // Does this node have groups? if ($node->og_groups) { - foreach ($node->og_groups as $gid) { + foreach ($node->og_groups as $gid) { if ((arg(1) == 'add' || arg(1) == 'ognodeadd') && $gid > 0) { - $access = FALSE; + $access = FALSE; // Get the module $module = node_get_types('module', $type); - // Get all permissions for this module + // Get all permissions for this module $perms = module_invoke($module, 'perm'); - // Look for the 'create' permission - foreach ($perms as $string) { - // If this is a create permission - if (preg_match('/create/', $string) || preg_match('/edit own blog/', $string)) { - // See if the user has this permission in this group + // Look for the 'create' permission + foreach ($perms as $string) { + // If this is a create permission + if (preg_match('/create/', $string) || preg_match('/edit own blog/', $string)) { + // See if the user has this permission in this group if (og_user_roles_user_access($string, $gid, $uid) === TRUE) { - $access = TRUE; + $access = TRUE; } - } - } + } + } if ($access === FALSE) { $temp_node = node_load($gid); - $group_name = $temp_node->title; + $group_name = $temp_node->title; form_set_error('og_groups', t('You do not have permission to post this content type (' . $type . ') into Group: ' . $group_name . ' (' . $gid . ')')); } } if ((arg(2) == 'edit' || arg(2) == 'delete') && $gid > 0) { - $access = FALSE; + $access = FALSE; $module = node_get_types('module', $type); - + $perms = module_invoke($module, 'perm'); - foreach ($perms as $string) { - // If this is an edit string - if (preg_match('/edit/', $string) || preg_match('/manage/', $string)) { + foreach ($perms as $string) { + // If this is an edit string + if (preg_match('/edit/', $string) || preg_match('/manage/', $string)) { if (og_user_roles_user_access($string, $gid, $uid) === TRUE) { - $access = TRUE; + $access = TRUE; } - } - } + } + } if ($access === FALSE) { $temp_node = node_load($gid); - $group_name = $temp_node->title; + $group_name = $temp_node->title; form_set_error('og_groups', t('You do not have permission to edit or delete this content type (' . $type . ') in Group: ' . $group_name . ' (' . $gid . ')')); } } @@ -2197,38 +2240,38 @@ function og_user_roles_nodeapi(&$node, $ } // Check to see if this is a group post, and if so, if public posts are allowed; // Do we have group context? - if ($group_node = og_get_group_context()) { - // Get the group node id - $gid = $group_node->nid; - - // If this is a group node - if (in_array($node->type, og_get_types('group'))) { - } - - // Check the nopublic variable for this group - if (variable_get('og_user_roles_assign_nopublic_' . $gid, 0) == 1) { - // Check public status of this post - if ($node->og_public) { - form_set_error('og_public', t('No public posts allowed in this group. You may NOT check the Public box on this post.')); - } - // Check forum status of this post - if (module_exists('og_forum')) { - if ($node->type == 'forum') { + if ($group_node = og_get_group_context()) { + // Get the group node id + $gid = $group_node->nid; + + // If this is a group node + if (in_array($node->type, og_get_types('group'))) {} + + // Check the nopublic variable for this group + if (variable_get('og_user_roles_assign_nopublic_' . $gid, 0) == 1) { + // Check public status of this post + if ($node->og_public) { + form_set_error('og_public', t('No public posts allowed in this group. You may NOT check the Public box on this post.')); + } + // Check forum status of this post + if (module_exists('og_forum')) { + if ($node->type == 'forum') { // Get the forum vocabulary ID - $vid = og_forum_get_vid(); // http://drupal.org/node/346717 + // http://drupal.org/node/346717 + $vid = og_forum_get_vid(); $ok = FALSE; - // Get all forums for this group - $sql = "SELECT tid FROM {og_term} WHERE nid = %d"; + // Get all forums for this group + $sql = "SELECT tid FROM {og_term} WHERE nid = %d"; $forums = array(); $result = db_query($sql, $gid); - while ($nid = db_fetch_array($result)){ + while ($nid = db_fetch_array($result)) { $forums[] = $nid['tid']; } // Get the forum containers only for this group - $containers = variable_get('forum_containers', array()); - $my_containers = array_intersect($containers, $forums); - // Get the list of names for forum containers for this group - $names = ""; + $containers = variable_get('forum_containers', array()); + $my_containers = array_intersect($containers, $forums); + // Get the list of names for forum containers for this group + $names = ""; foreach ($my_containers as $item) { $temp = taxonomy_get_term($item); $names .= $temp->name . " "; @@ -2240,33 +2283,32 @@ function og_user_roles_nodeapi(&$node, $ // Make sure this term is in the same group if ($gid == og_user_roles_gid_from_tid($term)) { $tid = $term; - $ok = TRUE; + $ok = TRUE; } } } - // Check the gid of this tid against this gid - if (!$ok) { - form_set_error('tid', t('You have selected the wrong Forum for this post. You may only select a forum from the Forums pull-down menu that is in the same group as this post. Please try again. Group ('.$gid.') Term ('.$term.') Suggested container(s): %names', array('%names' => $names))); - } - } - } - } - } + // Check the gid of this tid against this gid + if (!$ok) { + form_set_error('tid', t('You have selected the wrong Forum for this post. You may only select a forum from the Forums pull-down menu that is in the same group as this post. Please try again. Group (' . $gid . ') Term (' . $term . ') Suggested container(s): %names', array('%names' => $names))); + } + } + } + } + } break; case 'delete': // Remove og_users_roles and variables related to group node if it is deleted; - // If this is a group node - if (og_is_group_type($node->type)) { - og_user_roles_role_remove($node->nid); - og_user_roles_variable_remove($node->nid); - // This table no longer supported in og_subgroups 6.x. - // if (module_exists('og_subgroups')) db_query('DELETE FROM {og_subgroups} WHERE gid = %d', $node->nid); - } + // If this is a group node + if (og_is_group_type($node->type)) { + og_user_roles_role_remove($node->nid); + og_user_roles_variable_remove($node->nid); + // This table no longer supported in og_subgroups 6.x. + // if (module_exists('og_subgroups')) { db_query('DELETE FROM {og_subgroups} WHERE gid = %d', $node->nid); } + } break; - - } // end switch -} // end og_user_roles_nodeapi function + } +} /** * Use this function to determine whether a user has a given privilege @@ -2307,9 +2349,9 @@ function og_user_roles_user_access($stri while ($role = db_fetch_object($result)) { $roles[$role->rid] = $role->name; } - $rids = array_keys($roles); + $rids = array_keys($roles); $placeholders = implode(',', array_fill(0, count($rids), '%d')); - $result = db_query("SELECT DISTINCT(p.perm) FROM {role} r INNER JOIN {permission} p ON p.rid = r.rid WHERE r.rid IN ($placeholders)", $rids); + $result = db_query("SELECT DISTINCT(p.perm) FROM {role} r INNER JOIN {permission} p ON p.rid = r.rid WHERE r.rid IN ($placeholders)", $rids); while ($row = db_fetch_object($result)) { $perms .= "$row->perm, "; } @@ -2347,25 +2389,27 @@ function og_user_roles_get_groups_result */ function og_user_roles_all_roles($user) { - drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); // added as per this issue: http://drupal.org/node/149469 -// drupal_bootstrap(DRUPAL_BOOTSTRAP_PATH); // added as per this issue: http://drupal.org/node/149469 + // added as per this issue: http://drupal.org/node/149469 + drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); + // added as per this issue: http://drupal.org/node/149469 + // drupal_bootstrap(DRUPAL_BOOTSTRAP_PATH); // This will be the process to get BOTH the group and non-group roles for a user - $uid = $user->uid; - $gid = 0; - $gids = array(); - $nid = 0; - $location = 0; + $uid = $user->uid; + $gid = 0; + $gids = array(); + $nid = 0; + $location = 0; $uri_request_id = request_uri(); - $arg = explode('/', $uri_request_id); - $ogroles = array(); - $x1 = 0; + $arg = explode('/', $uri_request_id); + $ogroles = array(); + $x1 = 0; // Need to use the referrer to get OG group in some cases; - $ref = $_SERVER['HTTP_REFERER']; - $ref_url = parse_url($ref); - $ref_path = $ref_url['path']; + $ref = $_SERVER['HTTP_REFERER']; + $ref_url = parse_url($ref); + $ref_path = $ref_url['path']; $ref_query = $ref_url['query']; - $ref_arg = explode('/', $ref_path); + $ref_arg = explode('/', $ref_path); // // This will by default add the anonymous user role (no need since we merge user->roles) @@ -2374,15 +2418,18 @@ function og_user_roles_all_roles($user) // drupal_load('module', 'og'); -// require_once("modules/og/og.module"); + // require_once("modules/og/og.module"); $group_node = og_get_group_context(); - $gid02 = $group_node->nid; - $gid = $gid02; + $gid02 = $group_node->nid; + $gid = $gid02; if ($gid02 === NULL) { $gid = 0; - }else{ - if (isset($_SESSION['og_last'])) $_SESSION['og_last'] = $group_node->nid; + } + else { + if (isset($_SESSION['og_last'])) { + $_SESSION['og_last'] = $group_node->nid; + } $_SESSION['og_user_role'] = $gid; } @@ -2393,26 +2440,27 @@ function og_user_roles_all_roles($user) // http://doadance.scbbs.com/drupal03/node/79 if (arg(0) == 'node' && is_numeric(arg(1)) && is_null(arg(2))) { $location = 1; - $nid = (int)arg(1); - $gid = og_user_roles_getgid($nid, $uid); + $nid = (int)arg(1); + $gid = og_user_roles_getgid($nid, $uid); } // Translate pages using i18n translation module as per: http://drupal.org/node/203395 - if (arg(0) == 'node' && arg(1) == 'add' && isset($_REQUEST['translation'])) { - $nid = intval($_REQUEST['translation']); - $gid = og_user_roles_getgid($nid, $uid); - if ($gid) { - // Troubleshooting - // drupal_set_message('recognized translation node add, gid = '.$gid); - $_GET['gids'] = array($gid); // inject gid - } - } - - // http://doadance.scbbs.com/node/79/edit - // http://doadance.scbbs.com/node/79/outline - // http://doadance.scbbs.com/node/79/track - // http://doadance.scbbs.com/node/79/modr8 - // http://doadance.scbbs.com/node/79/ogmodr8 + if (arg(0) == 'node' && arg(1) == 'add' && isset($_REQUEST['translation'])) { + $nid = intval($_REQUEST['translation']); + $gid = og_user_roles_getgid($nid, $uid); + if ($gid) { + // Troubleshooting + // drupal_set_message('recognized translation node add, gid = '.$gid); + // inject gid + $_GET['gids'] = array($gid); + } + } + + // http://doadance.scbbs.com/node/79/edit + // http://doadance.scbbs.com/node/79/outline + // http://doadance.scbbs.com/node/79/track + // http://doadance.scbbs.com/node/79/modr8 + // http://doadance.scbbs.com/node/79/ogmodr8 // Modified 2007-07-05 for webform "results"; // Modified 2007-07-23 for content_access "access"; @@ -2422,37 +2470,37 @@ function og_user_roles_all_roles($user) // Modified 2007-12-20 for "revisions": http://drupal.org/node/202196 // Modified 2008-01-10 for "workflow": http://drupal.org/node/208363 // Modified 2008-03-21 for "feedapi": http://drupal.org/node/237258 - // Modified 2008-12-24: How about just looking for nid in /node/ instead of trying to - // anticipate each and every module. + // Modified 2008-12-24: How about just looking for nid in /node/ instead of trying to + // anticipate each and every module. // if (arg(0) == 'node' && is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'outline' || arg(2) == 'track' || arg(2) == 'results' || arg(2) == 'access' || arg(2) == 'modr8' || arg(2) == 'ogmodr8' || arg(2) == 'delete' || arg(2) == 'galleries' || arg(2) == 'email' || arg(2) == 'revisions' || arg(2) == 'signups' || arg(2) == 'agenda' || arg(2) == 'workflow' || arg(2) == 'votes' || arg(2) == 'refresh' || arg(2) == 'purge')) { if (arg(0) == 'node' && is_numeric(arg(1))) { $location = 2; - $nid = (int)arg(1); - $gid = og_user_roles_getgid($nid, $uid); + $nid = (int)arg(1); + $gid = og_user_roles_getgid($nid, $uid); } // poll.module if (arg(0) == 'poll' && is_numeric(arg(2)) && (arg(1) == 'cancel')) { $location = 20; - $nid = (int)arg(2); - $gid = og_user_roles_getgid($nid, $uid); + $nid = (int)arg(2); + $gid = og_user_roles_getgid($nid, $uid); } // Edit users (og_user_roles_approval) - // - // This will get a group context if the current user and the - // user he is trying to access both belong to at least the same - // group that is also the last group set by OG in "og_last" session - // (which logically should be the current group); + // + // This will get a group context if the current user and the + // user he is trying to access both belong to at least the same + // group that is also the last group set by OG in "og_last" session + // (which logically should be the current group); // // http://doadance.scbbs.com/oguseredit/72?gids[]=47 // http://doadance.scbbs.com/oguseredit/72/delete?gids[]=47 // http://doadance.scbbs.com/oguseredit/72/edit?gids[]=47 - if (arg(0) == 'oguseredit' && is_numeric(arg(1)) && (is_null(arg(2)) || arg(2) == 'edit' || arg(2) == 'delete') ) { + if (arg(0) == 'oguseredit' && is_numeric(arg(1)) && (is_null(arg(2)) || arg(2) == 'edit' || arg(2) == 'delete')) { if (isset($_REQUEST['gids'])) { $location = 200; - $gids = $_GET['gids']; - $gid = intval(current($_REQUEST['gids'])); + $gids = $_GET['gids']; + $gid = intval(current($_REQUEST['gids'])); } } @@ -2463,13 +2511,13 @@ function og_user_roles_all_roles($user) header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: post-check=0, pre-check=0', FALSE); - header('Pragma: no-cache'); + header('Pragma: no-cache'); cache_clear_all(); $location = 201; - $nid = (int)arg(1); - $gid = og_user_roles_getgid($nid, $uid); + $nid = (int)arg(1); + $gid = og_user_roles_getgid($nid, $uid); // Set group context. $group_node = node_load($gid); og_set_group_context($group_node); @@ -2485,14 +2533,14 @@ function og_user_roles_all_roles($user) // Set group context. $group_node = node_load($gid); og_set_group_context($group_node); - } + } } // Manage users (og_user_roles_approval) - // - // This will get a group context from og_last session - // and list all users in the group if the user listing - // is admin for the group and has the 'administer users' permission. + // + // This will get a group context from og_last session + // and list all users in the group if the user listing + // is admin for the group and has the 'administer users' permission. // // http://doadance.scbbs.com/ogusermanage/47 if (arg(0) == 'ogusermanage' AND is_numeric(arg(1))) { @@ -2503,9 +2551,9 @@ function og_user_roles_all_roles($user) // http://www.mysite.com/comment/edit/14 if (arg(0) == 'comment' && is_numeric(arg(2)) && arg(1) == 'edit') { $location = 3; - $comment = _comment_load(arg(2)); - $nid = $comment->nid; - $gid = og_user_roles_getgid($nid, $uid); + $comment = _comment_load(arg(2)); + $nid = $comment->nid; + $gid = og_user_roles_getgid($nid, $uid); // Set group context. $group_node = node_load($gid); og_set_group_context($group_node); @@ -2515,18 +2563,18 @@ function og_user_roles_all_roles($user) // http://www.mysite.com/comment/delete/14 if (arg(0) == 'comment' && is_numeric(arg(2)) && arg(1) == 'delete') { $location = 31; - $comment = _comment_load(arg(2)); - $nid = $comment->nid; - $gid = og_user_roles_getgid($nid, $uid); + $comment = _comment_load(arg(2)); + $nid = $comment->nid; + $gid = og_user_roles_getgid($nid, $uid); } // 0 1 2 // http://www.mysite.com/comment/reply/128#comment_form if (arg(0) == 'comment' && arg(1) == 'reply') { - $location = 4; + $location = 4; $subsections = explode('#', arg(2)); - $nid = (int)$subsections[0]; - $gid = og_user_roles_getgid($nid, $uid); + $nid = (int)$subsections[0]; + $gid = og_user_roles_getgid($nid, $uid); } // og_term access @@ -2534,8 +2582,8 @@ function og_user_roles_all_roles($user) // http://www.mysite.com/node/add/forum/121 if (arg(0) == 'node' && is_numeric(arg(3)) && arg(1) == 'add') { $location = 5; - $nid = (int)arg(3); - $gid = og_user_roles_getgid($nid, $uid); + $nid = (int)arg(3); + $gid = og_user_roles_getgid($nid, $uid); } // Here we get the gid directly @@ -2576,8 +2624,8 @@ function og_user_roles_all_roles($user) $gid = (int)arg(1); } - // og_vocab - // + // og_vocab + // // http://clients.brixrealtyinc.com/node/ogtermedit?destination=node%2F29%2Fog%2Fvocab%2Fterms%2F26&gids[]=29&tid=116 // // Modification as per: http://drupal.org/node/162649 @@ -2586,8 +2634,8 @@ function og_user_roles_all_roles($user) // Modification -- Get the gid from the variable instead of trying to calculate it. if (isset($_REQUEST['gids'])) { $location = 62; - $gids = $_GET['gids']; - $gid = intval(current($_REQUEST['gids'])); + $gids = $_GET['gids']; + $gid = intval(current($_REQUEST['gids'])); } } @@ -2643,20 +2691,20 @@ function og_user_roles_all_roles($user) // Modification as per: http://drupal.org/node/155882 - replaced $uri_request_id // with arg() values. - if (arg(0) == 'og_forum' && is_numeric(arg(2)) && isset($_REQUEST['edit'])) { - $location = 68; - $edit = $_GET['edit']; - if ($edit[og_groups][0] > 0) { - $gid = arg(2); - } - } + if (arg(0) == 'og_forum' && is_numeric(arg(2)) && isset($_REQUEST['edit'])) { + $location = 68; + $edit = $_GET['edit']; + if ($edit[og_groups][0] > 0) { + $gid = arg(2); + } + } // http://www.mysite.com/forum/39 // Modification - 2007-07-04. In the case where this is a forum if (arg(0) == 'forum' && is_numeric(arg(1)) && is_null(arg(2))) { $location = 681; - $tid = (int)arg(1); - $gid = og_user_roles_gid_from_tid($tid); + $tid = (int)arg(1); + $gid = og_user_roles_gid_from_tid($tid); // If no gid returned, then set $gid = 0 if (empty($gid)) { $gid = 0; @@ -2678,12 +2726,12 @@ function og_user_roles_all_roles($user) // with arg() values. if (arg(0) == 'node' && arg(1) == 'add' && isset($_REQUEST['gids'])) { $location = 10; - $gids = $_GET['gids']; - $gid = intval(current($_REQUEST['gids'])); + $gids = $_GET['gids']; + $gid = intval(current($_REQUEST['gids'])); } // modr8 view modr8_log - // + // // http://clients.brixrealtyinc.com/node/ogmodr8?gids[]=12&event=2 // // Modification as per: http://drupal.org/node/164092 @@ -2692,8 +2740,8 @@ function og_user_roles_all_roles($user) // Modification -- Get the gid from the variable instead of trying to calculate it. if (isset($_REQUEST['gids'])) { $location = 131; - $gids = $_GET['gids']; - $gid = intval(current($_REQUEST['gids'])); + $gids = $_GET['gids']; + $gid = intval(current($_REQUEST['gids'])); } } @@ -2710,180 +2758,197 @@ function og_user_roles_all_roles($user) // -- http://drupal.org/node/156568 if (isset($_REQUEST['gids'])) { $location = 132; - $gids = $_GET['gids']; - $gid = intval(current($_REQUEST['gids'])); + $gids = $_GET['gids']; + $gid = intval(current($_REQUEST['gids'])); } } - - // File upload: http://www.scbbs.com/node/135/225#comment-225 - if ((arg(0) == 'upload' && arg(1) == 'js') || (arg(0) == 'filemanager' && arg(1) == 'active')) { + + // File upload: http://www.scbbs.com/node/135/225#comment-225 + if ((arg(0) == 'upload' && arg(1) == 'js') || (arg(0) == 'filemanager' && arg(1) == 'active')) { $location = 14; // First, try and get gid from the session cookie - if (isset($_SESSION['og_last'])) $gid = $_SESSION['og_last']; - // If gid is still = 0, then try getting it from referrer - if ($gid == 0 || is_null($gid)) { - if ($ref_arg[1] == 'node' && is_numeric($ref_arg[2]) && $ref_arg[3] == 'edit') { + if (isset($_SESSION['og_last'])) { + $gid = $_SESSION['og_last']; + } + // If gid is still = 0, then try getting it from referrer + if ($gid == 0 || is_null($gid)) { + if ($ref_arg[1] == 'node' && is_numeric($ref_arg[2]) && $ref_arg[3] == 'edit') { $nid = (int)$ref_arg[2]; $gid = og_user_roles_getgid($nid, $uid); - // Set group context. + // Set group context. $group_node = node_load($gid); og_set_group_context($group_node); - } - if ($ref_arg[1] == 'node' && $ref_arg[2] == 'ognodeadd') { + } + if ($ref_arg[1] == 'node' && $ref_arg[2] == 'ognodeadd') { parse_str($ref_query); $gid = $gids[0]; // Set group context. $group_node = node_load($gid); og_set_group_context($group_node); - } - } - } - // File upload: comment_upload - // http://drupal.org/node/331838 - if (arg(0) == 'comment-upload' && arg(1) == 'js') { + } + } + } + // File upload: comment_upload + // http://drupal.org/node/331838 + if (arg(0) == 'comment-upload' && arg(1) == 'js') { $location = 145; // First, try and get gid from the session cookie - if (isset($_SESSION['og_last'])) $gid = $_SESSION['og_last']; - // If gid is still = 0, then try getting it from referrer - if ($gid == 0 || is_null($gid)) { - if ($ref_arg[1] == 'node' && is_numeric($ref_arg[3]) && $ref_arg[2] == 'reply') { + if (isset($_SESSION['og_last'])) { + $gid = $_SESSION['og_last']; + } + // If gid is still = 0, then try getting it from referrer + if ($gid == 0 || is_null($gid)) { + if ($ref_arg[1] == 'node' && is_numeric($ref_arg[3]) && $ref_arg[2] == 'reply') { $nid = (int)$ref_arg[3]; $gid = og_user_roles_getgid($nid, $uid); - // Set group context. + // Set group context. $group_node = node_load($gid); og_set_group_context($group_node); - } - } - } - // File upload: Using wysiwygpro editor - if (arg(0) == 'modules' && arg(1) == 'wysiwygPro') { + } + } + } + // File upload: Using wysiwygpro editor + if (arg(0) == 'modules' && arg(1) == 'wysiwygPro') { $location = 140; // First, try and get gid from the session cookie if ($_SESSION['og_user_role']) { - $gid = $_SESSION['og_user_role']; - // Set group context. - $group_node = node_load($gid); - og_set_group_context($group_node); + $gid = $_SESSION['og_user_role']; + // Set group context. + $group_node = node_load($gid); + og_set_group_context($group_node); } - } + } // File download - if (arg(0) == 'system' && arg(1) == 'files') { + if (arg(0) == 'system' && arg(1) == 'files') { $location = 15; - if (isset($_SESSION['og_last'])) $gid = $_SESSION['og_last']; - } + if (isset($_SESSION['og_last'])) { + $gid = $_SESSION['og_last']; + } + } // File download using FileManger and Attachment modules - if (arg(0) == 'filemanager' && arg(1) == 'active') { + if (arg(0) == 'filemanager' && arg(1) == 'active') { $location = 16; - if (isset($_SESSION['og_last'])) $gid = $_SESSION['og_last']; - } + if (isset($_SESSION['og_last'])) { + $gid = $_SESSION['og_last']; + } + } - // IMCE - if (arg(0) == 'imce' && (arg(1) == 'browse' || arg(1) == 'upload')) { + // IMCE + if (arg(0) == 'imce' && (arg(1) == 'browse' || arg(1) == 'upload')) { $location = 160; if (isset($_SESSION['og_last'])) { $gid = $_SESSION['og_last']; // Set group context. $group_node = node_load($gid); og_set_group_context($group_node); - } - } + } + } // Listing by taxonomy terms - if (arg(0) == 'taxonomy' && arg(1) == 'term') { + if (arg(0) == 'taxonomy' && arg(1) == 'term') { $location = 161; - if (isset($_SESSION['og_last'])) $gid = $_SESSION['og_last']; - } + if (isset($_SESSION['og_last'])) { + $gid = $_SESSION['og_last']; + } + } // Files - if (arg(0) == 'files' || arg(1) == 'files') { + if (arg(0) == 'files' || arg(1) == 'files') { $location = 162; // Modification -- Get the gid from the variable instead of trying to calculate it. if (isset($_REQUEST['gids'])) { - $location = 1621; - $gids = $_GET['gids']; - $gid = intval(current($_REQUEST['gids'])); + $location = 1621; + $gids = $_GET['gids']; + $gid = intval(current($_REQUEST['gids'])); $group_node = node_load($gid); og_set_group_context($group_node); - } elseif (isset($_SESSION['og_last'])) { - $location = 1622; - $gid = $_SESSION['og_last']; + } + elseif (isset($_SESSION['og_last'])) { + $location = 1622; + $gid = $_SESSION['og_last']; $group_node = node_load($gid); og_set_group_context($group_node); - } else { - // Need to get the file name; + } + else { + // Need to get the file name; $location = 1623; - $path = $_SERVER['REQUEST_URI']; - $basename = basename($path); - $basename = urldecode($basename); + $path = $_SERVER['REQUEST_URI']; + $basename = basename($path); + $basename = urldecode($basename); $basename = preg_replace("/\+/", " ", $basename); - // Now, get the node associated with this file; - // 6.x has different file structure -// $file = db_fetch_object(db_query("SELECT u.nid FROM {files} f INNER JOIN {upload} u ON f.fid = u.fid where f.filepath like '%s'", '%' . $basename)); - $file = db_fetch_object(db_query("SELECT u.nid FROM {files} f INNER JOIN {upload} u ON f.fid = u.fid where f.filepath like '%s'", '%' . '/' . $basename)); - $nid = $file->nid; - $gid = og_user_roles_getgid($nid, $uid); + // Now, get the node associated with this file; + // 6.x has different file structure + // $file = db_fetch_object(db_query("SELECT u.nid FROM {files} f INNER JOIN {upload} u ON f.fid = u.fid where f.filepath like '%s'", '%' . $basename)); + $file = db_fetch_object(db_query("SELECT u.nid FROM {files} f INNER JOIN {upload} u ON f.fid = u.fid where f.filepath like '%s'", '%' . '/' . $basename)); + $nid = $file->nid; + $gid = og_user_roles_getgid($nid, $uid); $group_node = node_load($gid); og_set_group_context($group_node); - } - } + } + } // Agenda module // http://doadance.scbbs.com/node/agenda/list/279 - if (arg(0) == 'node' && arg(1) == 'agenda' && arg(2) == 'list' && is_numeric(arg(3)) ) { + if (arg(0) == 'node' && arg(1) == 'agenda' && arg(2) == 'list' && is_numeric(arg(3))) { $location = 17; - $nid = (int)arg(3); - $gid = og_user_roles_getgid($nid, $uid); + $nid = (int)arg(3); + $gid = og_user_roles_getgid($nid, $uid); } // Modification as per: http://drupal.org/node/204080 // Galleries (view part: The view urls can have 'subdirs' so we may need to check until the nth arg) if (module_exists("og_galleries")) { - $og_gal_parts=split('/',og_galleries_get_url()); + $og_gal_parts = split('/', og_galleries_get_url()); if (!empty($og_gal_parts)) { - $is_og_gal_url=TRUE; - $arg_num=0; + $is_og_gal_url = TRUE; + $arg_num = 0; foreach ($og_gal_parts as $value) { if ($value != arg($arg_num++)) { - $is_og_gal_url=FALSE; + $is_og_gal_url = FALSE; } } if ($is_og_gal_url && is_numeric(arg($arg_num))) { - $location = 18; - $gid = (int)arg($arg_num); + $location = 18; + $gid = (int)arg($arg_num); } } - } + } // Book module - // As per: http://drupal.org/node/228386 + // As per: http://drupal.org/node/228386 // http://doadance.scbbs.com/book/export/html/279 - if (arg(0) == 'book' && arg(1) == 'export' && arg(2) == 'html' && is_numeric(arg(3)) ) { + if (arg(0) == 'book' && arg(1) == 'export' && arg(2) == 'html' && is_numeric(arg(3))) { $location = 19; - $nid = (int)arg(3); - $gid = og_user_roles_getgid($nid, $uid); + $nid = (int)arg(3); + $gid = og_user_roles_getgid($nid, $uid); } - // Modification. As per: http://drupal.org/node/176390 - // Present a hook for other modules: hook_og_user_roles_gid() - if ($results = module_invoke_all('og_user_roles_gid')) { - foreach ($results as $result) { - if ($result) $gid = $result; - } - } - - } // end $gid if + // Modification. As per: http://drupal.org/node/176390 + // Present a hook for other modules: hook_og_user_roles_gid() + if ($results = module_invoke_all('og_user_roles_gid')) { + foreach ($results as $result) { + if ($result) { + $gid = $result; + } + } + } + } // // Now, using $uid and $gid we find out what roles this user has in this group; // if (empty($gid)) { - $gid = 0; // This prevents us from getting error on non-group node/add - }else{ - if (isset($_SESSION['og_last'])) $_SESSION['og_last'] = $gid; + // This prevents us from getting error on non-group node/add + $gid = 0; + } + else { + if (isset($_SESSION['og_last'])) { + $_SESSION['og_last'] = $gid; + } $_SESSION['og_user_role'] = $gid; } -/* +/** * Modification as per http://drupal.org/node/189227 * Makes sure use is "active" (not in moderation) before any of these group roles are added. * Was: $query = 'SELECT r.rid, r.name FROM {role} r INNER JOIN {og_users_roles} ogr ON r.rid = ogr.rid WHERE ogr.uid = %d AND ogr.gid = %d'; @@ -2921,17 +2986,18 @@ function og_user_roles_all_roles($user) // Write the test data: http://drupal.org/node/164038 if (variable_get('og_user_roles_test_default', 0) == 1) { if (is_array($d)) { - $d1 = 'Roles Returned: ('. implode(',', $d) .')'; - } else { - $d1 = ''; - } + $d1 = 'Roles Returned: (' . implode(',', $d) . ')'; + } + else { + $d1 = ''; + } og_user_roles_write_test($user, $location, $gid02, $gid, $uri_request_id, $d1, $ref); } // $d is either the merged results, or just $user->roles; return $d; -} // end og_user_roles_all_roles() +} /** * This will return a $gid based upon the $nid and $uid supplied @@ -2957,49 +3023,52 @@ function og_user_roles_getgid($nid, $uid } } - // If this user is not a member of this group (fails test above), and this is a public node, + // If this user is not a member of this group (fails test above), and this is a public node, // then we just need to find the first group it belongs to. // // select og_ancestry.group_nid FROM og_ancestry WHERE og_ancestry.nid = 130 AND og_ancestry.is_public = 1 // if ($gid == 0) { -// See: http://drupal.org/node/432544 -// $result = db_query("SELECT oga.group_nid FROM {og_ancestry} oga WHERE oga.nid = %d AND oga.is_public = 1", $nid); + // See: http://drupal.org/node/432544 + // $result = db_query("SELECT oga.group_nid FROM {og_ancestry} oga WHERE oga.nid = %d AND oga.is_public = 1", $nid); $result = db_query("SELECT oga.group_nid FROM {og_ancestry} oga WHERE oga.nid = %d", $nid); while ($t = db_fetch_object($result)) { $gid = $t->group_nid; } } -/** - * If $gid still equals 0 then try searching node_access table - * Modified as per: http://drupal.org/node/347277 - */ + /** + * If $gid still equals 0 then try searching node_access table + * Modified as per: http://drupal.org/node/347277 + */ if ($gid == 0) { - $result = db_query("SELECT na.gid from {node_access} na INNER JOIN {og_uid} ogu ON na.gid = ogu.nid WHERE na.realm = 'og_subscriber' AND ogu.uid = %d AND (na.nid = %d)", $uid, $nid, $nid); // modified to check for either the node ID in node_access + // modified to check for either the node ID in node_access + $result = db_query("SELECT na.gid from {node_access} na INNER JOIN {og_uid} ogu ON na.gid = ogu.nid WHERE na.realm = 'og_subscriber' AND ogu.uid = %d AND (na.nid = %d)", $uid, $nid, $nid); while ($t = db_fetch_object($result)) { $gid = $t->gid; } - } + } if ($gid == 0) { - $result = db_query("SELECT na.gid from {node_access} na INNER JOIN {og_uid} ogu ON na.gid = ogu.nid WHERE na.realm = 'og_subscriber' AND ogu.uid = %d AND (na.gid = %d)", $uid, $nid, $nid); // modified to check for group ID in node_access + // modified to check for group ID in node_access + $result = db_query("SELECT na.gid from {node_access} na INNER JOIN {og_uid} ogu ON na.gid = ogu.nid WHERE na.realm = 'og_subscriber' AND ogu.uid = %d AND (na.gid = %d)", $uid, $nid, $nid); while ($t = db_fetch_object($result)) { $gid = $t->gid; } - } + } -/** - * Old code. Query too slow: - * SELECT node_access.gid from node_access INNER JOIN og_uid ON node_access.gid = og_uid.nid WHERE node_access.realm = 'og_subscriber' AND og_uid.uid = 2 AND (node_access.nid = 194 OR node_access.gid = 194) - * - */ -// if ($gid == 0) { -// $result = db_query("SELECT na.gid from {node_access} na INNER JOIN {og_uid} ogu ON na.gid = ogu.nid WHERE na.realm = 'og_subscriber' AND ogu.uid = %d AND (na.nid = %d OR na.gid = %d)", $uid, $nid, $nid); // modified to check for either the node or group ID in node_access -// while ($t = db_fetch_object($result)) { -// $gid = $t->gid; -// } -// } + /** + * Old code. Query too slow: + * SELECT node_access.gid from node_access INNER JOIN og_uid ON node_access.gid = og_uid.nid WHERE node_access.realm = 'og_subscriber' AND og_uid.uid = 2 AND (node_access.nid = 194 OR node_access.gid = 194) + * + */ + // if ($gid == 0) { + // modified to check for either the node or group ID in node_access + // $result = db_query("SELECT na.gid from {node_access} na INNER JOIN {og_uid} ogu ON na.gid = ogu.nid WHERE na.realm = 'og_subscriber' AND ogu.uid = %d AND (na.nid = %d OR na.gid = %d)", $uid, $nid, $nid); + // while ($t = db_fetch_object($result)) { + // $gid = $t->gid; + // } + // } // If $gid still equals 0 then try searching og_term table (if it exists) // og forums will typically be listed here @@ -3016,27 +3085,31 @@ function og_user_roles_getgid($nid, $uid $node = db_fetch_object(db_query('SELECT nid, type FROM {node} WHERE nid = %d', $nid)); if (og_is_group_type($node->type)) { $gid = $node->nid; - } elseif (is_array($groups = og_get_node_groups($node))) { + } + elseif (is_array($groups = og_get_node_groups($node))) { $last_id = 0; foreach ($groups as $id => $group) { if ($group) { // Need some way to determine the group to select in case of - // multiple groups. Going to try using og_last session cookie. - // Just not sure if session will be set for current group by now. - if ($id == $_SESSION['og_last']) $gid = $id; - $last_id = $id; - } - } - // If there was no session with og_last session cookie, then set gid to last - // id located in groups. Roll of the dice until we can find something more - // certain. - if ($gid == 0) $gid = $last_id; + // multiple groups. Going to try using og_last session cookie. + // Just not sure if session will be set for current group by now. + if ($id == $_SESSION['og_last']) { + $gid = $id; + } + $last_id = $id; + } + } + // If there was no session with og_last session cookie, then set gid to last + // id located in groups. Roll of the dice until we can find something more + // certain. + if ($gid == 0) { + $gid = $last_id; + } } } - - return $gid; -} // end getgid() + return $gid; +} /** * Check if table exist. @@ -3044,37 +3117,38 @@ function og_user_roles_getgid($nid, $uid function og_user_roles_table_exists($table) { // return db_num_rows(db_query("SHOW TABLES LIKE '{". db_escape_table($table) ."}'")); // http://drupal.org/node/114774#db-num-rows (db_num_rows removed) - return db_result(db_query("SHOW TABLES LIKE '{". db_escape_table($table) ."}'")); + return db_result(db_query("SHOW TABLES LIKE '{" . db_escape_table($table) . "}'")); } /** * See what is found in user_all_roles. */ function og_user_roles_write_test($user, $location, $gid02, $gid, $uri_request_id, $d, $ref, $test_function = 'og_user_roles_all_roles') { - drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); // http://drupal.org/node/273068 - $test_status = ''; - $test_date = format_date(time(), 'custom', 'Y-m-d h:i:s a'); - $test_user = $user->uid; + // http://drupal.org/node/273068 + drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); + $test_status = ''; + $test_date = format_date(time(), 'custom', 'Y-m-d h:i:s a'); + $test_user = $user->uid; $test_subfunction = $location; - $test_string = 'group context: '. $gid02; - $test_username = $user->name; - $test_group = $gid; - $test_uri = $uri_request_id . " (" . $ref . ")"; - $test_aarg0 = arg(0); - $test_aarg1 = arg(1); - $test_aarg2 = arg(2); - $test_aarg3 = arg(3); - $test_perm = $d; + $test_string = 'group context: ' . $gid02; + $test_username = $user->name; + $test_group = $gid; + $test_uri = $uri_request_id . " (" . $ref . ")"; + $test_aarg0 = arg(0); + $test_aarg1 = arg(1); + $test_aarg2 = arg(2); + $test_aarg3 = arg(3); + $test_perm = $d; if (og_user_roles_table_exists('{og_user_test}')) { - $test_query = "INSERT INTO og_user_test (testStatus, testDate, testUser, testUserName, testGroup, testFunction, testSubFunction, testString, testURI, testAArg0, testAArg1, testAArg2, testAArg3, testPerm) values ('". $test_status ."','". $test_date ."','". $test_user ."','". $test_username ."','". $test_group ."','". $test_function ."','". $test_subfunction ."','". $test_string ."','". $test_uri ."','". $test_aarg0 ."','". $test_aarg1 ."','". $test_aarg2 ."','". $test_aarg3 ."','". $test_perm ."')"; + $test_query = "INSERT INTO og_user_test (testStatus, testDate, testUser, testUserName, testGroup, testFunction, testSubFunction, testString, testURI, testAArg0, testAArg1, testAArg2, testAArg3, testPerm) values ('" . $test_status . "','" . $test_date . "','" . $test_user . "','" . $test_username . "','" . $test_group . "','" . $test_function . "','" . $test_subfunction . "','" . $test_string . "','" . $test_uri . "','" . $test_aarg0 . "','" . $test_aarg1 . "','" . $test_aarg2 . "','" . $test_aarg3 . "','" . $test_perm . "')"; db_query($test_query); - } else { + } + else { drupal_install_schema('og_user_test'); } } - /** * Create content * Format: http://www.scbbs.com/node/ognodeadd?type=link&gids[]=29 @@ -3082,20 +3156,20 @@ function og_user_roles_write_test($user, function og_user_roles_ognodeadd() { global $user; - require('modules/node/node.pages.inc'); - - $roles = og_user_roles_all_roles($user); // This returns normal $user->roles and includes OG roles if any + require ('modules/node/node.pages.inc'); + // This returns normal $user->roles and includes OG roles if any + $roles = og_user_roles_all_roles($user); $user->roles = $roles; - $gids = $_GET['gids']; + $gids = $_GET['gids']; if ($gids) { - $group_node = node_load($gids[0]); - og_set_group_context($group_node); + $group_node = node_load($gids[0]); + og_set_group_context($group_node); } $type = $_GET['type']; // Convert the dashes in the URL back to underscores. http://drupal.org/node/349648 - $type = str_replace('-', '_' , $type); + $type = str_replace('-', '_', $type); if ($type) { // Got this from node.module (node_access) @@ -3103,37 +3177,34 @@ function og_user_roles_ognodeadd() { $module = node_get_types('module', $type); if ($module == 'node') { - $module = 'node_content'; // Avoid function name collisions. + // Avoid function name collisions. + $module = 'node_content'; } $access = module_invoke($module, 'access', 'create', $type, $user); if ($access === TRUE) { - $content_type = node_get_types('type', $type); - $output = '

'. filter_xss_admin($content_type->help) .'

'; + $output = '

' . filter_xss_admin($content_type->help) . '

'; $output .= node_add($type); } - else { - $output = 'Access denied.'; - - // Old = type, message, severity, link - // New = type, message, variables, severity, link - - watchdog('access denied', 'User can not create this node type: '.$type.'', $variables = array() , WATCHDOG_WARNING, 'node/ognodeadd?type='. $type .'&gids[]='. $gids[0]); - } - }else{ + // Old = type, message, severity, link + // New = type, message, variables, severity, link + watchdog('access denied', 'User can not create this node type: ' . $type . '', $variables = array(), WATCHDOG_WARNING, 'node/ognodeadd?type=' . $type . '&gids[]=' . $gids[0]); + } + } + else { /** * Modification: Creates an overview page with the allowed node types for this user and group * when there is no type in the url query. This page is similar to generic node/add page * Taken and modified from node_add() function in node core module and og_og_create_links() in og module * If no (valid) node type has been provided, display a node type overview. - * http://drupal.org/node/203875 - */ + * http://drupal.org/node/203875 + */ $exempt = array_merge(og_get_types('group'), variable_get('og_omitted', array())); foreach (node_get_types() as $type) { // we used to check for node_access(create) but then node admins would get a false positive and see node types that they could not create @@ -3141,16 +3212,16 @@ function og_user_roles_ognodeadd() { // Why is this needed? // $type_url_str = str_replace('_', '-', $type->type); $type_url_str = $type->type; - $title = t('Add a new @s.', array('@s' => $type->name)); - $out = '
'. l(drupal_ucfirst($type->name), "node/add/$type_url_str", array('attributes' => array('title' => $title), 'query' => 'gids[]='. $gids[0])) .'
'; - $out .= '
'. filter_xss_admin($type->description) .'
'; + $title = t('Add a new @s.', array('@s' => $type->name)); + $out = '
' . l(drupal_ucfirst($type->name), "node/add/$type_url_str", array('attributes' => array('title' => $title), 'query' => 'gids[]=' . $gids[0])) . '
'; + $out .= '
' . filter_xss_admin($type->description) . '
'; $item[$type->type] = $out; } } if (isset($item)) { uksort($item, 'strnatcasecmp'); - $output = t('Choose the appropriate item from the list:') .'
'. implode('', $item) .'
'; + $output = t('Choose the appropriate item from the list:') . '
' . implode('', $item) . '
'; } else { $output = t('No content types available.'); @@ -3165,17 +3236,17 @@ function og_user_roles_ognodeadd() { * Format: http://www.scbbs.com/node/ogtermedit?destination=node%2F29%2Fog%2Fvocab%2Fterms%2F26&gids[]=29&tid=116 */ function og_user_roles_ogtermedit() { - require_once drupal_get_path('module', 'taxonomy'). '/taxonomy.admin.inc'; + require_once drupal_get_path('module', 'taxonomy') . '/taxonomy.admin.inc'; global $user; - $roles = og_user_roles_all_roles($user); // This returns normal $user->roles and includes OG roles if any - + // This returns normal $user->roles and includes OG roles if any + $roles = og_user_roles_all_roles($user); $user->roles = $roles; - $gids = $_GET['gids']; + $gids = $_GET['gids']; if ($gids) { - $group_node = node_load($gids[0]); - og_set_group_context($group_node); + $group_node = node_load($gids[0]); + og_set_group_context($group_node); } $tid = $_GET['tid']; @@ -3184,9 +3255,10 @@ function og_user_roles_ogtermedit() { if ($access === TRUE) { $output = taxonomy_admin_term_edit($tid); - } else { + } + else { $output = 'Access denied.'; - watchdog('access denied', 'node/ogtermedit?tid='. $tid .'&gids[]='. $gids[0], WATCHDOG_WARNING); + watchdog('access denied', 'node/ogtermedit?tid=' . $tid . '&gids[]=' . $gids[0], WATCHDOG_WARNING); } return $output; @@ -3199,15 +3271,15 @@ function og_user_roles_ogtermedit() { function og_user_roles_ogmodr8() { global $user; // Need this in order to not get "undefined function" on "modr8_log_event" call below - require_once drupal_get_path('module', 'modr8'). '/modr8_admin.inc'; - - $roles = og_user_roles_all_roles($user); // This returns normal $user->roles and includes OG roles if any + require_once drupal_get_path('module', 'modr8') . '/modr8_admin.inc'; + // This returns normal $user->roles and includes OG roles if any + $roles = og_user_roles_all_roles($user); $user->roles = $roles; - $gids = $_GET['gids']; + $gids = $_GET['gids']; if ($gids) { - $group_node = node_load($gids[0]); - og_set_group_context($group_node); + $group_node = node_load($gids[0]); + og_set_group_context($group_node); } $event = $_GET['event']; @@ -3216,9 +3288,10 @@ function og_user_roles_ogmodr8() { if ($access === TRUE) { $output = modr8_log_event($event); - } else { + } + else { $output = 'Access denied.'; - watchdog('access denied', 'node/ogmodr8?event='. $event .'&gids[]='. $gids[0], WATCHDOG_WARNING); + watchdog('access denied', 'node/ogmodr8?event=' . $event . '&gids[]=' . $gids[0], WATCHDOG_WARNING); } return $output; @@ -3231,54 +3304,70 @@ function og_user_roles_ogmodr8() { */ function og_user_roles_oguseredit($uid = 0) { - require_once drupal_get_path('module', 'user'). '/user.pages.inc'; + require_once drupal_get_path('module', 'user') . '/user.pages.inc'; global $user; - $roles = og_user_roles_all_roles($user); // This returns normal $user->roles and includes OG roles if any - + // This returns normal $user->roles and includes OG roles if any + $roles = og_user_roles_all_roles($user); $user->roles = $roles; - $gids = $_GET['gids']; + $gids = $_GET['gids']; if ($gids) { - $group_node = node_load($gids[0]); - $gid = $gids[0]; - og_set_group_context($group_node); + $group_node = node_load($gids[0]); + $gid = $gids[0]; + og_set_group_context($group_node); } - $account = user_load(array('uid' => $uid)); + $account = user_load(array('uid' => $uid)); $in_this_group = 'no'; - $oguseredit = 'yes'; + $oguseredit = 'yes'; - if (user_access('no oguseredit', $account)) $oguseredit = 'no'; + if (user_access('no oguseredit', $account)) { + $oguseredit = 'no'; + } - /** - * This checks all groups the user is a member of to see if any one has given the - * 'no oguseredit' permission. If one group has given him a role with this - * permission, then his profile cannot be edited using oguseredit. - */ + /** + * This checks all groups the user is a member of to see if any one has given the + * 'no oguseredit' permission. If one group has given him a role with this + * permission, then his profile cannot be edited using oguseredit. + */ $user_gids = array_keys($account->og_groups); if ($user_gids) { foreach ($user_gids as $user_gid) { - if (og_user_roles_user_access('no oguseredit', $user_gid, $uid) === TRUE) $oguseredit = 'no'; + if (og_user_roles_user_access('no oguseredit', $user_gid, $uid) === TRUE) { + $oguseredit = 'no'; + } } } if (array_keys($account->og_groups)) { - if (array_key_exists($gid, $account->og_groups)) $in_this_group = 'yes'; + if (array_key_exists($gid, $account->og_groups)) { + $in_this_group = 'yes'; + } } $access = user_access('administer users'); if ($access === TRUE && $uid != 1 && $in_this_group == 'yes' && $oguseredit == 'yes') { - - if (arg(2) == 'edit') $output = drupal_get_form('user_profile_form', $account); - if (arg(2) == 'delete') $output = drupal_get_form('user_confirm_delete', $account); - if (is_null(arg(2))) $output = user_view($account); - } else { - if ($oguseredit == 'no') drupal_set_message('This user account may not be edited using oguseredit.'); - if ($in_this_group == 'no') drupal_set_message('This user is not a member of the current group.'); + if (arg(2) == 'edit') { + $output = drupal_get_form('user_profile_form', $account); + } + if (arg(2) == 'delete') { + $output = drupal_get_form('user_confirm_delete', $account); + } + if (is_null(arg(2))) { + $output = user_view($account); + } + } + else { + if ($oguseredit == 'no') { + drupal_set_message('This user account may not be edited using oguseredit.'); + } + if ($in_this_group == 'no') { + drupal_set_message('This user is not a member of the current group.'); + } $output = 'Access denied.'; - watchdog('access denied', 'oguseredit/'. $uid, WATCHDOG_WARNING); + watchdog('access denied', 'oguseredit/' . $uid, WATCHDOG_WARNING); } return $output; @@ -3290,10 +3379,10 @@ function og_user_roles_oguseredit($uid = */ function og_user_roles_user_manage($gid) { global $user; - $roles = og_user_roles_all_roles($user); // This returns normal $user->roles and includes OG roles if any - + // This returns normal $user->roles and includes OG roles if any + $roles = og_user_roles_all_roles($user); $user->roles = $roles; - $gids = array_keys($user->og_groups); + $gids = array_keys($user->og_groups); $this_gid = $gid; if ($this_gid) { @@ -3317,20 +3406,22 @@ function og_user_roles_user_manage($gid) $output = ""; while ($item = db_fetch_object($items)) { - $uid = $item->uid; - $account = user_load(array('uid' => $uid)); + $uid = $item->uid; + $account = user_load(array('uid' => $uid)); $account_gids = array_keys($account->og_groups); - $common_gids = array_intersect($gids, $account_gids); + $common_gids = array_intersect($gids, $account_gids); if ($common_gids) { foreach ($common_gids as $common) { if ($common == $this_gid && $is_admin == 1 && user_access('administer users') && $uid != 1) { - $output .= "
  • " . l($account->name, 'oguseredit/' . $uid, array('attributes' => $attributes = array(), 'query' => 'gids[]=' . $this_gid)) . " | " . l('(edit)', 'oguseredit/' . $uid . '/edit', array('attributes' => $attributes = array(), 'query' => 'gids[]=' . $this_gid . '&destination=og/users/'.$this_gid.'/manage')) . " | " . l('(delete)', 'oguseredit/' . $uid . '/delete', array('attributes' => $attributes = array(), 'query' => 'gids[]=' . $this_gid . '&destination=og/users/'.$this_gid.'/manage')) . "
    • "; - } + $output .= "
  • " . l($account->name, 'oguseredit/' . $uid, array('attributes' => $attributes = array(), 'query' => 'gids[]=' . $this_gid)) . " | " . l('(edit)', 'oguseredit/' . $uid . '/edit', array('attributes' => $attributes = array(), 'query' => 'gids[]=' . $this_gid . '&destination=og/users/' . $this_gid . '/manage')) . " | " . l('(delete)', 'oguseredit/' . $uid . '/delete', array('attributes' => $attributes = array(), 'query' => 'gids[]=' . $this_gid . '&destination=og/users/' . $this_gid . '/manage')) . "
    • "; + } } } - } // end while + } - if ($output == "") $output = "No users have been located for this group or you are not an admin user for this group!"; + if ($output == "") { + $output = "No users have been located for this group or you are not an admin user for this group!"; + } return $output; } @@ -3344,13 +3435,14 @@ function og_user_roles_oglogo($uid) { header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: post-check=0, pre-check=0', FALSE); - header('Pragma: no-cache'); - + header('Pragma: no-cache'); + cache_clear_all(); if (empty($uid)) { global $user; - } else { + } + else { $user = user_load(array('uid' => $uid)); } @@ -3359,71 +3451,71 @@ function og_user_roles_oglogo($uid) { $addr = $_SERVER['REMOTE_ADDR']; - $ref = $_SERVER["HTTP_REFERER"]; - $ref_url = parse_url($ref); - $ref_path = $ref_url[path]; + $ref = $_SERVER["HTTP_REFERER"]; + $ref_url = parse_url($ref); + $ref_path = $ref_url[path]; $ref_query = $ref_url[query]; - $ref_arg = explode('/', $ref_path); + $ref_arg = explode('/', $ref_path); $group_node = og_get_group_context(); - $gid02 = $group_node->nid; - $gid = $gid02; + $gid02 = $group_node->nid; + $gid = $gid02; $uri_request_id = request_uri(); $arg = explode('/', $uri_request_id); if ($group_node = og_get_group_context()) { $location .= "A"; - $gid = $group_node->nid; - $logo = variable_get('og_user_roles_logo_' . $gid, ''); + $gid = $group_node->nid; + $logo = variable_get('og_user_roles_logo_' . $gid, ''); $_SESSION['oglogo'] = $logo; variable_set('oglogo_' . $addr, $logo); } if ($ref_arg[1] == 'print' && is_numeric($ref_arg[2])) { $location .= "B"; - $nid = (int)$ref_arg[2]; - $gid = og_user_roles_getgid($nid, $uid); - $logo = variable_get('og_user_roles_logo_' . $gid, ''); + $nid = (int)$ref_arg[2]; + $gid = og_user_roles_getgid($nid, $uid); + $logo = variable_get('og_user_roles_logo_' . $gid, ''); $_SESSION['oglogo'] = $logo; variable_set('oglogo_' . $addr, $logo); } if (arg(0) == 'print' && arg(2) == 'og' && is_numeric(arg(3))) { $location .= "C"; - $nid = (int)arg(3); - $gid = og_user_roles_getgid($nid, $uid); - $logo = variable_get('og_user_roles_logo_' . $gid, ''); + $nid = (int)arg(3); + $gid = og_user_roles_getgid($nid, $uid); + $logo = variable_get('og_user_roles_logo_' . $gid, ''); $_SESSION['oglogo'] = $logo; variable_set('oglogo_' . $addr, $logo); } if ($ref_arg[1] == 'print' && is_numeric($ref_arg[4])) { $location .= "D"; - $nid = (int)$ref_arg[4]; - $gid = og_user_roles_getgid($nid, $uid); - $logo = variable_get('og_user_roles_logo_' . $gid, ''); + $nid = (int)$ref_arg[4]; + $gid = og_user_roles_getgid($nid, $uid); + $logo = variable_get('og_user_roles_logo_' . $gid, ''); $_SESSION['oglogo'] = $logo; variable_set('oglogo_' . $addr, $logo); } -// if (empty($logo) && $_SESSION['oglogo']) { -// $location .= "E"; -// $logo = $_SESSION['oglogo']; -// } - -// if (empty($logo) && isset($_SESSION['og_last'])) { -// $location .= "F"; -// $nid = $_SESSION['og_last']; -// $gid = og_user_roles_getgid($nid, $uid); -// $logo = variable_get('og_user_roles_logo_' . $gid, ''); -// } - -// IE Print Problem: If we found $logo above, use this to locate it. -// Problem is: How do we not use this if logo is legitimately not found for group -// after this user has found one that does exist? -// + // if (empty($logo) && $_SESSION['oglogo']) { + // $location .= "E"; + // $logo = $_SESSION['oglogo']; + // } + + // if (empty($logo) && isset($_SESSION['og_last'])) { + // $location .= "F"; + // $nid = $_SESSION['og_last']; + // $gid = og_user_roles_getgid($nid, $uid); + // $logo = variable_get('og_user_roles_logo_' . $gid, ''); + // } + + // IE Print Problem: If we found $logo above, use this to locate it. + // Problem is: How do we not use this if logo is legitimately not found for group + // after this user has found one that does exist? + // if (empty($logo) && empty($ref) && empty($gid) && $user->uid == 0) { $location .= "G"; $logo = variable_get('oglogo_' . $addr, ''); @@ -3438,7 +3530,7 @@ function og_user_roles_oglogo($uid) { $d .= ' | logo = ' . $logo; $d .= ')'; - if (empty($logo)) { + if (empty($logo)) { $location .= "H"; $logo = theme_get_setting('logo_path'); } @@ -3448,7 +3540,9 @@ function og_user_roles_oglogo($uid) { og_user_roles_write_test($user, $location, $gid02, $gid, $uri_request_id, $d, $ref, $test_function); } - if (empty($logo)) $logo = theme_get_setting('logo_path'); + if (empty($logo)) { + $logo = theme_get_setting('logo_path'); + } // Return image information $info = image_get_info($logo); @@ -3461,7 +3555,7 @@ function og_user_roles_oglogo($uid) { } // Display headers so browser knows we're outputting an image - $headers = array('Content-Type: '.$info['mime_type']); + $headers = array('Content-Type: ' . $info['mime_type']); foreach ($headers as $header) { header($header); } @@ -3470,29 +3564,28 @@ function og_user_roles_oglogo($uid) { $im = @readfile($logo); // If there's been a problem, report it - if (!$im) og_user_roles_oglogo_display_error(); - + if (!$im) { + og_user_roles_oglogo_display_error(); + } } /** * Return group logo path from group gid */ function og_user_roles_oglogo_gid($gid) { - $logo = variable_get('og_user_roles_logo_' . $gid, ''); - return $logo; } function og_user_roles_oglogo_display_error($text = "Error Creating Logo") { - $im = imagecreate(181, 20); - $bg = imagecolorallocate($im, 255, 255, 255); + $im = imagecreate(181, 20); + $bg = imagecolorallocate($im, 255, 255, 255); $textcolor = imagecolorallocate($im, 255, 0, 0); imagestring($im, 5, 2, 1, $text, $textcolor); header("Content-type: image/png"); imagepng($im); imagedestroy($im); -} // og_user_roles_oglogo_display_error +} /** * using the og_forum tid, get the group id @@ -3505,7 +3598,8 @@ function og_user_roles_gid_from_tid($tid $sql = "SELECT nid FROM {og_term} WHERE tid = %d"; $gid = db_result(db_query($sql, $tid)); } - return empty($gid) ? 0 : $gid; // As per http://drupal.org/node/194214 + // As per http://drupal.org/node/194214 + return empty($gid) ? 0 : $gid; } /** @@ -3513,7 +3607,8 @@ function og_user_roles_gid_from_tid($tid */ function og_user_roles_gid_from_og_vocab_tid($tid = 0) { $gid = 0; - $result = db_query("SELECT ogv.nid FROM {og_vocab} ogv INNER JOIN {vocabulary} v ON v.vid = ogv.vid INNER JOIN {term_data} td ON td.vid = v.vid WHERE td.tid = %d", $tid); // Get the group node of this term, if it is a group term + // Get the group node of this term, if it is a group term + $result = db_query("SELECT ogv.nid FROM {og_vocab} ogv INNER JOIN {vocabulary} v ON v.vid = ogv.vid INNER JOIN {term_data} td ON td.vid = v.vid WHERE td.tid = %d", $tid); while ($t = db_fetch_object($result)) { $gid = $t->nid; } @@ -3525,7 +3620,8 @@ function og_user_roles_gid_from_og_vocab */ function og_user_roles_gid_from_modr8_event($event = 0) { $gid = 0; - $result = db_query("SELECT o.group_nid FROM {modr8_log} m INNER JOIN {og_ancestry} o ON o.nid = m.nid WHERE m.modid = %d", $event); // Get the group this node belongs to. + // Get the group this node belongs to. + $result = db_query("SELECT o.group_nid FROM {modr8_log} m INNER JOIN {og_ancestry} o ON o.nid = m.nid WHERE m.modid = %d", $event); while ($t = db_fetch_object($result)) { $gid = $t->group_nid; } @@ -3540,24 +3636,26 @@ function og_user_roles_gid_from_referrer $gid = 0; // Need to use the referrer to get OG group in some cases; - $ref = $_SERVER["HTTP_REFERER"]; - $ref_url = parse_url($ref); - $ref_path = $ref_url[path]; + $ref = $_SERVER["HTTP_REFERER"]; + $ref_url = parse_url($ref); + $ref_path = $ref_url[path]; $ref_query = $ref_url[query]; - $ref_arg = explode('/', $ref_path); + $ref_arg = explode('/', $ref_path); // First, try and get gid from the session cookie - if (isset($_SESSION['og_last'])) $gid = $_SESSION['og_last']; - // If gid is still = 0, then try getting it from referrer + if (isset($_SESSION['og_last'])) { + $gid = $_SESSION['og_last']; + } + // If gid is still = 0, then try getting it from referrer if ($gid == 0 || is_null($gid)) { if ($ref_arg[1] == 'node' && is_numeric($ref_arg[2]) && $ref_arg[3] == 'edit') { $nid = (int)$ref_arg[2]; $gid = og_user_roles_getgid($nid, $uid); } - if ($ref_arg[1] == 'node' && $ref_arg[2] == 'ognodeadd') { + if ($ref_arg[1] == 'node' && $ref_arg[2] == 'ognodeadd') { parse_str($ref_query); $gid = $gids[0]; - } + } } return $gid; @@ -3583,7 +3681,6 @@ function og_user_roles_gid_from_regcode( return $gid; } - /** * Implementation of hook_form_alter * Adds ability to set default group role for new members for an individual @@ -3597,17 +3694,18 @@ function og_user_roles_form_alter(&$form if (!isset($form['og_register'])) { $form['og_register'] = array('#type' => 'fieldset', '#title' => t('Groups')); } - if (variable_get('og_user_roles_assign_regcode_gid_required', 0) == 1) { - $boolean = 1; - } else { + if (variable_get('og_user_roles_assign_regcode_gid_required', 0) == 1) { + $boolean = 1; + } + else { $boolean = 0; - } + } $form['og_register']['og_user_roles_regcode'] = array( '#type' => 'textfield', '#title' => t('Group registration code'), '#access' => user_access('use registration codes'), '#description' => t('If you received a group registration code, enter it here.'), - '#required' => $boolean, + '#required' => $boolean, ); } $roles = array(); @@ -3623,7 +3721,7 @@ function og_user_roles_form_alter(&$form foreach ($group_types as $type) { // Get list of assignable group roles for this group type $role_ids = variable_get("og_user_roles_roles_{$type}", array()); -// $all_roles = user_roles(); + // $all_roles = user_roles(); $all_roles = og_user_roles_get_roles(); foreach ($role_ids as $rid => $checked) { if (!empty($all_roles[$rid]) && $checked != 0) { @@ -3631,34 +3729,34 @@ function og_user_roles_form_alter(&$form } } // If the form loaded is this type then we can move on - if ($type != '' && $form_id == $type . "_node_form") { + if ($type != '' && $form_id == $type . "_node_form") { $form['og_user_roles_basicgrouprole_gid'] = array( '#type' => 'fieldset', '#title' => t('Default Basic Group Role for new subscribers to this group.'), '#description' => t('Allows you to select a group role to automatically assign to users who join this group. The role is specific to this group. That is, the user will only have the privileges of the role while he is visiting this group. You must have the auto assign group roles permission to use this setting.'), '#collapsible' => TRUE, '#collapsed' => TRUE, - ); + ); $form['og_user_roles_basicgrouprole_gid']['og_user_roles_assign_basicgrouprole_' . $gid] = array( '#type' => 'checkbox', '#title' => t('Set default basic group (group limited) role for users who join this group?'), '#default_value' => variable_get('og_user_roles_assign_basicgrouprole_' . $gid, 0), '#description' => t('Do you wish to automatically assign a specific "basic group role" to every new subscriber to this group at the time he subscribes to this group? The role is limited to this group. This role assignment can be be removed by the groups\' admin(s)'), - ); + ); $form['og_user_roles_basicgrouprole_gid']['og_user_roles_basicgrouprole_value_' . $gid] = array( '#type' => 'select', '#title' => t('Role to use as a basic group role'), '#options' => $roles, '#default_value' => variable_get('og_user_roles_basicgrouprole_value_' . $gid, 0), '#description' => t('Select the role you wish to use as the "basic group role" for every new subscriber to this group.'), - ); - $form['#submit'][] = 'og_user_roles_basicgrouprole_form_submit'; + ); + $form['#submit'][] = 'og_user_roles_basicgrouprole_form_submit'; } } } - // If this is a group node edit (use og_last to determine if this is a group node) - if (arg(0) == 'node' && ($_SESSION['og_last'] == arg(1)) && arg(2) == 'edit' ) { + // If this is a group node edit (use og_last to determine if this is a group node) + if (arg(0) == 'node' && ($_SESSION['og_last'] == arg(1)) && arg(2) == 'edit') { $gid = arg(1); // First, we need to get a list of all og-enabled node types @@ -3666,36 +3764,35 @@ function og_user_roles_form_alter(&$form foreach ($group_types as $type) { // Get list of assignable group roles for this group type $role_ids = variable_get("og_user_roles_roles_{$type}", array()); -// $all_roles = user_roles(); + // $all_roles = user_roles(); $all_roles = og_user_roles_get_roles(); foreach ($role_ids as $rid => $checked) { if (!empty($all_roles[$rid]) && $checked != 0) { $roles[$rid] = $all_roles[$rid]; } } - + // If the form loaded is this type then we can move on - if ($type != '' && $form_id == $type . "_node_form") { + if ($type != '' && $form_id == $type . "_node_form") { // Group Logo Location - - if(variable_get('og_user_roles_logo_enabled', '1') ) { + if (variable_get('og_user_roles_logo_enabled', '1')) { $form['og_user_roles_logo'] = array( '#type' => 'fieldset', '#title' => t('Group Logo location.'), '#description' => t('Allows you to supply location of logo to be used with this group. You can provide either the URL to the file if it is available on a remote website, or the relative file path if it is available locally (i.e., on this server). You can use File attachments to upload the file to this server.'), '#collapsible' => TRUE, '#collapsed' => TRUE, - ); + ); $form['og_user_roles_logo']['og_user_roles_logo_' . $gid] = array( '#type' => 'textfield', '#title' => t('Location of group logo?'), '#default_value' => variable_get('og_user_roles_logo_' . $gid, ''), '#description' => t('Enter either the local file path or the remote URL for the image to be used as the logo for this group. Enter one of the following formats: http://www.yoursite.com/yourlogo.gif (for remote file) or files/yourlogo.gif (for local file). You can attach the file you wish to use to this group using File attachments section below, then supply local path here once the file is uploaded (attached). Your logo image must not exceed these size dimensions: Width (in pixels): ' . variable_get('og_user_roles_logo_width', '135') . 'px Height (in pixels): ' . variable_get('og_user_roles_logo_height', '113') . 'px'), - ); - $form['#validate'][] = 'og_user_roles_logo_form_validate'; - $form['#submit'][] = 'og_user_roles_logo_form_submit'; - } + ); + $form['#validate'][] = 'og_user_roles_logo_form_validate'; + $form['#submit'][] = 'og_user_roles_logo_form_submit'; + } // Add the code to display 'Create content' link and/or remove 'create_' links. @@ -3705,39 +3802,38 @@ function og_user_roles_form_alter(&$form '#title' => t('Control group menu content links.'), '#collapsible' => TRUE, '#collapsed' => TRUE, - ); + ); $form['og_user_roles_links_gid']['og_user_roles_links_content_' . $gid] = array( '#type' => 'checkbox', '#title' => t('Display the Create content link?'), '#default_value' => variable_get('og_user_roles_links_content_' . $gid, 0), '#description' => t('Do you wish to display the OGUR Create content link on this group\'s menu?'), - ); + ); $form['og_user_roles_links_gid']['og_user_roles_links_remove_' . $gid] = array( '#type' => 'checkbox', '#title' => t('Remove the default Create links?'), '#default_value' => variable_get('og_user_roles_links_remove_' . $gid, 0), '#description' => t('Do you wish to remove the default OG Create content links on this group\'s menu?'), - ); - $form['#submit'][] = 'og_user_roles_links_form_submit'; - } + ); + $form['#submit'][] = 'og_user_roles_links_form_submit'; + } // Add the code to disallow public posts to the // group edit form. - - $form['og_user_roles_nopublic_gid'] = array( - '#type' => 'fieldset', - '#title' => t('Disallow public posts in this group.'), - '#description' => t('Allows you to prevent any Public posts from this group. That is, no post made in this group may have the Public box checked. In addition, if OG Forums is installed and this is a group Forum topic post, then the forum group selected in the Forums pull-down menu on the edit form must match this group, or the post will be rejected.'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - $form['og_user_roles_nopublic_gid']['og_user_roles_assign_nopublic_' . $gid] = array( - '#type' => 'checkbox', - '#title' => t('Do not allow public posts in this group?'), - '#default_value' => variable_get('og_user_roles_assign_nopublic_' . $gid, 0), - '#description' => t('Do you wish to disallow public postings from this group?'), - ); - $form['#submit'][] = 'og_user_roles_nopublic_form_submit'; + $form['og_user_roles_nopublic_gid'] = array( + '#type' => 'fieldset', + '#title' => t('Disallow public posts in this group.'), + '#description' => t('Allows you to prevent any Public posts from this group. That is, no post made in this group may have the Public box checked. In addition, if OG Forums is installed and this is a group Forum topic post, then the forum group selected in the Forums pull-down menu on the edit form must match this group, or the post will be rejected.'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['og_user_roles_nopublic_gid']['og_user_roles_assign_nopublic_' . $gid] = array( + '#type' => 'checkbox', + '#title' => t('Do not allow public posts in this group?'), + '#default_value' => variable_get('og_user_roles_assign_nopublic_' . $gid, 0), + '#description' => t('Do you wish to disallow public postings from this group?'), + ); + $form['#submit'][] = 'og_user_roles_nopublic_form_submit'; // If the user has the 'manage registration codes' permission, and we allow group admins // to set registration codes, then print the 'regcode' form on the @@ -3750,19 +3846,19 @@ function og_user_roles_form_alter(&$form '#description' => t('Allows you to enter registration codes that can be used for new users to automatically subscribe to this group and bypass moderation. This will only work if this group is in moderation status. You must have the manage registration codes permission to use this setting.'), '#collapsible' => TRUE, '#collapsed' => TRUE, - ); + ); $form['og_user_roles_regcode_gid']['og_user_roles_assign_regcode_' . $gid] = array( '#type' => 'checkbox', '#title' => t('Set registration codes to allow users to join this group?'), '#default_value' => variable_get('og_user_roles_assign_regcode_' . $gid, 0), '#description' => t('Do you wish to enter registration codes that will allow new subscribers to bypass admin approval and join this group?'), - ); + ); $form['og_user_roles_regcode_gid']['og_user_roles_delete_regcode_' . $gid] = array( '#type' => 'checkbox', '#title' => t('Delete registration code after it is used?'), '#default_value' => variable_get('og_user_roles_delete_regcode_' . $gid, 0), '#description' => t('Do you want to delete each individual registration code after it is used to successfully subscribe a user to the group?'), - ); + ); $form['og_user_roles_regcode_gid']['og_user_roles_regcode_value_' . $gid] = array( '#type' => variable_get('og_user_roles_assign_regcode_gid_text', 'textarea'), '#title' => t('Registration codes for allowing users to subscribe to this group without admin approval'), @@ -3770,27 +3866,27 @@ function og_user_roles_form_alter(&$form '#description' => t('Specify here the registration codes which will allow users who enter them to subscribe to this moderated group without being manually approved by the group administrator. Structure your entries like this:

    Code1,Code2,Code3

    Each registration code separated by a comma. No spaces.'), - ); - // They only see this if they can configure user roles + ); + // They only see this if they can configure user roles if (user_access('auto assign group roles')) { $form['og_user_roles_regcode_gid']['og_user_roles_assign_regcoderole_' . $gid] = array( '#type' => 'checkbox', '#title' => t('Set default basic group (group limited) role for users who join this group using this registration code?'), '#default_value' => variable_get('og_user_roles_assign_regcoderole_' . $gid, 0), '#description' => t('Do you wish to automatically assign a specific "registration code group role" to new subscribers to this group who use this registration code to subscribe to this group? The role is limited to this group. This role assignment can be be removed by the groups\' admin(s)'), - ); + ); $form['og_user_roles_regcode_gid']['og_user_roles_regcoderole_value_' . $gid] = array( '#type' => 'select', '#title' => t('Role to assign'), '#options' => $roles, '#default_value' => variable_get('og_user_roles_regcoderole_value_' . $gid, 0), '#description' => t('Select the role you wish to use as the "registration code group role" for every new subscriber who subscribes to this group using one of the registration codes above.'), - ); + ); } - $form['#validate'][] = 'og_user_roles_regcode_form_validate'; - $form['#submit'][] = 'og_user_roles_regcode_form_submit'; + $form['#validate'][] = 'og_user_roles_regcode_form_validate'; + $form['#submit'][] = 'og_user_roles_regcode_form_submit'; } - } + } } } @@ -3798,12 +3894,11 @@ function og_user_roles_form_alter(&$form if (arg(0) == 'admin' && arg(1) == 'user' && arg(2) == 'roles' && arg(3) == 'edit' && is_numeric(arg(4))) { $rid = arg(4); // If the form loaded is this type then we want to run it by our submit function - // which will test to see if it is a delete operation - if ($form_id == "user_admin_role") { - $form['#submit'][] = 'og_user_roles_role_submit'; + // which will test to see if it is a delete operation + if ($form_id == "user_admin_role") { + $form['#submit'][] = 'og_user_roles_role_submit'; } } - } function og_user_roles_basicgrouprole_form_submit($form, &$form_state) { @@ -3811,6 +3906,7 @@ function og_user_roles_basicgrouprole_fo variable_set('og_user_roles_assign_basicgrouprole_' . $gid, $form_state['values']['og_user_roles_assign_basicgrouprole_' . $gid]); variable_set('og_user_roles_basicgrouprole_value_' . $gid, $form_state['values']['og_user_roles_basicgrouprole_value_' . $gid]); } + function og_user_roles_logo_form_submit($form, &$form_state) { $gid = arg(1); variable_set('og_user_roles_logo_' . $gid, $form_state['values']['og_user_roles_logo_' . $gid]); @@ -3821,25 +3917,28 @@ function og_user_roles_logo_form_submit( function og_user_roles_logo_form_validate($form, &$form_state) { $gid = arg(1); if ($form_state['values']['og_user_roles_logo_' . $gid]) { - $width = variable_get('og_user_roles_logo_width', '135'); - $height = variable_get('og_user_roles_logo_height', '113'); - $image = image_get_info($form_state['values']['og_user_roles_logo_' . $gid]); - $img_width = $image['width']; - $img_height = $image['height']; - if ($img_width > $width || $img_height > $height) { - form_set_error('og_user_roles_logo_' . $gid, "Your submitted group logo image exceeds maximim image dimension limits."); - } + $width = variable_get('og_user_roles_logo_width', '135'); + $height = variable_get('og_user_roles_logo_height', '113'); + $image = image_get_info($form_state['values']['og_user_roles_logo_' . $gid]); + $img_width = $image['width']; + $img_height = $image['height']; + if ($img_width > $width || $img_height > $height) { + form_set_error('og_user_roles_logo_' . $gid, "Your submitted group logo image exceeds maximim image dimension limits."); + } } } + function og_user_roles_links_form_submit($form, &$form_state) { $gid = arg(1); variable_set('og_user_roles_links_content_' . $gid, $form_state['values']['og_user_roles_links_content_' . $gid]); variable_set('og_user_roles_links_remove_' . $gid, $form_state['values']['og_user_roles_links_remove_' . $gid]); } + function og_user_roles_nopublic_form_submit($form, &$form_state) { $gid = arg(1); variable_set('og_user_roles_assign_nopublic_' . $gid, $form_state['values']['og_user_roles_assign_nopublic_' . $gid]); } + function og_user_roles_regcode_form_submit($form, &$form_state) { $gid = arg(1); variable_set('og_user_roles_assign_regcode_' . $gid, $form_state['values']['og_user_roles_assign_regcode_' . $gid]); @@ -3865,27 +3964,29 @@ function og_user_roles_regcode_form_vali // Get the list of OG groups $groups = og_all_groups_options(); foreach ($groups as $group => $title) { - // Get all groups except current one. + // Get all groups except current one. if ($group != $gid) { // Only process groups that are allowed to have registration codes if (variable_get('og_user_roles_assign_regcode_' . $group, 0) == 1) { - // Get the array of codes for this group. + // Get the array of codes for this group. $group_array = explode(',', variable_get('og_user_roles_regcode_value_' . $group, '')); // Check to see this array as any elements which are duplicated if ($duplicated = array_intersect($regcode_array, $group_array)) { // If there are duplicates, then display the group in which they are duplicated ONLY if this is a site admin if (user_access('administer nodes')) { form_set_error('og_user_roles_regcode_value_' . $gid, "Registration codes " . implode(', ', $duplicated) . " duplicated in group " . l($title, 'node/' . $group)); - } else { + } + else { form_set_error('og_user_roles_regcode_value_' . $gid, "Registration codes " . implode(', ', $duplicated) . " duplicated."); - } + } } - } - } + } + } } } } } + function og_user_roles_role_submit($form, &$form_state) { // If this is a delete role operation (Admin->User Management->Roles->Edit Role) $op = $form_state['clicked_button']['#value']; @@ -3896,12 +3997,13 @@ function og_user_roles_role_submit($form } /** - * This is what is in OG. og_user_roles_theme() was returning error, so decided to + * This is what is in OG. og_user_roles_theme() was returning error, so decided to * try this. */ function og_user_roles_determine_context() { global $custom_theme; - $group_node = NULL; // a node object containing the 'active' group for this request + // a node object containing the 'active' group for this request + $group_node = NULL; $type = $_GET['type']; @@ -3913,11 +4015,12 @@ function og_user_roles_determine_context } elseif (arg(0) == 'node' && (arg(1) == 'add' || arg(1) == 'ognodeadd') && (arg(2) == 'book' || $type == 'book') && arg(3) == 'parent') { $group_node = og_set_theme(arg(4)); - $_REQUEST['edit']['og_groups'][] = $group_node->nid; // checks the right box on node form + // checks the right box on node form + $_REQUEST['edit']['og_groups'][] = $group_node->nid; } elseif (arg(0) == 'node' && (arg(1) == 'add' || arg(1) == 'ognodeadd') && isset($_REQUEST['gids'])) { - $gid = intval(current($_REQUEST['gids'])); - $group_node = node_load($gid); + $gid = intval(current($_REQUEST['gids'])); + $group_node = node_load($gid); $custom_theme = $group_node->og_theme; } // As per: http://drupal.org/node/194214 @@ -3930,23 +4033,24 @@ function og_user_roles_determine_context } } elseif (arg(0) == 'og_calendar' && is_numeric(arg(1))) { - $gid = intval(arg(1)); - $group_node = node_load($gid); + $gid = intval(arg(1)); + $group_node = node_load($gid); $custom_theme = $group_node->og_theme; } elseif (arg(0) == 'comment' && is_numeric(arg(2))) { if (arg(1) == 'edit') { - $comment = _comment_load(arg(2)); - $nid = $comment->nid; - $gid = og_user_roles_getgid($nid, $uid); + $comment = _comment_load(arg(2)); + $nid = $comment->nid; + $gid = og_user_roles_getgid($nid, $uid); $group_node = og_set_theme($gid); - } else { + } + else { $group_node = og_set_theme(arg(2)); } } elseif (arg(0) == 'user' && arg(1) == 'register' && isset($_REQUEST['gids'])) { - $gid = intval(current($_REQUEST['gids'])); - $group_node = node_load($gid); + $gid = intval(current($_REQUEST['gids'])); + $group_node = node_load($gid); $custom_theme = $group_node->og_theme; } @@ -3961,7 +4065,9 @@ function og_user_roles_link_alter(&$link if ($node->nid) { $gid = $node->nid; foreach ($links as $type => $link) { - if ($type == 'book_add_child') $links['book_add_child']['query'] .= '&gids[]='.$gid; + if ($type == 'book_add_child') { + $links['book_add_child']['query'] .= '&gids[]=' . $gid; + } } } } @@ -3988,22 +4094,21 @@ function og_user_roles_og_create_links($ function og_user_roles_og_links_alter(&$links, $group_node) { // Convert the dashes in the URL back to underscores. - foreach($links as $key => $value) { - if(substr($key,0,7) == 'create_') { - $links[$key] = str_replace('-', '_' , $value); - } + foreach ($links as $key => $value) { + if (substr($key, 0, 7) == 'create_') { + $links[$key] = str_replace('-', '_', $value); + } } if (variable_get('og_user_roles_links_remove_' . $group_node->nid, 0) == 1) { - foreach($links as $key => $value) { - if(substr($key,0,7) == 'create_') { + foreach ($links as $key => $value) { + if (substr($key, 0, 7) == 'create_') { unset($links["$key"]); } } } } - /** * hook_block * @@ -4013,39 +4118,42 @@ function og_user_roles_block($op = 'list if ($op == 'list') { $blocks[0] = array('info' => t('Register Codes'), - 'weight' => 0, 'enabled' => 1, 'region' => 'left'); + 'weight' => 0, 'enabled' => 1, 'region' => 'left', + ); $blocks[1] = array('info' => t('Group Logo'), - 'weight' => 0, 'enabled' => 0); + 'weight' => 0, 'enabled' => 0, + ); return $blocks; } else if ($op == 'view') { - switch($delta) { + switch ($delta) { case 0: if ($node = og_get_group_context()) { $subscription = og_user_roles_og_status($node); if ($subscription == 'none') { if ($user->uid) { - if (variable_get('og_user_roles_assign_regcode_gid', 0) == 1 && variable_get('og_user_roles_assign_regcode_' . $node->nid, 0) == 1 ) { + if (variable_get('og_user_roles_assign_regcode_gid', 0) == 1 && variable_get('og_user_roles_assign_regcode_' . $node->nid, 0) == 1) { $block = array('subject' => t('Register Codes'), 'content' => l('Enter your registration code', 'og/regcode')); } } - } - } + } + } break; + case 1: if ($node = og_get_group_context()) { if ($logo = variable_get('og_user_roles_logo_' . $node->nid, '')) { -// $width = variable_get('og_user_roles_logo_width', '135'); -// $height = variable_get('og_user_roles_logo_height', '113'); -// $attributes = array('width' => $width, 'height' => $height); - $attributes = array(); + // $width = variable_get('og_user_roles_logo_width', '135'); + // $height = variable_get('og_user_roles_logo_height', '113'); + // $attributes = array('width' => $width, 'height' => $height); + $attributes = array(); $imglink = theme_image($logo, $alt = $node->title, $title = $node->title, $attributes, $getsize = FALSE); -// Modification as per: http://drupal.org/node/287571 -// $output = "" . $imglink . ""; - $output = "nid) . "'>" . $imglink . ""; + // Modification as per: http://drupal.org/node/287571 + // $output = "" . $imglink . ""; + $output = "nid) . "'>" . $imglink . ""; $block = array('content' => $output); - } - } + } + } break; } return $block; @@ -4054,15 +4162,15 @@ function og_user_roles_block($op = 'list /** * hook_og_block_details - * + * * Trying to get this to work to put "Enter registration code" link in group menu * if in moderation. */ function og_user_roles_og_block_details($group) { if ($group->og_selective == OG_MODERATED && variable_get('og_user_roles_assign_regcode_gid', 0) == 1 && variable_get('og_user_roles_assign_regcode_' . $group->nid, '') == 1) { $links[] = l(t('Enter registration code'), "og/regcode", array('attributes' => array('title' => t('Subscribe to this group using a registration code.')))); - } - $oldblock = og_og_block_details($group); + } + $oldblock = og_og_block_details($group); $block['content'] = $oldblock['content'] . theme('item_list', $links); $block['subject'] = $oldblock['subject']; return $block; @@ -4087,7 +4195,8 @@ function og_user_roles_register() { if ($user->uid) { drupal_set_message(t('If you have received a registration code for access to a group, process it here.')); - } else { + } + else { drupal_set_message(l('You must register/login use registration codes.', 'user/login')); } @@ -4096,11 +4205,11 @@ function og_user_roles_register() { '#title' => t('Group registration code'), '#required' => TRUE, '#size' => 25, - '#access' => $user->uid, + '#access' => $user->uid, ); - + if ($user->uid > 0) { - $form['submit'] = array('#type' => 'submit', '#value' => t('Submit code') ); + $form['submit'] = array('#type' => 'submit', '#value' => t('Submit code')); } return $form; } @@ -4121,14 +4230,15 @@ function og_user_roles_register_validate function og_user_roles_register_submit($form, &$form_state) { global $user; - + if ($user->uid) { $regcode = $form_state['values']['og_user_roles_regcode']; $gid = og_user_roles_gid_from_regcode($regcode); - if ($gid > 0) { - drupal_goto('og/regcode/confirm/'.$regcode); - } - } else { + if ($gid > 0) { + drupal_goto('og/regcode/confirm/' . $regcode); + } + } + else { drupal_access_denied(); } } @@ -4140,23 +4250,24 @@ function og_user_roles_register_submit($ * @see og_user_roles_register_confirm_submit() */ function og_user_roles_register_confirm() { - $form = array(); - $regcode = arg(3); + $form = array(); + $regcode = arg(3); $form['#regcode'] = $regcode; $gid = og_user_roles_gid_from_regcode($regcode); if ($gid > 0) { - $node = node_load($gid); + $node = node_load($gid); $form['#node'] = $node; - $question = t('Are you sure you want to join this group: %title?', array('%title' => $node->title)); - $path = 'og/regcode'; - $description = t('Are you sure you want to join this group: %title?', array('%title' => $node->title)); - $yes = t('Join'); - $no = t('Cancel'); - $name = 'og_user_roles_register_confirm'; + $question = t('Are you sure you want to join this group: %title?', array('%title' => $node->title)); + $path = 'og/regcode'; + $description = t('Are you sure you want to join this group: %title?', array('%title' => $node->title)); + $yes = t('Join'); + $no = t('Cancel'); + $name = 'og_user_roles_register_confirm'; return confirm_form($form, $question, $path, $description, $yes, $no, $name); - } else { + } + else { form_set_error('regcode', "Not a valid group registration code."); } } @@ -4178,22 +4289,27 @@ function og_user_roles_register_confirm_ function og_user_roles_register_confirm_submit($form, &$form_state) { global $user; - $node = $form['#node']; + $node = $form['#node']; $regcode = $form['#regcode']; - $title = $node->title; - $gid = $node->nid; - $return = og_save_subscription($gid, $user->uid, array('is_active' => 1)); // as per http://drupal.org/node/156224 - drupal_set_message(t('Subscription request to ' . l($title, 'node/'. $gid) . ' approved. You are now a member.')); + $title = $node->title; + $gid = $node->nid; + // as per http://drupal.org/node/156224 + $return = og_save_subscription($gid, $user->uid, array('is_active' => 1)); + drupal_set_message(t('Subscription request to ' . l($title, 'node/' . $gid) . ' approved. You are now a member.')); // Delete this registration code if 'delete_regcode' is set - if (variable_get('og_user_roles_delete_regcode_' . $gid, 0) == 1) og_user_roles_delete_regcode($gid, $regcode); + if (variable_get('og_user_roles_delete_regcode_' . $gid, 0) == 1) { + og_user_roles_delete_regcode($gid, $regcode); + } // Places all new registration code group subscribers into default regcode role. - if (variable_get('og_user_roles_assign_regcoderole_' . $gid, 0)) { // check to see if this variable exists - if (variable_get('og_user_roles_assign_regcode_gid', 0) == 1 && variable_get('og_user_roles_assign_regcoderole_' . $gid, 0) == 1 ) { + // check to see if this variable exists + if (variable_get('og_user_roles_assign_regcoderole_' . $gid, 0)) { + if (variable_get('og_user_roles_assign_regcode_gid', 0) == 1 && variable_get('og_user_roles_assign_regcoderole_' . $gid, 0) == 1) { $rid = variable_get('og_user_roles_regcoderole_value_' . $gid, 0); - og_user_roles_role_join($user->uid, $rid, $gid); // assign user to group role in that group + // assign user to group role in that group + og_user_roles_role_join($user->uid, $rid, $gid); } } - drupal_goto('node/'.$gid); + drupal_goto('node/' . $gid); } function og_user_roles_delete_regcode($gid, $regcode) { @@ -4202,13 +4318,13 @@ function og_user_roles_delete_regcode($g // Create new array that contains all codes for this one. foreach ($group_array as $item) { if ($item != $regcode) { - $new_array[] = $item; + $new_array[] = $item; } } // Implode the new array $new = implode(",", $new_array); // Write the new value. - variable_set('og_user_roles_regcode_value_' . $gid, $new); + variable_set('og_user_roles_regcode_value_' . $gid, $new); } /** @@ -4216,10 +4332,11 @@ function og_user_roles_delete_regcode($g * * @param * Group node + * * @return status * The status of subscriber containing 'active' or 'requested' or 'none' */ - function og_user_roles_og_status($node) { +function og_user_roles_og_status($node) { global $user; $subscription = 'none'; $result = db_query('select * from {og_uid} where nid = %d', $node->nid); @@ -4227,7 +4344,8 @@ function og_user_roles_delete_regcode($g if ($row->uid == $user->uid) { if ($row->is_active) { $subscription = 'active'; - } else { + } + else { $subscription = 'requested'; } } @@ -4243,21 +4361,20 @@ function og_user_roles_delete_regcode($g * @param * node id * user access + * * @return status * Boolean true or false */ - function og_user_roles_modr8_access($nid, $access) { - -// ToDo: Use og_user_roles_access to determine access. -// og_user_roles_user_access($access, $gid, $uid) - -// This code doesn't work because it gives "access denied" once node is approved: -// $node = node_load($nid); -// return $node->moderate && user_access($access); +function og_user_roles_modr8_access($nid, $access) { + // ToDo: Use og_user_roles_access to determine access. + // og_user_roles_user_access($access, $gid, $uid) + + // This code doesn't work because it gives "access denied" once node is approved: + // $node = node_load($nid); + // return $node->moderate && user_access($access); return user_access($access); - - } +} /* * Implementation of hook_node_grants @@ -4286,31 +4403,31 @@ function og_user_roles_node_access_recor // From: http://drupal.org/node/234087#comment-788876 if (og_is_omitted_type($node->type) || (is_array($node->og_groups) && count($node->og_groups) === 0) || (!is_array($node->og_groups) && !og_is_group_type($node->type))) { - $grants[] = array ( + $grants[] = array( 'realm' => 'og_public', 'gid' => 0, 'grant_view' => 1, 'grant_update' => 0, - 'grant_delete' => 0 ); + 'grant_delete' => 0, + ); } - - // This creates all ogr grants - - $where = "WHERE ta.rid = ogr.rid AND n.nid = ".$node->nid; + + // This creates all ogr grants + $where = "WHERE ta.rid = ogr.rid AND n.nid = " . $node->nid; $result = db_query("SELECT n.nid, ta.rid, ogr.ogr_id, BIT_OR(ta.grant_view) AS grant_view, BIT_OR(ta.grant_update) AS grant_update, BIT_OR(ta.grant_delete) AS grant_delete FROM {term_node} n INNER JOIN {term_access} ta ON n.tid = ta.tid INNER JOIN {og_ancestry} oa ON n.nid = oa.nid INNER JOIN {og_users_roles} ogr ON oa.group_nid = ogr.gid $where GROUP BY n.nid, ta.rid"); - - while($row = db_fetch_object($result)) { + + while ($row = db_fetch_object($result)) { if ($row) { - $grant_view = ($row->grant_view == 1) ? 1 : 0; + $grant_view = ($row->grant_view == 1) ? 1 : 0; $grant_update = ($row->grant_update == 1) ? 1 : 0; $grant_delete = ($row->grant_delete == 1) ? 1 : 0; $grants[] = array( 'realm' => 'ogr_access', - 'gid' => $row->ogr_id, - 'grant_view' => $grant_view, - 'grant_update' => $grant_update, - 'grant_delete' => $grant_delete, + 'gid' => $row->ogr_id, + 'grant_view' => $grant_view, + 'grant_update' => $grant_update, + 'grant_delete' => $grant_delete, 'priority' => 0, ); } @@ -4331,22 +4448,21 @@ function og_user_roles_cron() { if (!empty($nodelist)) { $nodelist_array = explode(',', $nodelist); $result = db_query("SELECT nid FROM {og}"); - + while ($row = db_fetch_object($result)) { foreach ($nodelist_array as $nodelist_item) { - print "
    nodelist_item : " . $nodelist_item; + print "
    nodelist_item : " . $nodelist_item; $count = db_result(db_query("SELECT COUNT(nid) FROM {og_ancestry} WHERE nid = %d AND group_nid = %d", $nodelist_item, $row->nid)); // Insert if it doesn't already belong. if ($count == 0) { -// See: http://drupal.org/node/432544 -// db_query('INSERT INTO {og_ancestry} (nid,group_nid,is_public) VALUES (%d,%d,0)', $nodelist_item, $row->nid); + // See: http://drupal.org/node/432544 + // db_query('INSERT INTO {og_ancestry} (nid,group_nid,is_public) VALUES (%d,%d,0)', $nodelist_item, $row->nid); db_query('INSERT INTO {og_ancestry} (nid,group_nid) VALUES (%d,%d)', $nodelist_item, $row->nid); watchdog('og_user_roles', t('Inserted nid: %nid into group: %gid.', array('%nid' => $nodelist_item, '%gid' => $row->nid))); - } - } // end foreach + } + } } } - } /** @@ -4356,11 +4472,11 @@ function og_user_roles_cron() { * User ID * @param * Group ID + * * @return array * An array containing the [roleID => roleName] that the user has in this group */ - function og_user_roles_get_og_roles($uid, $gid) { - +function og_user_roles_get_og_roles($uid, $gid) { $roles = array(); // Get the group roles $result = db_query('SELECT r.rid, r.name FROM {role} r INNER JOIN {og_users_roles} ogr ON r.rid = ogr.rid INNER JOIN {og_uid} ogu ON ogu.uid = ogr.uid AND ogu.nid = ogr.gid WHERE ogr.uid = %d AND ogr.gid = %d AND ogu.is_active = 1', $uid, $gid); @@ -4368,7 +4484,7 @@ function og_user_roles_cron() { $roles[$role->rid] = $role->name; } return $roles; -} +} /** * Implementation of hook_mail_alter(). @@ -4376,40 +4492,38 @@ function og_user_roles_cron() { function og_user_roles_mail_alter(&$message) { $mailkey = $message['mail_id']; - $to = $message['to']; + $to = $message['to']; $subject = $message['subject']; - $body = $message['body']; - $from = $message['from']; + $body = $message['body']; + $from = $message['from']; $headers = $message['headers']; if ($mailkey == 'og_mail') { // Get unsubscribe url - $unsubscribe_url = $headers['List-Unsubscribe']; - // Take out the "<" and ">" characters - $url = preg_replace('/[\<|\>]/', '', $unsubscribe_url); - // Get the group number (i.e., http://www.less-paper.org/og/manage/16 will yield "16") - $gid = basename($url); - // Get the logo path - $logo = og_user_roles_oglogo_gid($gid); - // Construct the url to the logo - $parsed_url = parse_url($url); - $logo_url = $parsed_url['scheme'] . '://' . $parsed_url['host'] . '/' . $logo; + $unsubscribe_url = $headers['List-Unsubscribe']; + // Take out the "<" and ">" characters + $url = preg_replace('/[\<|\>]/', '', $unsubscribe_url); + // Get the group number (i.e., http://www.less-paper.org/og/manage/16 will yield "16") + $gid = basename($url); + // Get the logo path + $logo = og_user_roles_oglogo_gid($gid); + // Construct the url to the logo + $parsed_url = parse_url($url); + $logo_url = $parsed_url['scheme'] . '://' . $parsed_url['host'] . '/' . $logo; $body = preg_replace('/\!group_logo_url/', '', $body); } - } function og_user_roles_readme() { global $base_path; // this link has to work when clean urls are disabled and drupal in subdir. - $href = drupal_get_path('module', 'og_user_roles'). '/README.txt'; - $link = "". t('README file'). ''; + $href = drupal_get_path('module', 'og_user_roles') . '/README.txt'; + $link = "" . t('README file') . ''; return $link; } -function og_user_roles_list_users_sql($min_is_active = 1, $min_is_admin = 0, $orderby='u.name ASC') { +function og_user_roles_list_users_sql($min_is_active = 1, $min_is_admin = 0, $orderby = 'u.name ASC') { return "SELECT u.uid, u.name, u.mail, u.picture, ou.* FROM {og_uid} ou INNER JOIN {users} u ON ou.uid = u.uid WHERE ou.nid = %d AND u.status > 0 AND ou.is_active >= $min_is_active AND ou.is_admin >= $min_is_admin ORDER BY $orderby"; } -?> Index: views/handlers/ogur_handler_argument_og_users_roles_gid.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og_user_roles/views/handlers/ogur_handler_argument_og_users_roles_gid.inc,v retrieving revision 1.2 diff -u -p -r1.2 ogur_handler_argument_og_users_roles_gid.inc --- views/handlers/ogur_handler_argument_og_users_roles_gid.inc 23 May 2009 02:40:41 -0000 1.2 +++ views/handlers/ogur_handler_argument_og_users_roles_gid.inc 23 May 2009 03:04:20 -0000 @@ -1,4 +1,6 @@ nid ORDER BY r.name"); while ($role = db_fetch_object($result)) { - $this->items[$role->uid][$role->rid] = l(t($role->name), "og/users/$node->nid/$path", array('query' => drupal_get_destination())); + $this->items[$role->uid][$role->rid] = l(t($role->name), "og/users/$node->nid/$path", array('query' => drupal_get_destination())); } } } } + Index: views/handlers/ogur_handler_field_og_users_roles_all.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og_user_roles/views/handlers/ogur_handler_field_og_users_roles_all.inc,v retrieving revision 1.2 diff -u -p -r1.2 ogur_handler_field_og_users_roles_all.inc --- views/handlers/ogur_handler_field_og_users_roles_all.inc 23 May 2009 02:40:41 -0000 1.2 +++ views/handlers/ogur_handler_field_og_users_roles_all.inc 23 May 2009 03:06:06 -0000 @@ -1,5 +1,6 @@ view->args[0]) { - $uid = $this->view->args[0]; - } else { - $uid = $user->uid; - } - + // If there are args for the user, use them, else use the current user info. + if ($this->view->args[0]) { + $uid = $this->view->args[0]; + } + else { + $uid = $user->uid; + } + $this->items = array(); foreach ($values as $result) { $path = ""; // Check to see if user has access to configure member roles site-wide - if (user_access('configure restricted member roles')) $path = 'restricted_roles'; - if (user_access('configure member roles')) $path = 'roles'; - + if (user_access('configure restricted member roles')) { + $path = 'restricted_roles'; + } + if (user_access('configure member roles')) { + $path = 'roles'; + } + $group_id = $result->{$this->aliases['gid']}; // Check to see if user has access to group-limited configure member roles - if (og_user_roles_user_access('configure restricted member roles', $group_id, $user->uid)) $path = 'restricted_roles'; - if (og_user_roles_user_access('configure member roles', $group_id, $user->uid)) $path = 'roles'; - + if (og_user_roles_user_access('configure restricted member roles', $group_id, $user->uid)) { + $path = 'restricted_roles'; + } + if (og_user_roles_user_access('configure member roles', $group_id, $user->uid)) { + $path = 'roles'; + } + $result = db_query("SELECT u.uid, u.rid, u.gid, r.name FROM {role} r INNER JOIN {og_users_roles} u ON u.rid = r.rid WHERE u.uid = $uid AND u.gid = {$group_id} ORDER BY r.name"); while ($role = db_fetch_object($result)) { $this->items[$role->gid][$role->rid] = l(t($role->name), "og/users/$group_id/$path", array('query' => drupal_get_destination())); } } - } } + Index: views/handlers/ogur_handler_filter_og_users_roles.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og_user_roles/views/handlers/ogur_handler_filter_og_users_roles.inc,v retrieving revision 1.2 diff -u -p -r1.2 ogur_handler_filter_og_users_roles.inc --- views/handlers/ogur_handler_filter_og_users_roles.inc 23 May 2009 02:40:41 -0000 1.2 +++ views/handlers/ogur_handler_filter_og_users_roles.inc 23 May 2009 03:06:23 -0000 @@ -1,5 +1,6 @@ value_options[DRUPAL_AUTHENTICATED_RID]); } } + Index: views/handlers/ogur_handler_filter_og_users_roles_picg.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og_user_roles/views/handlers/ogur_handler_filter_og_users_roles_picg.inc,v retrieving revision 1.2 diff -u -p -r1.2 ogur_handler_filter_og_users_roles_picg.inc --- views/handlers/ogur_handler_filter_og_users_roles_picg.inc 23 May 2009 02:40:41 -0000 1.2 +++ views/handlers/ogur_handler_filter_og_users_roles_picg.inc 23 May 2009 03:06:29 -0000 @@ -1,4 +1,6 @@ ensure_my_table(); $this->query->add_where($this->options['group'], "$table.gid = ***CURRENT_GID***"); } -} \ No newline at end of file +} + Index: views/handlers/ogur_handler_filter_og_users_roles_ricg.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og_user_roles/views/handlers/ogur_handler_filter_og_users_roles_ricg.inc,v retrieving revision 1.2 diff -u -p -r1.2 ogur_handler_filter_og_users_roles_ricg.inc --- views/handlers/ogur_handler_filter_og_users_roles_ricg.inc 23 May 2009 02:40:41 -0000 1.2 +++ views/handlers/ogur_handler_filter_og_users_roles_ricg.inc 23 May 2009 03:06:40 -0000 @@ -1,17 +1,21 @@ view->args[0]) { - $uid = $this->view->args[0]; - } else { - $uid = '***CURRENT_USER***'; - } + if ($this->view->args[0]) { + $uid = $this->view->args[0]; + } + else { + $uid = '***CURRENT_USER***'; + } $table = $this->ensure_my_table(); $this->query->add_where($this->options['group'], "$table.uid = $uid"); } -} \ No newline at end of file +} +