BOINC / boinc

drupal/sites/default/boinc/modules/contrib/jump/jump.module

Indentation +130 added lines, -130 removed lines

@@ -12,16 +12,16 @@ 
  * @return array
  */
 function jump_menu() {
-  $items = array();
-  $items['admin/settings/jump'] = array(
+    $items = array();
+    $items['admin/settings/jump'] = array(
     'title' => 'Jump Settings',
     'description' => 'Configure Jump module settings.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('jump_settings'),
     'access callback' => 'user_access',
     'access arguments' => array('administer menu'),
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
@@ -30,13 +30,13 @@ 
  * @return string
  */
 function jump_settings() {
-  $form['jump_activepageinmenu'] = array(
+    $form['jump_activepageinmenu'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show active page in menu.'),
     '#default_value' => variable_get('jump_activepageinmenu', 1),
     '#description' => t('This setting will force the jump menu to show the current page as the default selection in the jump menu when checked.  If you have a menu option that you would always like displayed at the top of the menu, like <em>Select a menu item</em>, you will want to uncheck this. This setting controls this behavior for all jump menus sitewide.  You can override this setting on a block-by-block basis.'),
-  );
-  return system_settings_form($form);
+    );
+    return system_settings_form($form);
 }
 
 /**
@@ -48,64 +48,64 @@ 
  * @return array
  */
 function jump_block($op = 'list', $delta = 0, $edit = array()) {
-  switch ($op) {
+    switch ($op) {
     case 'list':
       $blocks = array();
-      foreach (menu_get_menus() as $name => $title) {
+        foreach (menu_get_menus() as $name => $title) {
         $blocks['menu-' . $name] = array(
-          'info' => t('Jump menu: !menu', array('!menu' => $name))
+            'info' => t('Jump menu: !menu', array('!menu' => $name))
         );
-      }
+        }
 
-      $vocs = taxonomy_get_vocabularies();
-      foreach ($vocs as $vid => $vocabulary) {
+        $vocs = taxonomy_get_vocabularies();
+        foreach ($vocs as $vid => $vocabulary) {
         $blocks['taxo-' . $vid] = array(
-          'info' => t('Jump menu: !voc', array('!voc' => $vocabulary->name))
+            'info' => t('Jump menu: !voc', array('!voc' => $vocabulary->name))
         );
-      }
-      return $blocks;
+        }
+        return $blocks;
     case 'configure':
       $form = array();
-      $form['block_settings']['jump_activepageinmenu_' . $delta] = array(
+        $form['block_settings']['jump_activepageinmenu_' . $delta] = array(
         '#type' => 'checkbox',
         '#title' => t('Show active page in jump menu.'),
         '#default_value' => variable_get('jump_activepageinmenu_' . $delta, 1),
         '#description' => t('This setting will force the jump menu to show the current page as the default selection in this block\'s jump menu.'),
-      );
-      // Do the rest of the form additions in hook_form_alter() since we can't do ahah here.
-      return $form;
+        );
+        // Do the rest of the form additions in hook_form_alter() since we can't do ahah here.
+        return $form;
     case 'save':
       variable_set('jump_activepageinmenu_' . $delta, $edit['jump_activepageinmenu_' . $delta]);
-      variable_set('jump_use_js_' . $delta, $edit['jump_use_js_' . $delta]);
-      variable_set('jump_add_select_' . $delta, $edit['jump_add_select_' . $delta]);
-      variable_set('jump_add_select_text_' . $delta, $edit['jump_add_select_text_' . $delta]);
-      break;
+        variable_set('jump_use_js_' . $delta, $edit['jump_use_js_' . $delta]);
+        variable_set('jump_add_select_' . $delta, $edit['jump_add_select_' . $delta]);
+        variable_set('jump_add_select_text_' . $delta, $edit['jump_add_select_text_' . $delta]);
+        break;
     case 'view':
       // The first 5 characters of $delta should be one of:
       //    menu-
       //    taxo-
       $subject = '';
-      $jumpmenu_type = substr($delta, 0, 4);
-      $jumpmenu_name = substr($delta, 5);
-      $active = jump_get_active_setting($delta);
-      if ($jumpmenu_type == 'menu') {
+        $jumpmenu_type = substr($delta, 0, 4);
+        $jumpmenu_name = substr($delta, 5);
+        $active = jump_get_active_setting($delta);
+        if ($jumpmenu_type == 'menu') {
         $form = jump_quickly($jumpmenu_name, 'menu', $active);
 
         // Use the menu label as the default block subject
         $menus = menu_get_menus();
         $subject = $menus[$jumpmenu_name];
-      }
-      else if ($jumpmenu_type == 'taxo') {
+        }
+        else if ($jumpmenu_type == 'taxo') {
         $form = jump_quickly($jumpmenu_name, 'taxo', $active);
 
         // Use the vocabulary name as the default block subject
         $vocab = taxonomy_vocabulary_load($jumpmenu_name);
         $subject = $vocab->name;
-      }
-      if (variable_get('jump_use_js_' . $delta, 0) === 1) drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-      return array('subject' => $subject, 'content' => $form);
-      break;
-  }
+        }
+        if (variable_get('jump_use_js_' . $delta, 0) === 1) drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+        return array('subject' => $subject, 'content' => $form);
+        break;
+    }
 }
 
 /**
@@ -124,36 +124,36 @@ 
  * @return array
  */
 function jump_quickly($name = 'navigation', $type = 'menu', $active = -1, $override = '') {
-  // Reconstruct the $delta
-  $delta = $type . '-' . $name;
-  if ($active === -1) {
+    // Reconstruct the $delta
+    $delta = $type . '-' . $name;
+    if ($active === -1) {
     $active = variable_get('jump_activepageinmenu', 1);
-  }
-  $menu_state = array(
+    }
+    $menu_state = array(
     'delta' => $delta,
     'active' => $active,
     'override' => $override
-  );
+    );
 
-  if (is_array($name)) {
+    if (is_array($name)) {
     $options = $name;
-  }
-  else {
+    }
+    else {
     $options = array();
     if ($type == 'menu') {
-      jump_menu_get_menu_options($options, $name);
+        jump_menu_get_menu_options($options, $name);
     }
     elseif ($type == 'taxo') {
-      jump_menu_get_taxo_options($options, $name);
+        jump_menu_get_taxo_options($options, $name);
+    }
     }
-  }
 
-  // Give each form on the page a unique id so we can handle multiple
-  // jump forms...
-  static $num_jump_forms = 0;
-  $num_jump_forms++;
+    // Give each form on the page a unique id so we can handle multiple
+    // jump forms...
+    static $num_jump_forms = 0;
+    $num_jump_forms++;
 
-  return drupal_get_form('jump_quickly_form_' . $num_jump_forms, $options, $menu_state);
+    return drupal_get_form('jump_quickly_form_' . $num_jump_forms, $options, $menu_state);
 }
 
 /**
@@ -165,43 +165,43 @@ 
  * @return array
  */
 function jump_quickly_form(&$form_state, $options, $menu_state) {
-  $default = '';
-  if ($menu_state['active'] === 1) {
+    $default = '';
+    if ($menu_state['active'] === 1) {
     if (isset($options[$_GET['q']])) {
-      $default = $_GET['q'];
+        $default = $_GET['q'];
+    }
     }
-  }
-  if ($menu_state['override']) {
+    if ($menu_state['override']) {
     $default = $menu_state['override'];
-  }
+    }
 
-  $form = array();
-  $form['#submit'][] = 'jump_quickly_form_submit';
-  $form['#theme'] = 'jump_quickly_form';
-  $form['#attributes']['class'] = 'jump-quickly';
-  $form['jump_goto'] = array(
+    $form = array();
+    $form['#submit'][] = 'jump_quickly_form_submit';
+    $form['#theme'] = 'jump_quickly_form';
+    $form['#attributes']['class'] = 'jump-quickly';
+    $form['jump_goto'] = array(
     '#type' => 'select',
     '#default_value' => $default,
     '#options' => $options
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Go')
-  );
-  if (variable_get('jump_use_js_' . $menu_state['delta'], 0) === 1) {
+    );
+    if (variable_get('jump_use_js_' . $menu_state['delta'], 0) === 1) {
     // Give each menu a unique name.
     $form['#attributes']['name'] = 'jumpquickly' . $menu_state['delta'];
     $form['#attributes']['class'] .= ' js-enabled';
 //    unset($form['submit']);
     if (variable_get('jump_add_select_' . $menu_state['delta'], 0) === 1) {
-      $form['jump_goto']['#attributes']['class'] = 'first-no-jump';
-      // Add the extra empty select option to the top of the array.
-      $form['jump_goto']['#options'] = array('' => variable_get('jump_add_select_text_' . $menu_state['delta'], t('Select Option'))) + $options;
-      $form['jump_goto']['#default_value'] = (array_key_exists($default, $options)) ? $default : '';
+        $form['jump_goto']['#attributes']['class'] = 'first-no-jump';
+        // Add the extra empty select option to the top of the array.
+        $form['jump_goto']['#options'] = array('' => variable_get('jump_add_select_text_' . $menu_state['delta'], t('Select Option'))) + $options;
+        $form['jump_goto']['#default_value'] = (array_key_exists($default, $options)) ? $default : '';
+    }
     }
-  }
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -211,15 +211,15 @@ 
  * @param array $form_state
  */
 function jump_quickly_form_submit($form, &$form_state) {
-  if (!empty($form_state['values']['jump_goto'])) {
+    if (!empty($form_state['values']['jump_goto'])) {
     $fragment = explode('#', $form_state['values']['jump_goto']);
     if (isset($fragment[1])) {
-      drupal_goto($fragment[0], NULL, $fragment[1]);
+        drupal_goto($fragment[0], NULL, $fragment[1]);
     }
     else {
-      drupal_goto($form_state['values']['jump_goto']);
+        drupal_goto($form_state['values']['jump_goto']);
+    }
     }
-  }
 }
 
 /**
@@ -229,12 +229,12 @@ 
  * @return string
  */
 function theme_jump_quickly_form($form) {
-  $output = '<div class="container-inline">';
-  $output .= drupal_render($form['jump_goto']);
-  $output .= drupal_render($form['submit']);
-  $output .= '</div>';
-  $output .= drupal_render($form);
-  return $output;
+    $output = '<div class="container-inline">';
+    $output .= drupal_render($form['jump_goto']);
+    $output .= drupal_render($form['submit']);
+    $output .= '</div>';
+    $output .= drupal_render($form);
+    return $output;
 }
 
 /**
@@ -244,15 +244,15 @@ 
  * @param string $name
  */
 function jump_menu_get_menu_options(&$options, $name) {
-  $tree = menu_tree_page_data($name);
-  $front = variable_get('site_frontpage', 'node');
-  foreach ($tree as $data) {
+    $tree = menu_tree_page_data($name);
+    $front = variable_get('site_frontpage', 'node');
+    foreach ($tree as $data) {
     if (!$data['link']['hidden']) {
-      $href = ($data['link']['href'] == '<front>') ? $front : $data['link']['href'];
-      $href = (isset($data['link']['options']['fragment'])) ? $href . '#' . $data['link']['options']['fragment'] : $href;
-      $options[$href] = $data['link']['title'];
+        $href = ($data['link']['href'] == '<front>') ? $front : $data['link']['href'];
+        $href = (isset($data['link']['options']['fragment'])) ? $href . '#' . $data['link']['options']['fragment'] : $href;
+        $options[$href] = $data['link']['title'];
+    }
     }
-  }
 }
 
 /**
@@ -262,10 +262,10 @@ 
  * @param integer $vid
  */
 function jump_menu_get_taxo_options(&$options, $vid) {
-  $tree = taxonomy_get_tree($vid);
-  foreach ($tree as $term) {
+    $tree = taxonomy_get_tree($vid);
+    foreach ($tree as $term) {
     $options[taxonomy_term_path($term)] = $term->name;
-  }
+    }
 }
 
 /**
@@ -276,14 +276,14 @@ 
  * @return array
  */
 function jump_forms($form_id) {
-  // Ensure we map a callback for our form and not something else
-  $forms = array();
-  if (strpos($form_id, 'jump_quickly_form') === 0) {
+    // Ensure we map a callback for our form and not something else
+    $forms = array();
+    if (strpos($form_id, 'jump_quickly_form') === 0) {
     // Let the forms API know where to get the form data corresponding
     // to this form id.
     $forms[$form_id] = array('callback' => 'jump_quickly_form');
-  }
-  return $forms;
+    }
+    return $forms;
 }
 
 /**
@@ -292,11 +292,11 @@ 
  * @return array
  */
 function jump_theme() {
-  return array(
+    return array(
     'jump_quickly_form' => array(
-      'arguments' => array('form')
+        'arguments' => array('form')
     )
-  );
+    );
 }
 
 /**
@@ -308,7 +308,7 @@ 
  * @param string $form_id
  */
 function jump_form_alter(&$form, $form_state, $form_id) {
-  switch ($form_id) {
+    switch ($form_id) {
     case 'block_admin_configure':
       if ($form['module']['#value'] === 'jump' && function_exists('ahah_helper_register')) {
         $delta = $form['delta']['#value'];
@@ -317,45 +317,45 @@ 
         $default_jump_add_select = (!isset($form_state['storage']['jump_add_select_' . $delta])) ? variable_get('jump_add_select_' . $delta, 0) : $form_state['storage']['jump_add_select_' . $delta];
 
         $form['block_settings']['jump_wrapper'] = array(
-          '#prefix' => '<div id="jump-wrapper">',
-          '#suffix' => '</div>',
-          '#type' => 'markup'
+            '#prefix' => '<div id="jump-wrapper">',
+            '#suffix' => '</div>',
+            '#type' => 'markup'
         );
         $form['block_settings']['jump_wrapper']['jump_use_js_' . $delta] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Hide the submit button and use Javascript to automatically jump to the selected menu item'),
-          '#default_value' => $default_jump_use_js,
-          '#disabled' => ($default_jump_add_select === 1) ? TRUE : FALSE,
-          '#ahah' => array(
+            '#type' => 'checkbox',
+            '#title' => t('Hide the submit button and use Javascript to automatically jump to the selected menu item'),
+            '#default_value' => $default_jump_use_js,
+            '#disabled' => ($default_jump_add_select === 1) ? TRUE : FALSE,
+            '#ahah' => array(
             'event' => 'change',
             'path' => ahah_helper_path(array('block_settings', 'jump_wrapper')),
             'wrapper' => 'jump-wrapper',
-          ),
+            ),
         );
         if ($default_jump_use_js === 1) {
-          $form['block_settings']['jump_wrapper']['jump_add_select_' . $delta] = array(
+            $form['block_settings']['jump_wrapper']['jump_add_select_' . $delta] = array(
             '#type' => 'checkbox',
             '#title' => t('Add an empty select option into the list of options'),
             '#default_value' => $default_jump_add_select,
             '#weight' => 1,
             '#ahah' => array(
-              'event' => 'change',
-              'path' => ahah_helper_path(array('block_settings', 'jump_wrapper')),
-              'wrapper' => 'jump-wrapper',
+                'event' => 'change',
+                'path' => ahah_helper_path(array('block_settings', 'jump_wrapper')),
+                'wrapper' => 'jump-wrapper',
             ),
-          );
-          if ($default_jump_add_select === 1) {
+            );
+            if ($default_jump_add_select === 1) {
             $form['block_settings']['jump_wrapper']['jump_add_select_text_' . $delta] = array(
-              '#type' => 'textfield',
-              '#title' => t('Text to use for the empty select option'),
-              '#default_value' => variable_get('jump_add_select_text_' . $delta, t('Select Option')),
-              '#weight' => 2
+                '#type' => 'textfield',
+                '#title' => t('Text to use for the empty select option'),
+                '#default_value' => variable_get('jump_add_select_text_' . $delta, t('Select Option')),
+                '#weight' => 2
             );
-          }
+            }
         }
-      }
-      break;
-  }
+        }
+        break;
+    }
 }
 
 /**
@@ -365,16 +365,16 @@ 
  * @return integer
  */
 function jump_get_active_setting($delta) {
-  $active_site_default = variable_get('jump_activepageinmenu', 1);
-  $active = variable_get('jump_activepageinmenu_' . $delta, $active_site_default);
-  return $active;
+    $active_site_default = variable_get('jump_activepageinmenu', 1);
+    $active = variable_get('jump_activepageinmenu_' . $delta, $active_site_default);
+    return $active;
 }
 
 /**
  * Implementation of hook_views_api().
  */
 function jump_views_api() {
-  return array(
+    return array(
     'api' => 2,
-  );
+    );
 }

Switch Indentation +87 added lines, -87 removed lines

@@ -49,62 +49,62 @@ 
  */
 function jump_block($op = 'list', $delta = 0, $edit = array()) {
   switch ($op) {
-    case 'list':
-      $blocks = array();
-      foreach (menu_get_menus() as $name => $title) {
-        $blocks['menu-' . $name] = array(
-          'info' => t('Jump menu: !menu', array('!menu' => $name))
-        );
-      }
+  case 'list':
+    $blocks = array();
+    foreach (menu_get_menus() as $name => $title) {
+      $blocks['menu-' . $name] = array(
+        'info' => t('Jump menu: !menu', array('!menu' => $name))
+      );
+    }
 
-      $vocs = taxonomy_get_vocabularies();
-      foreach ($vocs as $vid => $vocabulary) {
-        $blocks['taxo-' . $vid] = array(
-          'info' => t('Jump menu: !voc', array('!voc' => $vocabulary->name))
-        );
-      }
-      return $blocks;
-    case 'configure':
-      $form = array();
-      $form['block_settings']['jump_activepageinmenu_' . $delta] = array(
-        '#type' => 'checkbox',
-        '#title' => t('Show active page in jump menu.'),
-        '#default_value' => variable_get('jump_activepageinmenu_' . $delta, 1),
-        '#description' => t('This setting will force the jump menu to show the current page as the default selection in this block\'s jump menu.'),
+    $vocs = taxonomy_get_vocabularies();
+    foreach ($vocs as $vid => $vocabulary) {
+      $blocks['taxo-' . $vid] = array(
+        'info' => t('Jump menu: !voc', array('!voc' => $vocabulary->name))
       );
-      // Do the rest of the form additions in hook_form_alter() since we can't do ahah here.
-      return $form;
-    case 'save':
-      variable_set('jump_activepageinmenu_' . $delta, $edit['jump_activepageinmenu_' . $delta]);
-      variable_set('jump_use_js_' . $delta, $edit['jump_use_js_' . $delta]);
-      variable_set('jump_add_select_' . $delta, $edit['jump_add_select_' . $delta]);
-      variable_set('jump_add_select_text_' . $delta, $edit['jump_add_select_text_' . $delta]);
-      break;
-    case 'view':
-      // The first 5 characters of $delta should be one of:
-      //    menu-
-      //    taxo-
-      $subject = '';
-      $jumpmenu_type = substr($delta, 0, 4);
-      $jumpmenu_name = substr($delta, 5);
-      $active = jump_get_active_setting($delta);
-      if ($jumpmenu_type == 'menu') {
-        $form = jump_quickly($jumpmenu_name, 'menu', $active);
+    }
+    return $blocks;
+  case 'configure':
+    $form = array();
+    $form['block_settings']['jump_activepageinmenu_' . $delta] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Show active page in jump menu.'),
+      '#default_value' => variable_get('jump_activepageinmenu_' . $delta, 1),
+      '#description' => t('This setting will force the jump menu to show the current page as the default selection in this block\'s jump menu.'),
+    );
+    // Do the rest of the form additions in hook_form_alter() since we can't do ahah here.
+    return $form;
+  case 'save':
+    variable_set('jump_activepageinmenu_' . $delta, $edit['jump_activepageinmenu_' . $delta]);
+    variable_set('jump_use_js_' . $delta, $edit['jump_use_js_' . $delta]);
+    variable_set('jump_add_select_' . $delta, $edit['jump_add_select_' . $delta]);
+    variable_set('jump_add_select_text_' . $delta, $edit['jump_add_select_text_' . $delta]);
+    break;
+  case 'view':
+    // The first 5 characters of $delta should be one of:
+    //    menu-
+    //    taxo-
+    $subject = '';
+    $jumpmenu_type = substr($delta, 0, 4);
+    $jumpmenu_name = substr($delta, 5);
+    $active = jump_get_active_setting($delta);
+    if ($jumpmenu_type == 'menu') {
+      $form = jump_quickly($jumpmenu_name, 'menu', $active);
 
-        // Use the menu label as the default block subject
-        $menus = menu_get_menus();
-        $subject = $menus[$jumpmenu_name];
-      }
-      else if ($jumpmenu_type == 'taxo') {
-        $form = jump_quickly($jumpmenu_name, 'taxo', $active);
+      // Use the menu label as the default block subject
+      $menus = menu_get_menus();
+      $subject = $menus[$jumpmenu_name];
+    }
+    else if ($jumpmenu_type == 'taxo') {
+      $form = jump_quickly($jumpmenu_name, 'taxo', $active);
 
-        // Use the vocabulary name as the default block subject
-        $vocab = taxonomy_vocabulary_load($jumpmenu_name);
-        $subject = $vocab->name;
-      }
-      if (variable_get('jump_use_js_' . $delta, 0) === 1) drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-      return array('subject' => $subject, 'content' => $form);
-      break;
+      // Use the vocabulary name as the default block subject
+      $vocab = taxonomy_vocabulary_load($jumpmenu_name);
+      $subject = $vocab->name;
+    }
+    if (variable_get('jump_use_js_' . $delta, 0) === 1) drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+    return array('subject' => $subject, 'content' => $form);
+    break;
   }
 }
 
@@ -309,52 +309,52 @@ 
  */
 function jump_form_alter(&$form, $form_state, $form_id) {
   switch ($form_id) {
-    case 'block_admin_configure':
-      if ($form['module']['#value'] === 'jump' && function_exists('ahah_helper_register')) {
-        $delta = $form['delta']['#value'];
-        ahah_helper_register($form, $form_state);
-        $default_jump_use_js = (!isset($form_state['storage']['jump_use_js_' . $delta])) ? variable_get('jump_use_js_' . $delta, 0) : $form_state['storage']['jump_use_js_' . $delta];
-        $default_jump_add_select = (!isset($form_state['storage']['jump_add_select_' . $delta])) ? variable_get('jump_add_select_' . $delta, 0) : $form_state['storage']['jump_add_select_' . $delta];
+  case 'block_admin_configure':
+    if ($form['module']['#value'] === 'jump' && function_exists('ahah_helper_register')) {
+      $delta = $form['delta']['#value'];
+      ahah_helper_register($form, $form_state);
+      $default_jump_use_js = (!isset($form_state['storage']['jump_use_js_' . $delta])) ? variable_get('jump_use_js_' . $delta, 0) : $form_state['storage']['jump_use_js_' . $delta];
+      $default_jump_add_select = (!isset($form_state['storage']['jump_add_select_' . $delta])) ? variable_get('jump_add_select_' . $delta, 0) : $form_state['storage']['jump_add_select_' . $delta];
 
-        $form['block_settings']['jump_wrapper'] = array(
-          '#prefix' => '<div id="jump-wrapper">',
-          '#suffix' => '</div>',
-          '#type' => 'markup'
-        );
-        $form['block_settings']['jump_wrapper']['jump_use_js_' . $delta] = array(
+      $form['block_settings']['jump_wrapper'] = array(
+        '#prefix' => '<div id="jump-wrapper">',
+        '#suffix' => '</div>',
+        '#type' => 'markup'
+      );
+      $form['block_settings']['jump_wrapper']['jump_use_js_' . $delta] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Hide the submit button and use Javascript to automatically jump to the selected menu item'),
+        '#default_value' => $default_jump_use_js,
+        '#disabled' => ($default_jump_add_select === 1) ? TRUE : FALSE,
+        '#ahah' => array(
+          'event' => 'change',
+          'path' => ahah_helper_path(array('block_settings', 'jump_wrapper')),
+          'wrapper' => 'jump-wrapper',
+        ),
+      );
+      if ($default_jump_use_js === 1) {
+        $form['block_settings']['jump_wrapper']['jump_add_select_' . $delta] = array(
           '#type' => 'checkbox',
-          '#title' => t('Hide the submit button and use Javascript to automatically jump to the selected menu item'),
-          '#default_value' => $default_jump_use_js,
-          '#disabled' => ($default_jump_add_select === 1) ? TRUE : FALSE,
+          '#title' => t('Add an empty select option into the list of options'),
+          '#default_value' => $default_jump_add_select,
+          '#weight' => 1,
           '#ahah' => array(
             'event' => 'change',
             'path' => ahah_helper_path(array('block_settings', 'jump_wrapper')),
             'wrapper' => 'jump-wrapper',
           ),
         );
-        if ($default_jump_use_js === 1) {
-          $form['block_settings']['jump_wrapper']['jump_add_select_' . $delta] = array(
-            '#type' => 'checkbox',
-            '#title' => t('Add an empty select option into the list of options'),
-            '#default_value' => $default_jump_add_select,
-            '#weight' => 1,
-            '#ahah' => array(
-              'event' => 'change',
-              'path' => ahah_helper_path(array('block_settings', 'jump_wrapper')),
-              'wrapper' => 'jump-wrapper',
-            ),
+        if ($default_jump_add_select === 1) {
+          $form['block_settings']['jump_wrapper']['jump_add_select_text_' . $delta] = array(
+            '#type' => 'textfield',
+            '#title' => t('Text to use for the empty select option'),
+            '#default_value' => variable_get('jump_add_select_text_' . $delta, t('Select Option')),
+            '#weight' => 2
           );
-          if ($default_jump_add_select === 1) {
-            $form['block_settings']['jump_wrapper']['jump_add_select_text_' . $delta] = array(
-              '#type' => 'textfield',
-              '#title' => t('Text to use for the empty select option'),
-              '#default_value' => variable_get('jump_add_select_text_' . $delta, t('Select Option')),
-              '#weight' => 2
-            );
-          }
         }
       }
-      break;
+    }
+    break;
   }
 }
 

Spacing +23 added lines, -23 removed lines

@@ -52,33 +52,33 @@ 
     case 'list':
       $blocks = array();
       foreach (menu_get_menus() as $name => $title) {
-        $blocks['menu-' . $name] = array(
+        $blocks['menu-'.$name] = array(
           'info' => t('Jump menu: !menu', array('!menu' => $name))
         );
       }
 
       $vocs = taxonomy_get_vocabularies();
       foreach ($vocs as $vid => $vocabulary) {
-        $blocks['taxo-' . $vid] = array(
+        $blocks['taxo-'.$vid] = array(
           'info' => t('Jump menu: !voc', array('!voc' => $vocabulary->name))
         );
       }
       return $blocks;
     case 'configure':
       $form = array();
-      $form['block_settings']['jump_activepageinmenu_' . $delta] = array(
+      $form['block_settings']['jump_activepageinmenu_'.$delta] = array(
         '#type' => 'checkbox',
         '#title' => t('Show active page in jump menu.'),
-        '#default_value' => variable_get('jump_activepageinmenu_' . $delta, 1),
+        '#default_value' => variable_get('jump_activepageinmenu_'.$delta, 1),
         '#description' => t('This setting will force the jump menu to show the current page as the default selection in this block\'s jump menu.'),
       );
       // Do the rest of the form additions in hook_form_alter() since we can't do ahah here.
       return $form;
     case 'save':
-      variable_set('jump_activepageinmenu_' . $delta, $edit['jump_activepageinmenu_' . $delta]);
-      variable_set('jump_use_js_' . $delta, $edit['jump_use_js_' . $delta]);
-      variable_set('jump_add_select_' . $delta, $edit['jump_add_select_' . $delta]);
-      variable_set('jump_add_select_text_' . $delta, $edit['jump_add_select_text_' . $delta]);
+      variable_set('jump_activepageinmenu_'.$delta, $edit['jump_activepageinmenu_'.$delta]);
+      variable_set('jump_use_js_'.$delta, $edit['jump_use_js_'.$delta]);
+      variable_set('jump_add_select_'.$delta, $edit['jump_add_select_'.$delta]);
+      variable_set('jump_add_select_text_'.$delta, $edit['jump_add_select_text_'.$delta]);
       break;
     case 'view':
       // The first 5 characters of $delta should be one of:
@@ -102,7 +102,7 @@ 
         $vocab = taxonomy_vocabulary_load($jumpmenu_name);
         $subject = $vocab->name;
       }
-      if (variable_get('jump_use_js_' . $delta, 0) === 1) drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+      if (variable_get('jump_use_js_'.$delta, 0) === 1) drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
       return array('subject' => $subject, 'content' => $form);
       break;
   }
@@ -125,7 +125,7 @@ 
  */
 function jump_quickly($name = 'navigation', $type = 'menu', $active = -1, $override = '') {
   // Reconstruct the $delta
-  $delta = $type . '-' . $name;
+  $delta = $type.'-'.$name;
   if ($active === -1) {
     $active = variable_get('jump_activepageinmenu', 1);
   }
@@ -153,7 +153,7 @@ 
   static $num_jump_forms = 0;
   $num_jump_forms++;
 
-  return drupal_get_form('jump_quickly_form_' . $num_jump_forms, $options, $menu_state);
+  return drupal_get_form('jump_quickly_form_'.$num_jump_forms, $options, $menu_state);
 }
 
 /**
@@ -188,15 +188,15 @@ 
     '#type' => 'submit',
     '#value' => t('Go')
   );
-  if (variable_get('jump_use_js_' . $menu_state['delta'], 0) === 1) {
+  if (variable_get('jump_use_js_'.$menu_state['delta'], 0) === 1) {
     // Give each menu a unique name.
-    $form['#attributes']['name'] = 'jumpquickly' . $menu_state['delta'];
+    $form['#attributes']['name'] = 'jumpquickly'.$menu_state['delta'];
     $form['#attributes']['class'] .= ' js-enabled';
 //    unset($form['submit']);
-    if (variable_get('jump_add_select_' . $menu_state['delta'], 0) === 1) {
+    if (variable_get('jump_add_select_'.$menu_state['delta'], 0) === 1) {
       $form['jump_goto']['#attributes']['class'] = 'first-no-jump';
       // Add the extra empty select option to the top of the array.
-      $form['jump_goto']['#options'] = array('' => variable_get('jump_add_select_text_' . $menu_state['delta'], t('Select Option'))) + $options;
+      $form['jump_goto']['#options'] = array('' => variable_get('jump_add_select_text_'.$menu_state['delta'], t('Select Option'))) + $options;
       $form['jump_goto']['#default_value'] = (array_key_exists($default, $options)) ? $default : '';
     }
   }
@@ -249,7 +249,7 @@ 
   foreach ($tree as $data) {
     if (!$data['link']['hidden']) {
       $href = ($data['link']['href'] == '<front>') ? $front : $data['link']['href'];
-      $href = (isset($data['link']['options']['fragment'])) ? $href . '#' . $data['link']['options']['fragment'] : $href;
+      $href = (isset($data['link']['options']['fragment'])) ? $href.'#'.$data['link']['options']['fragment'] : $href;
       $options[$href] = $data['link']['title'];
     }
   }
@@ -313,15 +313,15 @@ 
       if ($form['module']['#value'] === 'jump' && function_exists('ahah_helper_register')) {
         $delta = $form['delta']['#value'];
         ahah_helper_register($form, $form_state);
-        $default_jump_use_js = (!isset($form_state['storage']['jump_use_js_' . $delta])) ? variable_get('jump_use_js_' . $delta, 0) : $form_state['storage']['jump_use_js_' . $delta];
-        $default_jump_add_select = (!isset($form_state['storage']['jump_add_select_' . $delta])) ? variable_get('jump_add_select_' . $delta, 0) : $form_state['storage']['jump_add_select_' . $delta];
+        $default_jump_use_js = (!isset($form_state['storage']['jump_use_js_'.$delta])) ? variable_get('jump_use_js_'.$delta, 0) : $form_state['storage']['jump_use_js_'.$delta];
+        $default_jump_add_select = (!isset($form_state['storage']['jump_add_select_'.$delta])) ? variable_get('jump_add_select_'.$delta, 0) : $form_state['storage']['jump_add_select_'.$delta];
 
         $form['block_settings']['jump_wrapper'] = array(
           '#prefix' => '<div id="jump-wrapper">',
           '#suffix' => '</div>',
           '#type' => 'markup'
         );
-        $form['block_settings']['jump_wrapper']['jump_use_js_' . $delta] = array(
+        $form['block_settings']['jump_wrapper']['jump_use_js_'.$delta] = array(
           '#type' => 'checkbox',
           '#title' => t('Hide the submit button and use Javascript to automatically jump to the selected menu item'),
           '#default_value' => $default_jump_use_js,
@@ -333,7 +333,7 @@ 
           ),
         );
         if ($default_jump_use_js === 1) {
-          $form['block_settings']['jump_wrapper']['jump_add_select_' . $delta] = array(
+          $form['block_settings']['jump_wrapper']['jump_add_select_'.$delta] = array(
             '#type' => 'checkbox',
             '#title' => t('Add an empty select option into the list of options'),
             '#default_value' => $default_jump_add_select,
@@ -345,10 +345,10 @@ 
             ),
           );
           if ($default_jump_add_select === 1) {
-            $form['block_settings']['jump_wrapper']['jump_add_select_text_' . $delta] = array(
+            $form['block_settings']['jump_wrapper']['jump_add_select_text_'.$delta] = array(
               '#type' => 'textfield',
               '#title' => t('Text to use for the empty select option'),
-              '#default_value' => variable_get('jump_add_select_text_' . $delta, t('Select Option')),
+              '#default_value' => variable_get('jump_add_select_text_'.$delta, t('Select Option')),
               '#weight' => 2
             );
           }
@@ -366,7 +366,7 @@ 
  */
 function jump_get_active_setting($delta) {
   $active_site_default = variable_get('jump_activepageinmenu', 1);
-  $active = variable_get('jump_activepageinmenu_' . $delta, $active_site_default);
+  $active = variable_get('jump_activepageinmenu_'.$delta, $active_site_default);
   return $active;
 }
 

Braces +4 added lines, -8 removed lines

@@ -94,8 +94,7 @@ 
         // Use the menu label as the default block subject
         $menus = menu_get_menus();
         $subject = $menus[$jumpmenu_name];
-      }
-      else if ($jumpmenu_type == 'taxo') {
+      } else if ($jumpmenu_type == 'taxo') {
         $form = jump_quickly($jumpmenu_name, 'taxo', $active);
 
         // Use the vocabulary name as the default block subject
@@ -137,13 +136,11 @@ 
 
   if (is_array($name)) {
     $options = $name;
-  }
-  else {
+  } else {
     $options = array();
     if ($type == 'menu') {
       jump_menu_get_menu_options($options, $name);
-    }
-    elseif ($type == 'taxo') {
+    } elseif ($type == 'taxo') {
       jump_menu_get_taxo_options($options, $name);
     }
   }
@@ -215,8 +212,7 @@ 
     $fragment = explode('#', $form_state['values']['jump_goto']);
     if (isset($fragment[1])) {
       drupal_goto($fragment[0], NULL, $fragment[1]);
-    }
-    else {
+    } else {
       drupal_goto($form_state['values']['jump_goto']);
     }
   }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -214,7 +214,7 @@ 
   if (!empty($form_state['values']['jump_goto'])) {
     $fragment = explode('#', $form_state['values']['jump_goto']);
     if (isset($fragment[1])) {
-      drupal_goto($fragment[0], NULL, $fragment[1]);
+      drupal_goto($fragment[0], null, $fragment[1]);
     }
     else {
       drupal_goto($form_state['values']['jump_goto']);
@@ -325,7 +325,7 @@ 
           '#type' => 'checkbox',
           '#title' => t('Hide the submit button and use Javascript to automatically jump to the selected menu item'),
           '#default_value' => $default_jump_use_js,
-          '#disabled' => ($default_jump_add_select === 1) ? TRUE : FALSE,
+          '#disabled' => ($default_jump_add_select === 1) ? true : false,
           '#ahah' => array(
             'event' => 'change',
             'path' => ahah_helper_path(array('block_settings', 'jump_wrapper')),

drupal/sites/default/boinc/modules/contrib/jump/jump.views.inc

Indentation +4 added lines, -4 removed lines

@@ -9,9 +9,9 @@ 
  * Implementation of hook_views_plugins().
  */
 function jump_views_plugins() {
-  return array(
+    return array(
     'style' => array(
-      'jump_views' => array(
+        'jump_views' => array(
         'title' => t('Jump menu'),
         'theme' => 'jump_views_plugin_style',
         'help' => t('Displays items as a select list jump menu.'),
@@ -20,7 +20,7 @@ 
         'uses fields' => TRUE,
         'uses options' => TRUE,
         'type' => 'normal',
-      ),
+        ),
     ),
-  );
+    );
 }

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -16,9 +16,9 @@
         'theme' => 'jump_views_plugin_style',
         'help' => t('Displays items as a select list jump menu.'),
         'handler' => 'jump_views_plugin_style',
-        'uses row plugin' => TRUE,
-        'uses fields' => TRUE,
-        'uses options' => TRUE,
+        'uses row plugin' => true,
+        'uses fields' => true,
+        'uses options' => true,
         'type' => 'normal',
       ),
     ),

drupal/sites/default/boinc/modules/contrib/jump/jump.views_default.inc

Indentation +64 added lines, -64 removed lines

@@ -9,20 +9,20 @@ 
  * Implementation of hook_views_default_views().
  */
 function jump_views_default_views() {
-  $view = new view;
-  $view->name = 'recent_nodes_jump_menu';
-  $view->description = 'Recent nodes in a jump menu.';
-  $view->tag = '';
-  $view->view_php = '';
-  $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
-  $view->disabled = TRUE;
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
+    $view = new view;
+    $view->name = 'recent_nodes_jump_menu';
+    $view->description = 'Recent nodes in a jump menu.';
+    $view->tag = '';
+    $view->view_php = '';
+    $view->base_table = 'node';
+    $view->is_cacheable = FALSE;
+    $view->api_version = 2;
+    $view->disabled = TRUE;
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('fields', array(
     'nid' => array(
-      'label' => 'Nid',
-      'alter' => array(
+        'label' => 'Nid',
+        'alter' => array(
         'alter_text' => 1,
         'text' => 'node/[nid]',
         'make_link' => 0,
@@ -38,17 +38,17 @@ 
         'ellipsis' => 1,
         'strip_tags' => 0,
         'html' => 0,
-      ),
-      'link_to_node' => 0,
-      'exclude' => 1,
-      'id' => 'nid',
-      'table' => 'node',
-      'field' => 'nid',
-      'relationship' => 'none',
+        ),
+        'link_to_node' => 0,
+        'exclude' => 1,
+        'id' => 'nid',
+        'table' => 'node',
+        'field' => 'nid',
+        'relationship' => 'none',
     ),
     'title' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -64,60 +64,60 @@ 
         'ellipsis' => 1,
         'strip_tags' => 0,
         'html' => 0,
-      ),
-      'link_to_node' => 0,
-      'exclude' => 0,
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
-      'relationship' => 'none',
+        ),
+        'link_to_node' => 0,
+        'exclude' => 0,
+        'id' => 'title',
+        'table' => 'node',
+        'field' => 'title',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('sorts', array(
+    ));
+    $handler->override_option('sorts', array(
     'changed' => array(
-      'order' => 'DESC',
-      'granularity' => 'second',
-      'id' => 'changed',
-      'table' => 'node',
-      'field' => 'changed',
-      'relationship' => 'none',
+        'order' => 'DESC',
+        'granularity' => 'second',
+        'id' => 'changed',
+        'table' => 'node',
+        'field' => 'changed',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('filters', array(
     'status_extra' => array(
-      'operator' => '=',
-      'value' => '',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        'operator' => '=',
+        'value' => '',
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'status_extra',
-      'table' => 'node',
-      'field' => 'status_extra',
-      'relationship' => 'none',
+        ),
+        'id' => 'status_extra',
+        'table' => 'node',
+        'field' => 'status_extra',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('access', array(
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('style_plugin', 'jump_views');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('style_plugin', 'jump_views');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'keys' => array(
-      'nid' => 'nid',
-      'title' => 0,
+        'nid' => 'nid',
+        'title' => 0,
     ),
     'first_item' => 'Recent nodes',
-  ));
-  $handler = $view->new_display('block', 'Block', 'block_1');
-  $handler->override_option('block_description', '');
-  $handler->override_option('block_caching', -1);
+    ));
+    $handler = $view->new_display('block', 'Block', 'block_1');
+    $handler->override_option('block_description', '');
+    $handler->override_option('block_caching', -1);
 
-  $views[$view->name] = $view;
-  return $views;
+    $views[$view->name] = $view;
+    return $views;
 }

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -15,9 +15,9 @@ 
   $view->tag = '';
   $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
+  $view->is_cacheable = false;
   $view->api_version = 2;
-  $view->disabled = TRUE;
+  $view->disabled = true;
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
     'nid' => array(
@@ -88,9 +88,9 @@ 
       'operator' => '=',
       'value' => '',
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'status_extra',

drupal/sites/default/boinc/modules/contrib/jump/jump_views_plugin_style.inc

Indentation +63 added lines, -63 removed lines

@@ -7,11 +7,11 @@ 
 
 class jump_views_plugin_style extends views_plugin_style {
 
-  function render() {
+    function render() {
     // Build an array of field / field_alias pairs.
     $this->field_map = array();
     foreach ($this->view->field as $field_name => $object) {
-      $this-> field_map[$object->field_alias] = $field_name;
+        $this-> field_map[$object->field_alias] = $field_name;
     }
 
     // $keys contains the fields used to build up the path.
@@ -21,116 +21,116 @@ 
     // callback.
     $select = array();
     if (!empty($this->options['first_item'])) {
-      $select[0] = $this->options['first_item'];
+        $select[0] = $this->options['first_item'];
     }
 
     foreach ($this->view->result as $row) {
-      $select_key = array();
-      // For each field in the row, we first check if it's to be used
-      // as part of the select key, then run views token replacement
-      // on it. This allows for paths like node/n/revisions/6 to be built
-      // easily.
-      foreach ($row as $field => $value) {
+        $select_key = array();
+        // For each field in the row, we first check if it's to be used
+        // as part of the select key, then run views token replacement
+        // on it. This allows for paths like node/n/revisions/6 to be built
+        // easily.
+        foreach ($row as $field => $value) {
         if (in_array($this->field_map[$field], $keys)) {
-          $field_object = $this->view->field[$this->field_map[$field]];
-          // Re-implementing some of the code from views_handler_field.inc
-          // since we need to operate on $result, and to avoid using
-          // a row style or templates.
-          if (!empty($field_object->options['alter']['alter_text']) && !empty($field_object->options['alter']['text'])) {
+            $field_object = $this->view->field[$this->field_map[$field]];
+            // Re-implementing some of the code from views_handler_field.inc
+            // since we need to operate on $result, and to avoid using
+            // a row style or templates.
+            if (!empty($field_object->options['alter']['alter_text']) && !empty($field_object->options['alter']['text'])) {
             $tokens = $this->get_render_tokens($this->field_map[$field], $row);
             $value = $field_object->render_altered($tokens);
-          }
-          $select_key[] = $value;
+            }
+            $select_key[] = $value;
         }
-      }
-      // For the value of the select, just use the output of the row, but strip
-      // all markup first.
-      $select_key = implode('/', $select_key);
-      $raw_select_value = $this->row_plugin->render($row);
-      $select_value = trim(html_entity_decode(strip_tags($raw_select_value), ENT_QUOTES));
-      $select[$select_key] = $select_value;
+        }
+        // For the value of the select, just use the output of the row, but strip
+        // all markup first.
+        $select_key = implode('/', $select_key);
+        $raw_select_value = $this->row_plugin->render($row);
+        $select_value = trim(html_entity_decode(strip_tags($raw_select_value), ENT_QUOTES));
+        $select[$select_key] = $select_value;
     }
 
     return jump_quickly($select);
-  }
+    }
 
-  function option_definition() {
+    function option_definition() {
     $options = parent::option_definition();
     $options['keys'] = array('default' => array());
     $options['first_item'] = array('default' => '');
     return $options;
-  }
+    }
 
-  function options_form(&$form, $form_state) {
+    function options_form(&$form, $form_state) {
     parent::options_form($form, $form_state);
     $handlers = $this->display->handler->get_handlers('field');
     if (empty($handlers)) {
-      $form['error_markup'] = array(
+        $form['error_markup'] = array(
         '#value' => t('You need at least one field before you can configure your jump menu settings'),
         '#prefix' => '<div class="error form-item description">',
         '#suffix' => '</div>',
-      );
-      return;
+        );
+        return;
     }
     // Create an array of fields from the data we know.
     foreach ($handlers as $field => $handler) {
-      if ($label = $handler->label()) {
+        if ($label = $handler->label()) {
         $field_names[$field] = $label;
-      }
-      else {
+        }
+        else {
         $field_names[$field] = $handler->ui_name();
-      }
+        }
     }
     $form['keys'] = array(
-      '#type' => 'checkboxes',
-      '#title' => t('Select keys'),
-      '#default_value' => $this->options['keys'],
-      '#description' => t("These fields will be used to build the path for each row, used as the 'key' in the select options, and will be automatically separated by '/'"),
-      '#options' => $field_names,
+        '#type' => 'checkboxes',
+        '#title' => t('Select keys'),
+        '#default_value' => $this->options['keys'],
+        '#description' => t("These fields will be used to build the path for each row, used as the 'key' in the select options, and will be automatically separated by '/'"),
+        '#options' => $field_names,
     );
     $form['first_item'] = array(
-      '#type' => 'textfield',
-      '#title' => 'First item',
-      '#default_value' => $this->options['first_item'],
-      '#description' => t('This will be used as the first item in your select list, for example <em>Choose one</em>'),
+        '#type' => 'textfield',
+        '#title' => 'First item',
+        '#default_value' => $this->options['first_item'],
+        '#description' => t('This will be used as the first item in your select list, for example <em>Choose one</em>'),
     );
-  }
+    }
 
-  /**
-   * Get the 'render' tokens to use for advanced rendering.
-   *
-   * This runs through all of the fields and arguments that
-   * are available and gets their values. This will then be
-   * used in one giant str_replace().
-   * Slightly modified from views_handler_field.inc
-   */
-  function get_render_tokens($field_name, $row) {
+    /**
+     * Get the 'render' tokens to use for advanced rendering.
+     *
+     * This runs through all of the fields and arguments that
+     * are available and gets their values. This will then be
+     * used in one giant str_replace().
+     * Slightly modified from views_handler_field.inc
+     */
+    function get_render_tokens($field_name, $row) {
     $tokens = array();
     if (!empty($this->view->build_info['substitutions'])) {
-      $tokens = $this->view->build_info['substitutions'];
+        $tokens = $this->view->build_info['substitutions'];
     }
 
     $count = 0;
     foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
-      $token = '%'. ++$count;
-      if (!isset($tokens[$token])) {
+        $token = '%'. ++$count;
+        if (!isset($tokens[$token])) {
         $tokens[$token] = '';
-      }
+        }
     }
 
     // Now add replacements for our fields.
     $options = array();
     $map = array_flip($this->field_map);
     foreach ($this->view->display_handler->get_handlers('field') as $field => $handler) {
-      $map = array_flip($this->field_map);
-      if (isset($row->$map[$field])) {
+        $map = array_flip($this->field_map);
+        if (isset($row->$map[$field])) {
         $tokens["[$field]"] = $row->$map[$field];
-      }
-      else {
+        }
+        else {
         $tokens["[$field]"] = '';
-      }
+        }
     }
 
     return $tokens;
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 
     $count = 0;
     foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
-      $token = '%'. ++$count;
+      $token = '%'.++$count;
       if (!isset($tokens[$token])) {
         $tokens[$token] = '';
       }

Braces +2 added lines, -4 removed lines

@@ -76,8 +76,7 @@ 
     foreach ($handlers as $field => $handler) {
       if ($label = $handler->label()) {
         $field_names[$field] = $label;
-      }
-      else {
+      } else {
         $field_names[$field] = $handler->ui_name();
       }
     }
@@ -125,8 +124,7 @@ 
       $map = array_flip($this->field_map);
       if (isset($row->$map[$field])) {
         $tokens["[$field]"] = $row->$map[$field];
-      }
-      else {
+      } else {
         $tokens["[$field]"] = '';
       }
     }

drupal/sites/default/boinc/modules/contrib/forum_access/forum_access.admin.inc

Indentation +470 added lines, -470 removed lines

@@ -12,33 +12,33 @@ 
  * Rewrite the forum administration page with our new access rules.
  */
 function _forum_access_forum_form(&$form, &$form_state, $is_container) {
-  $tid = (isset($form['tid']['#value']) ? $form['tid']['#value'] : NULL);
-  if (isset($tid) && !forum_access_access($tid, 'view', NULL, FALSE)) {
+    $tid = (isset($form['tid']['#value']) ? $form['tid']['#value'] : NULL);
+    if (isset($tid) && !forum_access_access($tid, 'view', NULL, FALSE)) {
     drupal_access_denied();  // Deny access if the user doesn't have View access.
     module_invoke_all('exit');
     exit;
-  }
+    }
 
-  $roles = user_roles();
-  if (isset($tid)) {  // edit
+    $roles = user_roles();
+    if (isset($tid)) {  // edit
     $template_tid = variable_get('forum_access_default_template_tid', 0);
     $settings = _forum_access_get_settings($tid);
-  }
-  else {  // create
+    }
+    else {  // create
     $template_tid = variable_get('forum_access_new_template_tid', NULL);
     $settings = _forum_access_get_settings($template_tid);
-  }
-  $fa_priority = $settings['priority'];
+    }
+    $fa_priority = $settings['priority'];
 
-  $form['forum_access'] = array(
+    $form['forum_access'] = array(
     '#type' => 'fieldset',
     '#title' => t('Access control'),
     '#collapsible' => TRUE,
     '#tree' => TRUE,
-  );
+    );
 
-  $tr = 't';
-  $variables = array(
+    $tr = 't';
+    $variables = array(
     '!access_content'                 => '<em>'. l($tr('access content'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
     '!access_comments'                => '<em>'. l($tr('access comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
     '!create_forum_topics'            => '<em>'. l($tr('create forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
@@ -51,368 +51,368 @@ 
     '!administer_comments'            => '<em>'. l($tr('administer comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
     '!administer_forums'              => '<em>'. l($tr('administer forums'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
     '!administer_nodes'               => '<em>'. l($tr('administer nodes'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
-  );
-  if (!$is_container) {
+    );
+    if (!$is_container) {
     $form['forum_access']['permissions'] = array(
-      '#type' => 'fieldset',
-      '#title' => $tr('Permissions information'),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+        '#type' => 'fieldset',
+        '#title' => $tr('Permissions information'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
     );
     $form['forum_access']['permissions'][] = array(
-      '#type' => 'markup',
-      '#value' => '<div>'. t('Note that users need') .'<ul style="margin-top: 0"><li>'.
-                           t('the !access_content and !access_comments permissions <strong>AND <em>View</em></strong> to be able to see this forum and its content at all,', $variables) .'</li><li>'.
-                           t('the !create_forum_topics (and similar) permissions <strong>AND <em>Post</em></strong> to be able to create forum content, and', $variables) .'</li><li>'.
-                           t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', FALSE) ? 'del title="'. t('Drupal 5 legacy mode') .'"' : 'strong'))) .'</li><li>'.
-                           t('the !edit_own_forum_topics or !edit_any_forum_topics (and similar) permissions <strong>AND (<em>Edit</em> AND <em>Comment</em></strong>) can be added if desired, <strong>plus</strong>', $variables) .'</li><li>'.
-                           t('the !delete_own_forum_topics or !delete_any_forum_topics (and similar) permissions (<strong>OR <em>Delete</em></strong>) if desired;', $variables) .'</li><li>'.
-                           t('the !administer_comments (global!) permission <strong>OR <em>Edit</em>/<em>Delete</em></strong> to be able to edit/delete comments;', $variables) .'</li><li>'.
-                           t('the !administer_forums permission <strong>AND <em>View</em></strong> to be able to administer forums (and change access!).', $variables) .'</li></ul>'.
-                           t('Furthermore note that content which is not published is treated in a different way by Drupal: it can be viewed only by its author or by users with the !administer_nodes permission. Unpublished comments and replies are accessible to users with <strong><em>Edit</em> OR <em>Delete</em></strong>, <strong>OR</strong> with the !administer_comments permission, but they are never counted on the forum page.', $variables) .'</div>',
-    );
-  }
-
-  // Load a template:
-  $vid = _forum_access_get_vid();
-  $form['forum_access']['template'] = array(
-      '#type' => 'fieldset',
-      '#title' => $tr('Template'),
-      '#collapsible' => TRUE,
-      '#collapsed' => empty($template_tid),
-  );
-  $form['forum_access']['template']['taxonomy'][$vid] = taxonomy_form($vid, array($template_tid), '');
-  $form['forum_access']['template']['taxonomy'][$vid]['#description'] = t("Select a forum and click !Load to retrieve that forum's settings as a starting point for this forum or container.", array('!Load' => '['. t('Load') .']'));
-  $form['forum_access']['template']['load_button'] = array(
+        '#type' => 'markup',
+        '#value' => '<div>'. t('Note that users need') .'<ul style="margin-top: 0"><li>'.
+                            t('the !access_content and !access_comments permissions <strong>AND <em>View</em></strong> to be able to see this forum and its content at all,', $variables) .'</li><li>'.
+                            t('the !create_forum_topics (and similar) permissions <strong>AND <em>Post</em></strong> to be able to create forum content, and', $variables) .'</li><li>'.
+                            t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', FALSE) ? 'del title="'. t('Drupal 5 legacy mode') .'"' : 'strong'))) .'</li><li>'.
+                            t('the !edit_own_forum_topics or !edit_any_forum_topics (and similar) permissions <strong>AND (<em>Edit</em> AND <em>Comment</em></strong>) can be added if desired, <strong>plus</strong>', $variables) .'</li><li>'.
+                            t('the !delete_own_forum_topics or !delete_any_forum_topics (and similar) permissions (<strong>OR <em>Delete</em></strong>) if desired;', $variables) .'</li><li>'.
+                            t('the !administer_comments (global!) permission <strong>OR <em>Edit</em>/<em>Delete</em></strong> to be able to edit/delete comments;', $variables) .'</li><li>'.
+                            t('the !administer_forums permission <strong>AND <em>View</em></strong> to be able to administer forums (and change access!).', $variables) .'</li></ul>'.
+                            t('Furthermore note that content which is not published is treated in a different way by Drupal: it can be viewed only by its author or by users with the !administer_nodes permission. Unpublished comments and replies are accessible to users with <strong><em>Edit</em> OR <em>Delete</em></strong>, <strong>OR</strong> with the !administer_comments permission, but they are never counted on the forum page.', $variables) .'</div>',
+    );
+    }
+
+    // Load a template:
+    $vid = _forum_access_get_vid();
+    $form['forum_access']['template'] = array(
+        '#type' => 'fieldset',
+        '#title' => $tr('Template'),
+        '#collapsible' => TRUE,
+        '#collapsed' => empty($template_tid),
+    );
+    $form['forum_access']['template']['taxonomy'][$vid] = taxonomy_form($vid, array($template_tid), '');
+    $form['forum_access']['template']['taxonomy'][$vid]['#description'] = t("Select a forum and click !Load to retrieve that forum's settings as a starting point for this forum or container.", array('!Load' => '['. t('Load') .']'));
+    $form['forum_access']['template']['load_button'] = array(
     '#type' => 'button',
     '#name' => 'load_template',
     '#value' => t('Load'),
     '#submit' => FALSE,
-  );
-  $form['forum_access']['template']['template_tid'] = array(
+    );
+    $form['forum_access']['template']['template_tid'] = array(
     '#type' => 'value',
     '#value' => NULL,
-  );
-  $form['forum_access']['template']['select_by_default'] = array(
+    );
+    $form['forum_access']['template']['select_by_default'] = array(
     '#type' => 'checkbox',
     '#title' => t('Remember this selection.'),
     '#default_value' => FALSE,
-  );
-  $form['forum_access']['template']['load_for_new'] = array(
+    );
+    $form['forum_access']['template']['load_for_new'] = array(
     '#type' => 'checkbox',
     '#title' => t("Use the selected forum's settings as defaults for new forums and containers."),
     '#default_value' => FALSE,
-  );
-  $form['forum_access']['#after_build'][] = '_forum_access_forum_form_after_build';
+    );
+    $form['forum_access']['#after_build'][] = '_forum_access_forum_form_after_build';
 
-  // Column titles:
-  $form['forum_access']['headers']['view'] = array(
+    // Column titles:
+    $form['forum_access']['headers']['view'] = array(
     '#type' => 'item',
     '#prefix' => '<div class="forum-access-div">',
     '#title' => ($is_container ? t('View this container') : t('View this forum')),
     '#suffix' => '</div>',
-  );
-  $forum_vocabulary = taxonomy_vocabulary_load(_forum_access_get_vid());
-  $form['forum_access']['headers']['create'] = array(
+    );
+    $forum_vocabulary = taxonomy_vocabulary_load(_forum_access_get_vid());
+    $form['forum_access']['headers']['create'] = array(
     '#type' => 'item',
     '#prefix' => '<div class="forum-access-div" id="forum-access-div-container">',
     '#title' => t('See this container in the %Forums selection list', array('%Forums' => $forum_vocabulary->name)),
     '#suffix' => '</div>',
-  );
-  if (!$is_container) {
+    );
+    if (!$is_container) {
     $form['forum_access']['headers']['create'] = array(  // overwrite!
-      '#type' => 'item',
-      '#prefix' => '<div class="forum-access-div">',
-      '#title' => t('Post in this forum'),
-      '#suffix' => '</div>',
+        '#type' => 'item',
+        '#prefix' => '<div class="forum-access-div">',
+        '#title' => t('Post in this forum'),
+        '#suffix' => '</div>',
     );
     $form['forum_access']['headers']['comment_create'] = array(
-      '#type' => 'item',
-      '#prefix' => '<div class="forum-access-div">',
-      '#title' => t('Comment on posts'),
-      '#suffix' => '</div>',
+        '#type' => 'item',
+        '#prefix' => '<div class="forum-access-div">',
+        '#title' => t('Comment on posts'),
+        '#suffix' => '</div>',
     );
     $form['forum_access']['headers']['update'] = array(
-      '#type' => 'item',
-      '#prefix' => '<div class="forum-access-div">',
-      '#title' => t('Edit posts'),
-      '#suffix' => '</div>',
+        '#type' => 'item',
+        '#prefix' => '<div class="forum-access-div">',
+        '#title' => t('Edit posts'),
+        '#suffix' => '</div>',
     );
     $form['forum_access']['headers']['delete'] = array(
-      '#type' => 'item',
-      '#prefix' => '<div class="forum-access-div">',
-      '#title' => t('Delete posts'),
-      '#suffix' => '</div>',
-    );
-  }
-  $form['forum_access']['headers']['clearer'] = array(
-      '#value' => '<div class="forum-access-clearer"></div>',
-  );
+        '#type' => 'item',
+        '#prefix' => '<div class="forum-access-div">',
+        '#title' => t('Delete posts'),
+        '#suffix' => '</div>',
+    );
+    }
+    $form['forum_access']['headers']['clearer'] = array(
+        '#value' => '<div class="forum-access-clearer"></div>',
+    );
   
-  // Column content (checkboxes):
-  $form['forum_access']['view'] = array(
+    // Column content (checkboxes):
+    $form['forum_access']['view'] = array(
     '#type' => 'checkboxes',
     '#prefix' => '<div class="forum-access-div">',
     '#suffix' => '</div>',
     '#options' => $roles,
     '#default_value' => $settings['view'],
     '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
-  );
-  $form['forum_access']['create'] = array(
+    );
+    $form['forum_access']['create'] = array(
     '#type' => 'checkboxes',
     '#prefix' => '<div class="forum-access-div">',
     '#suffix' => '</div>',
     '#options' => $roles,
     '#default_value' => $settings['create'],
     '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
-  );
-  if (!$is_container) {
+    );
+    if (!$is_container) {
     $form['forum_access']['comment_create'] = array(
-      '#type' => 'checkboxes',
-      '#prefix' => '<div class="forum-access-div">',
-      '#suffix' => '</div>',
-      '#options' => $roles,
-      '#default_value' => $settings['comment_create'],
-      '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
+        '#type' => 'checkboxes',
+        '#prefix' => '<div class="forum-access-div">',
+        '#suffix' => '</div>',
+        '#options' => $roles,
+        '#default_value' => $settings['comment_create'],
+        '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
     );
     $form['forum_access']['update'] = array(
-      '#type' => 'checkboxes',
-      '#prefix' => '<div class="forum-access-div">',
-      '#suffix' => '</div>',
-      '#options' => $roles,
-      '#default_value' => $settings['update'],
-      '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
+        '#type' => 'checkboxes',
+        '#prefix' => '<div class="forum-access-div">',
+        '#suffix' => '</div>',
+        '#options' => $roles,
+        '#default_value' => $settings['update'],
+        '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
     );
     $form['forum_access']['delete'] = array(
-      '#type' => 'checkboxes',
-      '#prefix' => '<div class="forum-access-div">',
-      '#suffix' => '</div>',
-      '#options' => $roles,
-      '#default_value' => $settings['delete'],
-      '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
-    );
-  }
-  $form['forum_access']['clearer'] = array(
+        '#type' => 'checkboxes',
+        '#prefix' => '<div class="forum-access-div">',
+        '#suffix' => '</div>',
+        '#options' => $roles,
+        '#default_value' => $settings['delete'],
+        '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
+    );
+    }
+    $form['forum_access']['clearer'] = array(
     '#type' => 'item',
     '#prefix' => '<div class="forum-access-clearer">',
     '#suffix' => '</div>',
     '#description' => t('For explanations of special cases, hover your mouse over role names.'),
-  );
-  if ($is_container) {
+    );
+    if ($is_container) {
     $form['forum_access']['container_note'] = array(
-      '#type' => 'item',
-      '#description' => t('Users who can see any forum or container within this one should get the <strong><em>View</em></strong> grant. <br /> Users who can post to a forum within this container should get the <strong><em>See</em></strong> grant, so that this forum appears in the proper context in the selection list.', $variables),
+        '#type' => 'item',
+        '#description' => t('Users who can see any forum or container within this one should get the <strong><em>View</em></strong> grant. <br /> Users who can post to a forum within this container should get the <strong><em>See</em></strong> grant, so that this forum appears in the proper context in the selection list.', $variables),
     );
-  }
+    }
 
-  drupal_add_css(drupal_get_path('module', 'forum_access') .'/forum_access.css');
+    drupal_add_css(drupal_get_path('module', 'forum_access') .'/forum_access.css');
 
-  // Find our moderator ACL:
-  if (isset($tid)) {  // edit, not new
+    // Find our moderator ACL:
+    if (isset($tid)) {  // edit, not new
     $acl_id = acl_get_id_by_number('forum_access', $tid);
     if (!$acl_id) { // create one
-      $acl_id = acl_create_new_acl('forum_access', NULL, $tid);
-      // update every existing node in this forum to use this acl.
-      $result = db_query("SELECT nid FROM {term_node} WHERE tid = %d", $tid);
-      while ($node = db_fetch_object($result)) {
+        $acl_id = acl_create_new_acl('forum_access', NULL, $tid);
+        // update every existing node in this forum to use this acl.
+        $result = db_query("SELECT nid FROM {term_node} WHERE tid = %d", $tid);
+        while ($node = db_fetch_object($result)) {
         // all privs to this ACL.
         acl_node_add_acl($node->nid, $acl_id, 1, 1, 1);
-      }
+        }
     }
     $form['forum_access']['acl'] = acl_edit_form($acl_id, t('Moderators'));
     $form['forum_access']['acl'][] = array(
-      '#type' => 'markup',
-      '#value' => '<div>'. t('Moderators receive all grants above.') .'</div>',
-      '#weight' => -1,
+        '#type' => 'markup',
+        '#value' => '<div>'. t('Moderators receive all grants above.') .'</div>',
+        '#weight' => -1,
     );
     $form['forum_access']['acl']['note'] = array(
-      '#type' => 'markup',
-      '#value' => '<div>'. t('Note: Changes to moderators are not saved until you click [!Save] below.', array('!Save' => $tr('Save'))) .'</div>',
+        '#type' => 'markup',
+        '#value' => '<div>'. t('Note: Changes to moderators are not saved until you click [!Save] below.', array('!Save' => $tr('Save'))) .'</div>',
     );
     $form['forum_access']['acl']['#after_build'][] = '_forum_access_forum_form_after_build_acl0';
     $form['forum_access']['acl']['#after_build'] = array_reverse($form['forum_access']['acl']['#after_build']);
     $form['forum_access']['acl']['#after_build'][] = '_forum_access_forum_form_after_build_acl2';
-  }
+    }
 
-  foreach (module_implements('node_access_records') as $module) {
+    foreach (module_implements('node_access_records') as $module) {
     $na_modules[$module] = $module;
-  }
-  unset($na_modules['forum_access']);
-  unset($na_modules['acl']);
-  if (count($na_modules) && !$is_container) {
+    }
+    unset($na_modules['forum_access']);
+    unset($na_modules['acl']);
+    if (count($na_modules) && !$is_container) {
     $form['forum_access']['interference'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Module interference'),
-      '#collapsible' => TRUE,
+        '#type' => 'fieldset',
+        '#title' => t('Module interference'),
+        '#collapsible' => TRUE,
     );
     $variables = array(
-      '%content_type' => node_get_types('name', 'forum'),
-      '!Forum_Access' => 'Forum Access',
-      '!Content_Access' => l('Content Access', 'http://drupal.org/project/content_access'),
-      '@Content_Access' => 'Content Access',
-      '!ACL' => 'ACL',
-      '!module_list' => '<ul><li>'. implode($na_modules, '</li><li>') .'</li></ul>',
+        '%content_type' => node_get_types('name', 'forum'),
+        '!Forum_Access' => 'Forum Access',
+        '!Content_Access' => l('Content Access', 'http://drupal.org/project/content_access'),
+        '@Content_Access' => 'Content Access',
+        '!ACL' => 'ACL',
+        '!module_list' => '<ul><li>'. implode($na_modules, '</li><li>') .'</li></ul>',
     );
     $form['forum_access']['interference'][] = array(
-      '#type' => 'item',
-      '#value' => '<p>'. t("Besides !Forum_Access (and !ACL) you have installed the following node access module(s): !module_list   The grants of every module are combined for each node. Access can only be granted, not removed &mdash; if a certain module grants a permission, the other(s) cannot deny it.", $variables) .'</p>',
-      '#description' => t('Forums can contain other content types besides %content_type; !Forum_Access will contribute the grants defined above to every node in this forum, but other node access control modules may also contribute their grants, especially to nodes of types other than %content_type.', $variables),
+        '#type' => 'item',
+        '#value' => '<p>'. t("Besides !Forum_Access (and !ACL) you have installed the following node access module(s): !module_list   The grants of every module are combined for each node. Access can only be granted, not removed &mdash; if a certain module grants a permission, the other(s) cannot deny it.", $variables) .'</p>',
+        '#description' => t('Forums can contain other content types besides %content_type; !Forum_Access will contribute the grants defined above to every node in this forum, but other node access control modules may also contribute their grants, especially to nodes of types other than %content_type.', $variables),
     );
 
     if (module_exists('content_access')) {
-      $ca_settings = variable_get('content_access_settings', array());
-      foreach (array('view', 'update', 'delete', 'per_node') as $type) {
+        $ca_settings = variable_get('content_access_settings', array());
+        foreach (array('view', 'update', 'delete', 'per_node') as $type) {
         $value = content_access_get_settings($type, 'forum');
         if (!empty($value)) {
-          $ca_interferes = TRUE;
+            $ca_interferes = TRUE;
+        }
         }
-      }
-      $ca_priority = content_access_get_settings('priority', 'forum');
-      $is_conflict = $ca_priority >= $fa_priority && !empty($ca_interferes) || $ca_priority > $fa_priority;
-      $variables += array(
+        $ca_priority = content_access_get_settings('priority', 'forum');
+        $is_conflict = $ca_priority >= $fa_priority && !empty($ca_interferes) || $ca_priority > $fa_priority;
+        $variables += array(
         '!link' => l(t('@Content_Access configuration for the %content_type type', $variables), 'admin/content/node-type/forum/access', array('html' => TRUE)),
         '%Advanced' => $tr('Advanced'),
-      );
-      $specifically = ($ca_priority == $fa_priority ? t('Specifically, any grants given by !Content_Access cannot be taken back by !Forum_Access.', $variables) : '');
-      if ($is_conflict) {
+        );
+        $specifically = ($ca_priority == $fa_priority ? t('Specifically, any grants given by !Content_Access cannot be taken back by !Forum_Access.', $variables) : '');
+        if ($is_conflict) {
         $form['forum_access']['interference']['by_content_access'] = array(
-          '#type' => 'fieldset',
-          '#title' => 'Content Access',
-          '#collapsible' => FALSE,
-          '#attributes' => array('class' => 'error'),
+            '#type' => 'fieldset',
+            '#title' => 'Content Access',
+            '#collapsible' => FALSE,
+            '#attributes' => array('class' => 'error'),
         );
         $form['forum_access']['interference']['by_content_access'][] = array(
-          '#value' => '<div>'. t('You have set the !Content_Access module to control access to content of type %content_type&mdash;this can interfere with proper operation of !Forum_Access!', $variables) ." $specifically</div>",
+            '#value' => '<div>'. t('You have set the !Content_Access module to control access to content of type %content_type&mdash;this can interfere with proper operation of !Forum_Access!', $variables) ." $specifically</div>",
         );
         if ($ca_priority == $fa_priority) {
-          $form['forum_access']['interference']['by_content_access'][] = array(
+            $form['forum_access']['interference']['by_content_access'][] = array(
             '#value' => '<div>'. t("Unless you really know what you're doing, we recommend that you go to the !link page and clear all checkboxes. This will instruct @Content_Access to leave the %content_type nodes alone. However, if you put nodes of other content types into forums as well, then these content types will continue to have this problem.", $variables) .'</div>',
-          );
+            );
         }
         else {
-          $form['forum_access']['interference']['by_content_access'][] = array(
+            $form['forum_access']['interference']['by_content_access'][] = array(
             '#value' => '<div>'. t("The priority of @Content_Access ($ca_priority) is higher than the priority of !Forum_Access ($fa_priority), which means the latter is <strong>completely disabled</strong> for the %content_type type! Unless you really know what you're doing, we recommend that you go to the !link page, change the priority (under %Advanced) to 0, and clear all checkboxes.", $variables) .'</div>',
-          );
+            );
         }
         $form['forum_access']['interference']['by_content_access'][] = array(
-          '#value' => '<div>'. t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables) .'</div>',
+            '#value' => '<div>'. t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables) .'</div>',
         );
-      }
-      else {
+        }
+        else {
         $form['forum_access']['interference'][] = array(
-          '#value' => '<p>'. t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables) .'</p>',
+            '#value' => '<p>'. t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables) .'</p>',
         );
-      }
+        }
     }
 
     $form['forum_access']['interference']['advanced'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Advanced'),
-      '#collapsible' => TRUE,
-      '#collapsed' => !($fa_priority != 0),
+        '#type' => 'fieldset',
+        '#title' => t('Advanced'),
+        '#collapsible' => TRUE,
+        '#collapsed' => !($fa_priority != 0),
     );
     $form['forum_access']['interference']['advanced']['priority'] = array(
-      '#type' => 'weight',
-      '#title' => t('Priority of !Forum_Access node grants in this forum', $variables),
-      '#default_value' => $fa_priority,
-      '#description' => t("If you have no other node access control modules installed, you should leave this at the default 0. <br /> Otherwise you can raise or lower the priority of !Forum_Access' grants. Out of all the grants contributed to a node, only those with the highest priority are used, and all others are discarded.", $variables),
+        '#type' => 'weight',
+        '#title' => t('Priority of !Forum_Access node grants in this forum', $variables),
+        '#default_value' => $fa_priority,
+        '#description' => t("If you have no other node access control modules installed, you should leave this at the default 0. <br /> Otherwise you can raise or lower the priority of !Forum_Access' grants. Out of all the grants contributed to a node, only those with the highest priority are used, and all others are discarded.", $variables),
     );
-  }
+    }
 
-  if (!$is_container) {
+    if (!$is_container) {
     $variables = array(
-      '!Forum_Access'        => l('Forum Access', 'http://drupal.org/project/forum_access'),
-      '!ACL'                 => l('ACL', 'http://drupal.org/project/acl'),
-      '%Module_interference' => t('Module interference'),
-      '!Forum_Access-dev'    => l('Forum&nbsp;Access&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96795', array('html' => TRUE)),
-      '!ACL-dev'             => l('ACL&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96794', array('html' => TRUE)),
-      '%devel_node_access'   => 'devel_node_access',
-      '!Devel'               => l('Devel', 'http://drupal.org/project/devel'),
-      '!DNA'                 => 'DNA',
-      '!debug_mode'          => l('debug mode', 'admin/settings/devel', array('fragment' => 'edit-devel-node-access-debug-mode')),
-      '!dna_summary'         => l('devel/node_access/summary', 'devel/node_access/summary'),
-      '!Rebuild_permissions' => '['. $tr('Rebuild permissions') .']',
-      '!Post_settings_link'  => l('admin/content/node-settings', 'admin/content/node-settings'),
-      '!Forum_Access_'       => l('Forum Access', 'http://drupal.org/project/issues/forum_access'),
-      '!ACL_'                => l('ACL', 'http://drupal.org/project/issues/acl'),
+        '!Forum_Access'        => l('Forum Access', 'http://drupal.org/project/forum_access'),
+        '!ACL'                 => l('ACL', 'http://drupal.org/project/acl'),
+        '%Module_interference' => t('Module interference'),
+        '!Forum_Access-dev'    => l('Forum&nbsp;Access&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96795', array('html' => TRUE)),
+        '!ACL-dev'             => l('ACL&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96794', array('html' => TRUE)),
+        '%devel_node_access'   => 'devel_node_access',
+        '!Devel'               => l('Devel', 'http://drupal.org/project/devel'),
+        '!DNA'                 => 'DNA',
+        '!debug_mode'          => l('debug mode', 'admin/settings/devel', array('fragment' => 'edit-devel-node-access-debug-mode')),
+        '!dna_summary'         => l('devel/node_access/summary', 'devel/node_access/summary'),
+        '!Rebuild_permissions' => '['. $tr('Rebuild permissions') .']',
+        '!Post_settings_link'  => l('admin/content/node-settings', 'admin/content/node-settings'),
+        '!Forum_Access_'       => l('Forum Access', 'http://drupal.org/project/issues/forum_access'),
+        '!ACL_'                => l('ACL', 'http://drupal.org/project/issues/acl'),
     );
     $form['forum_access']['troubleshooting'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Trouble-shooting node access'),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+        '#type' => 'fieldset',
+        '#title' => t('Trouble-shooting node access'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
     );
     $form['forum_access']['troubleshooting'][] = array(
-      '#type' => 'item',
-      '#value' => '<div>'.    t("In case of problems, follow these steps until you've got it worked out:") .'<ol style="margin-top: 0"><li>'.
-                              t("Update to the 'recommended' !Forum_Access and !ACL releases for your version of Drupal.", $variables) .'</li><li>'.
+        '#type' => 'item',
+        '#value' => '<div>'.    t("In case of problems, follow these steps until you've got it worked out:") .'<ol style="margin-top: 0"><li>'.
+                                t("Update to the 'recommended' !Forum_Access and !ACL releases for your version of Drupal.", $variables) .'</li><li>'.
         (count($na_modules) ? t("Read %Module_interference above and update your other node access modules.", $variables) .'</li><li>' : '') .
-                              t("Check the release notes of the development snapshots for issues that might have been fixed in !Forum_Access-dev or !ACL-dev since the latest release.", $variables) .'</li><li>'.
-                              t("Install the %devel_node_access module (!DNA, part of the !Devel module) and enable its !debug_mode: !DNA will show you all the grants that actually control your nodes in a footer block on each node's page.", $variables) .'</li><li>'.
-                              t("Additional insight can be gained from !dna_summary and by enabling the second !DNA block.", $variables) .'</li><li>'.
-                              t("Click !Rebuild_permissions on !Post_settings_link and check DNA for changes.", $variables) .'</li><li>'.
-                              t("Check the issues queues of !Forum_Access_ and !ACL_ for existing reports and possible solutions.", $variables) .'</li><li>'.
-                              t("If all of this hasn't helped, then pick ONE node that is misbehaving, look at it using an account that can see the node (and that should NOT have access if that's your problem!), create a new issue in the issues queue, describe the problem... <ul><li> what did you do? </li><li> what did you expect? </li><li> what happened instead? </li></ul> ... and <strong>attach a screenshot of all the DNA records</strong> for that one node. <br /> Be sure to indicate paths (URLs) for every page and module that you mention.") .'</li></ol></div>',
+                                t("Check the release notes of the development snapshots for issues that might have been fixed in !Forum_Access-dev or !ACL-dev since the latest release.", $variables) .'</li><li>'.
+                                t("Install the %devel_node_access module (!DNA, part of the !Devel module) and enable its !debug_mode: !DNA will show you all the grants that actually control your nodes in a footer block on each node's page.", $variables) .'</li><li>'.
+                                t("Additional insight can be gained from !dna_summary and by enabling the second !DNA block.", $variables) .'</li><li>'.
+                                t("Click !Rebuild_permissions on !Post_settings_link and check DNA for changes.", $variables) .'</li><li>'.
+                                t("Check the issues queues of !Forum_Access_ and !ACL_ for existing reports and possible solutions.", $variables) .'</li><li>'.
+                                t("If all of this hasn't helped, then pick ONE node that is misbehaving, look at it using an account that can see the node (and that should NOT have access if that's your problem!), create a new issue in the issues queue, describe the problem... <ul><li> what did you do? </li><li> what did you expect? </li><li> what happened instead? </li></ul> ... and <strong>attach a screenshot of all the DNA records</strong> for that one node. <br /> Be sure to indicate paths (URLs) for every page and module that you mention.") .'</li></ol></div>',
     );
     $form['forum_access']['troubleshooting'][] = array(
-      '#type' => 'item',
-      '#value' => '<div>'. t("Note: You should not keep the !Devel module enabled on a production site.", $variables) .'</div>',
+        '#type' => 'item',
+        '#value' => '<div>'. t("Note: You should not keep the !Devel module enabled on a production site.", $variables) .'</div>',
     );
-  }
+    }
 
-  if (!$is_container && isset($tid) && !node_access_needs_rebuild()) {
+    if (!$is_container && isset($tid) && !node_access_needs_rebuild()) {
     $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
     $limit = 20;   // from _node_access_rebuild_batch_operation()
     $threshold = variable_get('forum_access_batch_threshold', $limit);  // change the variable if you want
     $form['forum_access']['update_limit'] = array(
-      '#type' => 'value',
-      '#value' => $limit,
+        '#type' => 'value',
+        '#value' => $limit,
     );
     $form['forum_access']['update_choice'] = array(
-      '#type' => 'radios',
-      '#title' => 'Update the permissions',
-      '#description' => t('<em>If</em> you make any node access changes, then each node in this forum needs to be updated. Hover over the radiobuttons for details.'),
-      '#options' => NULL,
-      0 => array(
+        '#type' => 'radios',
+        '#title' => 'Update the permissions',
+        '#description' => t('<em>If</em> you make any node access changes, then each node in this forum needs to be updated. Hover over the radiobuttons for details.'),
+        '#options' => NULL,
+        0 => array(
         '#type' => 'radio',
         '#title' => t('for all %count nodes immediately', array('%count' => $count)),
         '#attributes' => array('title' => t('This option is the fastest, but with many nodes it can still take considerable time and memory. If it fails, it will leave your !node_access table in an inconsistent state.', array('!node_access' => '{node_access}'))),
         '#return_value' => 0,
         '#default_value' => ($count <= $threshold ? 0 : 1),
         '#parents' => array('forum_access', 'update_choice'),
-      ),
-      1 => array(
+        ),
+        1 => array(
         '#type' => 'radio',
         '#title' => t('in batches of !limit now', array('!limit' => $limit)),
         '#attributes' => array('title' => t('The batch option will always work reliably, but it takes longer to complete.')),
         '#return_value' => 1,
         '#default_value' => ($count <= $threshold ? 0 : 1),
         '#parents' => array('forum_access', 'update_choice'),
-      ),
-      2 => array(
+        ),
+        2 => array(
         '#type' => 'radio',
         '#title' => t('rebuild <strong>all</strong> permissions later'),
         '#attributes' => array('title' => t("This option will only set a flag to remind you to rebuild all permissions later; this is useful if you want to make multiple changes to your node access settings quickly and delay the updating until you're done.")),
         '#return_value' => 2,
         '#default_value' => ($count <= $threshold ? 0 : 1),
         '#parents' => array('forum_access', 'update_choice'),
-      ),
-      '#attributes' => array('class' => 'forum-access-flowed'),
+        ),
+        '#attributes' => array('class' => 'forum-access-flowed'),
     );
-  }
-  if (isset($tid)) {
+    }
+    if (isset($tid)) {
     $form['forum_access']['force_update'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Update even if unchanged'),
+        '#type' => 'checkbox',
+        '#title' => t('Update even if unchanged'),
     );
-  }
+    }
 
-  // Move some stuff down so our block goes in a nice place.
-  $form['submit']['#weight'] = 10;
-  $form['delete']['#weight'] = 10;
+    // Move some stuff down so our block goes in a nice place.
+    $form['submit']['#weight'] = 10;
+    $form['delete']['#weight'] = 10;
 
-  $form['#validate'][] = '_forum_access_form_validate';
-  $form['#submit'][] = '_forum_access_form_submit';
+    $form['#validate'][] = '_forum_access_form_validate';
+    $form['#submit'][] = '_forum_access_form_submit';
 }
 
 /**
@@ -420,82 +420,82 @@ 
  * are the permissions of the corresponding role.
  */
 function _forum_access_get_role_permissions() {
-  static $permissions;
-  if (empty($permissions)) {
+    static $permissions;
+    if (empty($permissions)) {
     $permissions[DRUPAL_AUTHENTICATED_RID] = array();
     $result = db_query('SELECT r.rid, p.perm FROM {role} r INNER JOIN {permission} p ON r.rid = p.rid ORDER BY r.rid');
     while ($role = db_fetch_object($result)) {
-      $permissions[$role->rid] = ($role->rid == DRUPAL_ANONYMOUS_RID ? array() : $permissions[DRUPAL_AUTHENTICATED_RID]);
-      $permissions[$role->rid] += array_flip(explode(', ', $role->perm));
+        $permissions[$role->rid] = ($role->rid == DRUPAL_ANONYMOUS_RID ? array() : $permissions[DRUPAL_AUTHENTICATED_RID]);
+        $permissions[$role->rid] += array_flip(explode(', ', $role->perm));
+    }
     }
-  }
-  return $permissions;
+    return $permissions;
 }
 
 function _forum_access_forum_form_disable_checkboxes($element) {
-  global $user;
-  $tr = 't';
-  $moderator_rid = forum_access_query_moderator_rid();
+    global $user;
+    $tr = 't';
+    $moderator_rid = forum_access_query_moderator_rid();
 
-  $permissions = _forum_access_get_role_permissions();
-  $element_children = element_children($element);
-  foreach ($element_children as $rid) {
+    $permissions = _forum_access_get_role_permissions();
+    $element_children = element_children($element);
+    foreach ($element_children as $rid) {
     if ($rid == $moderator_rid) {
-      $element[$rid]['#prefix'] = '<span title="'. t("This is the (temporary) @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and is only used temporarily by @Forum_Access &mdash; do NOT give this role to any user!", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments'), '@Forum_Access' => 'Forum Access')) .'" class="forum-access-temporary-moderator">';
-      $element[$rid]['#suffix'] = "</span>";
-      $element[$rid]['#default_value'] = TRUE;
-      $element[$rid]['#disabled'] = TRUE;
+        $element[$rid]['#prefix'] = '<span title="'. t("This is the (temporary) @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and is only used temporarily by @Forum_Access &mdash; do NOT give this role to any user!", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments'), '@Forum_Access' => 'Forum Access')) .'" class="forum-access-temporary-moderator">';
+        $element[$rid]['#suffix'] = "</span>";
+        $element[$rid]['#default_value'] = TRUE;
+        $element[$rid]['#disabled'] = TRUE;
     }
     elseif ($element['#parents'][1] == 'create') {
-      // Do nothing (Post is always mutable).
+        // Do nothing (Post is always mutable).
     }
     elseif ($element['#parents'][1] == 'comment_create') {
     }
     elseif ($element['#parents'][1] == 'view' && isset($permissions[$rid]['administer forums'])) {
-      $element[$rid]['#title'] = '<em>'. $element[$rid]['#title'] .'</em>';
-      $element[$rid]['#prefix'] = '<span title="'. t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))) .'">';
-      if (isset($permissions[$rid]['administer nodes'])) {
+        $element[$rid]['#title'] = '<em>'. $element[$rid]['#title'] .'</em>';
+        $element[$rid]['#prefix'] = '<span title="'. t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))) .'">';
+        if (isset($permissions[$rid]['administer nodes'])) {
         $element[$rid]['#prefix'] = str_replace('">', ' '. t("Because the role also has the '@administer_nodes' permission, it has full access to all nodes either way.", array('@administer_nodes' => $tr('administer nodes'))) .'">', $element[$rid]['#prefix']);
-      }
-      $element[$rid]['#suffix'] = "</span>";
+        }
+        $element[$rid]['#suffix'] = "</span>";
     }
     elseif (isset($permissions[$rid]['administer nodes'])) {
-      $element[$rid]['#disabled'] = TRUE;
-      $element[$rid]['#default_value'] = TRUE;
-      $element[$rid]['#prefix'] = '<span title="'. ($rid != $moderator_rid
+        $element[$rid]['#disabled'] = TRUE;
+        $element[$rid]['#default_value'] = TRUE;
+        $element[$rid]['#prefix'] = '<span title="'. ($rid != $moderator_rid
                                                     ? t("This role has the '@administer_nodes' permission and thus full access to all nodes.", array('@administer_nodes' => $tr('administer nodes')))
                                                     : t("This is the @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and thus full access to all nodes and comments.", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments')))) .'">';
-      $element[$rid]['#suffix'] = "</span>";
+        $element[$rid]['#suffix'] = "</span>";
+    }
     }
-  }
-  return $element;
+    return $element;
 }
 
 function _forum_access_forum_form_after_build_acl0($form, $form_state) {
-  if (isset($form['#post']['forum_access']['template']['taxonomy'])) {
+    if (isset($form['#post']['forum_access']['template']['taxonomy'])) {
     // Get ACL's user_list for the template and replace it before ACL's after_build function gets its shot at it.
     $imv = array_values($form['#post']['forum_access']['template']['taxonomy']);
     $template_tid = reset($imv);
     if ($acl_id = acl_get_id_by_number('forum_access', $template_tid)) {
-      $f = acl_edit_form($acl_id, 'DUMMY');
-      $form['user_list']['#value'] = $f['user_list']['#default_value'];
+        $f = acl_edit_form($acl_id, 'DUMMY');
+        $form['user_list']['#value'] = $f['user_list']['#default_value'];
     }
-  }
-  return $form;
+    }
+    return $form;
 }
 
 function _forum_access_forum_form_after_build_acl2($form, $form_state) {
-  if (!count(unserialize($form['user_list']['#default_value'])) && !count(unserialize($form['user_list']['#value']))) {
+    if (!count(unserialize($form['user_list']['#default_value'])) && !count(unserialize($form['user_list']['#value']))) {
     $form['#collapsed'] = TRUE;
-  }
-  if ($form['user_list']['#default_value'] != $form['user_list']['#value']) {
+    }
+    if ($form['user_list']['#default_value'] != $form['user_list']['#value']) {
     $form['note']['#value'] = preg_replace('/<div>/', '<div class="warning">', $form['note']['#value']);
-  }
-  return $form;
+    }
+    return $form;
 }
 
 function _forum_access_forum_form_after_build($form, &$form_state) {
-  if (isset($form_state['clicked_button']['#name']) && $form_state['clicked_button']['#name'] == $form['template']['load_button']['#name']) {
+    if (isset($form_state['clicked_button']['#name']) && $form_state['clicked_button']['#name'] == $form['template']['load_button']['#name']) {
     // Load a setting from a template:
     $template_tid = reset(array_values($form['#post']['forum_access']['template']['taxonomy']));
     $form_state['values']['forum_access']['template']['template_tid'] = $template_tid;
@@ -503,158 +503,158 @@ 
 
     $settings = _forum_access_get_settings($template_tid);
     foreach (array('view', 'create', 'comment_create', 'update', 'delete') as $grant_type) {
-      if (empty($form[$grant_type])) {
+        if (empty($form[$grant_type])) {
         continue;
-      }
-      foreach (element_children($form[$grant_type]) as $tid) {
+        }
+        foreach (element_children($form[$grant_type]) as $tid) {
         $checked = array_search($tid, $settings[$grant_type]) !== FALSE;
         $form[$grant_type][$tid]['#value'] = ($checked ? $tid : 0);
-      }
+        }
     }
     $form['interference']['advanced']['priority']['#value'] = $settings['priority'];
     if ($settings['priority'] != 0) {
-      $form['interference']['advanced']['#collapsed'] = FALSE;
+        $form['interference']['advanced']['#collapsed'] = FALSE;
     }
-  }
-  elseif (is_array(reset($form_state['values']['forum_access']['template']['taxonomy']))) {
-      $imv = reset($form_state['values']['forum_access']['template']['taxonomy']);
+    }
+    elseif (is_array(reset($form_state['values']['forum_access']['template']['taxonomy']))) {
+        $imv = reset($form_state['values']['forum_access']['template']['taxonomy']);
     $template_tid = reset($imv);
-  }
-  if (isset($template_tid)) {
+    }
+    if (isset($template_tid)) {
     $form['template']['select_by_default']['#value'] = ($template_tid && $template_tid == variable_get('forum_access_default_template_tid', 0));
     $form['template']['load_for_new']['#value'] = ($template_tid && $template_tid == variable_get('forum_access_new_template_tid', 0));
-  }
-  return $form;
+    }
+    return $form;
 }
 
 function _forum_access_form_validate($form, &$form_state) {
-  global $user;
+    global $user;
 
-  if ($user->uid == 1) {
+    if ($user->uid == 1) {
     return;
-  }
-  $access = $form_state['values']['forum_access']; // shortcut
-  foreach ($access['view'] as $rid => $checked) {
+    }
+    $access = $form_state['values']['forum_access']; // shortcut
+    foreach ($access['view'] as $rid => $checked) {
     if ($checked && isset($user->roles[$rid])) {
-      return;
+        return;
+    }
     }
-  }
-  form_set_error('forum_access][view', t('You must assign %View access to a role that you hold.', array('%View' => 'View')));
+    form_set_error('forum_access][view', t('You must assign %View access to a role that you hold.', array('%View' => 'View')));
 }
 
 function _forum_access_form_submit($form, &$form_state) {
-  $access = $form_state['values']['forum_access']; // shortcut
+    $access = $form_state['values']['forum_access']; // shortcut
 
-  // Save template choice:
-  $template_tid = reset(array_values($access['template']['taxonomy']));
-  if ($access['template']['select_by_default']) {
+    // Save template choice:
+    $template_tid = reset(array_values($access['template']['taxonomy']));
+    if ($access['template']['select_by_default']) {
     variable_set('forum_access_default_template_tid', $template_tid);
-  }
-  elseif (variable_get('forum_access_default_template_tid', 0) == $template_tid) {
+    }
+    elseif (variable_get('forum_access_default_template_tid', 0) == $template_tid) {
     variable_del('forum_access_default_template_tid');
-  }
-  if ($access['template']['load_for_new']) {
+    }
+    if ($access['template']['load_for_new']) {
     variable_set('forum_access_new_template_tid', $template_tid);
-  }
-  elseif (variable_get('forum_access_new_template_tid', 0) == $template_tid) {
+    }
+    elseif (variable_get('forum_access_new_template_tid', 0) == $template_tid) {
     variable_del('forum_access_new_template_tid');
-  }
-  module_load_include('node.inc', 'forum_access');
-  $moderator_rid = _forum_access_get_moderator_rid(TRUE);  // create the moderators role if it doesn't exist
-
-  // check for changes
-  $is_changed = $is_new = strpos($_GET['q'], 'admin/content/forum/add/') === 0;
-  $is_changed = $is_changed || !empty($access['force_update']);
-  $form_initial_values = $form;  // avoid Coder warning
-  $form_initial_values = $form_initial_values['forum_access'];
-  foreach (array('view', 'create', 'comment_create', 'update', 'delete') as $grant_type) {
+    }
+    module_load_include('node.inc', 'forum_access');
+    $moderator_rid = _forum_access_get_moderator_rid(TRUE);  // create the moderators role if it doesn't exist
+
+    // check for changes
+    $is_changed = $is_new = strpos($_GET['q'], 'admin/content/forum/add/') === 0;
+    $is_changed = $is_changed || !empty($access['force_update']);
+    $form_initial_values = $form;  // avoid Coder warning
+    $form_initial_values = $form_initial_values['forum_access'];
+    foreach (array('view', 'create', 'comment_create', 'update', 'delete') as $grant_type) {
     if (isset($form_initial_values[$grant_type])) {
-      $defaults = $form_initial_values[$grant_type]['#default_value'];
-      $defaults = array_flip($defaults);
-      foreach ($access[$grant_type] as $rid => $checked) {
+        $defaults = $form_initial_values[$grant_type]['#default_value'];
+        $defaults = array_flip($defaults);
+        foreach ($access[$grant_type] as $rid => $checked) {
         $is_changed = $is_changed || (empty($form_initial_values[$grant_type][$rid]['#disabled']) && !empty($checked) != isset($defaults[$rid]));
-      }
+        }
+    }
     }
-  }
-  if (!$is_changed && $access['acl']['user_list'] == $form_initial_values['acl']['user_list']['#default_value'] && $access['interference']['advanced']['priority'] == $form_initial_values['interference']['advanced']['priority']['#default_value']) {
+    if (!$is_changed && $access['acl']['user_list'] == $form_initial_values['acl']['user_list']['#default_value'] && $access['interference']['advanced']['priority'] == $form_initial_values['interference']['advanced']['priority']['#default_value']) {
     drupal_set_message(t('The content access permissions are unchanged.'));
     return;
-  }
+    }
 
-  $tid = $form_state['values']['tid'];
-  db_query("DELETE FROM {forum_access} WHERE tid = %d", $tid);
+    $tid = $form_state['values']['tid'];
+    db_query("DELETE FROM {forum_access} WHERE tid = %d", $tid);
 
-  $fa_priority = isset($access['interference']['advanced']['priority']) ? $access['interference']['advanced']['priority'] : 0;
-  if (array_key_exists('acl', $access)) {
+    $fa_priority = isset($access['interference']['advanced']['priority']) ? $access['interference']['advanced']['priority'] : 0;
+    if (array_key_exists('acl', $access)) {
     $moderators = unserialize($access['acl']['user_list']);
     acl_save_form($access['acl'], $fa_priority);
-  }
-  $permissions = _forum_access_get_role_permissions();
-  foreach ($access['view'] as $rid => $checked) {
+    }
+    $permissions = _forum_access_get_role_permissions();
+    foreach ($access['view'] as $rid => $checked) {
     if ($rid == $moderator_rid) {
-      continue;
+        continue;
     }
     if (isset($permissions[$rid]['administer nodes'])) {
-      // We prefer not to save records for node administrators, because these have access anyway.
-      if (isset($permissions[$rid]['administer forums']) && $access['view'][$rid]) {
+        // We prefer not to save records for node administrators, because these have access anyway.
+        if (isset($permissions[$rid]['administer forums']) && $access['view'][$rid]) {
         // For forum administrators, View needs to be saved, ...
-      }
-      else {
+        }
+        else {
         // ... otherwise forget View.
         $access['view'][$rid] = FALSE;
-      }
-      if ($access['view'][$rid] || $access['create'][$rid] || $access['comment_create'][$rid]) {
+        }
+        if ($access['view'][$rid] || $access['create'][$rid] || $access['comment_create'][$rid]) {
         db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
         $tid, $rid, !empty($access['view'][$rid]), 0, 0, !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
-      }
+        }
     }
     else {
-      db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
-      $tid, $rid, (bool) $checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
+        db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
+        $tid, $rid, (bool) $checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
     }
-  }
-  $tr = 't';
-  $link = l($tr('edit'), 'admin/content/forum/edit/forum/'. $tid);
-  watchdog('access', 'Changed grants for %forum forum.', array('%forum' => $form_state['values']['name']), WATCHDOG_NOTICE, $link);
+    }
+    $tr = 't';
+    $link = l($tr('edit'), 'admin/content/forum/edit/forum/'. $tid);
+    watchdog('access', 'Changed grants for %forum forum.', array('%forum' => $form_state['values']['name']), WATCHDOG_NOTICE, $link);
 
-  if (!$is_new && $form_state['values']['form_id'] != 'forum_form_container') {
+    if (!$is_new && $form_state['values']['form_id'] != 'forum_form_container') {
     if (!isset($access['update_choice']) || $access['update_choice'] == 2) {
-      node_access_needs_rebuild(TRUE);
+        node_access_needs_rebuild(TRUE);
     }
     elseif ($access['update_choice'] == 0) {
-      // update immediately (but use the batch functions anyway
-      $save_redirect = $form_state['redirect'];
-      $form_state['redirect'] = $_GET['q'];
-      $context = array();
-      $pending_error_messages = drupal_get_messages('error', FALSE);
-      $our_error_message_index = (isset($pending_error_messages['error']) ? count($pending_error_messages['error']) : 0);
-      _forum_access_update_batch_finished(FALSE, array(), array());       // add our error message (in case we die underway)
-      _forum_access_update_batch_operation($tid, 999999, 1, $context);
-      $pending_error_messages = drupal_get_messages('error', TRUE);       // still alive, get and clear all 'error' messages
-      unset($pending_error_messages['error'][$our_error_message_index]);  // remove our error message
-      foreach ($pending_error_messages['error'] as $message) {            // replay any others
+        // update immediately (but use the batch functions anyway
+        $save_redirect = $form_state['redirect'];
+        $form_state['redirect'] = $_GET['q'];
+        $context = array();
+        $pending_error_messages = drupal_get_messages('error', FALSE);
+        $our_error_message_index = (isset($pending_error_messages['error']) ? count($pending_error_messages['error']) : 0);
+        _forum_access_update_batch_finished(FALSE, array(), array());       // add our error message (in case we die underway)
+        _forum_access_update_batch_operation($tid, 999999, 1, $context);
+        $pending_error_messages = drupal_get_messages('error', TRUE);       // still alive, get and clear all 'error' messages
+        unset($pending_error_messages['error'][$our_error_message_index]);  // remove our error message
+        foreach ($pending_error_messages['error'] as $message) {            // replay any others
         drupal_set_message($message, 'error');
-      }
-      _forum_access_update_batch_finished(TRUE, array(), array());
-      $form_state['redirect'] = $save_redirect;
+        }
+        _forum_access_update_batch_finished(TRUE, array(), array());
+        $form_state['redirect'] = $save_redirect;
     }
     else {
-      // mass update in batch mode, modeled after node.module
-      $limit = $access['update_limit'];
-      $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
-      $batch = array(
+        // mass update in batch mode, modeled after node.module
+        $limit = $access['update_limit'];
+        $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
+        $batch = array(
         'title' => t('Updating content access permissions'),
         'file' => drupal_get_path('module', 'forum_access') .'/forum_access.admin.inc',
         'operations' => array(
-          array('_forum_access_update_batch_operation', array($tid, $limit, $count)),
+            array('_forum_access_update_batch_operation', array($tid, $limit, $count)),
         ),
         'finished' => '_forum_access_update_batch_finished'
-      );
-      batch_set($batch);
+        );
+        batch_set($batch);
+    }
     }
-  }
 
-  variable_del('forum_access_rids');  // clear cache
+    variable_del('forum_access_rids');  // clear cache
 }
 
 /**
@@ -665,73 +665,73 @@ 
  * feedback after 1 second execution time.
  */
 function _forum_access_update_batch_operation($tid, $limit, $count, &$context) {
-  if (empty($context['sandbox'])) {
+    if (empty($context['sandbox'])) {
     // Initiate multistep processing.
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['current_node'] = 0;
     $context['sandbox']['max'] = $count;
-  }
+    }
 
-  // Process the next 20 nodes.
-  $result = db_query_range("SELECT DISTINCT n.nid FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE n.nid > %d AND tn.tid = %d ORDER BY n.nid ASC", $context['sandbox']['current_node'], $tid, 0, $limit);
-  while ($row = db_fetch_array($result)) {
+    // Process the next 20 nodes.
+    $result = db_query_range("SELECT DISTINCT n.nid FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE n.nid > %d AND tn.tid = %d ORDER BY n.nid ASC", $context['sandbox']['current_node'], $tid, 0, $limit);
+    while ($row = db_fetch_array($result)) {
     $loaded_node = node_load($row['nid'], NULL, TRUE);
     // To preserve database integrity, only aquire grants if the node
     // loads successfully.
     if (!empty($loaded_node)) {
-      node_access_acquire_grants($loaded_node);
+        node_access_acquire_grants($loaded_node);
     }
     $context['sandbox']['progress']++;
     $context['sandbox']['current_node'] = $loaded_node->nid;
-  }
+    }
 
-  // Multistep processing : report progress.
-  if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
+    // Multistep processing : report progress.
+    if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Post-processing for forum_access_form_submit().
  */
 function _forum_access_update_batch_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     drupal_set_message(t('The content access permissions have been updated.'));
     cache_clear_all();
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('The content access permissions have not been properly updated.'), 'error');
-  }
+    }
 }
 
 /**
  * Add our settings to the forum administration settings page.
  */
 function _forum_access_forum_admin_settings_form(&$form, &$form_state) {
-  $variables = array(
+    $variables = array(
     '!Forum_Access' => 'Forum Access',
     '%View' => 'View',
     '%Post' => 'Post',
     '%post_comments' => 'post comments',
-  );
-  $form['forum_access'] = array(
+    );
+    $form['forum_access'] = array(
     '#type' => 'fieldset',
     '#title' => 'Forum Access',
     '#attributes' => array('id' => 'edit-forum-admin-settings-forum-access'),
-  );
-  $form['forum_access']['note'] = array(
+    );
+    $form['forum_access']['note'] = array(
     '#type'          => 'item',
     '#value'         => t('Note: All other !Forum_Access controls are on the administration pages of the individual forums.', $variables),
-  );
-  $form['forum_access']['forum_access_D5_legacy_mode'] = array(
+    );
+    $form['forum_access']['forum_access_D5_legacy_mode'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Drupal 5 legacy mode', $variables),
     '#default_value' => variable_get('forum_access_D5_legacy_mode', FALSE),
     '#description'   => t('In Drupal 5, comment posting was not restricted by !Forum_Access; users with %View access (and the %post_comments permission) were always allowed to post forum comments. Starting with Drupal 6, posting comments is now restricted to users with %Post access. Turn this option on to revert to the old behavior. The default is OFF.', $variables),
-  );
-  $buttons = $form['buttons'];
-  unset($form['buttons']);
-  $form['buttons'] = $buttons;
+    );
+    $buttons = $form['buttons'];
+    unset($form['buttons']);
+    $form['buttons'] = $buttons;
 }
 
 /**
@@ -739,63 +739,63 @@ 
  */
 function _forum_access_get_settings($tid = NULL) {
     $return = array('view' => array(), 'create' => array(), 'comment_create' => array(), 'update' => array(), 'delete' => array(), 'priority' => 0);
-  if (!isset($tid)) {
+    if (!isset($tid)) {
     // Default to all users can read; all logged in users can post and comment.
     $return['view'] = array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID);
     $return['create'] = array(DRUPAL_AUTHENTICATED_RID);
     $return['comment_create'] = array(DRUPAL_AUTHENTICATED_RID);
-  }
-  else {
+    }
+    else {
     $result = db_query("SELECT * FROM {forum_access} where tid = %d", $tid);
     while ($access = db_fetch_object($result)) {
-      if ($access->grant_view) {
+        if ($access->grant_view) {
         $return['view'][] = $access->rid;
-      }
-      if ($access->grant_update) {
+        }
+        if ($access->grant_update) {
         $return['update'][] = $access->rid;
-      }
-      if ($access->grant_delete) {
+        }
+        if ($access->grant_delete) {
         $return['delete'][] = $access->rid;
-      }
-      if ($access->grant_create) {
+        }
+        if ($access->grant_create) {
         $return['create'][] = $access->rid;
-      }
-      if ($access->grant_comment_create) {
+        }
+        if ($access->grant_comment_create) {
         $return['comment_create'][] = $access->rid;
-      }
-      if ($access->rid == DRUPAL_AUTHENTICATED_RID) {  // this is our reference
+        }
+        if ($access->rid == DRUPAL_AUTHENTICATED_RID) {  // this is our reference
         $return['priority'] = $access->priority;
-      }
+        }
+    }
     }
-  }
-  return $return;
+    return $return;
 }
 
 /**
  * Remove unusable 'edit' links from overview form.
  */
 function _forum_access_forum_overview(&$form, &$form_state) {
-  global $user;
-  if ($user->uid == 1) {
+    global $user;
+    if ($user->uid == 1) {
     return;
-  }
-  foreach ($form as $key => $value) {
+    }
+    foreach ($form as $key => $value) {
     if (preg_match('/^tid:(.*):0$/', $key, $matches)) {
-      if (!forum_access_access($matches[1], 'view', NULL, FALSE)) {
+        if (!forum_access_access($matches[1], 'view', NULL, FALSE)) {
         $form[$key]['edit']['#access'] = FALSE;
         if (preg_match('|<a [^>]*>([^<]*)</a>|', $form[$key]['view']['#value'], $matches)) {
-          $form[$key]['view']['#value'] = $matches[1];
+            $form[$key]['view']['#value'] = $matches[1];
+        }
         }
-      }
     }
-  }
+    }
 }
 
 /**
  * We must know when a role is deleted.
  */
 function _forum_access_user_admin_role_form(&$form, &$form_state) {
-  $form['#submit'][] = '_forum_access_user_admin_role_submit';
+    $form['#submit'][] = '_forum_access_user_admin_role_submit';
 }
 
 /**
@@ -803,14 +803,14 @@ 
  * Also, we complain if the Forum Moderator role is deleted.
  */
 function _forum_access_user_admin_role_submit($form, &$form_state) {
-  if ($form_state['values']['op'] == $form_state['values']['delete']) {
+    if ($form_state['values']['op'] == $form_state['values']['delete']) {
     $rid = $form_state['values']['rid'];
     db_query("DELETE FROM {forum_access} WHERE rid = %d", $rid);
     db_query("DELETE FROM {node_access} WHERE gid = %d AND realm = 'forum_access'", $rid);
     if ($rid === forum_access_query_moderator_rid()) {
-      drupal_set_message(t('The role you have just deleted is required by !Forum_Access; it will be recreated automatically.', array('!Forum_Access' => 'Forum Access')), 'error');
+        drupal_set_message(t('The role you have just deleted is required by !Forum_Access; it will be recreated automatically.', array('!Forum_Access' => 'Forum Access')), 'error');
+    }
     }
-  }
 }
 
 /**
@@ -818,27 +818,27 @@ 
  * to control the same content types as we do.
  */
 function _forum_access_content_access_admin_form() {
-  $tr = 't';
-  $variables = array(
+    $tr = 't';
+    $variables = array(
     '!Content_Access' => 'Content Access',
     '!Forum_Access' => 'Forum Access',
     '!Forum_Access_link' => l('Forum Access', 'admin/content/forum'),
     '%anonymous_user' => $tr('anonymous user'),
     '%authenticated_user' => $tr('authenticated user'),
     '%Advanced' => $tr('Advanced'),
-  );
-  if (arg(3) == 'forum') {
+    );
+    if (arg(3) == 'forum') {
     drupal_set_message(t('Note: In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected in the !Forum_Access_link settings, but !Forum_Access can only allow <i>more</i> access, not less.', $variables)
-      .'<br /><span class="error">'. t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables) .'</span>'
-      .'<br />'. t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
-  }
-  else {
+        .'<br /><span class="error">'. t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables) .'</span>'
+        .'<br />'. t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
+    }
+    else {
     $vid = _forum_access_get_vid();
     $vocabulary = taxonomy_vocabulary_load($vid);
     if (isset($vocabulary->nodes[arg(3)])) {
-      drupal_set_message(t('Note: Nodes of this content type can be put inside forums, where access to them will also be controlled by !Forum_Access.<br />In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected on the !Forum_Access_link settings, and vice versa, but any node access module can only allow <i>more</i> access, not less.', $variables), 'warning');
+        drupal_set_message(t('Note: Nodes of this content type can be put inside forums, where access to them will also be controlled by !Forum_Access.<br />In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected on the !Forum_Access_link settings, and vice versa, but any node access module can only allow <i>more</i> access, not less.', $variables), 'warning');
+    }
     }
-  }
 }
 
 /**
@@ -848,12 +848,12 @@ 
  * admin/user/permissions.
  */
 function _forum_access_user_admin_perm_form(&$form, &$form_state) {
-  $moderator_rid = forum_access_query_moderator_rid();
-  if (isset($moderator_rid) && array_key_exists($moderator_rid, $form['role_names'])) {
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (isset($moderator_rid) && array_key_exists($moderator_rid, $form['role_names'])) {
     drupal_set_message(t('The %role role is used internally by the @Forum_Access module and must not be changed!', array('%role' => $form['role_names'][$moderator_rid]['#value'], '@Forum_Access' => 'Forum Access')), 'warning', FALSE);
     $form['checkboxes'][$moderator_rid]['#disabled'] = TRUE;
-  }
-  array_unshift($form['#submit'], '_forum_access_user_admin_perm_form_submit');
+    }
+    array_unshift($form['#submit'], '_forum_access_user_admin_perm_form_submit');
 }
 
 /**
@@ -863,10 +863,10 @@ 
  * before the real handler gets them.
  */
 function _forum_access_user_admin_perm_form_submit($form, &$form_state) {
-  $moderator_rid = forum_access_query_moderator_rid();
-  if (isset($moderator_rid)) {
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (isset($moderator_rid)) {
     unset($form_state['values'][$moderator_rid]);
-  }
+    }
 }
 
 /**
@@ -876,10 +876,10 @@ 
  * admin/user/user.
  */
 function _forum_access_user_admin_account_form(&$form, &$form_state) {
-  $moderator_rid = forum_access_query_moderator_rid();
-  if (isset($moderator_rid)) {
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (isset($moderator_rid)) {
     unset($form['options']['operation']['#options'][t('Add a role to the selected users')]["add_role-$moderator_rid"]);
-  }
+    }
 }
 
 /**
@@ -888,54 +888,54 @@ 
  * Disable the Forum Moderator checkbox on user/UID/edit.
  */
 function _forum_access_user_profile_form(&$form, &$form_state) {
-  //dpm($form, '_forum_access_user_profile_form()');
-  $moderator_rid = forum_access_query_moderator_rid();
-  if (isset($moderator_rid) && isset($form['account']['roles']['#options'][$moderator_rid])) {
+    //dpm($form, '_forum_access_user_profile_form()');
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (isset($moderator_rid) && isset($form['account']['roles']['#options'][$moderator_rid])) {
     $form['account']['roles'][$moderator_rid] = array(
-      '#type' => 'checkbox',
-      '#title' => $form['account']['roles']['#options'][$moderator_rid] .' ('. t('reserved for internal use by the @Forum_Access module', array('@Forum_Access' => 'Forum Access')) .')',
-      '#default_value' => in_array($moderator_rid, $form['account']['roles']['#default_value']),
-      '#disabled' => TRUE,
+        '#type' => 'checkbox',
+        '#title' => $form['account']['roles']['#options'][$moderator_rid] .' ('. t('reserved for internal use by the @Forum_Access module', array('@Forum_Access' => 'Forum Access')) .')',
+        '#default_value' => in_array($moderator_rid, $form['account']['roles']['#default_value']),
+        '#disabled' => TRUE,
     );
     unset($form['account']['roles']['#options'][$moderator_rid]);
-  }
+    }
 }
 
 /**
  * Create the Forum Moderator role.
  */
 function _forum_access_create_moderator_rid($verbose = FALSE) {
-  $tr = 't';
-  $variables = array('!Forum_Access' => 'Forum Access', '%administer_comments' => $tr('administer comments'), '%administer_nodes' => $tr('administer nodes'));
-  $role_name = t('Forum Moderator');
-  $role = new stdClass();
-  $role->name = $role_name;
-  for ($i = 2; $i <= 12; ++$i) {
+    $tr = 't';
+    $variables = array('!Forum_Access' => 'Forum Access', '%administer_comments' => $tr('administer comments'), '%administer_nodes' => $tr('administer nodes'));
+    $role_name = t('Forum Moderator');
+    $role = new stdClass();
+    $role->name = $role_name;
+    for ($i = 2; $i <= 12; ++$i) {
     $variables['%role'] = $role->name;
     if (!db_result(db_query("SELECT COUNT(rid) FROM {role} WHERE name = '%s'", $role->name)) &&
         drupal_write_record('role', $role)) {
-      $rid = $role->rid;
-      variable_set('forum_access_moderator_rid', $rid);
-      $permission = new stdClass();
-      $permission->rid = $rid;
-      $permission->perm = 'administer comments, administer nodes, post comments, post comments without approval';
-      drupal_write_record('permission', $permission);
-      $msg = t('!Forum_Access has created a new role named %role and given it the %administer_nodes and %administer_comments permissions. This role is used internally by !Forum_Access. You can change the name of the role as you like, but you must keep it unmodified otherwise.', $variables);
-      if ($verbose) {
+        $rid = $role->rid;
+        variable_set('forum_access_moderator_rid', $rid);
+        $permission = new stdClass();
+        $permission->rid = $rid;
+        $permission->perm = 'administer comments, administer nodes, post comments, post comments without approval';
+        drupal_write_record('permission', $permission);
+        $msg = t('!Forum_Access has created a new role named %role and given it the %administer_nodes and %administer_comments permissions. This role is used internally by !Forum_Access. You can change the name of the role as you like, but you must keep it unmodified otherwise.', $variables);
+        if ($verbose) {
         drupal_set_message($msg, 'warning');
-      }
-      watchdog('user', $msg, NULL, WATCHDOG_NOTICE);
-      return $rid;
+        }
+        watchdog('user', $msg, NULL, WATCHDOG_NOTICE);
+        return $rid;
     }
     else {
-      $msg = t('!Forum_Access cannot create the %role role!', $variables);
-      watchdog('user', $msg, NULL, WATCHDOG_WARNING);
-      drupal_set_message($msg .' '. t('Is it already in use?'), 'error');
-      $role->name = $role_name .' '. $i;
-    }
-  }
-  $msg = t('!Forum_Access has given up and will not work correctly! Rename one of the roles listed above, so that !Forum_Access can use its name.', $variables);
-  drupal_set_message($msg, 'error');
-  watchdog('user', $msg, NULL, WATCHDOG_CRITICAL);
+        $msg = t('!Forum_Access cannot create the %role role!', $variables);
+        watchdog('user', $msg, NULL, WATCHDOG_WARNING);
+        drupal_set_message($msg .' '. t('Is it already in use?'), 'error');
+        $role->name = $role_name .' '. $i;
+    }
+    }
+    $msg = t('!Forum_Access has given up and will not work correctly! Rename one of the roles listed above, so that !Forum_Access can use its name.', $variables);
+    drupal_set_message($msg, 'error');
+    watchdog('user', $msg, NULL, WATCHDOG_CRITICAL);
 }
 

Spacing +67 added lines, -67 removed lines

@@ -14,7 +14,7 @@ 
 function _forum_access_forum_form(&$form, &$form_state, $is_container) {
   $tid = (isset($form['tid']['#value']) ? $form['tid']['#value'] : NULL);
   if (isset($tid) && !forum_access_access($tid, 'view', NULL, FALSE)) {
-    drupal_access_denied();  // Deny access if the user doesn't have View access.
+    drupal_access_denied(); // Deny access if the user doesn't have View access.
     module_invoke_all('exit');
     exit;
   }
@@ -39,18 +39,18 @@ 
 
   $tr = 't';
   $variables = array(
-    '!access_content'                 => '<em>'. l($tr('access content'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
-    '!access_comments'                => '<em>'. l($tr('access comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!create_forum_topics'            => '<em>'. l($tr('create forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!post_comments'                  => '<em>'. l($tr('post comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!post_comments_without_approval' => '<em>'. l($tr('post comments without approval'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!edit_own_forum_topics'          => '<em>'. l($tr('edit own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!edit_any_forum_topics'          => '<em>'. l($tr('edit any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!delete_own_forum_topics'        => '<em>'. l($tr('delete own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!delete_any_forum_topics'        => '<em>'. l($tr('delete any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!administer_comments'            => '<em>'. l($tr('administer comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!administer_forums'              => '<em>'. l($tr('administer forums'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!administer_nodes'               => '<em>'. l($tr('administer nodes'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
+    '!access_content'                 => '<em>'.l($tr('access content'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)).'</em>',
+    '!access_comments'                => '<em>'.l($tr('access comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!create_forum_topics'            => '<em>'.l($tr('create forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!post_comments'                  => '<em>'.l($tr('post comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!post_comments_without_approval' => '<em>'.l($tr('post comments without approval'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!edit_own_forum_topics'          => '<em>'.l($tr('edit own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!edit_any_forum_topics'          => '<em>'.l($tr('edit any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!delete_own_forum_topics'        => '<em>'.l($tr('delete own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!delete_any_forum_topics'        => '<em>'.l($tr('delete any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!administer_comments'            => '<em>'.l($tr('administer comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!administer_forums'              => '<em>'.l($tr('administer forums'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!administer_nodes'               => '<em>'.l($tr('administer nodes'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)).'</em>',
   );
   if (!$is_container) {
     $form['forum_access']['permissions'] = array(
@@ -61,15 +61,15 @@ 
     );
     $form['forum_access']['permissions'][] = array(
       '#type' => 'markup',
-      '#value' => '<div>'. t('Note that users need') .'<ul style="margin-top: 0"><li>'.
-                           t('the !access_content and !access_comments permissions <strong>AND <em>View</em></strong> to be able to see this forum and its content at all,', $variables) .'</li><li>'.
-                           t('the !create_forum_topics (and similar) permissions <strong>AND <em>Post</em></strong> to be able to create forum content, and', $variables) .'</li><li>'.
-                           t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', FALSE) ? 'del title="'. t('Drupal 5 legacy mode') .'"' : 'strong'))) .'</li><li>'.
-                           t('the !edit_own_forum_topics or !edit_any_forum_topics (and similar) permissions <strong>AND (<em>Edit</em> AND <em>Comment</em></strong>) can be added if desired, <strong>plus</strong>', $variables) .'</li><li>'.
-                           t('the !delete_own_forum_topics or !delete_any_forum_topics (and similar) permissions (<strong>OR <em>Delete</em></strong>) if desired;', $variables) .'</li><li>'.
-                           t('the !administer_comments (global!) permission <strong>OR <em>Edit</em>/<em>Delete</em></strong> to be able to edit/delete comments;', $variables) .'</li><li>'.
-                           t('the !administer_forums permission <strong>AND <em>View</em></strong> to be able to administer forums (and change access!).', $variables) .'</li></ul>'.
-                           t('Furthermore note that content which is not published is treated in a different way by Drupal: it can be viewed only by its author or by users with the !administer_nodes permission. Unpublished comments and replies are accessible to users with <strong><em>Edit</em> OR <em>Delete</em></strong>, <strong>OR</strong> with the !administer_comments permission, but they are never counted on the forum page.', $variables) .'</div>',
+      '#value' => '<div>'.t('Note that users need').'<ul style="margin-top: 0"><li>'.
+                           t('the !access_content and !access_comments permissions <strong>AND <em>View</em></strong> to be able to see this forum and its content at all,', $variables).'</li><li>'.
+                           t('the !create_forum_topics (and similar) permissions <strong>AND <em>Post</em></strong> to be able to create forum content, and', $variables).'</li><li>'.
+                           t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', FALSE) ? 'del title="'.t('Drupal 5 legacy mode').'"' : 'strong'))).'</li><li>'.
+                           t('the !edit_own_forum_topics or !edit_any_forum_topics (and similar) permissions <strong>AND (<em>Edit</em> AND <em>Comment</em></strong>) can be added if desired, <strong>plus</strong>', $variables).'</li><li>'.
+                           t('the !delete_own_forum_topics or !delete_any_forum_topics (and similar) permissions (<strong>OR <em>Delete</em></strong>) if desired;', $variables).'</li><li>'.
+                           t('the !administer_comments (global!) permission <strong>OR <em>Edit</em>/<em>Delete</em></strong> to be able to edit/delete comments;', $variables).'</li><li>'.
+                           t('the !administer_forums permission <strong>AND <em>View</em></strong> to be able to administer forums (and change access!).', $variables).'</li></ul>'.
+                           t('Furthermore note that content which is not published is treated in a different way by Drupal: it can be viewed only by its author or by users with the !administer_nodes permission. Unpublished comments and replies are accessible to users with <strong><em>Edit</em> OR <em>Delete</em></strong>, <strong>OR</strong> with the !administer_comments permission, but they are never counted on the forum page.', $variables).'</div>',
     );
   }
 
@@ -82,7 +82,7 @@ 
       '#collapsed' => empty($template_tid),
   );
   $form['forum_access']['template']['taxonomy'][$vid] = taxonomy_form($vid, array($template_tid), '');
-  $form['forum_access']['template']['taxonomy'][$vid]['#description'] = t("Select a forum and click !Load to retrieve that forum's settings as a starting point for this forum or container.", array('!Load' => '['. t('Load') .']'));
+  $form['forum_access']['template']['taxonomy'][$vid]['#description'] = t("Select a forum and click !Load to retrieve that forum's settings as a starting point for this forum or container.", array('!Load' => '['.t('Load').']'));
   $form['forum_access']['template']['load_button'] = array(
     '#type' => 'button',
     '#name' => 'load_template',
@@ -205,7 +205,7 @@ 
     );
   }
 
-  drupal_add_css(drupal_get_path('module', 'forum_access') .'/forum_access.css');
+  drupal_add_css(drupal_get_path('module', 'forum_access').'/forum_access.css');
 
   // Find our moderator ACL:
   if (isset($tid)) {  // edit, not new
@@ -222,12 +222,12 @@ 
     $form['forum_access']['acl'] = acl_edit_form($acl_id, t('Moderators'));
     $form['forum_access']['acl'][] = array(
       '#type' => 'markup',
-      '#value' => '<div>'. t('Moderators receive all grants above.') .'</div>',
+      '#value' => '<div>'.t('Moderators receive all grants above.').'</div>',
       '#weight' => -1,
     );
     $form['forum_access']['acl']['note'] = array(
       '#type' => 'markup',
-      '#value' => '<div>'. t('Note: Changes to moderators are not saved until you click [!Save] below.', array('!Save' => $tr('Save'))) .'</div>',
+      '#value' => '<div>'.t('Note: Changes to moderators are not saved until you click [!Save] below.', array('!Save' => $tr('Save'))).'</div>',
     );
     $form['forum_access']['acl']['#after_build'][] = '_forum_access_forum_form_after_build_acl0';
     $form['forum_access']['acl']['#after_build'] = array_reverse($form['forum_access']['acl']['#after_build']);
@@ -251,11 +251,11 @@ 
       '!Content_Access' => l('Content Access', 'http://drupal.org/project/content_access'),
       '@Content_Access' => 'Content Access',
       '!ACL' => 'ACL',
-      '!module_list' => '<ul><li>'. implode($na_modules, '</li><li>') .'</li></ul>',
+      '!module_list' => '<ul><li>'.implode($na_modules, '</li><li>').'</li></ul>',
     );
     $form['forum_access']['interference'][] = array(
       '#type' => 'item',
-      '#value' => '<p>'. t("Besides !Forum_Access (and !ACL) you have installed the following node access module(s): !module_list   The grants of every module are combined for each node. Access can only be granted, not removed &mdash; if a certain module grants a permission, the other(s) cannot deny it.", $variables) .'</p>',
+      '#value' => '<p>'.t("Besides !Forum_Access (and !ACL) you have installed the following node access module(s): !module_list   The grants of every module are combined for each node. Access can only be granted, not removed &mdash; if a certain module grants a permission, the other(s) cannot deny it.", $variables).'</p>',
       '#description' => t('Forums can contain other content types besides %content_type; !Forum_Access will contribute the grants defined above to every node in this forum, but other node access control modules may also contribute their grants, especially to nodes of types other than %content_type.', $variables),
     );
 
@@ -282,25 +282,25 @@ 
           '#attributes' => array('class' => 'error'),
         );
         $form['forum_access']['interference']['by_content_access'][] = array(
-          '#value' => '<div>'. t('You have set the !Content_Access module to control access to content of type %content_type&mdash;this can interfere with proper operation of !Forum_Access!', $variables) ." $specifically</div>",
+          '#value' => '<div>'.t('You have set the !Content_Access module to control access to content of type %content_type&mdash;this can interfere with proper operation of !Forum_Access!', $variables)." $specifically</div>",
         );
         if ($ca_priority == $fa_priority) {
           $form['forum_access']['interference']['by_content_access'][] = array(
-            '#value' => '<div>'. t("Unless you really know what you're doing, we recommend that you go to the !link page and clear all checkboxes. This will instruct @Content_Access to leave the %content_type nodes alone. However, if you put nodes of other content types into forums as well, then these content types will continue to have this problem.", $variables) .'</div>',
+            '#value' => '<div>'.t("Unless you really know what you're doing, we recommend that you go to the !link page and clear all checkboxes. This will instruct @Content_Access to leave the %content_type nodes alone. However, if you put nodes of other content types into forums as well, then these content types will continue to have this problem.", $variables).'</div>',
           );
         }
         else {
           $form['forum_access']['interference']['by_content_access'][] = array(
-            '#value' => '<div>'. t("The priority of @Content_Access ($ca_priority) is higher than the priority of !Forum_Access ($fa_priority), which means the latter is <strong>completely disabled</strong> for the %content_type type! Unless you really know what you're doing, we recommend that you go to the !link page, change the priority (under %Advanced) to 0, and clear all checkboxes.", $variables) .'</div>',
+            '#value' => '<div>'.t("The priority of @Content_Access ($ca_priority) is higher than the priority of !Forum_Access ($fa_priority), which means the latter is <strong>completely disabled</strong> for the %content_type type! Unless you really know what you're doing, we recommend that you go to the !link page, change the priority (under %Advanced) to 0, and clear all checkboxes.", $variables).'</div>',
           );
         }
         $form['forum_access']['interference']['by_content_access'][] = array(
-          '#value' => '<div>'. t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables) .'</div>',
+          '#value' => '<div>'.t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables).'</div>',
         );
       }
       else {
         $form['forum_access']['interference'][] = array(
-          '#value' => '<p>'. t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables) .'</p>',
+          '#value' => '<p>'.t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables).'</p>',
         );
       }
     }
@@ -331,7 +331,7 @@ 
       '!DNA'                 => 'DNA',
       '!debug_mode'          => l('debug mode', 'admin/settings/devel', array('fragment' => 'edit-devel-node-access-debug-mode')),
       '!dna_summary'         => l('devel/node_access/summary', 'devel/node_access/summary'),
-      '!Rebuild_permissions' => '['. $tr('Rebuild permissions') .']',
+      '!Rebuild_permissions' => '['.$tr('Rebuild permissions').']',
       '!Post_settings_link'  => l('admin/content/node-settings', 'admin/content/node-settings'),
       '!Forum_Access_'       => l('Forum Access', 'http://drupal.org/project/issues/forum_access'),
       '!ACL_'                => l('ACL', 'http://drupal.org/project/issues/acl'),
@@ -344,26 +344,26 @@ 
     );
     $form['forum_access']['troubleshooting'][] = array(
       '#type' => 'item',
-      '#value' => '<div>'.    t("In case of problems, follow these steps until you've got it worked out:") .'<ol style="margin-top: 0"><li>'.
-                              t("Update to the 'recommended' !Forum_Access and !ACL releases for your version of Drupal.", $variables) .'</li><li>'.
-        (count($na_modules) ? t("Read %Module_interference above and update your other node access modules.", $variables) .'</li><li>' : '') .
-                              t("Check the release notes of the development snapshots for issues that might have been fixed in !Forum_Access-dev or !ACL-dev since the latest release.", $variables) .'</li><li>'.
-                              t("Install the %devel_node_access module (!DNA, part of the !Devel module) and enable its !debug_mode: !DNA will show you all the grants that actually control your nodes in a footer block on each node's page.", $variables) .'</li><li>'.
-                              t("Additional insight can be gained from !dna_summary and by enabling the second !DNA block.", $variables) .'</li><li>'.
-                              t("Click !Rebuild_permissions on !Post_settings_link and check DNA for changes.", $variables) .'</li><li>'.
-                              t("Check the issues queues of !Forum_Access_ and !ACL_ for existing reports and possible solutions.", $variables) .'</li><li>'.
-                              t("If all of this hasn't helped, then pick ONE node that is misbehaving, look at it using an account that can see the node (and that should NOT have access if that's your problem!), create a new issue in the issues queue, describe the problem... <ul><li> what did you do? </li><li> what did you expect? </li><li> what happened instead? </li></ul> ... and <strong>attach a screenshot of all the DNA records</strong> for that one node. <br /> Be sure to indicate paths (URLs) for every page and module that you mention.") .'</li></ol></div>',
+      '#value' => '<div>'.t("In case of problems, follow these steps until you've got it worked out:").'<ol style="margin-top: 0"><li>'.
+                              t("Update to the 'recommended' !Forum_Access and !ACL releases for your version of Drupal.", $variables).'</li><li>'.
+        (count($na_modules) ? t("Read %Module_interference above and update your other node access modules.", $variables).'</li><li>' : '').
+                              t("Check the release notes of the development snapshots for issues that might have been fixed in !Forum_Access-dev or !ACL-dev since the latest release.", $variables).'</li><li>'.
+                              t("Install the %devel_node_access module (!DNA, part of the !Devel module) and enable its !debug_mode: !DNA will show you all the grants that actually control your nodes in a footer block on each node's page.", $variables).'</li><li>'.
+                              t("Additional insight can be gained from !dna_summary and by enabling the second !DNA block.", $variables).'</li><li>'.
+                              t("Click !Rebuild_permissions on !Post_settings_link and check DNA for changes.", $variables).'</li><li>'.
+                              t("Check the issues queues of !Forum_Access_ and !ACL_ for existing reports and possible solutions.", $variables).'</li><li>'.
+                              t("If all of this hasn't helped, then pick ONE node that is misbehaving, look at it using an account that can see the node (and that should NOT have access if that's your problem!), create a new issue in the issues queue, describe the problem... <ul><li> what did you do? </li><li> what did you expect? </li><li> what happened instead? </li></ul> ... and <strong>attach a screenshot of all the DNA records</strong> for that one node. <br /> Be sure to indicate paths (URLs) for every page and module that you mention.").'</li></ol></div>',
     );
     $form['forum_access']['troubleshooting'][] = array(
       '#type' => 'item',
-      '#value' => '<div>'. t("Note: You should not keep the !Devel module enabled on a production site.", $variables) .'</div>',
+      '#value' => '<div>'.t("Note: You should not keep the !Devel module enabled on a production site.", $variables).'</div>',
     );
   }
 
   if (!$is_container && isset($tid) && !node_access_needs_rebuild()) {
     $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
-    $limit = 20;   // from _node_access_rebuild_batch_operation()
-    $threshold = variable_get('forum_access_batch_threshold', $limit);  // change the variable if you want
+    $limit = 20; // from _node_access_rebuild_batch_operation()
+    $threshold = variable_get('forum_access_batch_threshold', $limit); // change the variable if you want
     $form['forum_access']['update_limit'] = array(
       '#type' => 'value',
       '#value' => $limit,
@@ -441,7 +441,7 @@ 
   $element_children = element_children($element);
   foreach ($element_children as $rid) {
     if ($rid == $moderator_rid) {
-      $element[$rid]['#prefix'] = '<span title="'. t("This is the (temporary) @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and is only used temporarily by @Forum_Access &mdash; do NOT give this role to any user!", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments'), '@Forum_Access' => 'Forum Access')) .'" class="forum-access-temporary-moderator">';
+      $element[$rid]['#prefix'] = '<span title="'.t("This is the (temporary) @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and is only used temporarily by @Forum_Access &mdash; do NOT give this role to any user!", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments'), '@Forum_Access' => 'Forum Access')).'" class="forum-access-temporary-moderator">';
       $element[$rid]['#suffix'] = "</span>";
       $element[$rid]['#default_value'] = TRUE;
       $element[$rid]['#disabled'] = TRUE;
@@ -452,19 +452,19 @@ 
     elseif ($element['#parents'][1] == 'comment_create') {
     }
     elseif ($element['#parents'][1] == 'view' && isset($permissions[$rid]['administer forums'])) {
-      $element[$rid]['#title'] = '<em>'. $element[$rid]['#title'] .'</em>';
-      $element[$rid]['#prefix'] = '<span title="'. t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))) .'">';
+      $element[$rid]['#title'] = '<em>'.$element[$rid]['#title'].'</em>';
+      $element[$rid]['#prefix'] = '<span title="'.t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))).'">';
       if (isset($permissions[$rid]['administer nodes'])) {
-        $element[$rid]['#prefix'] = str_replace('">', ' '. t("Because the role also has the '@administer_nodes' permission, it has full access to all nodes either way.", array('@administer_nodes' => $tr('administer nodes'))) .'">', $element[$rid]['#prefix']);
+        $element[$rid]['#prefix'] = str_replace('">', ' '.t("Because the role also has the '@administer_nodes' permission, it has full access to all nodes either way.", array('@administer_nodes' => $tr('administer nodes'))).'">', $element[$rid]['#prefix']);
       }
       $element[$rid]['#suffix'] = "</span>";
     }
     elseif (isset($permissions[$rid]['administer nodes'])) {
       $element[$rid]['#disabled'] = TRUE;
       $element[$rid]['#default_value'] = TRUE;
-      $element[$rid]['#prefix'] = '<span title="'. ($rid != $moderator_rid
+      $element[$rid]['#prefix'] = '<span title="'.($rid != $moderator_rid
                                                     ? t("This role has the '@administer_nodes' permission and thus full access to all nodes.", array('@administer_nodes' => $tr('administer nodes')))
-                                                    : t("This is the @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and thus full access to all nodes and comments.", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments')))) .'">';
+                                                    : t("This is the @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and thus full access to all nodes and comments.", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments')))).'">';
       $element[$rid]['#suffix'] = "</span>";
     }
   }
@@ -560,12 +560,12 @@ 
     variable_del('forum_access_new_template_tid');
   }
   module_load_include('node.inc', 'forum_access');
-  $moderator_rid = _forum_access_get_moderator_rid(TRUE);  // create the moderators role if it doesn't exist
+  $moderator_rid = _forum_access_get_moderator_rid(TRUE); // create the moderators role if it doesn't exist
 
   // check for changes
   $is_changed = $is_new = strpos($_GET['q'], 'admin/content/forum/add/') === 0;
   $is_changed = $is_changed || !empty($access['force_update']);
-  $form_initial_values = $form;  // avoid Coder warning
+  $form_initial_values = $form; // avoid Coder warning
   $form_initial_values = $form_initial_values['forum_access'];
   foreach (array('view', 'create', 'comment_create', 'update', 'delete') as $grant_type) {
     if (isset($form_initial_values[$grant_type])) {
@@ -610,11 +610,11 @@ 
     }
     else {
       db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
-      $tid, $rid, (bool) $checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
+      $tid, $rid, (bool)$checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
     }
   }
   $tr = 't';
-  $link = l($tr('edit'), 'admin/content/forum/edit/forum/'. $tid);
+  $link = l($tr('edit'), 'admin/content/forum/edit/forum/'.$tid);
   watchdog('access', 'Changed grants for %forum forum.', array('%forum' => $form_state['values']['name']), WATCHDOG_NOTICE, $link);
 
   if (!$is_new && $form_state['values']['form_id'] != 'forum_form_container') {
@@ -628,10 +628,10 @@ 
       $context = array();
       $pending_error_messages = drupal_get_messages('error', FALSE);
       $our_error_message_index = (isset($pending_error_messages['error']) ? count($pending_error_messages['error']) : 0);
-      _forum_access_update_batch_finished(FALSE, array(), array());       // add our error message (in case we die underway)
+      _forum_access_update_batch_finished(FALSE, array(), array()); // add our error message (in case we die underway)
       _forum_access_update_batch_operation($tid, 999999, 1, $context);
-      $pending_error_messages = drupal_get_messages('error', TRUE);       // still alive, get and clear all 'error' messages
-      unset($pending_error_messages['error'][$our_error_message_index]);  // remove our error message
+      $pending_error_messages = drupal_get_messages('error', TRUE); // still alive, get and clear all 'error' messages
+      unset($pending_error_messages['error'][$our_error_message_index]); // remove our error message
       foreach ($pending_error_messages['error'] as $message) {            // replay any others
         drupal_set_message($message, 'error');
       }
@@ -644,7 +644,7 @@ 
       $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
       $batch = array(
         'title' => t('Updating content access permissions'),
-        'file' => drupal_get_path('module', 'forum_access') .'/forum_access.admin.inc',
+        'file' => drupal_get_path('module', 'forum_access').'/forum_access.admin.inc',
         'operations' => array(
           array('_forum_access_update_batch_operation', array($tid, $limit, $count)),
         ),
@@ -654,7 +654,7 @@ 
     }
   }
 
-  variable_del('forum_access_rids');  // clear cache
+  variable_del('forum_access_rids'); // clear cache
 }
 
 /**
@@ -687,7 +687,7 @@ 
 
   // Multistep processing : report progress.
   if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -829,8 +829,8 @@ 
   );
   if (arg(3) == 'forum') {
     drupal_set_message(t('Note: In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected in the !Forum_Access_link settings, but !Forum_Access can only allow <i>more</i> access, not less.', $variables)
-      .'<br /><span class="error">'. t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables) .'</span>'
-      .'<br />'. t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
+      .'<br /><span class="error">'.t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables).'</span>'
+      .'<br />'.t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
   }
   else {
     $vid = _forum_access_get_vid();
@@ -893,7 +893,7 @@ 
   if (isset($moderator_rid) && isset($form['account']['roles']['#options'][$moderator_rid])) {
     $form['account']['roles'][$moderator_rid] = array(
       '#type' => 'checkbox',
-      '#title' => $form['account']['roles']['#options'][$moderator_rid] .' ('. t('reserved for internal use by the @Forum_Access module', array('@Forum_Access' => 'Forum Access')) .')',
+      '#title' => $form['account']['roles']['#options'][$moderator_rid].' ('.t('reserved for internal use by the @Forum_Access module', array('@Forum_Access' => 'Forum Access')).')',
       '#default_value' => in_array($moderator_rid, $form['account']['roles']['#default_value']),
       '#disabled' => TRUE,
     );
@@ -930,8 +930,8 @@ 
     else {
       $msg = t('!Forum_Access cannot create the %role role!', $variables);
       watchdog('user', $msg, NULL, WATCHDOG_WARNING);
-      drupal_set_message($msg .' '. t('Is it already in use?'), 'error');
-      $role->name = $role_name .' '. $i;
+      drupal_set_message($msg.' '.t('Is it already in use?'), 'error');
+      $role->name = $role_name.' '.$i;
     }
   }
   $msg = t('!Forum_Access has given up and will not work correctly! Rename one of the roles listed above, so that !Forum_Access can use its name.', $variables);

Braces +29 added lines, -41 removed lines

@@ -20,11 +20,12 @@ 
   }
 
   $roles = user_roles();
-  if (isset($tid)) {  // edit
+  if (isset($tid)) {
+// edit
     $template_tid = variable_get('forum_access_default_template_tid', 0);
     $settings = _forum_access_get_settings($tid);
-  }
-  else {  // create
+  } else {
+// create
     $template_tid = variable_get('forum_access_new_template_tid', NULL);
     $settings = _forum_access_get_settings($template_tid);
   }
@@ -208,9 +209,11 @@ 
   drupal_add_css(drupal_get_path('module', 'forum_access') .'/forum_access.css');
 
   // Find our moderator ACL:
-  if (isset($tid)) {  // edit, not new
+  if (isset($tid)) {
+// edit, not new
     $acl_id = acl_get_id_by_number('forum_access', $tid);
-    if (!$acl_id) { // create one
+    if (!$acl_id) {
+// create one
       $acl_id = acl_create_new_acl('forum_access', NULL, $tid);
       // update every existing node in this forum to use this acl.
       $result = db_query("SELECT nid FROM {term_node} WHERE tid = %d", $tid);
@@ -288,8 +291,7 @@ 
           $form['forum_access']['interference']['by_content_access'][] = array(
             '#value' => '<div>'. t("Unless you really know what you're doing, we recommend that you go to the !link page and clear all checkboxes. This will instruct @Content_Access to leave the %content_type nodes alone. However, if you put nodes of other content types into forums as well, then these content types will continue to have this problem.", $variables) .'</div>',
           );
-        }
-        else {
+        } else {
           $form['forum_access']['interference']['by_content_access'][] = array(
             '#value' => '<div>'. t("The priority of @Content_Access ($ca_priority) is higher than the priority of !Forum_Access ($fa_priority), which means the latter is <strong>completely disabled</strong> for the %content_type type! Unless you really know what you're doing, we recommend that you go to the !link page, change the priority (under %Advanced) to 0, and clear all checkboxes.", $variables) .'</div>',
           );
@@ -297,8 +299,7 @@ 
         $form['forum_access']['interference']['by_content_access'][] = array(
           '#value' => '<div>'. t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables) .'</div>',
         );
-      }
-      else {
+      } else {
         $form['forum_access']['interference'][] = array(
           '#value' => '<p>'. t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables) .'</p>',
         );
@@ -445,21 +446,17 @@ 
       $element[$rid]['#suffix'] = "</span>";
       $element[$rid]['#default_value'] = TRUE;
       $element[$rid]['#disabled'] = TRUE;
-    }
-    elseif ($element['#parents'][1] == 'create') {
+    } elseif ($element['#parents'][1] == 'create') {
       // Do nothing (Post is always mutable).
-    }
-    elseif ($element['#parents'][1] == 'comment_create') {
-    }
-    elseif ($element['#parents'][1] == 'view' && isset($permissions[$rid]['administer forums'])) {
+    } elseif ($element['#parents'][1] == 'comment_create') {
+    } elseif ($element['#parents'][1] == 'view' && isset($permissions[$rid]['administer forums'])) {
       $element[$rid]['#title'] = '<em>'. $element[$rid]['#title'] .'</em>';
       $element[$rid]['#prefix'] = '<span title="'. t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))) .'">';
       if (isset($permissions[$rid]['administer nodes'])) {
         $element[$rid]['#prefix'] = str_replace('">', ' '. t("Because the role also has the '@administer_nodes' permission, it has full access to all nodes either way.", array('@administer_nodes' => $tr('administer nodes'))) .'">', $element[$rid]['#prefix']);
       }
       $element[$rid]['#suffix'] = "</span>";
-    }
-    elseif (isset($permissions[$rid]['administer nodes'])) {
+    } elseif (isset($permissions[$rid]['administer nodes'])) {
       $element[$rid]['#disabled'] = TRUE;
       $element[$rid]['#default_value'] = TRUE;
       $element[$rid]['#prefix'] = '<span title="'. ($rid != $moderator_rid
@@ -515,8 +512,7 @@ 
     if ($settings['priority'] != 0) {
       $form['interference']['advanced']['#collapsed'] = FALSE;
     }
-  }
-  elseif (is_array(reset($form_state['values']['forum_access']['template']['taxonomy']))) {
+  } elseif (is_array(reset($form_state['values']['forum_access']['template']['taxonomy']))) {
       $imv = reset($form_state['values']['forum_access']['template']['taxonomy']);
     $template_tid = reset($imv);
   }
@@ -549,14 +545,12 @@ 
   $template_tid = reset(array_values($access['template']['taxonomy']));
   if ($access['template']['select_by_default']) {
     variable_set('forum_access_default_template_tid', $template_tid);
-  }
-  elseif (variable_get('forum_access_default_template_tid', 0) == $template_tid) {
+  } elseif (variable_get('forum_access_default_template_tid', 0) == $template_tid) {
     variable_del('forum_access_default_template_tid');
   }
   if ($access['template']['load_for_new']) {
     variable_set('forum_access_new_template_tid', $template_tid);
-  }
-  elseif (variable_get('forum_access_new_template_tid', 0) == $template_tid) {
+  } elseif (variable_get('forum_access_new_template_tid', 0) == $template_tid) {
     variable_del('forum_access_new_template_tid');
   }
   module_load_include('node.inc', 'forum_access');
@@ -598,8 +592,7 @@ 
       // We prefer not to save records for node administrators, because these have access anyway.
       if (isset($permissions[$rid]['administer forums']) && $access['view'][$rid]) {
         // For forum administrators, View needs to be saved, ...
-      }
-      else {
+      } else {
         // ... otherwise forget View.
         $access['view'][$rid] = FALSE;
       }
@@ -607,8 +600,7 @@ 
         db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
         $tid, $rid, !empty($access['view'][$rid]), 0, 0, !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
       }
-    }
-    else {
+    } else {
       db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
       $tid, $rid, (bool) $checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
     }
@@ -620,8 +612,7 @@ 
   if (!$is_new && $form_state['values']['form_id'] != 'forum_form_container') {
     if (!isset($access['update_choice']) || $access['update_choice'] == 2) {
       node_access_needs_rebuild(TRUE);
-    }
-    elseif ($access['update_choice'] == 0) {
+    } elseif ($access['update_choice'] == 0) {
       // update immediately (but use the batch functions anyway
       $save_redirect = $form_state['redirect'];
       $form_state['redirect'] = $_GET['q'];
@@ -632,13 +623,13 @@ 
       _forum_access_update_batch_operation($tid, 999999, 1, $context);
       $pending_error_messages = drupal_get_messages('error', TRUE);       // still alive, get and clear all 'error' messages
       unset($pending_error_messages['error'][$our_error_message_index]);  // remove our error message
-      foreach ($pending_error_messages['error'] as $message) {            // replay any others
+      foreach ($pending_error_messages['error'] as $message) {
+// replay any others
         drupal_set_message($message, 'error');
       }
       _forum_access_update_batch_finished(TRUE, array(), array());
       $form_state['redirect'] = $save_redirect;
-    }
-    else {
+    } else {
       // mass update in batch mode, modeled after node.module
       $limit = $access['update_limit'];
       $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
@@ -698,8 +689,7 @@ 
   if ($success) {
     drupal_set_message(t('The content access permissions have been updated.'));
     cache_clear_all();
-  }
-  else {
+  } else {
     drupal_set_message(t('The content access permissions have not been properly updated.'), 'error');
   }
 }
@@ -744,8 +734,7 @@ 
     $return['view'] = array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID);
     $return['create'] = array(DRUPAL_AUTHENTICATED_RID);
     $return['comment_create'] = array(DRUPAL_AUTHENTICATED_RID);
-  }
-  else {
+  } else {
     $result = db_query("SELECT * FROM {forum_access} where tid = %d", $tid);
     while ($access = db_fetch_object($result)) {
       if ($access->grant_view) {
@@ -763,7 +752,8 @@ 
       if ($access->grant_comment_create) {
         $return['comment_create'][] = $access->rid;
       }
-      if ($access->rid == DRUPAL_AUTHENTICATED_RID) {  // this is our reference
+      if ($access->rid == DRUPAL_AUTHENTICATED_RID) {
+// this is our reference
         $return['priority'] = $access->priority;
       }
     }
@@ -831,8 +821,7 @@ 
     drupal_set_message(t('Note: In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected in the !Forum_Access_link settings, but !Forum_Access can only allow <i>more</i> access, not less.', $variables)
       .'<br /><span class="error">'. t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables) .'</span>'
       .'<br />'. t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
-  }
-  else {
+  } else {
     $vid = _forum_access_get_vid();
     $vocabulary = taxonomy_vocabulary_load($vid);
     if (isset($vocabulary->nodes[arg(3)])) {
@@ -926,8 +915,7 @@ 
       }
       watchdog('user', $msg, NULL, WATCHDOG_NOTICE);
       return $rid;
-    }
-    else {
+    } else {
       $msg = t('!Forum_Access cannot create the %role role!', $variables);
       watchdog('user', $msg, NULL, WATCHDOG_WARNING);
       drupal_set_message($msg .' '. t('Is it already in use?'), 'error');

Upper-Lower-Casing +63 added lines, -63 removed lines

@@ -12,8 +12,8 @@ 
  * Rewrite the forum administration page with our new access rules.
  */
 function _forum_access_forum_form(&$form, &$form_state, $is_container) {
-  $tid = (isset($form['tid']['#value']) ? $form['tid']['#value'] : NULL);
-  if (isset($tid) && !forum_access_access($tid, 'view', NULL, FALSE)) {
+  $tid = (isset($form['tid']['#value']) ? $form['tid']['#value'] : null);
+  if (isset($tid) && !forum_access_access($tid, 'view', null, false)) {
     drupal_access_denied();  // Deny access if the user doesn't have View access.
     module_invoke_all('exit');
     exit;
@@ -25,7 +25,7 @@ 
     $settings = _forum_access_get_settings($tid);
   }
   else {  // create
-    $template_tid = variable_get('forum_access_new_template_tid', NULL);
+    $template_tid = variable_get('forum_access_new_template_tid', null);
     $settings = _forum_access_get_settings($template_tid);
   }
   $fa_priority = $settings['priority'];
@@ -33,38 +33,38 @@ 
   $form['forum_access'] = array(
     '#type' => 'fieldset',
     '#title' => t('Access control'),
-    '#collapsible' => TRUE,
-    '#tree' => TRUE,
+    '#collapsible' => true,
+    '#tree' => true,
   );
 
   $tr = 't';
   $variables = array(
-    '!access_content'                 => '<em>'. l($tr('access content'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
-    '!access_comments'                => '<em>'. l($tr('access comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!create_forum_topics'            => '<em>'. l($tr('create forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!post_comments'                  => '<em>'. l($tr('post comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!post_comments_without_approval' => '<em>'. l($tr('post comments without approval'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!edit_own_forum_topics'          => '<em>'. l($tr('edit own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!edit_any_forum_topics'          => '<em>'. l($tr('edit any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!delete_own_forum_topics'        => '<em>'. l($tr('delete own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!delete_any_forum_topics'        => '<em>'. l($tr('delete any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!administer_comments'            => '<em>'. l($tr('administer comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!administer_forums'              => '<em>'. l($tr('administer forums'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!administer_nodes'               => '<em>'. l($tr('administer nodes'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
+    '!access_content'                 => '<em>'. l($tr('access content'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => true)) .'</em>',
+    '!access_comments'                => '<em>'. l($tr('access comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => true)) .'</em>',
+    '!create_forum_topics'            => '<em>'. l($tr('create forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => true)) .'</em>',
+    '!post_comments'                  => '<em>'. l($tr('post comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => true)) .'</em>',
+    '!post_comments_without_approval' => '<em>'. l($tr('post comments without approval'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => true)) .'</em>',
+    '!edit_own_forum_topics'          => '<em>'. l($tr('edit own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => true)) .'</em>',
+    '!edit_any_forum_topics'          => '<em>'. l($tr('edit any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => true)) .'</em>',
+    '!delete_own_forum_topics'        => '<em>'. l($tr('delete own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => true)) .'</em>',
+    '!delete_any_forum_topics'        => '<em>'. l($tr('delete any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => true)) .'</em>',
+    '!administer_comments'            => '<em>'. l($tr('administer comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => true)) .'</em>',
+    '!administer_forums'              => '<em>'. l($tr('administer forums'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => true)) .'</em>',
+    '!administer_nodes'               => '<em>'. l($tr('administer nodes'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => true)) .'</em>',
   );
   if (!$is_container) {
     $form['forum_access']['permissions'] = array(
       '#type' => 'fieldset',
       '#title' => $tr('Permissions information'),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+      '#collapsible' => true,
+      '#collapsed' => true,
     );
     $form['forum_access']['permissions'][] = array(
       '#type' => 'markup',
       '#value' => '<div>'. t('Note that users need') .'<ul style="margin-top: 0"><li>'.
                            t('the !access_content and !access_comments permissions <strong>AND <em>View</em></strong> to be able to see this forum and its content at all,', $variables) .'</li><li>'.
                            t('the !create_forum_topics (and similar) permissions <strong>AND <em>Post</em></strong> to be able to create forum content, and', $variables) .'</li><li>'.
-                           t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', FALSE) ? 'del title="'. t('Drupal 5 legacy mode') .'"' : 'strong'))) .'</li><li>'.
+                           t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', false) ? 'del title="'. t('Drupal 5 legacy mode') .'"' : 'strong'))) .'</li><li>'.
                            t('the !edit_own_forum_topics or !edit_any_forum_topics (and similar) permissions <strong>AND (<em>Edit</em> AND <em>Comment</em></strong>) can be added if desired, <strong>plus</strong>', $variables) .'</li><li>'.
                            t('the !delete_own_forum_topics or !delete_any_forum_topics (and similar) permissions (<strong>OR <em>Delete</em></strong>) if desired;', $variables) .'</li><li>'.
                            t('the !administer_comments (global!) permission <strong>OR <em>Edit</em>/<em>Delete</em></strong> to be able to edit/delete comments;', $variables) .'</li><li>'.
@@ -78,7 +78,7 @@ 
   $form['forum_access']['template'] = array(
       '#type' => 'fieldset',
       '#title' => $tr('Template'),
-      '#collapsible' => TRUE,
+      '#collapsible' => true,
       '#collapsed' => empty($template_tid),
   );
   $form['forum_access']['template']['taxonomy'][$vid] = taxonomy_form($vid, array($template_tid), '');
@@ -87,21 +87,21 @@ 
     '#type' => 'button',
     '#name' => 'load_template',
     '#value' => t('Load'),
-    '#submit' => FALSE,
+    '#submit' => false,
   );
   $form['forum_access']['template']['template_tid'] = array(
     '#type' => 'value',
-    '#value' => NULL,
+    '#value' => null,
   );
   $form['forum_access']['template']['select_by_default'] = array(
     '#type' => 'checkbox',
     '#title' => t('Remember this selection.'),
-    '#default_value' => FALSE,
+    '#default_value' => false,
   );
   $form['forum_access']['template']['load_for_new'] = array(
     '#type' => 'checkbox',
     '#title' => t("Use the selected forum's settings as defaults for new forums and containers."),
-    '#default_value' => FALSE,
+    '#default_value' => false,
   );
   $form['forum_access']['#after_build'][] = '_forum_access_forum_form_after_build';
 
@@ -211,7 +211,7 @@ 
   if (isset($tid)) {  // edit, not new
     $acl_id = acl_get_id_by_number('forum_access', $tid);
     if (!$acl_id) { // create one
-      $acl_id = acl_create_new_acl('forum_access', NULL, $tid);
+      $acl_id = acl_create_new_acl('forum_access', null, $tid);
       // update every existing node in this forum to use this acl.
       $result = db_query("SELECT nid FROM {term_node} WHERE tid = %d", $tid);
       while ($node = db_fetch_object($result)) {
@@ -243,7 +243,7 @@ 
     $form['forum_access']['interference'] = array(
       '#type' => 'fieldset',
       '#title' => t('Module interference'),
-      '#collapsible' => TRUE,
+      '#collapsible' => true,
     );
     $variables = array(
       '%content_type' => node_get_types('name', 'forum'),
@@ -264,13 +264,13 @@ 
       foreach (array('view', 'update', 'delete', 'per_node') as $type) {
         $value = content_access_get_settings($type, 'forum');
         if (!empty($value)) {
-          $ca_interferes = TRUE;
+          $ca_interferes = true;
         }
       }
       $ca_priority = content_access_get_settings('priority', 'forum');
       $is_conflict = $ca_priority >= $fa_priority && !empty($ca_interferes) || $ca_priority > $fa_priority;
       $variables += array(
-        '!link' => l(t('@Content_Access configuration for the %content_type type', $variables), 'admin/content/node-type/forum/access', array('html' => TRUE)),
+        '!link' => l(t('@Content_Access configuration for the %content_type type', $variables), 'admin/content/node-type/forum/access', array('html' => true)),
         '%Advanced' => $tr('Advanced'),
       );
       $specifically = ($ca_priority == $fa_priority ? t('Specifically, any grants given by !Content_Access cannot be taken back by !Forum_Access.', $variables) : '');
@@ -278,7 +278,7 @@ 
         $form['forum_access']['interference']['by_content_access'] = array(
           '#type' => 'fieldset',
           '#title' => 'Content Access',
-          '#collapsible' => FALSE,
+          '#collapsible' => false,
           '#attributes' => array('class' => 'error'),
         );
         $form['forum_access']['interference']['by_content_access'][] = array(
@@ -308,7 +308,7 @@ 
     $form['forum_access']['interference']['advanced'] = array(
       '#type' => 'fieldset',
       '#title' => t('Advanced'),
-      '#collapsible' => TRUE,
+      '#collapsible' => true,
       '#collapsed' => !($fa_priority != 0),
     );
     $form['forum_access']['interference']['advanced']['priority'] = array(
@@ -324,8 +324,8 @@ 
       '!Forum_Access'        => l('Forum Access', 'http://drupal.org/project/forum_access'),
       '!ACL'                 => l('ACL', 'http://drupal.org/project/acl'),
       '%Module_interference' => t('Module interference'),
-      '!Forum_Access-dev'    => l('Forum&nbsp;Access&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96795', array('html' => TRUE)),
-      '!ACL-dev'             => l('ACL&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96794', array('html' => TRUE)),
+      '!Forum_Access-dev'    => l('Forum&nbsp;Access&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96795', array('html' => true)),
+      '!ACL-dev'             => l('ACL&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96794', array('html' => true)),
       '%devel_node_access'   => 'devel_node_access',
       '!Devel'               => l('Devel', 'http://drupal.org/project/devel'),
       '!DNA'                 => 'DNA',
@@ -339,8 +339,8 @@ 
     $form['forum_access']['troubleshooting'] = array(
       '#type' => 'fieldset',
       '#title' => t('Trouble-shooting node access'),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+      '#collapsible' => true,
+      '#collapsed' => true,
     );
     $form['forum_access']['troubleshooting'][] = array(
       '#type' => 'item',
@@ -372,7 +372,7 @@ 
       '#type' => 'radios',
       '#title' => 'Update the permissions',
       '#description' => t('<em>If</em> you make any node access changes, then each node in this forum needs to be updated. Hover over the radiobuttons for details.'),
-      '#options' => NULL,
+      '#options' => null,
       0 => array(
         '#type' => 'radio',
         '#title' => t('for all %count nodes immediately', array('%count' => $count)),
@@ -443,8 +443,8 @@ 
     if ($rid == $moderator_rid) {
       $element[$rid]['#prefix'] = '<span title="'. t("This is the (temporary) @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and is only used temporarily by @Forum_Access &mdash; do NOT give this role to any user!", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments'), '@Forum_Access' => 'Forum Access')) .'" class="forum-access-temporary-moderator">';
       $element[$rid]['#suffix'] = "</span>";
-      $element[$rid]['#default_value'] = TRUE;
-      $element[$rid]['#disabled'] = TRUE;
+      $element[$rid]['#default_value'] = true;
+      $element[$rid]['#disabled'] = true;
     }
     elseif ($element['#parents'][1] == 'create') {
       // Do nothing (Post is always mutable).
@@ -460,8 +460,8 @@ 
       $element[$rid]['#suffix'] = "</span>";
     }
     elseif (isset($permissions[$rid]['administer nodes'])) {
-      $element[$rid]['#disabled'] = TRUE;
-      $element[$rid]['#default_value'] = TRUE;
+      $element[$rid]['#disabled'] = true;
+      $element[$rid]['#default_value'] = true;
       $element[$rid]['#prefix'] = '<span title="'. ($rid != $moderator_rid
                                                     ? t("This role has the '@administer_nodes' permission and thus full access to all nodes.", array('@administer_nodes' => $tr('administer nodes')))
                                                     : t("This is the @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and thus full access to all nodes and comments.", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments')))) .'">';
@@ -486,7 +486,7 @@ 
 
 function _forum_access_forum_form_after_build_acl2($form, $form_state) {
   if (!count(unserialize($form['user_list']['#default_value'])) && !count(unserialize($form['user_list']['#value']))) {
-    $form['#collapsed'] = TRUE;
+    $form['#collapsed'] = true;
   }
   if ($form['user_list']['#default_value'] != $form['user_list']['#value']) {
     $form['note']['#value'] = preg_replace('/<div>/', '<div class="warning">', $form['note']['#value']);
@@ -499,7 +499,7 @@ 
     // Load a setting from a template:
     $template_tid = reset(array_values($form['#post']['forum_access']['template']['taxonomy']));
     $form_state['values']['forum_access']['template']['template_tid'] = $template_tid;
-    $form['template']['#collapsed'] = FALSE;
+    $form['template']['#collapsed'] = false;
 
     $settings = _forum_access_get_settings($template_tid);
     foreach (array('view', 'create', 'comment_create', 'update', 'delete') as $grant_type) {
@@ -507,13 +507,13 @@ 
         continue;
       }
       foreach (element_children($form[$grant_type]) as $tid) {
-        $checked = array_search($tid, $settings[$grant_type]) !== FALSE;
+        $checked = array_search($tid, $settings[$grant_type]) !== false;
         $form[$grant_type][$tid]['#value'] = ($checked ? $tid : 0);
       }
     }
     $form['interference']['advanced']['priority']['#value'] = $settings['priority'];
     if ($settings['priority'] != 0) {
-      $form['interference']['advanced']['#collapsed'] = FALSE;
+      $form['interference']['advanced']['#collapsed'] = false;
     }
   }
   elseif (is_array(reset($form_state['values']['forum_access']['template']['taxonomy']))) {
@@ -560,7 +560,7 @@ 
     variable_del('forum_access_new_template_tid');
   }
   module_load_include('node.inc', 'forum_access');
-  $moderator_rid = _forum_access_get_moderator_rid(TRUE);  // create the moderators role if it doesn't exist
+  $moderator_rid = _forum_access_get_moderator_rid(true);  // create the moderators role if it doesn't exist
 
   // check for changes
   $is_changed = $is_new = strpos($_GET['q'], 'admin/content/forum/add/') === 0;
@@ -601,7 +601,7 @@ 
       }
       else {
         // ... otherwise forget View.
-        $access['view'][$rid] = FALSE;
+        $access['view'][$rid] = false;
       }
       if ($access['view'][$rid] || $access['create'][$rid] || $access['comment_create'][$rid]) {
         db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
@@ -619,23 +619,23 @@ 
 
   if (!$is_new && $form_state['values']['form_id'] != 'forum_form_container') {
     if (!isset($access['update_choice']) || $access['update_choice'] == 2) {
-      node_access_needs_rebuild(TRUE);
+      node_access_needs_rebuild(true);
     }
     elseif ($access['update_choice'] == 0) {
       // update immediately (but use the batch functions anyway
       $save_redirect = $form_state['redirect'];
       $form_state['redirect'] = $_GET['q'];
       $context = array();
-      $pending_error_messages = drupal_get_messages('error', FALSE);
+      $pending_error_messages = drupal_get_messages('error', false);
       $our_error_message_index = (isset($pending_error_messages['error']) ? count($pending_error_messages['error']) : 0);
-      _forum_access_update_batch_finished(FALSE, array(), array());       // add our error message (in case we die underway)
+      _forum_access_update_batch_finished(false, array(), array());       // add our error message (in case we die underway)
       _forum_access_update_batch_operation($tid, 999999, 1, $context);
-      $pending_error_messages = drupal_get_messages('error', TRUE);       // still alive, get and clear all 'error' messages
+      $pending_error_messages = drupal_get_messages('error', true);       // still alive, get and clear all 'error' messages
       unset($pending_error_messages['error'][$our_error_message_index]);  // remove our error message
       foreach ($pending_error_messages['error'] as $message) {            // replay any others
         drupal_set_message($message, 'error');
       }
-      _forum_access_update_batch_finished(TRUE, array(), array());
+      _forum_access_update_batch_finished(true, array(), array());
       $form_state['redirect'] = $save_redirect;
     }
     else {
@@ -675,7 +675,7 @@ 
   // Process the next 20 nodes.
   $result = db_query_range("SELECT DISTINCT n.nid FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE n.nid > %d AND tn.tid = %d ORDER BY n.nid ASC", $context['sandbox']['current_node'], $tid, 0, $limit);
   while ($row = db_fetch_array($result)) {
-    $loaded_node = node_load($row['nid'], NULL, TRUE);
+    $loaded_node = node_load($row['nid'], null, true);
     // To preserve database integrity, only aquire grants if the node
     // loads successfully.
     if (!empty($loaded_node)) {
@@ -726,7 +726,7 @@ 
   $form['forum_access']['forum_access_D5_legacy_mode'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Drupal 5 legacy mode', $variables),
-    '#default_value' => variable_get('forum_access_D5_legacy_mode', FALSE),
+    '#default_value' => variable_get('forum_access_D5_legacy_mode', false),
     '#description'   => t('In Drupal 5, comment posting was not restricted by !Forum_Access; users with %View access (and the %post_comments permission) were always allowed to post forum comments. Starting with Drupal 6, posting comments is now restricted to users with %Post access. Turn this option on to revert to the old behavior. The default is OFF.', $variables),
   );
   $buttons = $form['buttons'];
@@ -737,7 +737,7 @@ 
 /**
  * Helper function to retrieve the settings for a forum.
  */
-function _forum_access_get_settings($tid = NULL) {
+function _forum_access_get_settings($tid = null) {
     $return = array('view' => array(), 'create' => array(), 'comment_create' => array(), 'update' => array(), 'delete' => array(), 'priority' => 0);
   if (!isset($tid)) {
     // Default to all users can read; all logged in users can post and comment.
@@ -781,8 +781,8 @@ 
   }
   foreach ($form as $key => $value) {
     if (preg_match('/^tid:(.*):0$/', $key, $matches)) {
-      if (!forum_access_access($matches[1], 'view', NULL, FALSE)) {
-        $form[$key]['edit']['#access'] = FALSE;
+      if (!forum_access_access($matches[1], 'view', null, false)) {
+        $form[$key]['edit']['#access'] = false;
         if (preg_match('|<a [^>]*>([^<]*)</a>|', $form[$key]['view']['#value'], $matches)) {
           $form[$key]['view']['#value'] = $matches[1];
         }
@@ -850,8 +850,8 @@ 
 function _forum_access_user_admin_perm_form(&$form, &$form_state) {
   $moderator_rid = forum_access_query_moderator_rid();
   if (isset($moderator_rid) && array_key_exists($moderator_rid, $form['role_names'])) {
-    drupal_set_message(t('The %role role is used internally by the @Forum_Access module and must not be changed!', array('%role' => $form['role_names'][$moderator_rid]['#value'], '@Forum_Access' => 'Forum Access')), 'warning', FALSE);
-    $form['checkboxes'][$moderator_rid]['#disabled'] = TRUE;
+    drupal_set_message(t('The %role role is used internally by the @Forum_Access module and must not be changed!', array('%role' => $form['role_names'][$moderator_rid]['#value'], '@Forum_Access' => 'Forum Access')), 'warning', false);
+    $form['checkboxes'][$moderator_rid]['#disabled'] = true;
   }
   array_unshift($form['#submit'], '_forum_access_user_admin_perm_form_submit');
 }
@@ -895,7 +895,7 @@ 
       '#type' => 'checkbox',
       '#title' => $form['account']['roles']['#options'][$moderator_rid] .' ('. t('reserved for internal use by the @Forum_Access module', array('@Forum_Access' => 'Forum Access')) .')',
       '#default_value' => in_array($moderator_rid, $form['account']['roles']['#default_value']),
-      '#disabled' => TRUE,
+      '#disabled' => true,
     );
     unset($form['account']['roles']['#options'][$moderator_rid]);
   }
@@ -904,7 +904,7 @@ 
 /**
  * Create the Forum Moderator role.
  */
-function _forum_access_create_moderator_rid($verbose = FALSE) {
+function _forum_access_create_moderator_rid($verbose = false) {
   $tr = 't';
   $variables = array('!Forum_Access' => 'Forum Access', '%administer_comments' => $tr('administer comments'), '%administer_nodes' => $tr('administer nodes'));
   $role_name = t('Forum Moderator');
@@ -924,18 +924,18 @@ 
       if ($verbose) {
         drupal_set_message($msg, 'warning');
       }
-      watchdog('user', $msg, NULL, WATCHDOG_NOTICE);
+      watchdog('user', $msg, null, WATCHDOG_NOTICE);
       return $rid;
     }
     else {
       $msg = t('!Forum_Access cannot create the %role role!', $variables);
-      watchdog('user', $msg, NULL, WATCHDOG_WARNING);
+      watchdog('user', $msg, null, WATCHDOG_WARNING);
       drupal_set_message($msg .' '. t('Is it already in use?'), 'error');
       $role->name = $role_name .' '. $i;
     }
   }
   $msg = t('!Forum_Access has given up and will not work correctly! Rename one of the roles listed above, so that !Forum_Access can use its name.', $variables);
   drupal_set_message($msg, 'error');
-  watchdog('user', $msg, NULL, WATCHDOG_CRITICAL);
+  watchdog('user', $msg, null, WATCHDOG_CRITICAL);
 }
 

drupal/sites/default/boinc/modules/contrib/forum_access/forum_access.node.inc

Braces +4 added lines, -8 removed lines

@@ -49,23 +49,20 @@ 
   foreach ($form['taxonomy'][$vid]['#options'] as $tid => $name) {
     if (!is_numeric($tid)) {
       $options[$tid] = $name;
-    }
-    elseif (is_object($name)) {
+    } elseif (is_object($name)) {
       foreach ($name->option as $sub_tid => $sub_name) {
         if (!empty($tids[$sub_tid])) {
           $options[$tid]->option[$sub_tid] = $sub_name;
         }
       }
-    }
-    elseif ($tids[$tid]) {
+    } elseif ($tids[$tid]) {
       $options[$tid] = $name;
     }
   }
 
   if ($options) {
     $form['taxonomy'][$vid]['#options'] = $options;
-  }
-  else {
+  } else {
     unset($form['taxonomy'][$vid]);
   }
 
@@ -135,8 +132,7 @@ 
                 }
             break;
         }//switch arg(0)
-      }
-      else {
+      } else {
         if (isset($form['admin']) && !empty($user->_forum_access_moderator)) {
           foreach (element_children($form['admin']) as $key) {
             if ($key != 'status') {

Upper-Lower-Casing +18 added lines, -18 removed lines

@@ -81,24 +81,24 @@ 
       switch ($key) {
         case 'options':
           foreach (element_children($form[$key]) as $key2) {
-            if (array_search($key2, $allowed_options) === FALSE) {
-              $form[$key][$key2]['#access'] = FALSE;
+            if (array_search($key2, $allowed_options) === false) {
+              $form[$key][$key2]['#access'] = false;
             }
           }
           break;
         case 'buttons':
           $tid = $form['taxonomy'][$vid]['#default_value'][0];
           if (!forum_access_access($tid, 'update')) {
-            $form['buttons']['submit']['#access'] = FALSE;
-            $form['buttons']['preview']['#access'] = FALSE;
+            $form['buttons']['submit']['#access'] = false;
+            $form['buttons']['preview']['#access'] = false;
           }
           if (!forum_access_access($tid, 'delete')) {
-            $form['buttons']['delete']['#access'] = FALSE;
+            $form['buttons']['delete']['#access'] = false;
           }
           break;
         default:
-          if (array_search($key, $allowed_elements) === FALSE) {
-            $form[$key]['#access'] = FALSE;
+          if (array_search($key, $allowed_elements) === false) {
+            $form[$key]['#access'] = false;
           }
       }
     }
@@ -122,7 +122,7 @@ 
         switch (arg(0)) {
           case 'node':
               // Remove the in-line comment form, replace with text message to user.
-              $form = NULL;
+              $form = null;
               $form['from'] = array(
                   '#type'  => 'item',
                   '#value' => 'You do not have permission to post comments in this forum.',);
@@ -140,7 +140,7 @@ 
         if (isset($form['admin']) && !empty($user->_forum_access_moderator)) {
           foreach (element_children($form['admin']) as $key) {
             if ($key != 'status') {
-              $form['admin'][$key]['#access'] = FALSE;
+              $form['admin'][$key]['#access'] = false;
             }
           }
         }
@@ -156,7 +156,7 @@ 
   global $user;
   $rid = _forum_access_get_moderator_rid();
   $user->roles[$rid] = '(forum_access temporary)';
-  user_access('', NULL, TRUE); // clear the permissions cache to activate the new role
+  user_access('', null, true); // clear the permissions cache to activate the new role
 }
 
 /*
@@ -166,16 +166,16 @@ 
   global $user;
   $rid = _forum_access_get_moderator_rid();
   unset($user->roles[$rid]);
-  user_access('', NULL, TRUE); // clear the permissions cache to revert to normal
+  user_access('', null, true); // clear the permissions cache to revert to normal
 }
 
 /*
  * Retrieve the rid of the Forum Moderator role; if the role does not exist,
  * then create it.
  */
-function _forum_access_get_moderator_rid($verbose = FALSE) {
+function _forum_access_get_moderator_rid($verbose = false) {
   $rid = forum_access_query_moderator_rid();
-  if ($rid !== NULL) {
+  if ($rid !== null) {
     if (db_result(db_query("SELECT COUNT(rid) FROM {role} WHERE rid = %d", $rid)) == 1) {
       return $rid;
     }
@@ -208,17 +208,17 @@ 
 
   $tid = $variables['node']->tid;
   $links = module_invoke_all('link', 'comment', $variables['comment'], 0);
-  if (!empty($user->_forum_access_moderator) && arg(0) == 'node' && arg(2) == NULL) {
+  if (!empty($user->_forum_access_moderator) && arg(0) == 'node' && arg(2) == null) {
     _forum_access_disable_moderator();
   }
 
-  if (isset($links['comment_reply']) && (!preg_match('#<li class="[^"]*comment_reply[^"]*".*</li>#U', $variables['links']) || !user_access('post comments') || !forum_access_access($tid, 'comment_create', NULL, FALSE))) {
+  if (isset($links['comment_reply']) && (!preg_match('#<li class="[^"]*comment_reply[^"]*".*</li>#U', $variables['links']) || !user_access('post comments') || !forum_access_access($tid, 'comment_create', null, false))) {
     unset($links['comment_reply']);
   }
-  if (isset($links['comment_edit']) && !forum_access_access($tid, 'update', NULL, FALSE) && !comment_access('edit', $variables['comment'])) {
+  if (isset($links['comment_edit']) && !forum_access_access($tid, 'update', null, false) && !comment_access('edit', $variables['comment'])) {
     unset($links['comment_edit']);
   }
-  if (isset($links['comment_delete']) && !forum_access_access($tid, 'delete', NULL, FALSE) && !user_access('administer comments')) {
+  if (isset($links['comment_delete']) && !forum_access_access($tid, 'delete', null, false) && !user_access('administer comments')) {
     unset($links['comment_delete']);
   }
   foreach (array_keys($links) as $link) {
@@ -235,7 +235,7 @@ 
   if (empty($links)) {
     $links['comment_forbidden'] = array(
       'title' => theme('comment_post_forbidden', $variables['node']),
-      'html'  => TRUE,
+      'html'  => true,
     );
   }
   $variables['links'] = theme('links', $links);

Indentation +102 added lines, -102 removed lines

@@ -13,64 +13,64 @@ 
  * Rewrite the taxonomy item on the node form.
  */
 function _forum_access_node_form(&$form, &$form_state) {
-  global $user;
-  $vid = _forum_access_get_vid();
+    global $user;
+    $vid = _forum_access_get_vid();
 
-  if (!isset($form['taxonomy'][$vid]['#options'])) {
+    if (!isset($form['taxonomy'][$vid]['#options'])) {
     return;
-  }
+    }
 
-  // True node administrators are all powerful and do NOT get their forms rewritten here.
-  if (user_access('administer nodes') && empty($user->_forum_access_moderator)) {
+    // True node administrators are all powerful and do NOT get their forms rewritten here.
+    if (user_access('administer nodes') && empty($user->_forum_access_moderator)) {
     return;
-  }
+    }
 
-  $roles = array_keys($user->roles);
-  $result = db_query("SELECT tid FROM {forum_access} WHERE rid IN (". db_placeholders($roles) .") AND grant_create = 1", $roles);
-  while ($obj = db_fetch_object($result)) {
+    $roles = array_keys($user->roles);
+    $result = db_query("SELECT tid FROM {forum_access} WHERE rid IN (". db_placeholders($roles) .") AND grant_create = 1", $roles);
+    while ($obj = db_fetch_object($result)) {
     $tids[$obj->tid] = $obj->tid;
-  }
+    }
 
-  // Also get all forums they happen to be able to moderate.
-  $result = db_query("SELECT a.number AS tid FROM {acl} a INNER JOIN {acl_user} u ON a.acl_id = u.acl_id WHERE a.module = 'forum_access' AND u.uid = %d", $user->uid);
-  while ($obj = db_fetch_object($result)) {
+    // Also get all forums they happen to be able to moderate.
+    $result = db_query("SELECT a.number AS tid FROM {acl} a INNER JOIN {acl_user} u ON a.acl_id = u.acl_id WHERE a.module = 'forum_access' AND u.uid = %d", $user->uid);
+    while ($obj = db_fetch_object($result)) {
     $tids[$obj->tid] = $obj->tid;
-  }
+    }
 
-  // Ensure the forum they're trying to post to directly is allowed, otherwise
-  // there will be much confusion.
-  $forum_tid = arg(3);
-  if (isset($forum_tid) && is_numeric($forum_tid) && !isset($tids[$forum_tid])) {
+    // Ensure the forum they're trying to post to directly is allowed, otherwise
+    // there will be much confusion.
+    $forum_tid = arg(3);
+    if (isset($forum_tid) && is_numeric($forum_tid) && !isset($tids[$forum_tid])) {
     drupal_access_denied();
     module_invoke_all('exit');
     exit;
-  }
+    }
 
-  foreach ($form['taxonomy'][$vid]['#options'] as $tid => $name) {
+    foreach ($form['taxonomy'][$vid]['#options'] as $tid => $name) {
     if (!is_numeric($tid)) {
-      $options[$tid] = $name;
+        $options[$tid] = $name;
     }
     elseif (is_object($name)) {
-      foreach ($name->option as $sub_tid => $sub_name) {
+        foreach ($name->option as $sub_tid => $sub_name) {
         if (!empty($tids[$sub_tid])) {
-          $options[$tid]->option[$sub_tid] = $sub_name;
+            $options[$tid]->option[$sub_tid] = $sub_name;
+        }
         }
-      }
     }
     elseif ($tids[$tid]) {
-      $options[$tid] = $name;
+        $options[$tid] = $name;
+    }
     }
-  }
 
-  if ($options) {
+    if ($options) {
     $form['taxonomy'][$vid]['#options'] = $options;
-  }
-  else {
+    }
+    else {
     unset($form['taxonomy'][$vid]);
-  }
+    }
 
-  // Apply modifications for Moderators (by role or uid).
-  if (!empty($user->_forum_access_moderator)) {
+    // Apply modifications for Moderators (by role or uid).
+    if (!empty($user->_forum_access_moderator)) {
     // We gave this user the 'administer nodes' permission, which he doesn't
     // normally have. Remove controls that should be reserved to true node
     // administrators.
@@ -78,31 +78,31 @@ 
     $allowed_elements = variable_get('forum_access_allowed_node_edit_elements', array('nid', 'vid', 'uid', 'created', 'type', 'changed', 'title', 'shadow', 'body_field', 'revision_information', 'form_build_id', 'form_token', 'form_id', 'comment_settings', 'taxonomy', 'attachments'));
     $allowed_options = variable_get('forum_access_allowed_node_edit_options', array('status', 'sticky', 'subscriptions_notify'));
     foreach (element_children($form) as $key) {
-      switch ($key) {
+        switch ($key) {
         case 'options':
           foreach (element_children($form[$key]) as $key2) {
             if (array_search($key2, $allowed_options) === FALSE) {
-              $form[$key][$key2]['#access'] = FALSE;
+                $form[$key][$key2]['#access'] = FALSE;
+            }
             }
-          }
-          break;
+            break;
         case 'buttons':
           $tid = $form['taxonomy'][$vid]['#default_value'][0];
-          if (!forum_access_access($tid, 'update')) {
+            if (!forum_access_access($tid, 'update')) {
             $form['buttons']['submit']['#access'] = FALSE;
             $form['buttons']['preview']['#access'] = FALSE;
-          }
-          if (!forum_access_access($tid, 'delete')) {
+            }
+            if (!forum_access_access($tid, 'delete')) {
             $form['buttons']['delete']['#access'] = FALSE;
-          }
-          break;
+            }
+            break;
         default:
           if (array_search($key, $allowed_elements) === FALSE) {
             $form[$key]['#access'] = FALSE;
-          }
-      }
+            }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -114,18 +114,18 @@ 
  * and sanitize the Administration options for users with Edit grants.
  */
 function _forum_access_comment_form(&$form, &$form_state) {
-  global $user;
-  if ($user->uid != 1 && isset($form['nid']['#value'])) {
+    global $user;
+    if ($user->uid != 1 && isset($form['nid']['#value'])) {
     $node = node_load($form['nid']['#value']);
     if ($tid = _forum_access_get_tid($node)) {
-      if (!forum_access_access($tid, 'comment_create') and !(forum_access_access($tid, 'create') and ($node->uid==$user->uid)) ) {
+        if (!forum_access_access($tid, 'comment_create') and !(forum_access_access($tid, 'create') and ($node->uid==$user->uid)) ) {
         switch (arg(0)) {
-          case 'node':
+            case 'node':
               // Remove the in-line comment form, replace with text message to user.
               $form = NULL;
-              $form['from'] = array(
-                  '#type'  => 'item',
-                  '#value' => 'You do not have permission to post comments in this forum.',);
+                $form['from'] = array(
+                    '#type'  => 'item',
+                    '#value' => 'You do not have permission to post comments in this forum.',);
             break;
             case 'comment':
                 if (arg(1)=='reply') {
@@ -135,38 +135,38 @@ 
                 }
             break;
         }//switch arg(0)
-      }
-      else {
+        }
+        else {
         if (isset($form['admin']) && !empty($user->_forum_access_moderator)) {
-          foreach (element_children($form['admin']) as $key) {
+            foreach (element_children($form['admin']) as $key) {
             if ($key != 'status') {
-              $form['admin'][$key]['#access'] = FALSE;
+                $form['admin'][$key]['#access'] = FALSE;
             }
-          }
+            }
+        }
         }
-      }
     }
-  }
+    }
 }
 
 /*
  * Give the user the 'administer nodes' and 'administer comments' permissions for this request.
  */
 function _forum_access_enable_moderator() {
-  global $user;
-  $rid = _forum_access_get_moderator_rid();
-  $user->roles[$rid] = '(forum_access temporary)';
-  user_access('', NULL, TRUE); // clear the permissions cache to activate the new role
+    global $user;
+    $rid = _forum_access_get_moderator_rid();
+    $user->roles[$rid] = '(forum_access temporary)';
+    user_access('', NULL, TRUE); // clear the permissions cache to activate the new role
 }
 
 /*
  * Remove the moderator permissions.
  */
 function _forum_access_disable_moderator() {
-  global $user;
-  $rid = _forum_access_get_moderator_rid();
-  unset($user->roles[$rid]);
-  user_access('', NULL, TRUE); // clear the permissions cache to revert to normal
+    global $user;
+    $rid = _forum_access_get_moderator_rid();
+    unset($user->roles[$rid]);
+    user_access('', NULL, TRUE); // clear the permissions cache to revert to normal
 }
 
 /*
@@ -174,26 +174,26 @@ 
  * then create it.
  */
 function _forum_access_get_moderator_rid($verbose = FALSE) {
-  $rid = forum_access_query_moderator_rid();
-  if ($rid !== NULL) {
+    $rid = forum_access_query_moderator_rid();
+    if ($rid !== NULL) {
     if (db_result(db_query("SELECT COUNT(rid) FROM {role} WHERE rid = %d", $rid)) == 1) {
-      return $rid;
+        return $rid;
+    }
     }
-  }
-  module_load_include('admin.inc', 'forum_access');
-  return _forum_access_create_moderator_rid($verbose);
+    module_load_include('admin.inc', 'forum_access');
+    return _forum_access_create_moderator_rid($verbose);
 }
 
 /*
  * Return the roles for forum_access_node_access_explain().
  */
 function _forum_access_get_all_roles() {
-  $roles = user_roles();
-  $moderator_rid = forum_access_query_moderator_rid();
-  if (isset($roles[$moderator_rid])) {
+    $roles = user_roles();
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (isset($roles[$moderator_rid])) {
     $roles[$moderator_rid] .= ' '. t('(!Forum_Access temporary role, does not need any grants.)', array('!Forum_Access' => 'Forum Access'));
-  }
-  return $roles;
+    }
+    return $roles;
 }
 
 /**
@@ -201,42 +201,42 @@ 
  * remove those that aren't accessible to the user (pre-D6.17).
  */
 function _forum_access_preprocess_comment(&$variables) {
-  global $user;
-  if (!empty($user->_forum_access_moderator)) {
+    global $user;
+    if (!empty($user->_forum_access_moderator)) {
     _forum_access_enable_moderator(); // this allows us to retrieve the comment links (without setting precedent!)
-  }
+    }
 
-  $tid = $variables['node']->tid;
-  $links = module_invoke_all('link', 'comment', $variables['comment'], 0);
-  if (!empty($user->_forum_access_moderator) && arg(0) == 'node' && arg(2) == NULL) {
+    $tid = $variables['node']->tid;
+    $links = module_invoke_all('link', 'comment', $variables['comment'], 0);
+    if (!empty($user->_forum_access_moderator) && arg(0) == 'node' && arg(2) == NULL) {
     _forum_access_disable_moderator();
-  }
+    }
 
-  if (isset($links['comment_reply']) && (!preg_match('#<li class="[^"]*comment_reply[^"]*".*</li>#U', $variables['links']) || !user_access('post comments') || !forum_access_access($tid, 'comment_create', NULL, FALSE))) {
+    if (isset($links['comment_reply']) && (!preg_match('#<li class="[^"]*comment_reply[^"]*".*</li>#U', $variables['links']) || !user_access('post comments') || !forum_access_access($tid, 'comment_create', NULL, FALSE))) {
     unset($links['comment_reply']);
-  }
-  if (isset($links['comment_edit']) && !forum_access_access($tid, 'update', NULL, FALSE) && !comment_access('edit', $variables['comment'])) {
+    }
+    if (isset($links['comment_edit']) && !forum_access_access($tid, 'update', NULL, FALSE) && !comment_access('edit', $variables['comment'])) {
     unset($links['comment_edit']);
-  }
-  if (isset($links['comment_delete']) && !forum_access_access($tid, 'delete', NULL, FALSE) && !user_access('administer comments')) {
+    }
+    if (isset($links['comment_delete']) && !forum_access_access($tid, 'delete', NULL, FALSE) && !user_access('administer comments')) {
     unset($links['comment_delete']);
-  }
-  foreach (array_keys($links) as $link) {
+    }
+    foreach (array_keys($links) as $link) {
     if (!in_array($link, array('comment_reply', 'comment_edit', 'comment_delete'))) {
-      $link_preg_quote = preg_quote($link, '#');
-      if (!preg_match('#<li class="[^"]*'. $link_preg_quote .'[^"]*"(.|\n)*</li>#U', $variables['links'])) {
+        $link_preg_quote = preg_quote($link, '#');
+        if (!preg_match('#<li class="[^"]*'. $link_preg_quote .'[^"]*"(.|\n)*</li>#U', $variables['links'])) {
         unset($links[$link]); // eliminate possible additional unknown links that came in for 'administer_comments'
-      }
+        }
+    }
     }
-  }
 
-  drupal_alter('link', $links, $variables['node'], $variables['comment']);
+    drupal_alter('link', $links, $variables['node'], $variables['comment']);
 
-  if (empty($links)) {
+    if (empty($links)) {
     $links['comment_forbidden'] = array(
-      'title' => theme('comment_post_forbidden', $variables['node']),
-      'html'  => TRUE,
+        'title' => theme('comment_post_forbidden', $variables['node']),
+        'html'  => TRUE,
     );
-  }
-  $variables['links'] = theme('links', $links);
+    }
+    $variables['links'] = theme('links', $links);
 }

Switch Indentation +34 added lines, -34 removed lines

@@ -79,27 +79,27 @@ 
     $allowed_options = variable_get('forum_access_allowed_node_edit_options', array('status', 'sticky', 'subscriptions_notify'));
     foreach (element_children($form) as $key) {
       switch ($key) {
-        case 'options':
-          foreach (element_children($form[$key]) as $key2) {
-            if (array_search($key2, $allowed_options) === FALSE) {
-              $form[$key][$key2]['#access'] = FALSE;
-            }
-          }
-          break;
-        case 'buttons':
-          $tid = $form['taxonomy'][$vid]['#default_value'][0];
-          if (!forum_access_access($tid, 'update')) {
-            $form['buttons']['submit']['#access'] = FALSE;
-            $form['buttons']['preview']['#access'] = FALSE;
-          }
-          if (!forum_access_access($tid, 'delete')) {
-            $form['buttons']['delete']['#access'] = FALSE;
-          }
-          break;
-        default:
-          if (array_search($key, $allowed_elements) === FALSE) {
-            $form[$key]['#access'] = FALSE;
+      case 'options':
+        foreach (element_children($form[$key]) as $key2) {
+          if (array_search($key2, $allowed_options) === FALSE) {
+            $form[$key][$key2]['#access'] = FALSE;
           }
+        }
+        break;
+      case 'buttons':
+        $tid = $form['taxonomy'][$vid]['#default_value'][0];
+        if (!forum_access_access($tid, 'update')) {
+          $form['buttons']['submit']['#access'] = FALSE;
+          $form['buttons']['preview']['#access'] = FALSE;
+        }
+        if (!forum_access_access($tid, 'delete')) {
+          $form['buttons']['delete']['#access'] = FALSE;
+        }
+        break;
+      default:
+        if (array_search($key, $allowed_elements) === FALSE) {
+          $form[$key]['#access'] = FALSE;
+        }
       }
     }
   }
@@ -120,20 +120,20 @@ 
     if ($tid = _forum_access_get_tid($node)) {
       if (!forum_access_access($tid, 'comment_create') and !(forum_access_access($tid, 'create') and ($node->uid==$user->uid)) ) {
         switch (arg(0)) {
-          case 'node':
-              // Remove the in-line comment form, replace with text message to user.
-              $form = NULL;
-              $form['from'] = array(
-                  '#type'  => 'item',
-                  '#value' => 'You do not have permission to post comments in this forum.',);
-            break;
-            case 'comment':
-                if (arg(1)=='reply') {
-                    drupal_set_message(t("ERROR: You do not have permission to post comments in this forum."), 'error');
-                    drupal_goto("node/$node->nid");
-                    exit;
-                }
-            break;
+        case 'node':
+            // Remove the in-line comment form, replace with text message to user.
+            $form = NULL;
+            $form['from'] = array(
+                '#type'  => 'item',
+                '#value' => 'You do not have permission to post comments in this forum.',);
+          break;
+        case 'comment':
+            if (arg(1)=='reply') {
+                drupal_set_message(t("ERROR: You do not have permission to post comments in this forum."), 'error');
+                drupal_goto("node/$node->nid");
+                exit;
+            }
+        break;
         }//switch arg(0)
       }
       else {

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
   }
 
   $roles = array_keys($user->roles);
-  $result = db_query("SELECT tid FROM {forum_access} WHERE rid IN (". db_placeholders($roles) .") AND grant_create = 1", $roles);
+  $result = db_query("SELECT tid FROM {forum_access} WHERE rid IN (".db_placeholders($roles).") AND grant_create = 1", $roles);
   while ($obj = db_fetch_object($result)) {
     $tids[$obj->tid] = $obj->tid;
   }
@@ -118,7 +118,7 @@ 
   if ($user->uid != 1 && isset($form['nid']['#value'])) {
     $node = node_load($form['nid']['#value']);
     if ($tid = _forum_access_get_tid($node)) {
-      if (!forum_access_access($tid, 'comment_create') and !(forum_access_access($tid, 'create') and ($node->uid==$user->uid)) ) {
+      if (!forum_access_access($tid, 'comment_create') and !(forum_access_access($tid, 'create') and ($node->uid == $user->uid))) {
         switch (arg(0)) {
           case 'node':
               // Remove the in-line comment form, replace with text message to user.
@@ -128,7 +128,7 @@ 
                   '#value' => 'You do not have permission to post comments in this forum.',);
             break;
             case 'comment':
-                if (arg(1)=='reply') {
+                if (arg(1) == 'reply') {
                     drupal_set_message(t("ERROR: You do not have permission to post comments in this forum."), 'error');
                     drupal_goto("node/$node->nid");
                     exit;
@@ -191,7 +191,7 @@ 
   $roles = user_roles();
   $moderator_rid = forum_access_query_moderator_rid();
   if (isset($roles[$moderator_rid])) {
-    $roles[$moderator_rid] .= ' '. t('(!Forum_Access temporary role, does not need any grants.)', array('!Forum_Access' => 'Forum Access'));
+    $roles[$moderator_rid] .= ' '.t('(!Forum_Access temporary role, does not need any grants.)', array('!Forum_Access' => 'Forum Access'));
   }
   return $roles;
 }
@@ -224,7 +224,7 @@ 
   foreach (array_keys($links) as $link) {
     if (!in_array($link, array('comment_reply', 'comment_edit', 'comment_delete'))) {
       $link_preg_quote = preg_quote($link, '#');
-      if (!preg_match('#<li class="[^"]*'. $link_preg_quote .'[^"]*"(.|\n)*</li>#U', $variables['links'])) {
+      if (!preg_match('#<li class="[^"]*'.$link_preg_quote.'[^"]*"(.|\n)*</li>#U', $variables['links'])) {
         unset($links[$link]); // eliminate possible additional unknown links that came in for 'administer_comments'
       }
     }

drupal/sites/default/boinc/modules/contrib/forum_access/forum_access.module

Switch Indentation +134 added lines, -134 removed lines

@@ -86,75 +86,75 @@ 
   }
 
   switch (arg(0)) {
-    case 'comment':
-      if (variable_get('forum_access_D5_legacy_mode', FALSE)) {
-        return; // disable comment access control
-      }
-      if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
-        if (is_numeric($cid = arg(2))) { // comment/edit/%, comment/delete/%
-          $access[] = (arg(1) == 'edit' ? 'update' : 'delete');
-          $comment = _comment_load($cid);
-          $nid = $comment->nid;
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we need Moderator permissions now, so we can moderate
-          // this comment.
-          // We won't provide full Administrator access, though: we'll remove
-          // author and timestamp, for example.
-          $grant_normal_access = TRUE;
-        }
+  case 'comment':
+    if (variable_get('forum_access_D5_legacy_mode', FALSE)) {
+      return; // disable comment access control
+    }
+    if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
+      if (is_numeric($cid = arg(2))) { // comment/edit/%, comment/delete/%
+        $access[] = (arg(1) == 'edit' ? 'update' : 'delete');
+        $comment = _comment_load($cid);
+        $nid = $comment->nid;
+        // If the node turns out to be in a forum where we have update/delete
+        // access, then we need Moderator permissions now, so we can moderate
+        // this comment.
+        // We won't provide full Administrator access, though: we'll remove
+        // author and timestamp, for example.
+        $grant_normal_access = TRUE;
       }
-      break;
+    }
+    break;
 
-    case 'node':
-      if (is_numeric(arg(1))) {
-        if (arg(2) == 'edit' && !user_access('administer nodes')) { // node/%/edit
-          $access[] = 'update';
-          $nid = arg(1);
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we already get limited edit capabilities from NA, but
-          // we need some more, e.g. publish/unpublish and comment status.
-          // In order to get these controls on the form, we need Moderator
-          // permissions now.
-          // We won't provide full Administrator access, though: we'll remove
-          // author and timestamp, for example.
-        }
-        if (arg(2) == 'delete' && !user_access('administer nodes')) { // node/%/delete
-          $access = array();
-          $nid = arg(1);
-          // This is the delete confirmation page. We don't need any
-          // additional permissions, but we'll assert 'view' access below.
-        }
-        if (arg(2) == NULL && !user_access('administer comments')) { // node/%
-          $access[] = 'update';
-          $nid = arg(1);
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we'll get the 'Edit' link automatically from NA, but
-          // we'll need Moderator permissions, so that we can add the edit/delete
-          // comment links (*after* we've identified the other comment links).
-        }
+  case 'node':
+    if (is_numeric(arg(1))) {
+      if (arg(2) == 'edit' && !user_access('administer nodes')) { // node/%/edit
+        $access[] = 'update';
+        $nid = arg(1);
+        // If the node turns out to be in a forum where we have update/delete
+        // access, then we already get limited edit capabilities from NA, but
+        // we need some more, e.g. publish/unpublish and comment status.
+        // In order to get these controls on the form, we need Moderator
+        // permissions now.
+        // We won't provide full Administrator access, though: we'll remove
+        // author and timestamp, for example.
       }
-      break;
-
-    case 'community':
-        if (arg(1)=='forum') {
-            if (is_numeric(arg(2))) {
-                $tid=arg(2);
-                // Obtain the tid from a URL path containing
-                // community/forum/%tid, this will prevent users from
-                // loading forums they are not allowed to access.
-                // However, only tid>1 are terms we care about. (This
-                // allows forum_tweaks mark-read functionality to
-                // work.)
-                if (isset($tid) and ($tid>1)) {
-                    if (!forum_access_access($tid, 'view')) {
-                        drupal_access_denied();
-                        module_invoke_all('exit');
-                        exit;
-                    }
-                }// isset($tid)
-            }// is_numeric(arg(2))
-        }// arg(1)==forum
+      if (arg(2) == 'delete' && !user_access('administer nodes')) { // node/%/delete
+        $access = array();
+        $nid = arg(1);
+        // This is the delete confirmation page. We don't need any
+        // additional permissions, but we'll assert 'view' access below.
+      }
+      if (arg(2) == NULL && !user_access('administer comments')) { // node/%
+        $access[] = 'update';
+        $nid = arg(1);
+        // If the node turns out to be in a forum where we have update/delete
+        // access, then we'll get the 'Edit' link automatically from NA, but
+        // we'll need Moderator permissions, so that we can add the edit/delete
+        // comment links (*after* we've identified the other comment links).
+      }
+    }
     break;
+
+  case 'community':
+      if (arg(1)=='forum') {
+          if (is_numeric(arg(2))) {
+              $tid=arg(2);
+              // Obtain the tid from a URL path containing
+              // community/forum/%tid, this will prevent users from
+              // loading forums they are not allowed to access.
+              // However, only tid>1 are terms we care about. (This
+              // allows forum_tweaks mark-read functionality to
+              // work.)
+              if (isset($tid) and ($tid>1)) {
+                  if (!forum_access_access($tid, 'view')) {
+                      drupal_access_denied();
+                      module_invoke_all('exit');
+                      exit;
+                  }
+              }// isset($tid)
+          }// is_numeric(arg(2))
+      }// arg(1)==forum
+  break;
   }// switch
   if (isset($nid)) {
     $node = node_load($nid);
@@ -244,36 +244,36 @@ 
   global $user;
   $sql = NULL;
   switch ($primary_field) {
-    case 'tid':
-      if ($user->uid == 1
-        || user_access('administer nodes') && strpos($_GET['q'], 'node/add/forum') === FALSE
-        || user_access('administer forums') && $_GET['q'] == 'admin/content/forum') {
-        break;
-      }
-      if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
-        $required_access = 'create';
-      }
-      else {
-        $required_access = 'view';
-      }
-      $roles = implode(', ', array_keys($user->roles));
-      $sql['join'] = "LEFT JOIN {forum_access} fa ON $primary_table.tid = fa.tid
+  case 'tid':
+    if ($user->uid == 1
+      || user_access('administer nodes') && strpos($_GET['q'], 'node/add/forum') === FALSE
+      || user_access('administer forums') && $_GET['q'] == 'admin/content/forum') {
+      break;
+    }
+    if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
+      $required_access = 'create';
+    }
+    else {
+      $required_access = 'view';
+    }
+    $roles = implode(', ', array_keys($user->roles));
+    $sql['join'] = "LEFT JOIN {forum_access} fa ON $primary_table.tid = fa.tid
                       LEFT JOIN {acl} acl_fa ON acl_fa.number = $primary_table.tid AND acl_fa.module = 'forum_access'
                       LEFT JOIN {acl_user} aclu_fa ON aclu_fa.acl_id = acl_fa.acl_id AND aclu_fa.uid = $user->uid";
-      $sql['where'] = "(fa.grant_$required_access >= 1 AND fa.rid IN ($roles)) OR fa.tid IS NULL OR aclu_fa.uid = $user->uid";
-      $sql['distinct'] = 1;
-      break;
+    $sql['where'] = "(fa.grant_$required_access >= 1 AND fa.rid IN ($roles)) OR fa.tid IS NULL OR aclu_fa.uid = $user->uid";
+    $sql['distinct'] = 1;
+    break;
 
-    case 'rid':
-      if (strpos($query, 'FROM {role}') === FALSE
-        || strpos($_GET['q'] .'/', 'admin/content/forum/') === 0) {
-        break;
-      }
-      $moderator_rid = forum_access_query_moderator_rid();
-      if (!empty($moderator_rid)) {
-        $sql['where'] = "$primary_table.rid <> $moderator_rid";
-      }
+  case 'rid':
+    if (strpos($query, 'FROM {role}') === FALSE
+      || strpos($_GET['q'] .'/', 'admin/content/forum/') === 0) {
       break;
+    }
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (!empty($moderator_rid)) {
+      $sql['where'] = "$primary_table.rid <> $moderator_rid";
+    }
+    break;
   }
   return $sql;
 }
@@ -301,42 +301,42 @@ 
   }
 
   switch ($op) {
-    case 'presave':
-      $old_tid = db_result(db_query('SELECT tid FROM {forum} WHERE nid = %d', $node->nid));
-      break;
+  case 'presave':
+    $old_tid = db_result(db_query('SELECT tid FROM {forum} WHERE nid = %d', $node->nid));
+    break;
 
-    case 'update':
-      if (!empty($old_tid)) {
-        if (!empty($node->tid) && $node->tid == $old_tid) {
-          return;
-        }
-        acl_node_clear_acls($node->nid, 'forum_access');
+  case 'update':
+    if (!empty($old_tid)) {
+      if (!empty($node->tid) && $node->tid == $old_tid) {
+        return;
+      }
+      acl_node_clear_acls($node->nid, 'forum_access');
 
-        if (module_exists('nodecomment')) {
-          _forum_access_changed_tid($node->tid);
-          $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
-          while ($row = db_fetch_object($result)) {
-            acl_node_clear_acls($row->cid, 'forum_access');
-          }
+      if (module_exists('nodecomment')) {
+        _forum_access_changed_tid($node->tid);
+        $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
+        while ($row = db_fetch_object($result)) {
+          acl_node_clear_acls($row->cid, 'forum_access');
         }
       }
-      // Deliberate no break -- for changed and for previously unassigned terms we need an insert.
-
-    case 'insert':
-      if (!empty($node->tid)) {
-        $acl_id = acl_get_id_by_number('forum_access', $node->tid);
-        acl_node_add_acl($node->nid, $acl_id, 1, 1, 1);
-
-        if (isset($old_tid) && module_exists('nodecomment')) {
-          $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
-          while ($row = db_fetch_object($result)) {
-            acl_node_add_acl($row->cid, $acl_id, 1, 1, 1);
-            node_access_acquire_grants(node_load($row->cid));
-          }
+    }
+    // Deliberate no break -- for changed and for previously unassigned terms we need an insert.
+
+  case 'insert':
+    if (!empty($node->tid)) {
+      $acl_id = acl_get_id_by_number('forum_access', $node->tid);
+      acl_node_add_acl($node->nid, $acl_id, 1, 1, 1);
+
+      if (isset($old_tid) && module_exists('nodecomment')) {
+        $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
+        while ($row = db_fetch_object($result)) {
+          acl_node_add_acl($row->cid, $acl_id, 1, 1, 1);
+          node_access_acquire_grants(node_load($row->cid));
         }
       }
-      $old_tid = NULL;
-      break;
+    }
+    $old_tid = NULL;
+    break;
   }
 }
 
@@ -587,20 +587,20 @@ 
  */
 function forum_access_user($op, &$edit, &$account, $category = NULL) {
   switch ($op) {
-    case 'validate':
-      $rid = forum_access_query_moderator_rid();
-      if (!empty($rid)) {
-        if (isset($edit['roles'][$rid]) && $edit['roles'][$rid]) {
-          $roles = user_roles();
-          $variables = array(
-            '@Forum_Access' => 'Forum Access',
-            '%Role' => $roles[$rid],
-          );
-          drupal_set_message(t('The %Role role is reserved for internal use by the @Forum_Access module! It was not assigned.', $variables), 'warning');
-          unset($edit['roles'][$rid]);
-        }
+  case 'validate':
+    $rid = forum_access_query_moderator_rid();
+    if (!empty($rid)) {
+      if (isset($edit['roles'][$rid]) && $edit['roles'][$rid]) {
+        $roles = user_roles();
+        $variables = array(
+          '@Forum_Access' => 'Forum Access',
+          '%Role' => $roles[$rid],
+        );
+        drupal_set_message(t('The %Role role is reserved for internal use by the @Forum_Access module! It was not assigned.', $variables), 'warning');
+        unset($edit['roles'][$rid]);
       }
-      break;
+    }
+    break;
   }
 }
 

Upper-Lower-Casing +47 added lines, -47 removed lines

@@ -48,7 +48,7 @@ 
   if ($tid) {
     if (!isset($grants[$tid])) {
       if (!isset($node_admins)) {
-        $node_admins = user_roles(FALSE, 'administer nodes');
+        $node_admins = user_roles(false, 'administer nodes');
       }
       $result = db_query('SELECT * FROM {forum_access} WHERE tid = %d', $tid);
       while ($grant = db_fetch_object($result)) {
@@ -87,7 +87,7 @@ 
 
   switch (arg(0)) {
     case 'comment':
-      if (variable_get('forum_access_D5_legacy_mode', FALSE)) {
+      if (variable_get('forum_access_D5_legacy_mode', false)) {
         return; // disable comment access control
       }
       if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
@@ -100,7 +100,7 @@ 
           // this comment.
           // We won't provide full Administrator access, though: we'll remove
           // author and timestamp, for example.
-          $grant_normal_access = TRUE;
+          $grant_normal_access = true;
         }
       }
       break;
@@ -124,7 +124,7 @@ 
           // This is the delete confirmation page. We don't need any
           // additional permissions, but we'll assert 'view' access below.
         }
-        if (arg(2) == NULL && !user_access('administer comments')) { // node/%
+        if (arg(2) == null && !user_access('administer comments')) { // node/%
           $access[] = 'update';
           $nid = arg(1);
           // If the node turns out to be in a forum where we have update/delete
@@ -191,7 +191,7 @@ 
     module_load_include('node.inc', 'forum_access');
     _forum_access_node_form($form, $form_state);
   }
-  elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
+  elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', false)) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_comment_form($form, $form_state);
   }
@@ -201,11 +201,11 @@ 
   }
   elseif ($form_id == 'forum_form_container') {
     module_load_include('admin.inc', 'forum_access');
-    _forum_access_forum_form($form, $form_state, TRUE);
+    _forum_access_forum_form($form, $form_state, true);
   }
   elseif ($form_id == 'forum_form_forum') {
     module_load_include('admin.inc', 'forum_access');
-    _forum_access_forum_form($form, $form_state, FALSE);
+    _forum_access_forum_form($form, $form_state, false);
   }
   elseif ($form_id == 'forum_admin_settings') {
     module_load_include('admin.inc', 'forum_access');
@@ -242,15 +242,15 @@ 
  */
 function forum_access_db_rewrite_sql($query, $primary_table, $primary_field, $args) {
   global $user;
-  $sql = NULL;
+  $sql = null;
   switch ($primary_field) {
     case 'tid':
       if ($user->uid == 1
-        || user_access('administer nodes') && strpos($_GET['q'], 'node/add/forum') === FALSE
+        || user_access('administer nodes') && strpos($_GET['q'], 'node/add/forum') === false
         || user_access('administer forums') && $_GET['q'] == 'admin/content/forum') {
         break;
       }
-      if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
+      if (strpos($_GET['q'], 'node/add/forum') !== false) {
         $required_access = 'create';
       }
       else {
@@ -265,7 +265,7 @@ 
       break;
 
     case 'rid':
-      if (strpos($query, 'FROM {role}') === FALSE
+      if (strpos($query, 'FROM {role}') === false
         || strpos($_GET['q'] .'/', 'admin/content/forum/') === 0) {
         break;
       }
@@ -283,8 +283,8 @@ 
  *
  * Add ACL data to fresh forum posts.
  */
-function forum_access_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
-  static $old_tid = NULL;
+function forum_access_nodeapi(&$node, $op, $teaser = null, $page = null) {
+  static $old_tid = null;
   // This is modeled after forum_nodeapi():
   $vid = _forum_access_get_vid();
   $vocabulary = taxonomy_vocabulary_load($vid);
@@ -335,7 +335,7 @@ 
           }
         }
       }
-      $old_tid = NULL;
+      $old_tid = null;
       break;
   }
 }
@@ -361,7 +361,7 @@ 
  * and thus it is disabled by default. Set the variable to TRUE to enable.
  */
 function forum_access_preprocess_forum_list(&$variables) {
-  if (variable_get('forum_access_provide_moderators_template_variable', FALSE)) {
+  if (variable_get('forum_access_provide_moderators_template_variable', false)) {
     static $users;
     foreach ($variables['forums'] as $tid => $forum) {
       $moderators = array();
@@ -373,7 +373,7 @@ 
           $moderators[$uid] = $users[$uid];
         }
       }
-      $forum->forum_access_moderators = (empty($moderators) ? NULL : $moderators);
+      $forum->forum_access_moderators = (empty($moderators) ? null : $moderators);
     }
   }
 }
@@ -394,7 +394,7 @@ 
   }
 }
 
-if (!variable_get('forum_access_D5_legacy_mode', FALSE)) {
+if (!variable_get('forum_access_D5_legacy_mode', false)) {
   // LEGACY-MODE disables these methods
 
 /**
@@ -403,9 +403,9 @@ 
  * For nodes, remove the 'Add new comment' link, if the user does not have the
  * 'comment_create' permission; for comments, add any missing links (D6.17+).
  */
-function forum_access_link_alter(&$links, $node, $comment = NULL) {
+function forum_access_link_alter(&$links, $node, $comment = null) {
   global $user;
-  static $user1, $recursing = FALSE, $stored_links;
+  static $user1, $recursing = false, $stored_links;
 
   // If we are being called recursively, store the $links and return.
   if ($recursing) {
@@ -438,12 +438,12 @@ 
         unset($required_keys[$access]);
       }
       elseif (!array_key_exists($key, $links)) {
-        $link_is_missing = TRUE;
+        $link_is_missing = true;
       }
     }
 
     // Hack to manually remove quote link if comment_reply link is no longer set
-    if ( (!(isset($links['comment_reply']))) AND isset($links['quote']) ) {
+    if ( (!(isset($links['comment_reply']))) and isset($links['quote']) ) {
         unset($links['quote']);
     }
     
@@ -458,7 +458,7 @@ 
         $user1 = user_load(1);
       }
       $saved_user = $user;
-      session_save_session(FALSE);
+      session_save_session(false);
       $user = $user1;
 
       // With UID 1 we call hook_link(). This should give us the full set of
@@ -466,7 +466,7 @@ 
       $admin_links = module_invoke_all('link', 'comment', $comment, array_key_exists('comment_parent', $links));
 
       $user = $saved_user;
-      session_save_session(TRUE);
+      session_save_session(true);
 
       // Remove the links from $admin_links that are not in the reduced
       // set of $required_links AND not available to the current user anyway.
@@ -483,9 +483,9 @@ 
       // called it will store a copy of the links at their current state. Then
       // we pull those links which have not been link_alter'ed by any modules
       // that come after forum_access.
-      $recursing = TRUE;
+      $recursing = true;
       drupal_alter('link', $admin_links, $node, $comment);
-      $recursing = FALSE;
+      $recursing = false;
       // Now return the stored links.
       $links = $stored_links;
     }
@@ -523,9 +523,9 @@ 
 /**
  * This is also required by ACL module.
  */
-function forum_access_enabled($set = NULL) {
-  static $enabled = TRUE;
-  if ($set !== NULL) {
+function forum_access_enabled($set = null) {
+  static $enabled = true;
+  if ($set !== null) {
     $enabled = $set;
   }
   return $enabled;
@@ -544,7 +544,7 @@ 
  *   1     - access granted
  *   2     - access granted for forum moderator
  */
-function forum_access_access($tid, $type, $account = NULL, $administer_nodes_sees_everything = TRUE) {
+function forum_access_access($tid, $type, $account = null, $administer_nodes_sees_everything = true) {
   static $cache = array();
   if (!$account) {
     global $user;
@@ -552,13 +552,13 @@ 
   }
 
   if ($account->uid == 1 ||
-      $administer_nodes_sees_everything && user_access('administer nodes', $account) && array_search($type, array('view', 'update', 'delete')) !== FALSE) {
+      $administer_nodes_sees_everything && user_access('administer nodes', $account) && array_search($type, array('view', 'update', 'delete')) !== false) {
     return 1;
   }
 
   if (!isset($cache[$account->uid][$tid][$type])) {
     if (!user_access('access content', $account)) {
-      return $cache[$account->uid][$tid][$type] = FALSE;
+      return $cache[$account->uid][$tid][$type] = false;
     }
 
     $roles = array_keys($account->roles);
@@ -575,7 +575,7 @@ 
         $cache[$account->uid][$tid][$type] = 2;
       }
       else {
-        $cache[$account->uid][$tid][$type] = FALSE;
+        $cache[$account->uid][$tid][$type] = false;
       }
     }
   }
@@ -585,7 +585,7 @@ 
 /**
  * Implementation of hook_user().
  */
-function forum_access_user($op, &$edit, &$account, $category = NULL) {
+function forum_access_user($op, &$edit, &$account, $category = null) {
   switch ($op) {
     case 'validate':
       $rid = forum_access_query_moderator_rid();
@@ -628,7 +628,7 @@ 
  * no forum or container is specified will return TRUE if the user has at least
  * one role that can access at least one forum.
  */
-function _forum_access_forum_access_callback($tid = NULL) {
+function _forum_access_forum_access_callback($tid = null) {
   return (!$tid && _forum_access_access_any_forum()) || forum_access_access($tid, 'view');
 }
 
@@ -638,7 +638,7 @@ 
  * Returns TRUE if the user has at least one role that can access
  * at least one forum.
  */
-function _forum_access_access_any_forum($account = NULL) {
+function _forum_access_access_any_forum($account = null) {
   global $user;
   static $return = array();
 
@@ -648,12 +648,12 @@ 
 
   if (!isset($return[$account->uid])) {
     if ($account->uid == 1) {
-      return $return[$account->uid] = TRUE;
+      return $return[$account->uid] = true;
     }
     if (!user_access('access content', $account)) {
-      return $return[$account->uid] = FALSE;
+      return $return[$account->uid] = false;
     }
-    $rids = variable_get('forum_access_rids', NULL);
+    $rids = variable_get('forum_access_rids', null);
     if (!isset($rids)) {
       $rids = array();
       $result = db_query("SELECT fa.rid FROM {forum_access} fa WHERE fa.grant_view > 0 GROUP BY fa.rid");
@@ -664,10 +664,10 @@ 
     }
     foreach ($rids as $rid) {
       if (isset($account->roles[$rid])) {
-        return $return[$account->uid] = TRUE;
+        return $return[$account->uid] = true;
       }
     }
-    $return[$account->uid] = FALSE;
+    $return[$account->uid] = false;
   }
   return $return[$account->uid];
 }
@@ -677,7 +677,7 @@ 
  *
  * Delete {forum_access} records when forums are deleted.
  */
-function forum_access_taxonomy($op, $type, $array = NULL) {
+function forum_access_taxonomy($op, $type, $array = null) {
   //dpm($array, "hook_taxonomy($op, $type)");
   if ($type = 'term' && $op == 'delete' && $array['vid'] == _forum_access_get_vid()) {
     db_query("DELETE FROM {forum_access} WHERE tid = %d", $array['tid']);
@@ -697,21 +697,21 @@ 
  * exist.
  */
 function forum_access_query_moderator_rid() {
-  return variable_get('forum_access_moderator_rid', NULL);
+  return variable_get('forum_access_moderator_rid', null);
 }
 
 /**
  * Return the forum tid or FALSE.
  */
 function _forum_access_get_tid($node) {
-  return (isset($node->forum_tid) ? $node->forum_tid : (isset($node->tid) ? $node->tid : FALSE));
+  return (isset($node->forum_tid) ? $node->forum_tid : (isset($node->tid) ? $node->tid : false));
 }
 
 /**
  * Save and return the $tid.
  */
-function _forum_access_changed_tid($tid = NULL) {
-  static $saved_tid = NULL;
+function _forum_access_changed_tid($tid = null) {
+  static $saved_tid = null;
   if (!empty($tid)) {
     $saved_tid = $tid;
   }
@@ -722,7 +722,7 @@ 
  * Implementation of hook_node_access_explain().
  */
 function forum_access_node_access_explain($row) {
-  static $roles = NULL;
+  static $roles = null;
   if ($row->realm == 'forum_access') {
     if (!isset($roles)) {
       module_load_include('node.inc', 'forum_access');
@@ -738,7 +738,7 @@ 
 /**
  * Implementation of hook_acl_explain().
  */
-function forum_access_acl_explain($acl_id, $name, $number, $users = NULL) {
+function forum_access_acl_explain($acl_id, $name, $number, $users = null) {
   if (empty($users)) {
     return "ACL (id=$acl_id) would grant access to nodes in forum/$number.";
   }

Indentation +301 added lines, -301 removed lines

@@ -15,8 +15,8 @@ 
  * roles as ACLs, so rids translate directly to gids.
  */
 function forum_access_node_grants($user, $op) {
-  $grants['forum_access'] = array_keys($user->roles);
-  return $grants;
+    $grants['forum_access'] = array_keys($user->roles);
+    return $grants;
 }
 
 /**
@@ -26,51 +26,51 @@ 
  * Checks to see if maybe we're being disabled.
  */
 function forum_access_node_access_records($node) {
-  if (!forum_access_enabled()) {
+    if (!forum_access_enabled()) {
     return;
-  }
+    }
 
-  static $grants = array();
-  static $node_admins;
-  $tid = _forum_access_get_tid($node);
+    static $grants = array();
+    static $node_admins;
+    $tid = _forum_access_get_tid($node);
 
-  // Set proper grants for nodecomment comment nodes.
-  if (isset($node->comment_target_nid)) {
+    // Set proper grants for nodecomment comment nodes.
+    if (isset($node->comment_target_nid)) {
     if ($changed_tid = _forum_access_changed_tid()) {
-      $tid = $changed_tid; // the topic node hasn't been saved yet!
+        $tid = $changed_tid; // the topic node hasn't been saved yet!
     }
     else {
-      $node = node_load($node->comment_target_nid);
-      $tid = _forum_access_get_tid($node);
+        $node = node_load($node->comment_target_nid);
+        $tid = _forum_access_get_tid($node);
+    }
     }
-  }
 
-  if ($tid) {
+    if ($tid) {
     if (!isset($grants[$tid])) {
-      if (!isset($node_admins)) {
+        if (!isset($node_admins)) {
         $node_admins = user_roles(FALSE, 'administer nodes');
-      }
-      $result = db_query('SELECT * FROM {forum_access} WHERE tid = %d', $tid);
-      while ($grant = db_fetch_object($result)) {
+        }
+        $result = db_query('SELECT * FROM {forum_access} WHERE tid = %d', $tid);
+        while ($grant = db_fetch_object($result)) {
         if (isset($node_admins[$grant->rid])) {
-          continue; // Don't provide any useless grants!
+            continue; // Don't provide any useless grants!
         }
         $grants[$tid][] = array(
-          'realm' => 'forum_access',
-          'gid' => $grant->rid,
-          'grant_view' => $grant->grant_view,
-          'grant_update' => $grant->grant_update,
-          'grant_delete' => $grant->grant_delete,
-          'grant_comment_create' => $grant->grant_comment_create,
-          'priority' => $grant->priority,
+            'realm' => 'forum_access',
+            'gid' => $grant->rid,
+            'grant_view' => $grant->grant_view,
+            'grant_update' => $grant->grant_update,
+            'grant_delete' => $grant->grant_delete,
+            'grant_comment_create' => $grant->grant_comment_create,
+            'priority' => $grant->priority,
         );
-      }
-      //drupal_set_message("forum_access_node_access_records($node->nid) (tid=$tid) returns ". var_export($grants[$tid], TRUE), 'status');
+        }
+        //drupal_set_message("forum_access_node_access_records($node->nid) (tid=$tid) returns ". var_export($grants[$tid], TRUE), 'status');
     }
     if (isset($grants[$tid])) {
-      return $grants[$tid];
+        return $grants[$tid];
+    }
     }
-  }
 }
 
 /**
@@ -80,60 +80,60 @@ 
  * and comment/delete/% where needed.
  */
 function forum_access_init() {
-  global $user;
-  if ($user->uid == 1) {
+    global $user;
+    if ($user->uid == 1) {
     return;
-  }
+    }
 
-  switch (arg(0)) {
+    switch (arg(0)) {
     case 'comment':
       if (variable_get('forum_access_D5_legacy_mode', FALSE)) {
         return; // disable comment access control
-      }
-      if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
+        }
+        if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
         if (is_numeric($cid = arg(2))) { // comment/edit/%, comment/delete/%
-          $access[] = (arg(1) == 'edit' ? 'update' : 'delete');
-          $comment = _comment_load($cid);
-          $nid = $comment->nid;
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we need Moderator permissions now, so we can moderate
-          // this comment.
-          // We won't provide full Administrator access, though: we'll remove
-          // author and timestamp, for example.
-          $grant_normal_access = TRUE;
-        }
-      }
-      break;
+            $access[] = (arg(1) == 'edit' ? 'update' : 'delete');
+            $comment = _comment_load($cid);
+            $nid = $comment->nid;
+            // If the node turns out to be in a forum where we have update/delete
+            // access, then we need Moderator permissions now, so we can moderate
+            // this comment.
+            // We won't provide full Administrator access, though: we'll remove
+            // author and timestamp, for example.
+            $grant_normal_access = TRUE;
+        }
+        }
+        break;
 
     case 'node':
       if (is_numeric(arg(1))) {
         if (arg(2) == 'edit' && !user_access('administer nodes')) { // node/%/edit
-          $access[] = 'update';
-          $nid = arg(1);
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we already get limited edit capabilities from NA, but
-          // we need some more, e.g. publish/unpublish and comment status.
-          // In order to get these controls on the form, we need Moderator
-          // permissions now.
-          // We won't provide full Administrator access, though: we'll remove
-          // author and timestamp, for example.
+            $access[] = 'update';
+            $nid = arg(1);
+            // If the node turns out to be in a forum where we have update/delete
+            // access, then we already get limited edit capabilities from NA, but
+            // we need some more, e.g. publish/unpublish and comment status.
+            // In order to get these controls on the form, we need Moderator
+            // permissions now.
+            // We won't provide full Administrator access, though: we'll remove
+            // author and timestamp, for example.
         }
         if (arg(2) == 'delete' && !user_access('administer nodes')) { // node/%/delete
-          $access = array();
-          $nid = arg(1);
-          // This is the delete confirmation page. We don't need any
-          // additional permissions, but we'll assert 'view' access below.
+            $access = array();
+            $nid = arg(1);
+            // This is the delete confirmation page. We don't need any
+            // additional permissions, but we'll assert 'view' access below.
         }
         if (arg(2) == NULL && !user_access('administer comments')) { // node/%
-          $access[] = 'update';
-          $nid = arg(1);
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we'll get the 'Edit' link automatically from NA, but
-          // we'll need Moderator permissions, so that we can add the edit/delete
-          // comment links (*after* we've identified the other comment links).
+            $access[] = 'update';
+            $nid = arg(1);
+            // If the node turns out to be in a forum where we have update/delete
+            // access, then we'll get the 'Edit' link automatically from NA, but
+            // we'll need Moderator permissions, so that we can add the edit/delete
+            // comment links (*after* we've identified the other comment links).
         }
-      }
-      break;
+        }
+        break;
 
     case 'community':
         if (arg(1)=='forum') {
@@ -155,30 +155,30 @@ 
             }// is_numeric(arg(2))
         }// arg(1)==forum
     break;
-  }// switch
-  if (isset($nid)) {
+    }// switch
+    if (isset($nid)) {
     $node = node_load($nid);
     if ($tid = _forum_access_get_tid($node)) {
-      if (!forum_access_access($tid, 'view')) {
+        if (!forum_access_access($tid, 'view')) {
         drupal_access_denied();
         module_invoke_all('exit');
         exit;
-      }
-      foreach ($access as $a) {
+        }
+        foreach ($access as $a) {
         $faa = forum_access_access($tid, $a);
         $grant_moderator_access = $faa > 1;
         $grant_normal_access = !empty($grant_normal_access) && $faa > 0;
         if ($grant_normal_access || $grant_moderator_access) {
-          $user->_forum_access_moderator = $grant_moderator_access;
-          if (arg(0) == 'comment' || arg(0) == 'node' && arg(2) == 'edit') {
+            $user->_forum_access_moderator = $grant_moderator_access;
+            if (arg(0) == 'comment' || arg(0) == 'node' && arg(2) == 'edit') {
             module_load_include('node.inc', 'forum_access');
             _forum_access_enable_moderator();
             break;
-          }
+            }
         }
-      }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -187,50 +187,50 @@ 
  * Alter the node/comment create/edit forms and various admin forms.
  */
 function forum_access_form_alter(&$form, &$form_state, $form_id) {
-  if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id) {
+    if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_node_form($form, $form_state);
-  }
-  elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
+    }
+    elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_comment_form($form, $form_state);
-  }
-  elseif ($form_id == 'forum_overview') {
+    }
+    elseif ($form_id == 'forum_overview') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_overview($form, $form_state);
-  }
-  elseif ($form_id == 'forum_form_container') {
+    }
+    elseif ($form_id == 'forum_form_container') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, TRUE);
-  }
-  elseif ($form_id == 'forum_form_forum') {
+    }
+    elseif ($form_id == 'forum_form_forum') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, FALSE);
-  }
-  elseif ($form_id == 'forum_admin_settings') {
+    }
+    elseif ($form_id == 'forum_admin_settings') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_admin_settings_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_role') {
+    }
+    elseif ($form_id == 'user_admin_role') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_role_form($form, $form_state);
-  }
-  elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
+    }
+    elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_content_access_admin_form();
-  }
-  elseif ($form_id == 'user_admin_perm') {
+    }
+    elseif ($form_id == 'user_admin_perm') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_perm_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_account') {
+    }
+    elseif ($form_id == 'user_admin_account') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_account_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_profile_form') {
+    }
+    elseif ($form_id == 'user_profile_form') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_profile_form($form, $form_state);
-  }
+    }
 }
 
 /**
@@ -241,41 +241,41 @@ 
  * taxonomy. There should be.
  */
 function forum_access_db_rewrite_sql($query, $primary_table, $primary_field, $args) {
-  global $user;
-  $sql = NULL;
-  switch ($primary_field) {
+    global $user;
+    $sql = NULL;
+    switch ($primary_field) {
     case 'tid':
       if ($user->uid == 1
         || user_access('administer nodes') && strpos($_GET['q'], 'node/add/forum') === FALSE
         || user_access('administer forums') && $_GET['q'] == 'admin/content/forum') {
         break;
-      }
-      if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
+        }
+        if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
         $required_access = 'create';
-      }
-      else {
+        }
+        else {
         $required_access = 'view';
-      }
-      $roles = implode(', ', array_keys($user->roles));
-      $sql['join'] = "LEFT JOIN {forum_access} fa ON $primary_table.tid = fa.tid
+        }
+        $roles = implode(', ', array_keys($user->roles));
+        $sql['join'] = "LEFT JOIN {forum_access} fa ON $primary_table.tid = fa.tid
                       LEFT JOIN {acl} acl_fa ON acl_fa.number = $primary_table.tid AND acl_fa.module = 'forum_access'
                       LEFT JOIN {acl_user} aclu_fa ON aclu_fa.acl_id = acl_fa.acl_id AND aclu_fa.uid = $user->uid";
-      $sql['where'] = "(fa.grant_$required_access >= 1 AND fa.rid IN ($roles)) OR fa.tid IS NULL OR aclu_fa.uid = $user->uid";
-      $sql['distinct'] = 1;
-      break;
+        $sql['where'] = "(fa.grant_$required_access >= 1 AND fa.rid IN ($roles)) OR fa.tid IS NULL OR aclu_fa.uid = $user->uid";
+        $sql['distinct'] = 1;
+        break;
 
     case 'rid':
       if (strpos($query, 'FROM {role}') === FALSE
         || strpos($_GET['q'] .'/', 'admin/content/forum/') === 0) {
         break;
-      }
-      $moderator_rid = forum_access_query_moderator_rid();
-      if (!empty($moderator_rid)) {
+        }
+        $moderator_rid = forum_access_query_moderator_rid();
+        if (!empty($moderator_rid)) {
         $sql['where'] = "$primary_table.rid <> $moderator_rid";
-      }
-      break;
-  }
-  return $sql;
+        }
+        break;
+    }
+    return $sql;
 }
 
 /**
@@ -284,43 +284,43 @@ 
  * Add ACL data to fresh forum posts.
  */
 function forum_access_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
-  static $old_tid = NULL;
-  // This is modeled after forum_nodeapi():
-  $vid = _forum_access_get_vid();
-  $vocabulary = taxonomy_vocabulary_load($vid);
-  if (empty($vocabulary) || !in_array($node->type, $vocabulary->nodes)) {
+    static $old_tid = NULL;
+    // This is modeled after forum_nodeapi():
+    $vid = _forum_access_get_vid();
+    $vocabulary = taxonomy_vocabulary_load($vid);
+    if (empty($vocabulary) || !in_array($node->type, $vocabulary->nodes)) {
     if ($op == 'insert' && isset($node->comment_target_nid)) {
-      // Set moderator on nodecomment.
-      $topic_node = node_load($node->comment_target_nid);
-      if ($topic_tid = _forum_access_get_tid($topic_node)) {
+        // Set moderator on nodecomment.
+        $topic_node = node_load($node->comment_target_nid);
+        if ($topic_tid = _forum_access_get_tid($topic_node)) {
         $acl_id = acl_get_id_by_number('forum_access', $topic_tid);
         acl_node_add_acl($node->nid, $acl_id, 1, 1, 1);
-      }
+        }
     }
     return;
-  }
+    }
 
-  switch ($op) {
+    switch ($op) {
     case 'presave':
       $old_tid = db_result(db_query('SELECT tid FROM {forum} WHERE nid = %d', $node->nid));
-      break;
+        break;
 
     case 'update':
       if (!empty($old_tid)) {
         if (!empty($node->tid) && $node->tid == $old_tid) {
-          return;
+            return;
         }
         acl_node_clear_acls($node->nid, 'forum_access');
 
         if (module_exists('nodecomment')) {
-          _forum_access_changed_tid($node->tid);
-          $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
-          while ($row = db_fetch_object($result)) {
+            _forum_access_changed_tid($node->tid);
+            $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
+            while ($row = db_fetch_object($result)) {
             acl_node_clear_acls($row->cid, 'forum_access');
-          }
+            }
+        }
         }
-      }
-      // Deliberate no break -- for changed and for previously unassigned terms we need an insert.
+        // Deliberate no break -- for changed and for previously unassigned terms we need an insert.
 
     case 'insert':
       if (!empty($node->tid)) {
@@ -328,27 +328,27 @@ 
         acl_node_add_acl($node->nid, $acl_id, 1, 1, 1);
 
         if (isset($old_tid) && module_exists('nodecomment')) {
-          $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
-          while ($row = db_fetch_object($result)) {
+            $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
+            while ($row = db_fetch_object($result)) {
             acl_node_add_acl($row->cid, $acl_id, 1, 1, 1);
             node_access_acquire_grants(node_load($row->cid));
-          }
+            }
         }
-      }
-      $old_tid = NULL;
-      break;
-  }
+        }
+        $old_tid = NULL;
+        break;
+    }
 }
 
 /**
  * Get an array of moderator UIDs or NULL.
  */
 function forum_access_get_moderator_uids($tid) {
-  if ($acl_id = acl_get_id_by_number('forum_access', $tid)) {
+    if ($acl_id = acl_get_id_by_number('forum_access', $tid)) {
     if ($uids = acl_get_uids($acl_id)) {
-      return $uids;
+        return $uids;
+    }
     }
-  }
 }
 
 /**
@@ -361,21 +361,21 @@ 
  * and thus it is disabled by default. Set the variable to TRUE to enable.
  */
 function forum_access_preprocess_forum_list(&$variables) {
-  if (variable_get('forum_access_provide_moderators_template_variable', FALSE)) {
+    if (variable_get('forum_access_provide_moderators_template_variable', FALSE)) {
     static $users;
     foreach ($variables['forums'] as $tid => $forum) {
-      $moderators = array();
-      if ($uids = forum_access_get_moderator_uids($tid)) {
+        $moderators = array();
+        if ($uids = forum_access_get_moderator_uids($tid)) {
         foreach ($uids as $uid) {
-          if (!isset($users[$uid])) {
+            if (!isset($users[$uid])) {
             $users[$uid] = user_load(array('uid' => $uid));
-          }
-          $moderators[$uid] = $users[$uid];
+            }
+            $moderators[$uid] = $users[$uid];
+        }
         }
-      }
-      $forum->forum_access_moderators = (empty($moderators) ? NULL : $moderators);
+        $forum->forum_access_moderators = (empty($moderators) ? NULL : $moderators);
+    }
     }
-  }
 }
 
 /**
@@ -385,17 +385,17 @@ 
  * 'create' permission.
  */
 function forum_access_preprocess_forums(&$variables) {
-  if (!forum_access_access($variables['tid'], 'create') && !empty($variables['links'])) {
+    if (!forum_access_access($variables['tid'], 'create') && !empty($variables['links'])) {
     foreach ($variables['links'] as $key => $link) {
-      if (isset($link['href']) && substr($link['href'], 0, 9) == 'node/add/') {
+        if (isset($link['href']) && substr($link['href'], 0, 9) == 'node/add/') {
         unset($variables['links'][$key]);
-      }
+        }
+    }
     }
-  }
 }
 
 if (!variable_get('forum_access_D5_legacy_mode', FALSE)) {
-  // LEGACY-MODE disables these methods
+    // LEGACY-MODE disables these methods
 
 /**
  * Implementation of hook_link_alter().
@@ -404,42 +404,42 @@ 
  * 'comment_create' permission; for comments, add any missing links (D6.17+).
  */
 function forum_access_link_alter(&$links, $node, $comment = NULL) {
-  global $user;
-  static $user1, $recursing = FALSE, $stored_links;
+    global $user;
+    static $user1, $recursing = FALSE, $stored_links;
 
-  // If we are being called recursively, store the $links and return.
-  if ($recursing) {
+    // If we are being called recursively, store the $links and return.
+    if ($recursing) {
     $stored_links = $links;
     return;
-  }
-  if ($user->uid == 1 || !($tid = _forum_access_get_tid($node))) {
+    }
+    if ($user->uid == 1 || !($tid = _forum_access_get_tid($node))) {
     return;
-  }
-  if (empty($comment)) {
+    }
+    if (empty($comment)) {
     // Check links for the node.
     if ($tid && isset($links['comment_add']) && !forum_access_access($tid, 'comment_create') && !(forum_access_access($tid, 'create') and ($node->uid==$user->uid)) ) {
-      unset($links['comment_add']);
-      // Hack to manually remove quote link
-      if ( isset($links['quote']) ) {
-          unset($links['quote']);
-      }
-    }
-  }
-  else {
+        unset($links['comment_add']);
+        // Hack to manually remove quote link
+        if ( isset($links['quote']) ) {
+            unset($links['quote']);
+        }
+    }
+    }
+    else {
     // Check links for the comment.
     $required_keys = array(
-      'comment_create' => 'comment_reply',
-      'update' => 'comment_edit',
-      'delete' => 'comment_delete',
+        'comment_create' => 'comment_reply',
+        'update' => 'comment_edit',
+        'delete' => 'comment_delete',
     );
     foreach ($required_keys as $access => $key) {
-      if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment)) && !($access == 'comment_create' && forum_access_access($tid, 'create') && ($node->uid==$user->uid)) ) {
+        if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment)) && !($access == 'comment_create' && forum_access_access($tid, 'create') && ($node->uid==$user->uid)) ) {
         unset($links[$required_keys[$access]]);
         unset($required_keys[$access]);
-      }
-      elseif (!array_key_exists($key, $links)) {
+        }
+        elseif (!array_key_exists($key, $links)) {
         $link_is_missing = TRUE;
-      }
+        }
     }
 
     // Hack to manually remove quote link if comment_reply link is no longer set
@@ -448,48 +448,48 @@ 
     }
     
     if (isset($required_keys['comment_create']) && !user_access('post comments')) {
-      unset($required_keys['comment_create']);
+        unset($required_keys['comment_create']);
     }
     if (!empty($link_is_missing)) {
-      // One of the $required_links should be present, because the current
-      // user has the corresponding permission, but it isn't.
-      // We temporarily switch to UID 1 to 'harvest' all comment links.
-      if (!isset($user1)) {
+        // One of the $required_links should be present, because the current
+        // user has the corresponding permission, but it isn't.
+        // We temporarily switch to UID 1 to 'harvest' all comment links.
+        if (!isset($user1)) {
         $user1 = user_load(1);
-      }
-      $saved_user = $user;
-      session_save_session(FALSE);
-      $user = $user1;
-
-      // With UID 1 we call hook_link(). This should give us the full set of
-      // links that the site admin sees.
-      $admin_links = module_invoke_all('link', 'comment', $comment, array_key_exists('comment_parent', $links));
-
-      $user = $saved_user;
-      session_save_session(TRUE);
-
-      // Remove the links from $admin_links that are not in the reduced
-      // set of $required_links AND not available to the current user anyway.
-      // Afterwards, $admin_links should have the same content as $links, plus
-      // one or more additional links from the original set in $required_links.
-      foreach ($admin_links as $key => $target) {
+        }
+        $saved_user = $user;
+        session_save_session(FALSE);
+        $user = $user1;
+
+        // With UID 1 we call hook_link(). This should give us the full set of
+        // links that the site admin sees.
+        $admin_links = module_invoke_all('link', 'comment', $comment, array_key_exists('comment_parent', $links));
+
+        $user = $saved_user;
+        session_save_session(TRUE);
+
+        // Remove the links from $admin_links that are not in the reduced
+        // set of $required_links AND not available to the current user anyway.
+        // Afterwards, $admin_links should have the same content as $links, plus
+        // one or more additional links from the original set in $required_links.
+        foreach ($admin_links as $key => $target) {
         if (!in_array($key, $required_keys) && !array_key_exists($key, $links)) {
-          unset($admin_links[$key]);
-        }
-      }
-
-      // As the real current user, call hook_link_alter on the admin links.
-      // First we set a static variable so that the next time this function is
-      // called it will store a copy of the links at their current state. Then
-      // we pull those links which have not been link_alter'ed by any modules
-      // that come after forum_access.
-      $recursing = TRUE;
-      drupal_alter('link', $admin_links, $node, $comment);
-      $recursing = FALSE;
-      // Now return the stored links.
-      $links = $stored_links;
-    }
-  }// if empty($comment)
+            unset($admin_links[$key]);
+        }
+        }
+
+        // As the real current user, call hook_link_alter on the admin links.
+        // First we set a static variable so that the next time this function is
+        // called it will store a copy of the links at their current state. Then
+        // we pull those links which have not been link_alter'ed by any modules
+        // that come after forum_access.
+        $recursing = TRUE;
+        drupal_alter('link', $admin_links, $node, $comment);
+        $recursing = FALSE;
+        // Now return the stored links.
+        $links = $stored_links;
+    }
+    }// if empty($comment)
 }
 
 /**
@@ -499,10 +499,10 @@ 
  * (after _forum_access_comment_form()).
  */
 function forum_access_preprocess_box(&$variables) {
-  $tr = 't';
-  if (empty($variables['content']) && ($variables['title'] == $tr('Post new comment') || $variables['title'] == $tr('Reply'))) {
+    $tr = 't';
+    if (empty($variables['content']) && ($variables['title'] == $tr('Post new comment') || $variables['title'] == $tr('Reply'))) {
     $variables['title'] = '';
-  }
+    }
 }
 
 /**
@@ -512,10 +512,10 @@ 
  * remove those that aren't accessible to the user.
  */
 function forum_access_preprocess_comment(&$variables) {
-  if (version_compare(VERSION, '6.17', '<') && isset($variables['node']->tid)) {
+    if (version_compare(VERSION, '6.17', '<') && isset($variables['node']->tid)) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_preprocess_comment($variables);
-  }
+    }
 }
 
 } // End of !LEGACY-MODE
@@ -524,11 +524,11 @@ 
  * This is also required by ACL module.
  */
 function forum_access_enabled($set = NULL) {
-  static $enabled = TRUE;
-  if ($set !== NULL) {
+    static $enabled = TRUE;
+    if ($set !== NULL) {
     $enabled = $set;
-  }
-  return $enabled;
+    }
+    return $enabled;
 }
 
 /**
@@ -545,63 +545,63 @@ 
  *   2     - access granted for forum moderator
  */
 function forum_access_access($tid, $type, $account = NULL, $administer_nodes_sees_everything = TRUE) {
-  static $cache = array();
-  if (!$account) {
+    static $cache = array();
+    if (!$account) {
     global $user;
     $account = $user;
-  }
+    }
 
-  if ($account->uid == 1 ||
+    if ($account->uid == 1 ||
       $administer_nodes_sees_everything && user_access('administer nodes', $account) && array_search($type, array('view', 'update', 'delete')) !== FALSE) {
     return 1;
-  }
+    }
 
-  if (!isset($cache[$account->uid][$tid][$type])) {
+    if (!isset($cache[$account->uid][$tid][$type])) {
     if (!user_access('access content', $account)) {
-      return $cache[$account->uid][$tid][$type] = FALSE;
+        return $cache[$account->uid][$tid][$type] = FALSE;
     }
 
     $roles = array_keys($account->roles);
     $result = db_result(db_query("SELECT tid FROM {forum_access} WHERE rid IN (". db_placeholders($roles) .") AND grant_". $type ." = 1 AND tid = %d", array_merge($roles, array($tid))));
 
     if ($result) {
-      $cache[$account->uid][$tid][$type] = 1;
+        $cache[$account->uid][$tid][$type] = 1;
     }
     else {
-      // check our moderators too
-      $acl_id = acl_get_id_by_number('forum_access', $tid);
-      $result = db_result(db_query("SELECT uid FROM {acl_user} WHERE acl_id = %d AND uid = %d", $acl_id, $account->uid));
-      if ($result) {
+        // check our moderators too
+        $acl_id = acl_get_id_by_number('forum_access', $tid);
+        $result = db_result(db_query("SELECT uid FROM {acl_user} WHERE acl_id = %d AND uid = %d", $acl_id, $account->uid));
+        if ($result) {
         $cache[$account->uid][$tid][$type] = 2;
-      }
-      else {
+        }
+        else {
         $cache[$account->uid][$tid][$type] = FALSE;
-      }
+        }
     }
-  }
-  return $cache[$account->uid][$tid][$type];
+    }
+    return $cache[$account->uid][$tid][$type];
 }
 
 /**
  * Implementation of hook_user().
  */
 function forum_access_user($op, &$edit, &$account, $category = NULL) {
-  switch ($op) {
+    switch ($op) {
     case 'validate':
       $rid = forum_access_query_moderator_rid();
-      if (!empty($rid)) {
+        if (!empty($rid)) {
         if (isset($edit['roles'][$rid]) && $edit['roles'][$rid]) {
-          $roles = user_roles();
-          $variables = array(
+            $roles = user_roles();
+            $variables = array(
             '@Forum_Access' => 'Forum Access',
             '%Role' => $roles[$rid],
-          );
-          drupal_set_message(t('The %Role role is reserved for internal use by the @Forum_Access module! It was not assigned.', $variables), 'warning');
-          unset($edit['roles'][$rid]);
+            );
+            drupal_set_message(t('The %Role role is reserved for internal use by the @Forum_Access module! It was not assigned.', $variables), 'warning');
+            unset($edit['roles'][$rid]);
+        }
         }
-      }
-      break;
-  }
+        break;
+    }
 }
 
 /**
@@ -610,15 +610,15 @@ 
  * Remove the 'Forum' menu item if no forums are visible.
  */
 function forum_access_menu_alter(&$items) {
-  if (!empty($items['forum'])) {
+    if (!empty($items['forum'])) {
     //dpm($items['forum'], 'hook_menu_alter($items[\'forum\'])');
     if (!empty($items['forum']['access callback']) || $items['forum']['access arguments'][0] != 'access content') {
-      drupal_set_message(t('Unexpected access specification for the %forum menu path; @Forum_Access cannot control its access.', array('%forum' => 'forum', '@Forum_Access' => 'Forum Access')), 'error');
-      return;
+        drupal_set_message(t('Unexpected access specification for the %forum menu path; @Forum_Access cannot control its access.', array('%forum' => 'forum', '@Forum_Access' => 'Forum Access')), 'error');
+        return;
     }
     $items['forum']['access callback'] = '_forum_access_forum_access_callback';
     $items['forum']['access arguments'] = array(1);
-  }
+    }
 }
 
 /**
@@ -629,7 +629,7 @@ 
  * one role that can access at least one forum.
  */
 function _forum_access_forum_access_callback($tid = NULL) {
-  return (!$tid && _forum_access_access_any_forum()) || forum_access_access($tid, 'view');
+    return (!$tid && _forum_access_access_any_forum()) || forum_access_access($tid, 'view');
 }
 
 /**
@@ -639,37 +639,37 @@ 
  * at least one forum.
  */
 function _forum_access_access_any_forum($account = NULL) {
-  global $user;
-  static $return = array();
+    global $user;
+    static $return = array();
 
-  if (!isset($account)) {
+    if (!isset($account)) {
     $account = $user;
-  }
+    }
 
-  if (!isset($return[$account->uid])) {
+    if (!isset($return[$account->uid])) {
     if ($account->uid == 1) {
-      return $return[$account->uid] = TRUE;
+        return $return[$account->uid] = TRUE;
     }
     if (!user_access('access content', $account)) {
-      return $return[$account->uid] = FALSE;
+        return $return[$account->uid] = FALSE;
     }
     $rids = variable_get('forum_access_rids', NULL);
     if (!isset($rids)) {
-      $rids = array();
-      $result = db_query("SELECT fa.rid FROM {forum_access} fa WHERE fa.grant_view > 0 GROUP BY fa.rid");
-      while ($role = db_fetch_object($result)) {
+        $rids = array();
+        $result = db_query("SELECT fa.rid FROM {forum_access} fa WHERE fa.grant_view > 0 GROUP BY fa.rid");
+        while ($role = db_fetch_object($result)) {
         $rids[] = $role->rid;
-      }
-      variable_set('forum_access_rids', $rids);
+        }
+        variable_set('forum_access_rids', $rids);
     }
     foreach ($rids as $rid) {
-      if (isset($account->roles[$rid])) {
+        if (isset($account->roles[$rid])) {
         return $return[$account->uid] = TRUE;
-      }
+        }
     }
     $return[$account->uid] = FALSE;
-  }
-  return $return[$account->uid];
+    }
+    return $return[$account->uid];
 }
 
 /**
@@ -678,18 +678,18 @@ 
  * Delete {forum_access} records when forums are deleted.
  */
 function forum_access_taxonomy($op, $type, $array = NULL) {
-  //dpm($array, "hook_taxonomy($op, $type)");
-  if ($type = 'term' && $op == 'delete' && $array['vid'] == _forum_access_get_vid()) {
+    //dpm($array, "hook_taxonomy($op, $type)");
+    if ($type = 'term' && $op == 'delete' && $array['vid'] == _forum_access_get_vid()) {
     db_query("DELETE FROM {forum_access} WHERE tid = %d", $array['tid']);
     variable_del('forum_access_rids'); // clear cache
-  }
+    }
 }
 
 /**
  * Return forum.module's forum vocabulary ID.
  */
 function _forum_access_get_vid() {
-  return variable_get('forum_nav_vocabulary', '');
+    return variable_get('forum_nav_vocabulary', '');
 }
 
 /**
@@ -697,51 +697,51 @@ 
  * exist.
  */
 function forum_access_query_moderator_rid() {
-  return variable_get('forum_access_moderator_rid', NULL);
+    return variable_get('forum_access_moderator_rid', NULL);
 }
 
 /**
  * Return the forum tid or FALSE.
  */
 function _forum_access_get_tid($node) {
-  return (isset($node->forum_tid) ? $node->forum_tid : (isset($node->tid) ? $node->tid : FALSE));
+    return (isset($node->forum_tid) ? $node->forum_tid : (isset($node->tid) ? $node->tid : FALSE));
 }
 
 /**
  * Save and return the $tid.
  */
 function _forum_access_changed_tid($tid = NULL) {
-  static $saved_tid = NULL;
-  if (!empty($tid)) {
+    static $saved_tid = NULL;
+    if (!empty($tid)) {
     $saved_tid = $tid;
-  }
-  return $saved_tid;
+    }
+    return $saved_tid;
 }
 
 /**
  * Implementation of hook_node_access_explain().
  */
 function forum_access_node_access_explain($row) {
-  static $roles = NULL;
-  if ($row->realm == 'forum_access') {
+    static $roles = NULL;
+    if ($row->realm == 'forum_access') {
     if (!isset($roles)) {
-      module_load_include('node.inc', 'forum_access');
-      $roles = _forum_access_get_all_roles();
+        module_load_include('node.inc', 'forum_access');
+        $roles = _forum_access_get_all_roles();
     }
     if (isset($roles[$row->gid])) {
-      return array($roles[$row->gid]);
+        return array($roles[$row->gid]);
     }
     return array('(unknown gid)');
-  }
+    }
 }
 
 /**
  * Implementation of hook_acl_explain().
  */
 function forum_access_acl_explain($acl_id, $name, $number, $users = NULL) {
-  if (empty($users)) {
+    if (empty($users)) {
     return "ACL (id=$acl_id) would grant access to nodes in forum/$number.";
-  }
-  return "ACL (id=$acl_id) grants access to nodes in forum/$number to the listed user(s).";
+    }
+    return "ACL (id=$acl_id) grants access to nodes in forum/$number to the listed user(s).";
 }
 

Spacing +10 added lines, -10 removed lines

@@ -136,16 +136,16 @@ 
       break;
 
     case 'community':
-        if (arg(1)=='forum') {
+        if (arg(1) == 'forum') {
             if (is_numeric(arg(2))) {
-                $tid=arg(2);
+                $tid = arg(2);
                 // Obtain the tid from a URL path containing
                 // community/forum/%tid, this will prevent users from
                 // loading forums they are not allowed to access.
                 // However, only tid>1 are terms we care about. (This
                 // allows forum_tweaks mark-read functionality to
                 // work.)
-                if (isset($tid) and ($tid>1)) {
+                if (isset($tid) and ($tid > 1)) {
                     if (!forum_access_access($tid, 'view')) {
                         drupal_access_denied();
                         module_invoke_all('exit');
@@ -187,7 +187,7 @@ 
  * Alter the node/comment create/edit forms and various admin forms.
  */
 function forum_access_form_alter(&$form, &$form_state, $form_id) {
-  if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id) {
+  if (isset($form['type']['#value']) && $form['type']['#value'].'_node_form' == $form_id) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_node_form($form, $form_state);
   }
@@ -266,7 +266,7 @@ 
 
     case 'rid':
       if (strpos($query, 'FROM {role}') === FALSE
-        || strpos($_GET['q'] .'/', 'admin/content/forum/') === 0) {
+        || strpos($_GET['q'].'/', 'admin/content/forum/') === 0) {
         break;
       }
       $moderator_rid = forum_access_query_moderator_rid();
@@ -417,10 +417,10 @@ 
   }
   if (empty($comment)) {
     // Check links for the node.
-    if ($tid && isset($links['comment_add']) && !forum_access_access($tid, 'comment_create') && !(forum_access_access($tid, 'create') and ($node->uid==$user->uid)) ) {
+    if ($tid && isset($links['comment_add']) && !forum_access_access($tid, 'comment_create') && !(forum_access_access($tid, 'create') and ($node->uid == $user->uid))) {
       unset($links['comment_add']);
       // Hack to manually remove quote link
-      if ( isset($links['quote']) ) {
+      if (isset($links['quote'])) {
           unset($links['quote']);
       }
     }
@@ -433,7 +433,7 @@ 
       'delete' => 'comment_delete',
     );
     foreach ($required_keys as $access => $key) {
-      if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment)) && !($access == 'comment_create' && forum_access_access($tid, 'create') && ($node->uid==$user->uid)) ) {
+      if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment)) && !($access == 'comment_create' && forum_access_access($tid, 'create') && ($node->uid == $user->uid))) {
         unset($links[$required_keys[$access]]);
         unset($required_keys[$access]);
       }
@@ -443,7 +443,7 @@ 
     }
 
     // Hack to manually remove quote link if comment_reply link is no longer set
-    if ( (!(isset($links['comment_reply']))) AND isset($links['quote']) ) {
+    if ((!(isset($links['comment_reply']))) AND isset($links['quote'])) {
         unset($links['quote']);
     }
     
@@ -562,7 +562,7 @@ 
     }
 
     $roles = array_keys($account->roles);
-    $result = db_result(db_query("SELECT tid FROM {forum_access} WHERE rid IN (". db_placeholders($roles) .") AND grant_". $type ." = 1 AND tid = %d", array_merge($roles, array($tid))));
+    $result = db_result(db_query("SELECT tid FROM {forum_access} WHERE rid IN (".db_placeholders($roles).") AND grant_".$type." = 1 AND tid = %d", array_merge($roles, array($tid))));
 
     if ($result) {
       $cache[$account->uid][$tid][$type] = 1;

Braces +24 added lines, -36 removed lines

@@ -38,8 +38,7 @@ 
   if (isset($node->comment_target_nid)) {
     if ($changed_tid = _forum_access_changed_tid()) {
       $tid = $changed_tid; // the topic node hasn't been saved yet!
-    }
-    else {
+    } else {
       $node = node_load($node->comment_target_nid);
       $tid = _forum_access_get_tid($node);
     }
@@ -91,7 +90,8 @@ 
         return; // disable comment access control
       }
       if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
-        if (is_numeric($cid = arg(2))) { // comment/edit/%, comment/delete/%
+        if (is_numeric($cid = arg(2))) {
+// comment/edit/%, comment/delete/%
           $access[] = (arg(1) == 'edit' ? 'update' : 'delete');
           $comment = _comment_load($cid);
           $nid = $comment->nid;
@@ -107,7 +107,8 @@ 
 
     case 'node':
       if (is_numeric(arg(1))) {
-        if (arg(2) == 'edit' && !user_access('administer nodes')) { // node/%/edit
+        if (arg(2) == 'edit' && !user_access('administer nodes')) {
+// node/%/edit
           $access[] = 'update';
           $nid = arg(1);
           // If the node turns out to be in a forum where we have update/delete
@@ -118,13 +119,15 @@ 
           // We won't provide full Administrator access, though: we'll remove
           // author and timestamp, for example.
         }
-        if (arg(2) == 'delete' && !user_access('administer nodes')) { // node/%/delete
+        if (arg(2) == 'delete' && !user_access('administer nodes')) {
+// node/%/delete
           $access = array();
           $nid = arg(1);
           // This is the delete confirmation page. We don't need any
           // additional permissions, but we'll assert 'view' access below.
         }
-        if (arg(2) == NULL && !user_access('administer comments')) { // node/%
+        if (arg(2) == NULL && !user_access('administer comments')) {
+// node/%
           $access[] = 'update';
           $nid = arg(1);
           // If the node turns out to be in a forum where we have update/delete
@@ -190,44 +193,34 @@ 
   if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_node_form($form, $form_state);
-  }
-  elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
+  } elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_comment_form($form, $form_state);
-  }
-  elseif ($form_id == 'forum_overview') {
+  } elseif ($form_id == 'forum_overview') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_overview($form, $form_state);
-  }
-  elseif ($form_id == 'forum_form_container') {
+  } elseif ($form_id == 'forum_form_container') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, TRUE);
-  }
-  elseif ($form_id == 'forum_form_forum') {
+  } elseif ($form_id == 'forum_form_forum') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, FALSE);
-  }
-  elseif ($form_id == 'forum_admin_settings') {
+  } elseif ($form_id == 'forum_admin_settings') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_admin_settings_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_role') {
+  } elseif ($form_id == 'user_admin_role') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_role_form($form, $form_state);
-  }
-  elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
+  } elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_content_access_admin_form();
-  }
-  elseif ($form_id == 'user_admin_perm') {
+  } elseif ($form_id == 'user_admin_perm') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_perm_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_account') {
+  } elseif ($form_id == 'user_admin_account') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_account_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_profile_form') {
+  } elseif ($form_id == 'user_profile_form') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_profile_form($form, $form_state);
   }
@@ -252,8 +245,7 @@ 
       }
       if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
         $required_access = 'create';
-      }
-      else {
+      } else {
         $required_access = 'view';
       }
       $roles = implode(', ', array_keys($user->roles));
@@ -424,8 +416,7 @@ 
           unset($links['quote']);
       }
     }
-  }
-  else {
+  } else {
     // Check links for the comment.
     $required_keys = array(
       'comment_create' => 'comment_reply',
@@ -436,8 +427,7 @@ 
       if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment)) && !($access == 'comment_create' && forum_access_access($tid, 'create') && ($node->uid==$user->uid)) ) {
         unset($links[$required_keys[$access]]);
         unset($required_keys[$access]);
-      }
-      elseif (!array_key_exists($key, $links)) {
+      } elseif (!array_key_exists($key, $links)) {
         $link_is_missing = TRUE;
       }
     }
@@ -566,15 +556,13 @@ 
 
     if ($result) {
       $cache[$account->uid][$tid][$type] = 1;
-    }
-    else {
+    } else {
       // check our moderators too
       $acl_id = acl_get_id_by_number('forum_access', $tid);
       $result = db_result(db_query("SELECT uid FROM {acl_user} WHERE acl_id = %d AND uid = %d", $acl_id, $account->uid));
       if ($result) {
         $cache[$account->uid][$tid][$type] = 2;
-      }
-      else {
+      } else {
         $cache[$account->uid][$tid][$type] = FALSE;
       }
     }

drupal/sites/default/boinc/modules/contrib/i18nviews/includes/i18nviews.views.inc

Indentation +14 added lines, -14 removed lines

@@ -1,47 +1,47 @@
 <?php
 
 function i18nviews_views_data() {
-  $data['node']['content_negotiation'] = array(
+    $data['node']['content_negotiation'] = array(
     'group' => t('Node translation'),
     'title' => t('Content negotiation'),
     'help' => t('Removes the nodes that are not valid according to the content selection mode.'),
     'filter' => array(
-      'handler' => 'content_negotiation_filter_handler',
+        'handler' => 'content_negotiation_filter_handler',
     ),
-  );
-  return $data;
+    );
+    return $data;
 }
 
 /**
  * Implementation of hook_views_handlers
  */
 function i18nviews_views_handlers() {
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'i18nviews') . '/includes',
+        'path' => drupal_get_path('module', 'i18nviews') . '/includes',
     ),
     'handlers' => array(
-      'content_negotiation_filter_handler' => array(
+        'content_negotiation_filter_handler' => array(
         'parent' => 'views_handler_filter',
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_views_plugins().
  */
 function i18nviews_views_plugins() {
-  $path = drupal_get_path('module', 'i18nviews') . '/includes';
-  return array(
+    $path = drupal_get_path('module', 'i18nviews') . '/includes';
+    return array(
     'module' => 'i18nviews',
     'localization' => array(
-      'i18nstrings' => array(
+        'i18nstrings' => array(
         'title' => t('Views translation module'),
         'help' => t("Use the locale system as implemented by the Views translation module."),
         'handler' => 'views_plugin_localization_i18nstrings',
         'path' => $path,
-      ),
+        ),
     ),
-  );
+    );
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 function i18nviews_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'i18nviews') . '/includes',
+      'path' => drupal_get_path('module', 'i18nviews').'/includes',
     ),
     'handlers' => array(
       'content_negotiation_filter_handler' => array(
@@ -32,7 +32,7 @@ 
  * Implementation of hook_views_plugins().
  */
 function i18nviews_views_plugins() {
-  $path = drupal_get_path('module', 'i18nviews') . '/includes';
+  $path = drupal_get_path('module', 'i18nviews').'/includes';
   return array(
     'module' => 'i18nviews',
     'localization' => array(

drupal/sites/default/boinc/modules/contrib/i18nviews/includes/content_negotiation_filter_handler.inc

Indentation +5 added lines, -5 removed lines

@@ -1,18 +1,18 @@
 <?php
 
 class content_negotiation_filter_handler extends views_handler_filter {
-  function query() {
+    function query() {
     $this->ensure_my_table();
     $where = i18n_db_rewrite_where($this->table_alias, 'node');
     if (!empty($where)) {
-      $this->query->add_where($this->options['group'], $where);
+        $this->query->add_where($this->options['group'], $where);
+    }
     }
-  }
 
-  function option_definition() {
+    function option_definition() {
     $options = parent::option_definition();
     $options['operator']['default'] = '';
     $options['value']['default'] = '';
     return $options;
-  }
+    }
 }