BOINC / boinc

html/user/team_forum.php

Doc Comments +3 added lines

@@ -57,6 +57,9 @@
     edit_form($user, $team, $forum, true);
 }
 
+/**
+ * @param boolean $first
+ */
 function edit_form($user, $team, $forum, $first) {
     page_head(tra("Team Message Board"));
     echo "

html/user/team_search.php

Doc Comments +3 added lines

@@ -30,6 +30,9 @@
 // list entries are of the form id => team,
 // where team includes a field "refcnt".
 // 
+/**
+ * @param integer $weight
+ */
 function merge_lists($list1, &$list2, $weight) {
     foreach($list1 as $team) {
         $id = $team->id;

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 // where team includes a field "refcnt".
 // 
 function merge_lists($list1, &$list2, $weight) {
-    foreach($list1 as $team) {
+    foreach ($list1 as $team) {
         $id = $team->id;
         if (array_key_exists($id, $list2)) {
             $list2[$id]->refcnt += $weight;
@@ -97,7 +97,7 @@ 
         if (defined("SHOW_NONVALIDATED_TEAMS")) {
             $user = BoincUser::lookup_id($team->userid);
             echo "<td>";
-            echo $user->email_validated?"Yes":"No";
+            echo $user->email_validated ? "Yes" : "No";
             echo "</td>\n";
         }
         echo "
@@ -137,7 +137,7 @@ 
     xml_header();
     echo "<teams>\n";
     sort_list($list);
-    foreach($list as $team) {
+    foreach ($list as $team) {
         show_team_xml($team);
     }
     echo "</teams>\n";
@@ -164,14 +164,14 @@ 
         merge_lists($list2, $list, 3);
         $tried = true;
     }
-    if (strlen($params->country) && $params->country!='None') {
+    if (strlen($params->country) && $params->country != 'None') {
         $country = BoincDb::escape_string($params->country);
         $list2 = get_teams("country = '$country'", $params->active);
         //echo "<br>country matches: ",sizeof($list2);
         merge_lists($list2, $list, 1);
         $tried = true;
     }
-    if ($params->type and $params->type>1) {
+    if ($params->type and $params->type > 1) {
         $list2 = get_teams("type=$params->type", $params->active);
         //echo "<br>type matches: ",sizeof($list2);
         merge_lists($list2, $list, 2);

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.node.inc

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')) {
+        if (!forum_access_access($tid, 'comment_create')) {
         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')) {
         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 +4 added lines, -4 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;
   }
@@ -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'
       }
     }

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);

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

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')) {
-      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))) {
+        if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment))) {
         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).";
 }
 

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;
   }
 }
 

Spacing +8 added lines, -8 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();
@@ -420,7 +420,7 @@ 
     if ($tid && isset($links['comment_add']) && !forum_access_access($tid, 'comment_create')) {
       unset($links['comment_add']);
       // Hack to manually remove quote link
-      if ( isset($links['quote']) ) {
+      if (isset($links['quote'])) {
           unset($links['quote']);
       }
     }
@@ -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))) {
         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;
       }
     }

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.";
   }

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;
-  }
+    }
 }