BOINC / boinc

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

Doc Comments +2 added lines, -1 removed lines

@@ -99,6 +99,7 @@ 
 
 /**
  * Presents a node editing or adding form for the given content profile.
+ * @param string $type
  */
 function content_profile_page_edit($type, $account) {
   drupal_set_title(check_plain($account->name));
@@ -211,7 +212,7 @@ 
  * @param $op
  *   When set to 'types', content profile content types are returned
  *   as type objects. When set to 'names', only their type names are returned.
- * @param $setting
+ * @param string $setting
  *   If set, only content types that have this setting activated are returned.
  *   Leave it NULL to get all content profile types.
  * @param $value

Indentation +230 added lines, -230 removed lines

@@ -11,56 +11,56 @@ 
  * Implementation of hook_init().
  */
 function content_profile_init() {
-  module_load_include('inc', 'content_profile', 'content_profile.theme_vars');
+    module_load_include('inc', 'content_profile', 'content_profile.theme_vars');
 }
 
 /**
  * Implementation of hook_ctools_plugin_directory().
  */
 function content_profile_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'ctools' && $plugin == 'relationships') {
+    if ($module == 'ctools' && $plugin == 'relationships') {
     return 'panels/' . $plugin;
-  }
+    }
 }
 
 /**
  * Implementation of hook_menu().
  */
 function content_profile_menu() {
-  $items = array();
+    $items = array();
 
-  //Register a path for each content profile type
-  foreach (content_profile_get_types('names') as $type => $typename) {
+    //Register a path for each content profile type
+    foreach (content_profile_get_types('names') as $type => $typename) {
     $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/edit'] = array(
-      'title' => 'Edit',
-      'type' => MENU_DEFAULT_LOCAL_TASK,
+        'title' => 'Edit',
+        'type' => MENU_DEFAULT_LOCAL_TASK,
     );
     $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/profile'] = array(
-      'title' => 'Content profile',
-      'description' => 'Configure the display and management of this content profile.',
-      'page callback' => 'drupal_get_form',
-      'page arguments' => array('content_profile_admin_settings', $type),
-      'access callback' => 'user_access',
-      'access arguments' => array('administer nodes'),
-      'type' => MENU_LOCAL_TASK,
-      'weight' => 1,
+        'title' => 'Content profile',
+        'description' => 'Configure the display and management of this content profile.',
+        'page callback' => 'drupal_get_form',
+        'page arguments' => array('content_profile_admin_settings', $type),
+        'access callback' => 'user_access',
+        'access arguments' => array('administer nodes'),
+        'type' => MENU_LOCAL_TASK,
+        'weight' => 1,
     );
-  }
-  foreach (content_profile_get_types('names') as $type => $type_name) {
+    }
+    foreach (content_profile_get_types('names') as $type => $type_name) {
     $items['user/%user/profile/'. $type] = array(
-      'title callback' => 'check_plain',
-      'title' => drupal_ucfirst($type_name),
-      'page callback' => 'content_profile_page_edit',
-      'page arguments' => array($type, 1),
-      'access callback' => 'content_profile_page_access',
-      'access arguments' => array($type, 1),
-      'weight' => content_profile_get_settings($type, 'weight'),
-      'file' => 'node.pages.inc',
-      'file path' => drupal_get_path('module', 'node'),
-      'type' => content_profile_get_settings($type, 'edit_tab') == 'top' ? MENU_LOCAL_TASK : MENU_CALLBACK,
+        'title callback' => 'check_plain',
+        'title' => drupal_ucfirst($type_name),
+        'page callback' => 'content_profile_page_edit',
+        'page arguments' => array($type, 1),
+        'access callback' => 'content_profile_page_access',
+        'access arguments' => array($type, 1),
+        'weight' => content_profile_get_settings($type, 'weight'),
+        'file' => 'node.pages.inc',
+        'file path' => drupal_get_path('module', 'node'),
+        'type' => content_profile_get_settings($type, 'edit_tab') == 'top' ? MENU_LOCAL_TASK : MENU_CALLBACK,
     );
-  }
-  return $items;
+    }
+    return $items;
 }
 
 /**
@@ -68,45 +68,45 @@ 
  * Take over menu items generated by the user module for our categories.
  */
 function content_profile_menu_alter(&$items) {
-  foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
+    foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
     if (!empty($items['user/%user_category/edit/'. $type])) {
-      $item = &$items['user/%user_category/edit/'. $type];
-      $item = array(
+        $item = &$items['user/%user_category/edit/'. $type];
+        $item = array(
         'page callback' => 'content_profile_page_edit',
         'page arguments' => array($type, 1),
         'access callback' => 'content_profile_page_access',
         'access arguments' => array($type, 1),
         'file' => 'node.pages.inc',
         'file path' => drupal_get_path('module', 'node'),
-      ) + $item;
+        ) + $item;
+    }
     }
-  }
 }
 
 
 function content_profile_page_access($type, $account) {
-  if ($node = content_profile_load($type, $account->uid)) {
+    if ($node = content_profile_load($type, $account->uid)) {
     return node_access('update', $node);
-  }
-  // Else user may view the page when they are going to create their own profile
-  // or have permission to create it for others.
-  global $user;
-  if ($user->uid == $account->uid || user_access('administer nodes') ){
+    }
+    // Else user may view the page when they are going to create their own profile
+    // or have permission to create it for others.
+    global $user;
+    if ($user->uid == $account->uid || user_access('administer nodes') ){
     return node_access('create', $type);
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Presents a node editing or adding form for the given content profile.
  */
 function content_profile_page_edit($type, $account) {
-  drupal_set_title(check_plain($account->name));
-  $node = content_profile_load($type, $account->uid);
-  if (!$node) {
+    drupal_set_title(check_plain($account->name));
+    $node = content_profile_load($type, $account->uid);
+    if (!$node) {
     $node = array('uid' => $account->uid, 'name' => (isset($account->name) ? $account->name : ''), 'type' => $type, 'language' => '');
-  }
-  return drupal_get_form($type .'_node_form', $node);
+    }
+    return drupal_get_form($type .'_node_form', $node);
 }
 
 
@@ -114,10 +114,10 @@ 
  * Implementation of hook_views_api().
  */
 function content_profile_views_api() {
-  return array(
+    return array(
     'api' => 2,
     'path' => drupal_get_path('module', 'content_profile') .'/views',
-  );
+    );
 }
 
 
@@ -125,71 +125,71 @@ 
  * Menu callback; content profile settings.
  */
 function content_profile_admin_settings(&$form_state, $type) {
-  $form_state['type'] = $type;
+    $form_state['type'] = $type;
 
-  $form['weight'] = array(
+    $form['weight'] = array(
     '#type' => 'weight',
     '#title' => t("Weight"),
     '#default_value' => content_profile_get_settings($type, 'weight'),
     '#description' => t('The weight of content of this content type where ever they appear - this applies to the input form integration as well to the display integration.'),
     '#weight' => 5,
-  );
-  $form['display'] = array(
+    );
+    $form['display'] = array(
     '#type' => 'fieldset',
     '#title' => t('Display settings'),
     '#description' => t('Customize the display of this content profile.'),
     '#collapsible' => TRUE,
-  );
-  $form['display']['user_display'] = array(
+    );
+    $form['display']['user_display'] = array(
     '#type' => 'radios',
     '#title' => t("User page display style"),
     '#default_value' => content_profile_get_settings($type, 'user_display'),
     '#options' => array(
-      0 => t("Don't display this content profile on the user account page"),
-      'link' => t('Display it as link to the profile content'),
-      'full' => t('Display the full content'),
-      'teaser' => t("Display the content's teaser"),
+        0 => t("Don't display this content profile on the user account page"),
+        'link' => t('Display it as link to the profile content'),
+        'full' => t('Display the full content'),
+        'teaser' => t("Display the content's teaser"),
     ),
-  );
-  $form['display']['edit_link'] = array(
+    );
+    $form['display']['edit_link'] = array(
     '#type' => 'checkbox',
     '#title' => t("Include an edit link to the display"),
     '#default_value' => content_profile_get_settings($type, 'edit_link'),
-  );
-  $form['display']['add_link'] = array(
+    );
+    $form['display']['add_link'] = array(
     '#type' => 'checkbox',
     '#title' => t("Show a link to the content profile creation page, if there is no profile."),
     '#default_value' => content_profile_get_settings($type, 'add_link'),
     '#description' => t("If selected and the user has no profile of this type yet, a link to add one is shown on the user page."),
-  );
-  $form['display']['edit_tab'] = array(
+    );
+    $form['display']['edit_tab'] = array(
     '#type' => 'radios',
     '#title' => t("Profile edit tab"),
     '#default_value' => content_profile_get_settings($type, 'edit_tab'),
     '#options' => array(
-      0 => t('None'),
-      'top' => t("Show a tab at the user's page"),
-      'sub' => t("Show a secondary tab below the user's edit tab"),
+        0 => t('None'),
+        'top' => t("Show a tab at the user's page"),
+        'sub' => t("Show a secondary tab below the user's edit tab"),
     ),
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit'),
     '#weight' => 10,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 function content_profile_admin_settings_submit($form, &$form_state) {
-  $settings = content_profile_get_settings($form_state['type']);
-  foreach (content_profile_settings_info() as $setting => $default) {
+    $settings = content_profile_get_settings($form_state['type']);
+    foreach (content_profile_settings_info() as $setting => $default) {
     if (isset($form_state['values'][$setting])) {
-      $settings[$setting] = $form_state['values'][$setting];
+        $settings[$setting] = $form_state['values'][$setting];
+    }
     }
-  }
-  content_profile_set_settings($form_state['type'], $settings);
-  drupal_set_message('Your changes have been saved.');
-  menu_rebuild();
+    content_profile_set_settings($form_state['type'], $settings);
+    drupal_set_message('Your changes have been saved.');
+    menu_rebuild();
 }
 
 /**
@@ -198,10 +198,10 @@ 
  *   The node object or the node's type
  */
 function is_content_profile($type) {
-  if (is_object($type)) {
+    if (is_object($type)) {
     $type = $type->type;
-  }
-  return variable_get('content_profile_use_'. $type, FALSE);
+    }
+    return variable_get('content_profile_use_'. $type, FALSE);
 }
 
 /**
@@ -218,14 +218,14 @@ 
  *   The value to compare the given setting too.
  */
 function content_profile_get_types($op = 'types', $setting = NULL , $value = TRUE) {
-  $types = array();
+    $types = array();
 
-  foreach (node_get_types($op) as $type => $info) {
+    foreach (node_get_types($op) as $type => $info) {
     if (is_content_profile($type) && (!isset($setting) || content_profile_get_settings($type, $setting) == $value)) {
-      $types[$type] = $info;
+        $types[$type] = $info;
     }
-  }
-  return $types;
+    }
+    return $types;
 }
 
 /**
@@ -233,79 +233,79 @@ 
  * Rename or delete the settings variable if a type changes.
  */
 function content_profile_node_type($op, $info) {
-  switch ($op) {
+    switch ($op) {
     case 'delete':
       variable_del('content_profile_use_'. $info->type);
-      variable_del('content_profile_'. $info->type);
-      break;
+        variable_del('content_profile_'. $info->type);
+        break;
     case 'update':
       if (!empty($info->old_type) && $info->old_type != $info->type) {
         if (is_content_profile($info->old_type)) {
-          $settings = variable_get('content_profile_'. $info->old_type, array());
-          variable_del('content_profile_use_'. $info->old_type);
-          variable_del('content_profile_'. $info->old_type);
-          variable_set('content_profile_use_'. $info->type, 1);
-          variable_set('content_profile_'. $info->type, $settings);
+            $settings = variable_get('content_profile_'. $info->old_type, array());
+            variable_del('content_profile_use_'. $info->old_type);
+            variable_del('content_profile_'. $info->old_type);
+            variable_set('content_profile_use_'. $info->type, 1);
+            variable_set('content_profile_'. $info->type, $settings);
+        }
         }
-      }
-      break;
-  }
+        break;
+    }
 }
 
 /**
  * Implementation of hook_form_alter().
  */
 function content_profile_form_alter(&$form, $form_state, $form_id) {
-  if ($form_id == 'node_type_form') {
+    if ($form_id == 'node_type_form') {
     $form['content_profile'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Content Profile'),
-      '#group' => 'additional_settings',
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
-      '#weight' => 32,
+        '#type' => 'fieldset',
+        '#title' => t('Content Profile'),
+        '#group' => 'additional_settings',
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+        '#weight' => 32,
     );
     $form['content_profile']['content_profile_use'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Use this content type as a content profile for users'),
-      '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
+        '#type' => 'checkbox',
+        '#title' => t('Use this content type as a content profile for users'),
+        '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
     );
-  }
-  elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
+    }
+    elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
-      $form['buttons']['preview']['#access'] = FALSE;
-      $form['buttons']['delete']['#access'] = FALSE;
-      $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q'];
+        $form['buttons']['preview']['#access'] = FALSE;
+        $form['buttons']['delete']['#access'] = FALSE;
+        $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q'];
     }
     // Set the author value - note that this works only for admins.
     if (!empty($_GET['uid']) && ($uid = intval($_GET['uid'])) && ($user = user_load($uid))) {
-      $form['author']['name']['#default_value'] = $user->name;
+        $form['author']['name']['#default_value'] = $user->name;
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_user().
  */
 function content_profile_user($op, &$edit, &$account, $category = NULL) {
-  global $user;
+    global $user;
 
-  switch ($op) {
+    switch ($op) {
     case 'categories':
       $data = array();
-      foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
+        foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
         $data[] = array(
-          'name' => $type,
-          'title' => drupal_ucfirst($type_name),
-          'weight' => content_profile_get_settings($type, 'weight') + 1,
+            'name' => $type,
+            'title' => drupal_ucfirst($type_name),
+            'weight' => content_profile_get_settings($type, 'weight') + 1,
         );
-      }
-      return $data;
+        }
+        return $data;
 
     case 'view':
       $account->content['content_profile'] = content_profile_show_profiles($account->uid);
-      break;
+        break;
 
     case 'delete':
       // Retrieve all profile nodes (in any language) for this user by issueing an SQL query.
@@ -315,11 +315,11 @@ 
 
         $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
         while ($node = db_fetch_object($result)) {
-          _content_profile_node_delete($node);
+            _content_profile_node_delete($node);
+        }
         }
-      }
-      break;
-  }
+        break;
+    }
 }
 
 /**
@@ -333,42 +333,42 @@ 
  * "SELECT * FROM {node}" query) instead of just the $nid.
  */
 function _content_profile_node_delete($node) {
-  // Copied over from node_load(), so that node_invoke('delete') gets
-  // the fully extended node object, like modules would expect:
+    // Copied over from node_load(), so that node_invoke('delete') gets
+    // the fully extended node object, like modules would expect:
 
-  if ($node->nid) {
+    if ($node->nid) {
     // Call the node specific callback (if any) and piggy-back the
     // results to the node or overwrite some values.
     if ($extra = node_invoke($node, 'load')) {
-      foreach ($extra as $key => $value) {
+        foreach ($extra as $key => $value) {
         $node->$key = $value;
-      }
+        }
     }
     if ($extra = node_invoke_nodeapi($node, 'load')) {
-      foreach ($extra as $key => $value) {
+        foreach ($extra as $key => $value) {
         $node->$key = $value;
-      }
+        }
+    }
     }
-  }
 
-  // Copied over from node_delete():
+    // Copied over from node_delete():
 
-  db_query('DELETE FROM {node} WHERE nid = %d', $node->nid);
-  db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid);
+    db_query('DELETE FROM {node} WHERE nid = %d', $node->nid);
+    db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid);
 
-  // Call the node-specific callback (if any):
-  node_invoke($node, 'delete');
-  node_invoke_nodeapi($node, 'delete');
+    // Call the node-specific callback (if any):
+    node_invoke($node, 'delete');
+    node_invoke_nodeapi($node, 'delete');
 
-  // Clear the cache so an anonymous poster can see the node being deleted.
-  cache_clear_all();
+    // Clear the cache so an anonymous poster can see the node being deleted.
+    cache_clear_all();
 
-  // Remove this node from the search index if needed.
-  if (function_exists('search_wipe')) {
+    // Remove this node from the search index if needed.
+    if (function_exists('search_wipe')) {
     search_wipe($node->nid, 'node');
-  }
-  watchdog('content', '@type: deleted %title.', array('@type' => $node->type, '%title' => $node->title));
-  drupal_set_message(t('@type %title has been deleted.', array('@type' => node_get_types('name', $node), '%title' => $node->title)));
+    }
+    watchdog('content', '@type: deleted %title.', array('@type' => $node->type, '%title' => $node->title));
+    drupal_set_message(t('@type %title has been deleted.', array('@type' => node_get_types('name', $node), '%title' => $node->title)));
 }
 
 /**
@@ -376,30 +376,30 @@ 
  */
 function content_profile_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
 
-  if ($op == 'prepare' && is_content_profile($node) && !isset($node->nid) && $node->uid && !user_access('administer nodes') && arg(0) != 'admin') {
+    if ($op == 'prepare' && is_content_profile($node) && !isset($node->nid) && $node->uid && !user_access('administer nodes') && arg(0) != 'admin') {
     // Check if this nodetype already exists
     if ($nid = content_profile_profile_exists($node, $node->uid)) {
-      // This node already exists, redirect to edit page
-      drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
+        // This node already exists, redirect to edit page
+        drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
     }
-  }
-  elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
+    }
+    elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
     $form = $a3;
     // Only validate if the user-name changed or we add a new node
     if (!empty($node->nid) && $form['author']['name']['#default_value'] == $node->name) {
-      return;
+        return;
     }
     //check whether the selected user has already a profile
     $uid = db_result(db_query("SELECT uid FROM {users} WHERE name = '%s'", $node->name));
     if ($uid && content_profile_profile_exists($node, $uid)) {
-      form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
+        form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
+    }
     }
-  }
-  elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
+    elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
     // Make sure the translated profile belongs to the same user.
     $node->uid = $node->translation_source->uid;
     $node->name = $node->translation_source->name;
-  }
+    }
 }
 
 /**
@@ -412,11 +412,11 @@ 
  * @return If a node exists, the node id, FALSE else.
  */
 function content_profile_profile_exists($node, $uid) {
-  $query = "SELECT n.nid AS nid FROM {node} n WHERE n.type = '%s' AND n.uid = %d ";
-  if (module_exists('translation') && translation_supported_type($node->type)) {
+    $query = "SELECT n.nid AS nid FROM {node} n WHERE n.type = '%s' AND n.uid = %d ";
+    if (module_exists('translation') && translation_supported_type($node->type)) {
     $query .= "AND n.language = '%s'";
-  }
-  return db_result(db_query($query, $node->type, $uid, $node->language));
+    }
+    return db_result(db_query($query, $node->type, $uid, $node->language));
 }
 
 /**
@@ -428,19 +428,19 @@ 
  *   e.g. user_edit, register or weight.
  */
 function content_profile_get_settings($type, $return = 'all') {
-  $settings = variable_get('content_profile_'. $type, array());
-  $settings += content_profile_settings_info();
-  if ($return == 'all') {
+    $settings = variable_get('content_profile_'. $type, array());
+    $settings += content_profile_settings_info();
+    if ($return == 'all') {
     return $settings;
-  }
-  return $settings[$return];
+    }
+    return $settings[$return];
 }
 
 /**
  * Saves the content_profile settings of a content type.
  */
 function content_profile_set_settings($type, $settings) {
-  variable_set('content_profile_'. $type, $settings);
+    variable_set('content_profile_'. $type, $settings);
 }
 
 /**
@@ -448,7 +448,7 @@ 
  * and their default value.
  */
 function content_profile_settings_info() {
-  return module_invoke_all('content_profile_settings');
+    return module_invoke_all('content_profile_settings');
 }
 
 /**
@@ -457,13 +457,13 @@ 
  * Defines content profile settings and their default value.
  */
 function content_profile_content_profile_settings() {
-  return array(
+    return array(
     'weight' => 0,
     'user_display' => 'full',
     'edit_link' => 0,
     'edit_tab' => 'sub',
     'add_link' => 1,
-  );
+    );
 }
 
 /**
@@ -479,17 +479,17 @@ 
  *   Optional. If set, the cache is reset.
  */
 function content_profile_load($type, $uid, $lang = '', $reset = NULL) {
-  static $cache = array();
+    static $cache = array();
 
-  if (!isset($cache[$type][$uid][$lang]) || $reset) {
+    if (!isset($cache[$type][$uid][$lang]) || $reset) {
     $cache[$type][$uid][$lang] = FALSE;
     $params = array('type' => $type, 'uid' => $uid);
     if ($node = node_load($lang ? $params + array('language' => $lang) : $params, NULL, $reset)) {
-      $cache[$type][$uid][$lang] = $node->nid;
+        $cache[$type][$uid][$lang] = $node->nid;
     }
     return $node;
-  }
-  return !empty($cache[$type][$uid][$lang]) ? node_load($cache[$type][$uid][$lang]) : FALSE;
+    }
+    return !empty($cache[$type][$uid][$lang]) ? node_load($cache[$type][$uid][$lang]) : FALSE;
 }
 
 /**
@@ -498,19 +498,19 @@ 
  * Show node submission guidelines for content profile node forms.
  */
 function content_profile_help($path, $arg) {
-  if (preg_match('/user\/\%\/(profile|edit)\/(.*)/', $path, $matches)) {
+    if (preg_match('/user\/\%\/(profile|edit)\/(.*)/', $path, $matches)) {
     foreach (content_profile_get_types('names') as $type => $typename) {
-      if ($type == $matches[2]) {
+        if ($type == $matches[2]) {
         $node = content_profile_load($type, $arg[1]);
         if ($node) {
-          return node_help('node/%/edit', array(1 => $node->nid));
+            return node_help('node/%/edit', array(1 => $node->nid));
         }
         else {
-          return node_help('node/add/'. $type, array('node', 'add', $type));
+            return node_help('node/add/'. $type, array('node', 'add', $type));
         }
-      }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -518,14 +518,14 @@ 
  * that shows all content_profiles as configured by the admin.
  */
 function content_profile_show_profiles($uid) {
-  global $user;
+    global $user;
 
-  $content = array();
-  foreach (content_profile_get_types('names') as $type => $type_name) {
+    $content = array();
+    foreach (content_profile_get_types('names') as $type => $type_name) {
     $node = content_profile_load($type, $uid);
 
     if (($style = content_profile_get_settings($type, 'user_display')) && $node && node_access('view', $node)) {
-      $content['content_profile_'. $type] = array(
+        $content['content_profile_'. $type] = array(
         '#theme' => ($style == 'link') ? 'content_profile_display_link' : 'content_profile_display_view',
         '#edit_link' => content_profile_get_settings($type, 'edit_link'),
         '#uid' => $uid,
@@ -533,59 +533,59 @@ 
         '#content_type' => $type,
         '#weight' => content_profile_get_settings($type, 'weight'),
         '#suffix' => '<br />',
-      );
+        );
 
-      // Working around the bug described at http://drupal.org/node/302873
-      module_load_include('inc', 'content_profile', 'content_profile.theme');
+        // Working around the bug described at http://drupal.org/node/302873
+        module_load_include('inc', 'content_profile', 'content_profile.theme');
     }
     elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
-      $content['content_profile_'. $type] = array(
+        $content['content_profile_'. $type] = array(
         '#admin' => $uid != $user->uid,
         '#theme' => 'content_profile_display_add_link',
         '#uid' => $uid,
         '#content_type' => $type,
         '#weight' => content_profile_get_settings($type, 'weight'),
         '#suffix' => '<br />',
-      );
+        );
+    }
     }
-  }
-  if ($content) {
+    if ($content) {
     $content['#prefix'] = '<p id="content-profile-view">';
     $content['#suffix'] = '</p>';
-  }
-  return $content;
+    }
+    return $content;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function content_profile_theme() {
-  $return = array(
+    $return = array(
     'content_profile_display_view' => array(
-      'template'  => 'content_profile-display-view',
-      'arguments' => array('element' => NULL),
-      'file' => 'content_profile.theme.inc',
+        'template'  => 'content_profile-display-view',
+        'arguments' => array('element' => NULL),
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_add_link' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_link' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_tab_view' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_tab_edit' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
-  );
-  if (module_exists('pageroute')) {
+    );
+    if (module_exists('pageroute')) {
     $return['content_profile_pageroute_empty']  = array(
-      'arguments' => array('type_name' => NULL),
-    	'file' => 'content_profile.pageroute.inc',
+        'arguments' => array('type_name' => NULL),
+        'file' => 'content_profile.pageroute.inc',
     );
-  }
-  return $return;
+    }
+    return $return;
 }
 
 /**
@@ -594,7 +594,7 @@ 
  * $conf['content_profile_extra_templates'] in settings.php.
  */
 function content_profile_theme_registry_alter(&$items) {
-  $templates = array_merge(array(
+    $templates = array_merge(array(
     'author_pane',
     'comment',
     'node',
@@ -603,47 +603,47 @@ 
     'username',
     'user_profile',
     'user_signature',
-  ), variable_get('content_profile_extra_templates', array()));
+    ), variable_get('content_profile_extra_templates', array()));
 
-  foreach ($templates as $key) {
+    foreach ($templates as $key) {
     if (isset($items[$key])) {
-      $items[$key] += array('preprocess functions' => array());
-      $items[$key]['preprocess functions'][] = 'content_profile_template_preprocess';
+        $items[$key] += array('preprocess functions' => array());
+        $items[$key]['preprocess functions'][] = 'content_profile_template_preprocess';
+    }
     }
-  }
 }
 
 /**
  * Adds $content_profile variable if we can find a $uid.
  */
 function content_profile_template_preprocess(&$variables, $hook) {
-  // Search the uid
-  foreach (array('account_id', 'uid', 'account', 'node', 'comment', 'user') as $name) {
+    // Search the uid
+    foreach (array('account_id', 'uid', 'account', 'node', 'comment', 'user') as $name) {
     if (isset($variables[$name])) {
-      $uid = is_object($variables[$name]) ? $variables[$name]->uid : $variables[$name];
-      $variables['content_profile'] = new content_profile_theme_variables($uid);
-      break;
+        $uid = is_object($variables[$name]) ? $variables[$name]->uid : $variables[$name];
+        $variables['content_profile'] = new content_profile_theme_variables($uid);
+        break;
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_simpletest().
  */
 function content_profile_simpletest() {
-  // Scan through content_profile/tests directory for any .test files to tell SimpleTest module.
-  $tests = file_scan_directory(drupal_get_path('module', 'content_profile') .'/tests', '\.test');
-  return array_keys($tests);
+    // Scan through content_profile/tests directory for any .test files to tell SimpleTest module.
+    $tests = file_scan_directory(drupal_get_path('module', 'content_profile') .'/tests', '\.test');
+    return array_keys($tests);
 }
 
 /**
  * Implementation of hook_pageroute_info() for Pageroute integration.
  */
 function content_profile_pageroute_info() {
-  return array(
+    return array(
     'content_profile' => array(
-      'viewprofile' => 'content_profile.pageroute',
-      'editprofile' => 'content_profile.pageroute',
+        'viewprofile' => 'content_profile.pageroute',
+        'editprofile' => 'content_profile.pageroute',
     )
-  );
+    );
 }

Switch Indentation +37 added lines, -37 removed lines

@@ -234,21 +234,21 @@ 
  */
 function content_profile_node_type($op, $info) {
   switch ($op) {
-    case 'delete':
-      variable_del('content_profile_use_'. $info->type);
-      variable_del('content_profile_'. $info->type);
-      break;
-    case 'update':
-      if (!empty($info->old_type) && $info->old_type != $info->type) {
-        if (is_content_profile($info->old_type)) {
-          $settings = variable_get('content_profile_'. $info->old_type, array());
-          variable_del('content_profile_use_'. $info->old_type);
-          variable_del('content_profile_'. $info->old_type);
-          variable_set('content_profile_use_'. $info->type, 1);
-          variable_set('content_profile_'. $info->type, $settings);
-        }
+  case 'delete':
+    variable_del('content_profile_use_'. $info->type);
+    variable_del('content_profile_'. $info->type);
+    break;
+  case 'update':
+    if (!empty($info->old_type) && $info->old_type != $info->type) {
+      if (is_content_profile($info->old_type)) {
+        $settings = variable_get('content_profile_'. $info->old_type, array());
+        variable_del('content_profile_use_'. $info->old_type);
+        variable_del('content_profile_'. $info->old_type);
+        variable_set('content_profile_use_'. $info->type, 1);
+        variable_set('content_profile_'. $info->type, $settings);
       }
-      break;
+    }
+    break;
   }
 }
 
@@ -292,33 +292,33 @@ 
   global $user;
 
   switch ($op) {
-    case 'categories':
-      $data = array();
-      foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
-        $data[] = array(
-          'name' => $type,
-          'title' => drupal_ucfirst($type_name),
-          'weight' => content_profile_get_settings($type, 'weight') + 1,
-        );
-      }
-      return $data;
+  case 'categories':
+    $data = array();
+    foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
+      $data[] = array(
+        'name' => $type,
+        'title' => drupal_ucfirst($type_name),
+        'weight' => content_profile_get_settings($type, 'weight') + 1,
+      );
+    }
+    return $data;
 
-    case 'view':
-      $account->content['content_profile'] = content_profile_show_profiles($account->uid);
-      break;
+  case 'view':
+    $account->content['content_profile'] = content_profile_show_profiles($account->uid);
+    break;
 
-    case 'delete':
-      // Retrieve all profile nodes (in any language) for this user by issueing an SQL query.
-      if ($types = content_profile_get_types()) {
-        $condition = array_fill(0, count($types), "type = '%s'");
-        $arguments = array_merge(array_keys($types), array($account->uid));
+  case 'delete':
+    // Retrieve all profile nodes (in any language) for this user by issueing an SQL query.
+    if ($types = content_profile_get_types()) {
+      $condition = array_fill(0, count($types), "type = '%s'");
+      $arguments = array_merge(array_keys($types), array($account->uid));
 
-        $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
-        while ($node = db_fetch_object($result)) {
-          _content_profile_node_delete($node);
-        }
+      $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
+      while ($node = db_fetch_object($result)) {
+        _content_profile_node_delete($node);
       }
-      break;
+    }
+    break;
   }
 }
 

Spacing +31 added lines, -31 removed lines

@@ -19,7 +19,7 @@ 
  */
 function content_profile_ctools_plugin_directory($module, $plugin) {
   if ($module == 'ctools' && $plugin == 'relationships') {
-    return 'panels/' . $plugin;
+    return 'panels/'.$plugin;
   }
 }
 
@@ -31,11 +31,11 @@ 
 
   //Register a path for each content profile type
   foreach (content_profile_get_types('names') as $type => $typename) {
-    $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/edit'] = array(
+    $items['admin/content/node-type/'.str_replace('_', '-', $type).'/edit'] = array(
       'title' => 'Edit',
       'type' => MENU_DEFAULT_LOCAL_TASK,
     );
-    $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/profile'] = array(
+    $items['admin/content/node-type/'.str_replace('_', '-', $type).'/profile'] = array(
       'title' => 'Content profile',
       'description' => 'Configure the display and management of this content profile.',
       'page callback' => 'drupal_get_form',
@@ -47,7 +47,7 @@ 
     );
   }
   foreach (content_profile_get_types('names') as $type => $type_name) {
-    $items['user/%user/profile/'. $type] = array(
+    $items['user/%user/profile/'.$type] = array(
       'title callback' => 'check_plain',
       'title' => drupal_ucfirst($type_name),
       'page callback' => 'content_profile_page_edit',
@@ -69,8 +69,8 @@ 
  */
 function content_profile_menu_alter(&$items) {
   foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
-    if (!empty($items['user/%user_category/edit/'. $type])) {
-      $item = &$items['user/%user_category/edit/'. $type];
+    if (!empty($items['user/%user_category/edit/'.$type])) {
+      $item = &$items['user/%user_category/edit/'.$type];
       $item = array(
         'page callback' => 'content_profile_page_edit',
         'page arguments' => array($type, 1),
@@ -91,7 +91,7 @@ 
   // Else user may view the page when they are going to create their own profile
   // or have permission to create it for others.
   global $user;
-  if ($user->uid == $account->uid || user_access('administer nodes') ){
+  if ($user->uid == $account->uid || user_access('administer nodes')) {
     return node_access('create', $type);
   }
   return FALSE;
@@ -106,7 +106,7 @@ 
   if (!$node) {
     $node = array('uid' => $account->uid, 'name' => (isset($account->name) ? $account->name : ''), 'type' => $type, 'language' => '');
   }
-  return drupal_get_form($type .'_node_form', $node);
+  return drupal_get_form($type.'_node_form', $node);
 }
 
 
@@ -116,7 +116,7 @@ 
 function content_profile_views_api() {
   return array(
     'api' => 2,
-    'path' => drupal_get_path('module', 'content_profile') .'/views',
+    'path' => drupal_get_path('module', 'content_profile').'/views',
   );
 }
 
@@ -201,7 +201,7 @@ 
   if (is_object($type)) {
     $type = $type->type;
   }
-  return variable_get('content_profile_use_'. $type, FALSE);
+  return variable_get('content_profile_use_'.$type, FALSE);
 }
 
 /**
@@ -217,7 +217,7 @@ 
  * @param $value
  *   The value to compare the given setting too.
  */
-function content_profile_get_types($op = 'types', $setting = NULL , $value = TRUE) {
+function content_profile_get_types($op = 'types', $setting = NULL, $value = TRUE) {
   $types = array();
 
   foreach (node_get_types($op) as $type => $info) {
@@ -235,17 +235,17 @@ 
 function content_profile_node_type($op, $info) {
   switch ($op) {
     case 'delete':
-      variable_del('content_profile_use_'. $info->type);
-      variable_del('content_profile_'. $info->type);
+      variable_del('content_profile_use_'.$info->type);
+      variable_del('content_profile_'.$info->type);
       break;
     case 'update':
       if (!empty($info->old_type) && $info->old_type != $info->type) {
         if (is_content_profile($info->old_type)) {
-          $settings = variable_get('content_profile_'. $info->old_type, array());
-          variable_del('content_profile_use_'. $info->old_type);
-          variable_del('content_profile_'. $info->old_type);
-          variable_set('content_profile_use_'. $info->type, 1);
-          variable_set('content_profile_'. $info->type, $settings);
+          $settings = variable_get('content_profile_'.$info->old_type, array());
+          variable_del('content_profile_use_'.$info->old_type);
+          variable_del('content_profile_'.$info->old_type);
+          variable_set('content_profile_use_'.$info->type, 1);
+          variable_set('content_profile_'.$info->type, $settings);
         }
       }
       break;
@@ -268,15 +268,15 @@ 
     $form['content_profile']['content_profile_use'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use this content type as a content profile for users'),
-      '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
+      '#default_value' => variable_get('content_profile_use_'.$form['#node_type']->type, FALSE),
     );
   }
-  elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
+  elseif (isset($form['#node']) && $form['#node']->type.'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
       $form['buttons']['preview']['#access'] = FALSE;
       $form['buttons']['delete']['#access'] = FALSE;
-      $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q'];
+      $form['#redirect'] = arg(2) == 'profile' ? 'user/'.$form['#node']->uid : $_GET['q'];
     }
     // Set the author value - note that this works only for admins.
     if (!empty($_GET['uid']) && ($uid = intval($_GET['uid'])) && ($user = user_load($uid))) {
@@ -313,7 +313,7 @@ 
         $condition = array_fill(0, count($types), "type = '%s'");
         $arguments = array_merge(array_keys($types), array($account->uid));
 
-        $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
+        $result = db_query("SELECT * FROM {node} WHERE (".implode(' OR ', $condition).") AND uid = %d", $arguments);
         while ($node = db_fetch_object($result)) {
           _content_profile_node_delete($node);
         }
@@ -380,7 +380,7 @@ 
     // Check if this nodetype already exists
     if ($nid = content_profile_profile_exists($node, $node->uid)) {
       // This node already exists, redirect to edit page
-      drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
+      drupal_goto('node/'.$nid.'/edit', 'destination=user/'.$node->uid);
     }
   }
   elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
@@ -428,7 +428,7 @@ 
  *   e.g. user_edit, register or weight.
  */
 function content_profile_get_settings($type, $return = 'all') {
-  $settings = variable_get('content_profile_'. $type, array());
+  $settings = variable_get('content_profile_'.$type, array());
   $settings += content_profile_settings_info();
   if ($return == 'all') {
     return $settings;
@@ -440,7 +440,7 @@ 
  * Saves the content_profile settings of a content type.
  */
 function content_profile_set_settings($type, $settings) {
-  variable_set('content_profile_'. $type, $settings);
+  variable_set('content_profile_'.$type, $settings);
 }
 
 /**
@@ -506,7 +506,7 @@ 
           return node_help('node/%/edit', array(1 => $node->nid));
         }
         else {
-          return node_help('node/add/'. $type, array('node', 'add', $type));
+          return node_help('node/add/'.$type, array('node', 'add', $type));
         }
       }
     }
@@ -525,7 +525,7 @@ 
     $node = content_profile_load($type, $uid);
 
     if (($style = content_profile_get_settings($type, 'user_display')) && $node && node_access('view', $node)) {
-      $content['content_profile_'. $type] = array(
+      $content['content_profile_'.$type] = array(
         '#theme' => ($style == 'link') ? 'content_profile_display_link' : 'content_profile_display_view',
         '#edit_link' => content_profile_get_settings($type, 'edit_link'),
         '#uid' => $uid,
@@ -538,8 +538,8 @@ 
       // Working around the bug described at http://drupal.org/node/302873
       module_load_include('inc', 'content_profile', 'content_profile.theme');
     }
-    elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
-      $content['content_profile_'. $type] = array(
+    elseif (user_access('create '.$type.' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
+      $content['content_profile_'.$type] = array(
         '#admin' => $uid != $user->uid,
         '#theme' => 'content_profile_display_add_link',
         '#uid' => $uid,
@@ -580,7 +580,7 @@ 
     ),
   );
   if (module_exists('pageroute')) {
-    $return['content_profile_pageroute_empty']  = array(
+    $return['content_profile_pageroute_empty'] = array(
       'arguments' => array('type_name' => NULL),
     	'file' => 'content_profile.pageroute.inc',
     );
@@ -632,7 +632,7 @@ 
  */
 function content_profile_simpletest() {
   // Scan through content_profile/tests directory for any .test files to tell SimpleTest module.
-  $tests = file_scan_directory(drupal_get_path('module', 'content_profile') .'/tests', '\.test');
+  $tests = file_scan_directory(drupal_get_path('module', 'content_profile').'/tests', '\.test');
   return array_keys($tests);
 }
 

Braces +6 added lines, -11 removed lines

@@ -91,7 +91,7 @@ 
   // Else user may view the page when they are going to create their own profile
   // or have permission to create it for others.
   global $user;
-  if ($user->uid == $account->uid || user_access('administer nodes') ){
+  if ($user->uid == $account->uid || user_access('administer nodes') ) {
     return node_access('create', $type);
   }
   return FALSE;
@@ -270,8 +270,7 @@ 
       '#title' => t('Use this content type as a content profile for users'),
       '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
     );
-  }
-  elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
+  } elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
       $form['buttons']['preview']['#access'] = FALSE;
@@ -382,8 +381,7 @@ 
       // This node already exists, redirect to edit page
       drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
     }
-  }
-  elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
+  } elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
     $form = $a3;
     // Only validate if the user-name changed or we add a new node
     if (!empty($node->nid) && $form['author']['name']['#default_value'] == $node->name) {
@@ -394,8 +392,7 @@ 
     if ($uid && content_profile_profile_exists($node, $uid)) {
       form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
     }
-  }
-  elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
+  } elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
     // Make sure the translated profile belongs to the same user.
     $node->uid = $node->translation_source->uid;
     $node->name = $node->translation_source->name;
@@ -504,8 +501,7 @@ 
         $node = content_profile_load($type, $arg[1]);
         if ($node) {
           return node_help('node/%/edit', array(1 => $node->nid));
-        }
-        else {
+        } else {
           return node_help('node/add/'. $type, array('node', 'add', $type));
         }
       }
@@ -537,8 +533,7 @@ 
 
       // Working around the bug described at http://drupal.org/node/302873
       module_load_include('inc', 'content_profile', 'content_profile.theme');
-    }
-    elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
+    } elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
       $content['content_profile_'. $type] = array(
         '#admin' => $uid != $user->uid,
         '#theme' => 'content_profile_display_add_link',

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

@@ -94,7 +94,7 @@ 
   if ($user->uid == $account->uid || user_access('administer nodes') ){
     return node_access('create', $type);
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -138,7 +138,7 @@ 
     '#type' => 'fieldset',
     '#title' => t('Display settings'),
     '#description' => t('Customize the display of this content profile.'),
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
   );
   $form['display']['user_display'] = array(
     '#type' => 'radios',
@@ -201,7 +201,7 @@ 
   if (is_object($type)) {
     $type = $type->type;
   }
-  return variable_get('content_profile_use_'. $type, FALSE);
+  return variable_get('content_profile_use_'. $type, false);
 }
 
 /**
@@ -217,7 +217,7 @@ 
  * @param $value
  *   The value to compare the given setting too.
  */
-function content_profile_get_types($op = 'types', $setting = NULL , $value = TRUE) {
+function content_profile_get_types($op = 'types', $setting = null , $value = true) {
   $types = array();
 
   foreach (node_get_types($op) as $type => $info) {
@@ -261,21 +261,21 @@ 
       '#type' => 'fieldset',
       '#title' => t('Content Profile'),
       '#group' => 'additional_settings',
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+      '#collapsible' => true,
+      '#collapsed' => true,
       '#weight' => 32,
     );
     $form['content_profile']['content_profile_use'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use this content type as a content profile for users'),
-      '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
+      '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, false),
     );
   }
   elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
-      $form['buttons']['preview']['#access'] = FALSE;
-      $form['buttons']['delete']['#access'] = FALSE;
+      $form['buttons']['preview']['#access'] = false;
+      $form['buttons']['delete']['#access'] = false;
       $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q'];
     }
     // Set the author value - note that this works only for admins.
@@ -288,7 +288,7 @@ 
 /**
  * Implementation of hook_user().
  */
-function content_profile_user($op, &$edit, &$account, $category = NULL) {
+function content_profile_user($op, &$edit, &$account, $category = null) {
   global $user;
 
   switch ($op) {
@@ -374,7 +374,7 @@ 
 /**
  * Implementation of hook_nodeapi().
  */
-function content_profile_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
+function content_profile_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
 
   if ($op == 'prepare' && is_content_profile($node) && !isset($node->nid) && $node->uid && !user_access('administer nodes') && arg(0) != 'admin') {
     // Check if this nodetype already exists
@@ -478,18 +478,18 @@ 
  * @param $reset
  *   Optional. If set, the cache is reset.
  */
-function content_profile_load($type, $uid, $lang = '', $reset = NULL) {
+function content_profile_load($type, $uid, $lang = '', $reset = null) {
   static $cache = array();
 
   if (!isset($cache[$type][$uid][$lang]) || $reset) {
-    $cache[$type][$uid][$lang] = FALSE;
+    $cache[$type][$uid][$lang] = false;
     $params = array('type' => $type, 'uid' => $uid);
-    if ($node = node_load($lang ? $params + array('language' => $lang) : $params, NULL, $reset)) {
+    if ($node = node_load($lang ? $params + array('language' => $lang) : $params, null, $reset)) {
       $cache[$type][$uid][$lang] = $node->nid;
     }
     return $node;
   }
-  return !empty($cache[$type][$uid][$lang]) ? node_load($cache[$type][$uid][$lang]) : FALSE;
+  return !empty($cache[$type][$uid][$lang]) ? node_load($cache[$type][$uid][$lang]) : false;
 }
 
 /**
@@ -563,7 +563,7 @@ 
   $return = array(
     'content_profile_display_view' => array(
       'template'  => 'content_profile-display-view',
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
       'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_add_link' => array(
@@ -581,7 +581,7 @@ 
   );
   if (module_exists('pageroute')) {
     $return['content_profile_pageroute_empty']  = array(
-      'arguments' => array('type_name' => NULL),
+      'arguments' => array('type_name' => null),
     	'file' => 'content_profile.pageroute.inc',
     );
   }

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

Doc Comments +4 added lines

@@ -10,6 +10,7 @@ 
 
 /**
  * Rewrite the forum administration page with our new access rules.
+ * @param boolean $is_container
  */
 function _forum_access_forum_form(&$form, &$form_state, $is_container) {
   $tid = (isset($form['tid']['#value']) ? $form['tid']['#value'] : NULL);
@@ -663,6 +664,8 @@ 
  * This is a multistep operation : we go through all nodes by packs of 20.
  * The batch processing engine interrupts processing and sends progress
  * feedback after 1 second execution time.
+ * @param integer $limit
+ * @param integer $count
  */
 function _forum_access_update_batch_operation($tid, $limit, $count, &$context) {
   if (empty($context['sandbox'])) {
@@ -693,6 +696,7 @@ 
 
 /**
  * Post-processing for forum_access_form_submit().
+ * @param boolean $success
  */
 function _forum_access_update_batch_finished($success, $results, $operations) {
   if ($success) {

Indentation +470 added lines, -470 removed lines

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

Spacing +67 added lines, -67 removed lines

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

Braces +29 added lines, -41 removed lines

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

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

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
  * Return the Views fields that should be translated.
  *
  * @return
- *   Array of field names.
+ string[]   Array of field names.
  */
 function _i18nviews_display_fields() {
   return array('title', 'header', 'footer', 'empty');

Indentation +70 added lines, -70 removed lines

@@ -14,44 +14,44 @@ 
  * Implementation of hook_help().
  */
 function i18nviews_help($path, $arg) {
-  switch ($path) {
+    switch ($path) {
     case 'admin/modules#description' :
       $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>';
-      $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
-      return $output;
-  }
+        $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
+        return $output;
+    }
 }
 
 /**
  * Implementation of hook_locale().
  */
 function i18nviews_locale($op = 'groups') {
-  switch ($op) {
+    switch ($op) {
     case 'groups':
       return array('views' => t('Views'));
     case 'info':
       $info['views']['refresh callback'] = 'i18nviews_locale_refresh';
-      $info['views']['format'] = TRUE;
-      return $info;
-  }
+        $info['views']['format'] = TRUE;
+        return $info;
+    }
 }
 
 /**
  * Refresh views locales, 2.x version
  */
 function i18nviews_locale_refresh() {
-  $views = views_get_all_views();
-  foreach ($views as $view) {
+    $views = views_get_all_views();
+    foreach ($views as $view) {
     if (!$view->disabled) {
-      $fields = _i18nviews_display_fields();
-      if (!empty($view->display) && is_array($view->display)) {
+        $fields = _i18nviews_display_fields();
+        if (!empty($view->display) && is_array($view->display)) {
         foreach (array_keys($view->display) as $display_id) {
-          _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->display_options, $fields, TRUE);
+            _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->display_options, $fields, TRUE);
+        }
         }
-      }
     }
-  }
-  return TRUE; // Completed successfully
+    }
+    return TRUE; // Completed successfully
 }
 
 /**
@@ -60,37 +60,37 @@ 
  * Remake of views_handler_field_allterms with term name translation.
  */
 function i18nviews_views_handler_field_allterms($fieldinfo, $fielddata, $value, $data) {
-  if ($fieldinfo['vocabulary']) {
+    if ($fieldinfo['vocabulary']) {
     $terms = taxonomy_node_get_terms_by_vocabulary($data->nid, $fieldinfo['vocabulary']);
-  }
-  else {
+    }
+    else {
     $terms = taxonomy_node_get_terms($data->nid);
-  }
-  // Translate all these terms.
-  _i18ntaxonomy_translate_terms($terms);
+    }
+    // Translate all these terms.
+    _i18ntaxonomy_translate_terms($terms);
 
-  if ($fielddata['options'] == 'nolink') {
+    if ($fielddata['options'] == 'nolink') {
     foreach ($terms as $term) {
-      $links[] = check_plain($term->name);
+        $links[] = check_plain($term->name);
     }
     $links = !empty($links) ? implode(' | ', $links) : '';
-  }
-  else {
+    }
+    else {
     $node = new stdClass();
     $node->taxonomy = $terms;
     $links = theme('links', taxonomy_link('taxonomy terms', $node));
-  }
-  return $links;
+    }
+    return $links;
 }
 
 /**
  * Implementation of hook_views_api().
  */
 function i18nviews_views_api() {
-  return array(
+    return array(
     'api' => '2.0',
     'path' => drupal_get_path('module', 'i18nviews') . '/includes',
-  );
+    );
 }
 
 /**
@@ -105,38 +105,38 @@ 
  * This is just for views 2.x, next version (3.x) will use a different one
  */
 function i18nviews_views_pre_view(&$view, &$display_id, &$args) {
-  global $language;
-  if (views_api_version() == '2.0' && $language->language != language_default('language')) {
+    global $language;
+    if (views_api_version() == '2.0' && $language->language != language_default('language')) {
     // Also checking weird values for $display_id, see 277711
     if (!empty($view->display) && is_array($view->display) && is_string($display_id)) {
-      $fields = _i18nviews_display_fields();
-      if(!empty($view->display[$display_id])) {
+        $fields = _i18nviews_display_fields();
+        if(!empty($view->display[$display_id])) {
         $fields = _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->handler->options, $fields);
-      }
-      if($fields && !empty($view->display['default'])) {
+        }
+        if($fields && !empty($view->display['default'])) {
         _i18nviews_localize_array($view->name, 'default', $view->display['default']->handler->options, $fields);
-      }      
+        }      
     }
     // Translate taxonomy fields.
     // @todo I don think this works at all.
     if (module_exists('i18ntaxonomy') && isset($view->field) && is_array($view->field)) {
-      $translate = variable_get('i18ntaxonomy_vocabularies', array());
-      foreach ($view->field as $index => $data) {
+        $translate = variable_get('i18ntaxonomy_vocabularies', array());
+        foreach ($view->field as $index => $data) {
         $matches = array();
         if ($data['id'] == 'term_node.name') {
-          // That's a full taxonomy box.
-          $view->field[$index]['handler'] = 'i18ntaxonomy_views_handler_field_allterms';
+            // That's a full taxonomy box.
+            $view->field[$index]['handler'] = 'i18ntaxonomy_views_handler_field_allterms';
         }
         elseif (preg_match("/term_node_(\d+)\.name/", $data['id'], $matches)) {
-          $vid = $matches[1];
-          if ($translate[$vid]) {
+            $vid = $matches[1];
+            if ($translate[$vid]) {
             // Set new handler for this field.
             $view->field[$index]['handler'] = 'i18ntaxonomy_views_handler_field_allterms';
-          }
+            }
+        }
         }
-      }
     }
-  }
+    }
 }
 
 /**
@@ -146,7 +146,7 @@ 
  *   Array of field names.
  */
 function _i18nviews_display_fields() {
-  return array('title', 'header', 'footer', 'empty');
+    return array('title', 'header', 'footer', 'empty');
 }
 
 /**
@@ -155,21 +155,21 @@ 
  * We get the translated fields out of the array so they are not translated again.
  */
 function _i18nviews_localize_array($name, $group, &$data, $field_names, $update = FALSE) {
-  $translated = array();
-  foreach ($field_names as $field) {
+    $translated = array();
+    foreach ($field_names as $field) {
     if (!empty($data[$field])) {
-      if ($update) {
+        if ($update) {
         $format = isset($data[$field . '_format']) ? $data[$field . '_format'] : NULL;
         i18nstrings_update("views:$name:$group:$field", $data[$field], $format);
-      }
-      else {
+        }
+        else {
         $data[$field] = i18nstrings("views:$name:$group:$field", $data[$field]);
         $translated[] = $field;
-      }
+        }
     }
-  }
-  // Return remaining field names
-  return array_diff($field_names, $translated);
+    }
+    // Return remaining field names
+    return array_diff($field_names, $translated);
 }
 
 /**
@@ -178,15 +178,15 @@ 
  * We cannot play with object 2 array conversion because some are real typed objects.
  */
 function _i18nviews_localize_object($name, $group, &$data, &$field_names, $trim = FALSE) {
-  $translated = array();
-  foreach ($field_names as $field) {
+    $translated = array();
+    foreach ($field_names as $field) {
     if (!empty($data->$field)) {
-      $data->$field = i18nstrings("views:$name:$group:$field", $data->$field);
+        $data->$field = i18nstrings("views:$name:$group:$field", $data->$field);
+    }
     }
-  }
-  if ($trim && $translated) {
+    if ($trim && $translated) {
     $field_names = array_diff($field_names, $translated);
-  }
+    }
 }
 
 /**
@@ -195,7 +195,7 @@ 
  * Add a submit handler to the submit button on views_ui_edit_display_form.
  */
 function i18nviews_form_views_ui_edit_display_form_alter(&$form, $form_state) {
-  $form['buttons']['submit']['#submit'][] = 'i18nviews_views_ui_edit_display_submit';
+    $form['buttons']['submit']['#submit'][] = 'i18nviews_views_ui_edit_display_submit';
 }
 
 /**
@@ -204,13 +204,13 @@ 
  * Creates or updates translation source records for specified Views fields.
  */
 function i18nviews_views_ui_edit_display_submit($form, &$form_state) {
-  $fields = _i18nviews_display_fields();
-  foreach ($fields as $field) {
+    $fields = _i18nviews_display_fields();
+    foreach ($fields as $field) {
     if (isset($form_state['values'][$field])) {
-      $name = $form_state['view']->name;
-      $group = $form_state['display_id'];
-      $format = isset($form_state['values'][$field . '_format']) ? $form_state['values'][$field . '_format'] : NULL;
-      i18nstrings_update("views:$name:$group:$field", $form_state['values'][$field], $format);
+        $name = $form_state['view']->name;
+        $group = $form_state['display_id'];
+        $format = isset($form_state['values'][$field . '_format']) ? $form_state['values'][$field . '_format'] : NULL;
+        i18nstrings_update("views:$name:$group:$field", $form_state['values'][$field], $format);
+    }
     }
-  }
 }

Switch Indentation +10 added lines, -10 removed lines

@@ -15,10 +15,10 @@ 
  */
 function i18nviews_help($path, $arg) {
   switch ($path) {
-    case 'admin/modules#description' :
-      $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>';
-      $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
-      return $output;
+  case 'admin/modules#description' :
+    $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>';
+    $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
+    return $output;
   }
 }
 
@@ -27,12 +27,12 @@ 
  */
 function i18nviews_locale($op = 'groups') {
   switch ($op) {
-    case 'groups':
-      return array('views' => t('Views'));
-    case 'info':
-      $info['views']['refresh callback'] = 'i18nviews_locale_refresh';
-      $info['views']['format'] = TRUE;
-      return $info;
+  case 'groups':
+    return array('views' => t('Views'));
+  case 'info':
+    $info['views']['refresh callback'] = 'i18nviews_locale_refresh';
+    $info['views']['format'] = TRUE;
+    return $info;
   }
 }
 

Spacing +7 added lines, -7 removed lines

@@ -16,8 +16,8 @@ 
 function i18nviews_help($path, $arg) {
   switch ($path) {
     case 'admin/modules#description' :
-      $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>';
-      $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
+      $output = '<p>'.t('Supports translation for views strings: title, header, footer...').'</p>';
+      $output .= '<p>'.t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))).'</p>';
       return $output;
   }
 }
@@ -89,7 +89,7 @@ 
 function i18nviews_views_api() {
   return array(
     'api' => '2.0',
-    'path' => drupal_get_path('module', 'i18nviews') . '/includes',
+    'path' => drupal_get_path('module', 'i18nviews').'/includes',
   );
 }
 
@@ -110,10 +110,10 @@ 
     // Also checking weird values for $display_id, see 277711
     if (!empty($view->display) && is_array($view->display) && is_string($display_id)) {
       $fields = _i18nviews_display_fields();
-      if(!empty($view->display[$display_id])) {
+      if (!empty($view->display[$display_id])) {
         $fields = _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->handler->options, $fields);
       }
-      if($fields && !empty($view->display['default'])) {
+      if ($fields && !empty($view->display['default'])) {
         _i18nviews_localize_array($view->name, 'default', $view->display['default']->handler->options, $fields);
       }      
     }
@@ -159,7 +159,7 @@ 
   foreach ($field_names as $field) {
     if (!empty($data[$field])) {
       if ($update) {
-        $format = isset($data[$field . '_format']) ? $data[$field . '_format'] : NULL;
+        $format = isset($data[$field.'_format']) ? $data[$field.'_format'] : NULL;
         i18nstrings_update("views:$name:$group:$field", $data[$field], $format);
       }
       else {
@@ -209,7 +209,7 @@ 
     if (isset($form_state['values'][$field])) {
       $name = $form_state['view']->name;
       $group = $form_state['display_id'];
-      $format = isset($form_state['values'][$field . '_format']) ? $form_state['values'][$field . '_format'] : NULL;
+      $format = isset($form_state['values'][$field.'_format']) ? $form_state['values'][$field.'_format'] : NULL;
       i18nstrings_update("views:$name:$group:$field", $form_state['values'][$field], $format);
     }
   }

Braces +4 added lines, -8 removed lines

@@ -62,8 +62,7 @@ 
 function i18nviews_views_handler_field_allterms($fieldinfo, $fielddata, $value, $data) {
   if ($fieldinfo['vocabulary']) {
     $terms = taxonomy_node_get_terms_by_vocabulary($data->nid, $fieldinfo['vocabulary']);
-  }
-  else {
+  } else {
     $terms = taxonomy_node_get_terms($data->nid);
   }
   // Translate all these terms.
@@ -74,8 +73,7 @@ 
       $links[] = check_plain($term->name);
     }
     $links = !empty($links) ? implode(' | ', $links) : '';
-  }
-  else {
+  } else {
     $node = new stdClass();
     $node->taxonomy = $terms;
     $links = theme('links', taxonomy_link('taxonomy terms', $node));
@@ -126,8 +124,7 @@ 
         if ($data['id'] == 'term_node.name') {
           // That's a full taxonomy box.
           $view->field[$index]['handler'] = 'i18ntaxonomy_views_handler_field_allterms';
-        }
-        elseif (preg_match("/term_node_(\d+)\.name/", $data['id'], $matches)) {
+        } elseif (preg_match("/term_node_(\d+)\.name/", $data['id'], $matches)) {
           $vid = $matches[1];
           if ($translate[$vid]) {
             // Set new handler for this field.
@@ -161,8 +158,7 @@ 
       if ($update) {
         $format = isset($data[$field . '_format']) ? $data[$field . '_format'] : NULL;
         i18nstrings_update("views:$name:$group:$field", $data[$field], $format);
-      }
-      else {
+      } else {
         $data[$field] = i18nstrings("views:$name:$group:$field", $data[$field]);
         $translated[] = $field;
       }

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

@@ -31,7 +31,7 @@ 
       return array('views' => t('Views'));
     case 'info':
       $info['views']['refresh callback'] = 'i18nviews_locale_refresh';
-      $info['views']['format'] = TRUE;
+      $info['views']['format'] = true;
       return $info;
   }
 }
@@ -46,12 +46,12 @@ 
       $fields = _i18nviews_display_fields();
       if (!empty($view->display) && is_array($view->display)) {
         foreach (array_keys($view->display) as $display_id) {
-          _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->display_options, $fields, TRUE);
+          _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->display_options, $fields, true);
         }
       }
     }
   }
-  return TRUE; // Completed successfully
+  return true; // Completed successfully
 }
 
 /**
@@ -154,12 +154,12 @@ 
  *
  * We get the translated fields out of the array so they are not translated again.
  */
-function _i18nviews_localize_array($name, $group, &$data, $field_names, $update = FALSE) {
+function _i18nviews_localize_array($name, $group, &$data, $field_names, $update = false) {
   $translated = array();
   foreach ($field_names as $field) {
     if (!empty($data[$field])) {
       if ($update) {
-        $format = isset($data[$field . '_format']) ? $data[$field . '_format'] : NULL;
+        $format = isset($data[$field . '_format']) ? $data[$field . '_format'] : null;
         i18nstrings_update("views:$name:$group:$field", $data[$field], $format);
       }
       else {
@@ -177,7 +177,7 @@ 
  *
  * We cannot play with object 2 array conversion because some are real typed objects.
  */
-function _i18nviews_localize_object($name, $group, &$data, &$field_names, $trim = FALSE) {
+function _i18nviews_localize_object($name, $group, &$data, &$field_names, $trim = false) {
   $translated = array();
   foreach ($field_names as $field) {
     if (!empty($data->$field)) {
@@ -209,7 +209,7 @@ 
     if (isset($form_state['values'][$field])) {
       $name = $form_state['view']->name;
       $group = $form_state['display_id'];
-      $format = isset($form_state['values'][$field . '_format']) ? $form_state['values'][$field . '_format'] : NULL;
+      $format = isset($form_state['values'][$field . '_format']) ? $form_state['values'][$field . '_format'] : null;
       i18nstrings_update("views:$name:$group:$field", $form_state['values'][$field], $format);
     }
   }

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

Doc Comments -1 removed lines

@@ -161,7 +161,6 @@
  *
  * @param array $form_state
  * @param array $options
- * @param integer $active
  * @return array
  */
 function jump_quickly_form(&$form_state, $options, $menu_state) {

Indentation +130 added lines, -130 removed lines

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

Switch Indentation +87 added lines, -87 removed lines

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

Spacing +23 added lines, -23 removed lines

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

Braces +4 added lines, -8 removed lines

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

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

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

drupal/sites/default/boinc/modules/contrib/privatemsg/pm_block_user/pm_block_user.module

Doc Comments +3 added lines, -3 removed lines

@@ -374,7 +374,7 @@ 
  *   messages from.
  *
  * @return
- *   TRUE if the user is allowed to block $account, or FALSE if not.
+ boolean   TRUE if the user is allowed to block $account, or FALSE if not.
  */
 function _pm_block_user_access($account) {
   global $user;
@@ -399,11 +399,11 @@ 
  *   Author user object to check.
  * @param $recipient
  *   Receiver user object to check.
- * @param $action
+ * @param integer $action
  *   The action to be taken, defaults to PM_BLOCK_USER_DISALLOW_BLOCKING.
  *
  * @return
- *   TRUE if a rule exists for the combination of author recipient and action.
+ boolean   TRUE if a rule exists for the combination of author recipient and action.
  */
 function _pm_block_user_rule_exists($author, $recipient, $action = PM_BLOCK_USER_DISALLOW_BLOCKING) {
   $block_actions = variable_get('pm_block_user_actions', array());

Indentation +222 added lines, -222 removed lines

@@ -19,17 +19,17 @@ 
  * Implements hook_help().
  */
 function pm_block_user_help($path) {
-  switch ($path) {
+    switch ($path) {
     case 'admin/settings/messages/block':
       return '<p>' . t('This area is used to define user blocking rules for the Privatemsg module. Rules allow control of who may block messages from whom. By default all users are allowed to block messages from anyone else. However, a site may have groups of users that need to contact or get information to others, for example: the site may have administrative staff or be a forum with moderators. Groups of users are defined by roles, which can be managed on the <a href="@roles">roles configuration page</a>.', array('@roles' => url('admin/user/roles'))) . '</p>';
-  }
+    }
 }
 
 /**
  * Implements hook_menu().
  */
 function pm_block_user_menu() {
-  $items['messages/block/%user'] = array(
+    $items['messages/block/%user'] = array(
     'title'            => 'Block user messages',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('pm_block_user_form', 2),
@@ -37,61 +37,61 @@ 
     'access arguments' => array(2),
     'type'             => MENU_CALLBACK,
     'weight'           => -10,
-  );
+    );
 
-  $items['admin/settings/messages/block'] = array(
+    $items['admin/settings/messages/block'] = array(
     'title'            => 'User blocking rules',
     'description'      => 'Configure rules for which users may block each other.',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('pm_block_user_settings'),
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
-  );
+    );
 
-  $items['messages/block/js'] = array(
+    $items['messages/block/js'] = array(
     'title' => 'Javascript block actions form',
     'page callback' => 'pm_block_user_js',
     'access arguments' => array('administer privatemsg settings'),
     'type' => MENU_CALLBACK,
-  );
+    );
 
-  return $items;
+    return $items;
 }
 
 /**
  * Menu callback for blocked user settings.
  */
 function pm_block_user_settings(&$form_state) {
-  drupal_add_css(drupal_get_path('module', 'pm_block_user') .'/pm_block_user.css');
-  // Need to cache form for AHAH, so it can be rebuilt from cache later.
-  $form = array(
+    drupal_add_css(drupal_get_path('module', 'pm_block_user') .'/pm_block_user.css');
+    // Need to cache form for AHAH, so it can be rebuilt from cache later.
+    $form = array(
     '#cache' => TRUE,
-  );
+    );
 
-  // Container for just the actions, used for AHAH.
-  $form['block_actions'] = array(
+    // Container for just the actions, used for AHAH.
+    $form['block_actions'] = array(
     '#tree' => TRUE,
     '#prefix' => '<div id="block-actions">',
     '#suffix' => '</div>',
     '#theme' => 'pm_block_user_actions',
-  );
+    );
 
-  // Should we populate the form with data from $form_state or the database?
-  if (!isset($form_state['pm_block_user']['block_actions'])) {
+    // Should we populate the form with data from $form_state or the database?
+    if (!isset($form_state['pm_block_user']['block_actions'])) {
     $block_actions = variable_get('pm_block_user_actions', array());
-  }
-  else {
+    }
+    else {
     $block_actions = $form_state['pm_block_user']['block_actions'];
-  }
-  // Work through each rule, adding it as a new element in
-  // $form['block_actions'] ready to be themed later.
-  foreach ($block_actions as $delta => $details) {
+    }
+    // Work through each rule, adding it as a new element in
+    // $form['block_actions'] ready to be themed later.
+    foreach ($block_actions as $delta => $details) {
     $details['delta'] = $delta;
     $form['block_actions'][$delta] = _pm_block_user_actions_form($details);
-  }
+    }
 
-  // The magic AHAH callback button that adds more rows.
-  $form['pm_block_actions_more'] = array(
+    // The magic AHAH callback button that adds more rows.
+    $form['pm_block_actions_more'] = array(
     '#type' => 'submit',
     '#value' => t('More'),
     '#weight' => 1,
@@ -99,20 +99,20 @@ 
     '#suffix' => '<label for="edit-pm-block-actions-more">' . t('Add new rule') . '</label></div>',
     '#submit' => array('pm_block_user_more_submit'),
     '#ahah' => array(
-      'path' => 'messages/block/js',
-      'wrapper' => 'block-actions',
-      'method' => 'replace',
-      'effect' => 'fade',
+        'path' => 'messages/block/js',
+        'wrapper' => 'block-actions',
+        'method' => 'replace',
+        'effect' => 'fade',
     ),
-  );
+    );
 
-  $form['submit_form'] = array(
+    $form['submit_form'] = array(
     '#type' => 'submit',
     '#weight' => 10,
     '#value' => t('Save configuration'),
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -132,50 +132,50 @@ 
  *   Part of a form with controls for sending, receiving and actions.
  */
 function _pm_block_user_actions_form($details, $blacklist = TRUE) {
-  $form = array(
+    $form = array(
     '#tree' => TRUE,
-  );
-  $delta = $details['delta'];
-  // FALSE by default, or if the user has checked the 'Enabled' check box for
-  // this row.
-  $row_disabled = (isset($details['enabled']) ? !$details['enabled'] : FALSE);
+    );
+    $delta = $details['delta'];
+    // FALSE by default, or if the user has checked the 'Enabled' check box for
+    // this row.
+    $row_disabled = (isset($details['enabled']) ? !$details['enabled'] : FALSE);
 
-  $form['author'] = array(
+    $form['author'] = array(
     '#type' => 'select',
     '#options' => user_roles(TRUE),
     '#default_value' => (isset($details['author']) ? $details['author'] : DRUPAL_AUTHENTICATED_RID),
     '#disabled' => $row_disabled,
-  );
-  $form['recipient'] = array(
+    );
+    $form['recipient'] = array(
     '#type' => 'select',
     '#options' => user_roles(TRUE),
     '#default_value' => (isset($details['recipient']) ? $details['recipient'] : DRUPAL_AUTHENTICATED_RID),
     '#disabled' => $row_disabled,
-  );
+    );
 
-  // Provide different action radios if we're using a whitelist or a blacklist.
-  if ($blacklist) {
+    // Provide different action radios if we're using a whitelist or a blacklist.
+    if ($blacklist) {
     $options = array(
-      PM_BLOCK_USER_DISALLOW_BLOCKING => t('Disallow blocking author'),
-      PM_BLOCK_USER_DISALLOW_SENDING => t('Disallow sending message'),
+        PM_BLOCK_USER_DISALLOW_BLOCKING => t('Disallow blocking author'),
+        PM_BLOCK_USER_DISALLOW_SENDING => t('Disallow sending message'),
     );
     $default_value = (isset($details['action']) ? $details['action'] : PM_BLOCK_USER_DISALLOW_BLOCKING);
-  }
-  else {
+    }
+    else {
     // @todo: add whitelist options/default_value here.
-  }
-  $form['action']  = array(
+    }
+    $form['action']  = array(
     '#type' => 'radios',
     '#options' => $options,
     '#disabled' => $row_disabled,
     '#default_value' => $default_value,
-  );
+    );
 
-  $form['enabled'] = array(
+    $form['enabled'] = array(
     '#type' => 'checkbox',
     '#default_value' => (isset($details['enabled']) ? $details['enabled'] : TRUE),
-  );
-  $form['remove'] = array(
+    );
+    $form['remove'] = array(
     '#type' => 'submit',
     '#submit' => array('pm_block_user_remove_submit'),
     '#value' => t('Remove'),
@@ -183,14 +183,14 @@ 
     '#prefix' => '<div id="remove-rule-button">',
     '#suffix' => '<label for="edit-remove">' . t('Remove rule') . '</label></div>',
     '#ahah' => array(
-      'path' => 'messages/block/js',
-      'wrapper' => 'block-actions',
-      'method' => 'replace',
-      'effect' => 'fade',
+        'path' => 'messages/block/js',
+        'wrapper' => 'block-actions',
+        'method' => 'replace',
+        'effect' => 'fade',
     ),
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -199,17 +199,17 @@ 
  * @see pm_block_user_remove_submit()
  */
 function pm_block_user_more_submit($form, &$form_state) {
-  unset($form_state['submit_handlers']);
-  form_execute_handlers('submit', $form, $form_state);
-  // Get the submitted actions, then put them into a special area of
-  // the $form_state.
-  $submitted_values = $form_state['values'];
-  // Add an empty action.
-  $submitted_values['block_actions'][] = array();
-  $form_state['pm_block_user'] = $submitted_values;
-  // Rebuild the form by passing our $form_state through the
-  // pm_block_user_settings() builder function.
-  $form_state['rebuild'] = TRUE;
+    unset($form_state['submit_handlers']);
+    form_execute_handlers('submit', $form, $form_state);
+    // Get the submitted actions, then put them into a special area of
+    // the $form_state.
+    $submitted_values = $form_state['values'];
+    // Add an empty action.
+    $submitted_values['block_actions'][] = array();
+    $form_state['pm_block_user'] = $submitted_values;
+    // Rebuild the form by passing our $form_state through the
+    // pm_block_user_settings() builder function.
+    $form_state['rebuild'] = TRUE;
 }
 
 /**
@@ -218,33 +218,33 @@ 
  * @see pm_block_user_more_submit()
  */
 function pm_block_user_remove_submit($form, &$form_state) {
-  unset($form_state['submit_handlers']);
-  form_execute_handlers('submit', $form, $form_state);
-  $submitted_values = $form_state['values'];
-  // Remove the requested action.
-  $delta = $form_state['clicked_button']['#parents'][1];
-  unset($submitted_values['block_actions'][$delta]);
-  $form_state['pm_block_user'] = $submitted_values;
-  $form_state['rebuild'] = TRUE;
+    unset($form_state['submit_handlers']);
+    form_execute_handlers('submit', $form, $form_state);
+    $submitted_values = $form_state['values'];
+    // Remove the requested action.
+    $delta = $form_state['clicked_button']['#parents'][1];
+    unset($submitted_values['block_actions'][$delta]);
+    $form_state['pm_block_user'] = $submitted_values;
+    $form_state['rebuild'] = TRUE;
 }
 
 /**
  * Submit handler for admin form.
  */
 function pm_block_user_settings_submit($form, &$form_state) {
-  // We don't want it to submit when we're adding/removing actions.
-  if ($form_state['clicked_button']['#id'] == 'edit-submit-form') {
+    // We don't want it to submit when we're adding/removing actions.
+    if ($form_state['clicked_button']['#id'] == 'edit-submit-form') {
     // If the form's 'block_actions' aren't set, the user has deleted all the
     // rows in the table, so we save an empty array to stop errors in the form
     // builder.
     if (isset($form_state['values']['block_actions'])) {
-      variable_set('pm_block_user_actions', _pm_block_user_settings_filter($form_state['values']['block_actions']));
+        variable_set('pm_block_user_actions', _pm_block_user_settings_filter($form_state['values']['block_actions']));
     }
     else {
-      variable_set('pm_block_user_actions', array());
+        variable_set('pm_block_user_actions', array());
     }
     drupal_set_message(t('The configuration options have been saved.'));
-  }
+    }
 }
 
 /**
@@ -259,60 +259,60 @@ 
  * @see pm_block_user_settings_submit()
  */
 function _pm_block_user_settings_filter($settings) {
-  // Add-in the names of any settings to be saved into the array below.
-  $save_keys = array('author', 'recipient', 'action', 'enabled');
-  $matching = array();
-  // Run through each of the keys we want to save, creating a new array.
-  // It's not possible to simply check for unwanted values and unset() them as
-  // the array is multi-dimensional.
-  foreach ($save_keys as $save_key) {
+    // Add-in the names of any settings to be saved into the array below.
+    $save_keys = array('author', 'recipient', 'action', 'enabled');
+    $matching = array();
+    // Run through each of the keys we want to save, creating a new array.
+    // It's not possible to simply check for unwanted values and unset() them as
+    // the array is multi-dimensional.
+    foreach ($save_keys as $save_key) {
     if (isset($settings[$save_key])) {
-      $matching[$save_key] = $settings[$save_key];
+        $matching[$save_key] = $settings[$save_key];
+    }
     }
-  }
-  if (count($matching) > 0) {
+    if (count($matching) > 0) {
     return $matching;
-  }
-  else {
+    }
+    else {
     return array_map('_pm_block_user_settings_filter', $settings);
-  }
+    }
 }
 
 /**
  * Menu callback for AHAH handling.
  */
 function pm_block_user_js() {
-  // See: http://drupal.org/node/331941 for the philosophy of Drupal AHAH.
-  $form_state = array('storage' => NULL, 'submitted' => FALSE);
-  $form_build_id = $_POST['form_build_id'];
-  $form = form_get_cache($form_build_id, $form_state);
-  $args = $form['#parameters'];
-  $form_id = array_shift($args);
-  $form['#post'] = $_POST;
-  $form['#redirect'] = FALSE;
-  $form['#programmed'] = FALSE;
-  $form_state['post'] = $_POST;
-  drupal_process_form($form_id, $form, $form_state);
-  $form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id);
-  $output_form = $form['block_actions'];
-  unset($output_form['#prefix'], $output_form['#suffix']); // Prevent duplicate wrappers.
-  $output = theme('status_messages') . drupal_render($output_form);
-
-  // Hack to make behaviours attach to new HTML controls (delete buttons in
-  // this case).
-  $javascript = drupal_add_js(NULL, NULL, 'header');
-  drupal_json(array('status' => TRUE, 'data' => $output));
+    // See: http://drupal.org/node/331941 for the philosophy of Drupal AHAH.
+    $form_state = array('storage' => NULL, 'submitted' => FALSE);
+    $form_build_id = $_POST['form_build_id'];
+    $form = form_get_cache($form_build_id, $form_state);
+    $args = $form['#parameters'];
+    $form_id = array_shift($args);
+    $form['#post'] = $_POST;
+    $form['#redirect'] = FALSE;
+    $form['#programmed'] = FALSE;
+    $form_state['post'] = $_POST;
+    drupal_process_form($form_id, $form, $form_state);
+    $form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id);
+    $output_form = $form['block_actions'];
+    unset($output_form['#prefix'], $output_form['#suffix']); // Prevent duplicate wrappers.
+    $output = theme('status_messages') . drupal_render($output_form);
+
+    // Hack to make behaviours attach to new HTML controls (delete buttons in
+    // this case).
+    $javascript = drupal_add_js(NULL, NULL, 'header');
+    drupal_json(array('status' => TRUE, 'data' => $output));
 }
 
 /**
  * Implements hook_theme().
  */
 function pm_block_user_theme() {
-  return array(
+    return array(
     'pm_block_user_actions' => array(
-      'arguments' => array('form' => NULL),
+        'arguments' => array('form' => NULL),
     ),
-  );
+    );
 }
 
 /**
@@ -321,49 +321,49 @@ 
  * @ingroup themeable
  */
 function theme_pm_block_user_actions($form) {
-  $rows = array();
-  $headers = array(
+    $rows = array();
+    $headers = array(
     t('If the author has the role'),
     t('And the recipient has the role'),
     t('Action'),
     t('Enabled'),
     '',
-  );
-  $form_data = element_children($form);
+    );
+    $form_data = element_children($form);
 
-  foreach ($form_data as $key) {
+    foreach ($form_data as $key) {
     // Build the table row.
     $row = array(
-      'data' => array(
+        'data' => array(
         array('data' => drupal_render($form[$key]['author'])),
         array('data' => drupal_render($form[$key]['recipient'])),
         array('data' => drupal_render($form[$key]['action'])),
         array('data' => drupal_render($form[$key]['enabled'])),
         array('data' => drupal_render($form[$key]['remove'])),
-      ),
+        ),
     );
 
     // Add additional attributes to the row, such as a class for this row.
     if (isset($form[$key]['#attributes'])) {
-      $row = array_merge($row, $form[$key]['#attributes']);
+        $row = array_merge($row, $form[$key]['#attributes']);
     }
     $rows[] = $row;
-  }
+    }
 
-  // If there are no rows, output some instructions for the user.
-  if (empty($form_data)) {
+    // If there are no rows, output some instructions for the user.
+    if (empty($form_data)) {
     $rows[] = array(
-      array(
+        array(
         'data' => t("No rules have been added. All users may block private messages from each other. To limit which users may be blocked, click 'Add new rule'."),
         'colspan' => '5',
-      ),
+        ),
     );
-  }
+    }
 
-  $output = theme('table', $headers, $rows);
-  $output .= drupal_render($form);
+    $output = theme('table', $headers, $rows);
+    $output .= drupal_render($form);
 
-  return $output;
+    return $output;
 }
 
 /**
@@ -377,14 +377,14 @@ 
  *   TRUE if the user is allowed to block $account, or FALSE if not.
  */
 function _pm_block_user_access($account) {
-  global $user;
-  if (!privatemsg_user_access('read privatemsg', $user)) {
+    global $user;
+    if (!privatemsg_user_access('read privatemsg', $user)) {
     return FALSE;
-  }
-  if (_pm_block_user_rule_exists($account, $user, PM_BLOCK_USER_DISALLOW_BLOCKING)) {
+    }
+    if (_pm_block_user_rule_exists($account, $user, PM_BLOCK_USER_DISALLOW_BLOCKING)) {
     return FALSE;
-  }
-  return TRUE;
+    }
+    return TRUE;
 }
 
 /**
@@ -406,179 +406,179 @@ 
  *   TRUE if a rule exists for the combination of author recipient and action.
  */
 function _pm_block_user_rule_exists($author, $recipient, $action = PM_BLOCK_USER_DISALLOW_BLOCKING) {
-  $block_actions = variable_get('pm_block_user_actions', array());
-  foreach ($block_actions as $delta => $details) {
+    $block_actions = variable_get('pm_block_user_actions', array());
+    foreach ($block_actions as $delta => $details) {
     // If this rule doesn't relate to $action, or it's disabled
     // ignore it and go to next loop iteration.
     if ($details['action'] != $action || !$details['enabled']) {
-      continue;
+        continue;
     }
     // There are no rules governing user one, but user one may have roles that
     // affect other users, so these exceptions are narrow in scope.
     // Disallow sending affects private message authors.
     if ($author->uid == 1 && $action == PM_BLOCK_USER_DISALLOW_SENDING) {
-      continue;
+        continue;
     }
     // Disallow blocking affects private message recipients.
     if ($recipient->uid == 1 && $action == PM_BLOCK_USER_DISALLOW_BLOCKING) {
-      continue;
+        continue;
     }
     // The author has a role matching the rule and so does the recipient.
     if (isset($author->roles[$details['author']]) && isset($recipient->roles[$details['recipient']])) {
-      return TRUE;
+        return TRUE;
+    }
     }
-  }
-  return FALSE;
+    return FALSE;
 }
 
 function pm_block_user_form($form_state, $author) {
-  global $user;
+    global $user;
 
-  $form['author'] = array(
+    $form['author'] = array(
     '#type' => 'value',
     '#value' => $author->uid,
-  );
+    );
     $form['recipient'] = array(
     '#type' => 'value',
     '#value' => $user->uid,
-  );
-  $form['author_name'] = array(
+    );
+    $form['author_name'] = array(
     '#type' => 'value',
     '#value' => $author->name,
-  );
-  $form['destination'] = array(
+    );
+    $form['destination'] = array(
     '#type' => 'value',
     '#value' => isset($_GET['destination']) ? $_GET['destination'] : 'messages/',
-  );
+    );
 
-  if (db_result(db_query('SELECT COUNT(recipient) FROM {pm_block_user} WHERE author = %d AND recipient = %d', $author->uid, $user->uid))) {
+    if (db_result(db_query('SELECT COUNT(recipient) FROM {pm_block_user} WHERE author = %d AND recipient = %d', $author->uid, $user->uid))) {
     $form['block_action'] = array(
-      '#type' => 'value',
-      '#value' => 'unblock_user',
+        '#type' => 'value',
+        '#value' => 'unblock_user',
     );
     return confirm_form($form,
-      t('You have previously blocked "@author" from sending you any more messages. Are you sure you want to unblock this user?', array('@author' => $author->name)),
-      isset($_GET['destination']) ? $_GET['destination'] : 'messages/',
-      t('This action cannot be undone.'),
-      t('Unblock @author', array('@author' => $author->name)),
-      t('Cancel')
+        t('You have previously blocked "@author" from sending you any more messages. Are you sure you want to unblock this user?', array('@author' => $author->name)),
+        isset($_GET['destination']) ? $_GET['destination'] : 'messages/',
+        t('This action cannot be undone.'),
+        t('Unblock @author', array('@author' => $author->name)),
+        t('Cancel')
     );
-  }
-  else {
+    }
+    else {
     $form['block_action'] = array(
-      '#type' => 'value',
-      '#value' => 'block_user',
+        '#type' => 'value',
+        '#value' => 'block_user',
     );
     return confirm_form($form,
-      t('Are you sure you want to block "@author" from sending you any more messages?', array('@author' => $author->name)),
-      isset($_GET['destination']) ? $_GET['destination'] : 'messages/',
-      '',
-      t('Block @author', array('@author' => $author->name)),
-      t('Cancel')
+        t('Are you sure you want to block "@author" from sending you any more messages?', array('@author' => $author->name)),
+        isset($_GET['destination']) ? $_GET['destination'] : 'messages/',
+        '',
+        t('Block @author', array('@author' => $author->name)),
+        t('Cancel')
     );
-  }
+    }
 }
 
 /**
  * Implements hook_form_submit().
  */
 function pm_block_user_form_submit($form, &$form_state) {
-  if ($form_state['values']['confirm']) {
+    if ($form_state['values']['confirm']) {
     switch ($form_state['values']['block_action']) {
-      case 'block_user':
+        case 'block_user':
         db_query('INSERT INTO {pm_block_user} (author, recipient) VALUES (%d, %d)', $form_state['values']['author'], $form_state['values']['recipient']);
         drupal_set_message(t('@author has been blocked from sending you any further messages.', array('@author' => $form_state['values']['author_name'])));
-      break;
-      case 'unblock_user':
+        break;
+        case 'unblock_user':
         db_query('DELETE FROM {pm_block_user} WHERE author = %d AND recipient = %d', $form_state['values']['author'], $form_state['values']['recipient']);
         drupal_set_message(t('@author is now allowed to send you new messages.', array('@author' => $form_state['values']['author_name'])));
-      break;
+        break;
+    }
     }
-  }
-  $form_state['redirect'] = $form_state['values']['destination'];
+    $form_state['redirect'] = $form_state['values']['destination'];
 }
 
 /**
  * Implements hook_privatemsg_block_message().
  */
 function pm_block_user_privatemsg_block_message($author, $recipients) {
-  $blocked = array();
-  // Loop through each recipient and ensure there is no rule blocking this
-  // author from sending them private messages. Use a reference, so when
-  // user_load() is needed here the array is updated, negating the need for
-  // further calls to user_load() later in the code.
-  foreach (array_keys($recipients) as $uid) {
+    $blocked = array();
+    // Loop through each recipient and ensure there is no rule blocking this
+    // author from sending them private messages. Use a reference, so when
+    // user_load() is needed here the array is updated, negating the need for
+    // further calls to user_load() later in the code.
+    foreach (array_keys($recipients) as $uid) {
 
     // Ensure we have a recipient user object which includes roles.
     if (!isset($recipients[$uid]->roles)) {
-      $recipients[$uid] = user_load($uid);
+        $recipients[$uid] = user_load($uid);
     }
     // Note: this is checks whether the author may send the message (see third
     // parameter). Further below is a check whether the recipient may block it.
     if (_pm_block_user_rule_exists($author, $recipients[$uid], PM_BLOCK_USER_DISALLOW_SENDING)) {
-      $blocked[] = array(
+        $blocked[] = array(
         'uid' => $uid,
         'message' => t('Sorry, private messaging rules forbid sending messages to !name.', array('!name' => $recipients[$uid]->name)),
-      );
+        );
+    }
     }
-  }
 
-  $args = array_merge(array($author->uid), array_keys($recipients));
-  $result = db_query('SELECT recipient FROM {pm_block_user} WHERE author = %d AND recipient IN ('. db_placeholders($recipients) .') GROUP BY recipient', $args);
-  while ($row = db_fetch_array($result)) {
+    $args = array_merge(array($author->uid), array_keys($recipients));
+    $result = db_query('SELECT recipient FROM {pm_block_user} WHERE author = %d AND recipient IN ('. db_placeholders($recipients) .') GROUP BY recipient', $args);
+    while ($row = db_fetch_array($result)) {
     $recipient = $recipients[$row['recipient']];
     // If there's a rule disallowing blocking of this message, send it anyway.
     if (_pm_block_user_rule_exists($author, $recipient, PM_BLOCK_USER_DISALLOW_BLOCKING)) {
-      continue;
+        continue;
     }
     $blocked[] = array(
-      'uid' => $row['recipient'],
-      'message' => t('%name has chosen to not recieve any more messages from you.', array('%name' => $recipients[$row['recipient']]->name))
+        'uid' => $row['recipient'],
+        'message' => t('%name has chosen to not recieve any more messages from you.', array('%name' => $recipients[$row['recipient']]->name))
     );
-  }
-  return $blocked;
+    }
+    return $blocked;
 }
 
 function pm_block_user_privatemsg_sql_load_alter(&$fragments, $pmid, $uid) {
-  $fragments['select'][] = 'pmbu.recipient AS is_blocked';
+    $fragments['select'][] = 'pmbu.recipient AS is_blocked';
 
-  $fragments['inner_join'][] = 'LEFT JOIN {pm_block_user} pmbu ON (pm.author = pmbu.author AND pmi.uid = pmbu.recipient)';
+    $fragments['inner_join'][] = 'LEFT JOIN {pm_block_user} pmbu ON (pm.author = pmbu.author AND pmi.uid = pmbu.recipient)';
 }
 
 /**
  * Implements hook_privatemsg_message_view_alter().
  */
 function pm_block_user_privatemsg_message_view_alter(&$vars) {
-  global $user;
+    global $user;
 
-  $author = $vars['message']['author'];
-  if (_pm_block_user_rule_exists($author, $user, PM_BLOCK_USER_DISALLOW_BLOCKING)) {
+    $author = $vars['message']['author'];
+    if (_pm_block_user_rule_exists($author, $user, PM_BLOCK_USER_DISALLOW_BLOCKING)) {
     return;
-  }
-  if (!isset($vars['message']['thread_id'])) {
+    }
+    if (!isset($vars['message']['thread_id'])) {
     // No thread id, this is probably only a preview
     return;
-  }
-  $thread_id = $vars['message']['thread_id'];
+    }
+    $thread_id = $vars['message']['thread_id'];
 
-  if ($user->uid <> $author->uid) {
+    if ($user->uid <> $author->uid) {
     if ($vars['message']['is_blocked']) {
-      $vars['message_actions']['unblock_author'] = array('title' => t('Unblock author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
+        $vars['message_actions']['unblock_author'] = array('title' => t('Unblock author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
     }
     else {
-      $vars['message_actions']['block_author'] = array('title' => t('Block author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
+        $vars['message_actions']['block_author'] = array('title' => t('Block author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
+    }
     }
-  }
 }
 
 /**
  * Implement hook_user().
  */
 function pm_block_user_user($op, &$edit, &$account, $category = NULL) {
-  switch ($op) {
-      case 'delete':
+    switch ($op) {
+        case 'delete':
       // Delete blocking rules which involve this user.
       db_query("DELETE FROM {pm_block_user} WHERE author = %d OR recipient = %d", $account->uid, $account->uid);
-      break;
-  }
+        break;
+    }
 }

Switch Indentation +14 added lines, -14 removed lines

@@ -20,8 +20,8 @@ 
  */
 function pm_block_user_help($path) {
   switch ($path) {
-    case 'admin/settings/messages/block':
-      return '<p>' . t('This area is used to define user blocking rules for the Privatemsg module. Rules allow control of who may block messages from whom. By default all users are allowed to block messages from anyone else. However, a site may have groups of users that need to contact or get information to others, for example: the site may have administrative staff or be a forum with moderators. Groups of users are defined by roles, which can be managed on the <a href="@roles">roles configuration page</a>.', array('@roles' => url('admin/user/roles'))) . '</p>';
+  case 'admin/settings/messages/block':
+    return '<p>' . t('This area is used to define user blocking rules for the Privatemsg module. Rules allow control of who may block messages from whom. By default all users are allowed to block messages from anyone else. However, a site may have groups of users that need to contact or get information to others, for example: the site may have administrative staff or be a forum with moderators. Groups of users are defined by roles, which can be managed on the <a href="@roles">roles configuration page</a>.', array('@roles' => url('admin/user/roles'))) . '</p>';
   }
 }
 
@@ -485,14 +485,14 @@ 
 function pm_block_user_form_submit($form, &$form_state) {
   if ($form_state['values']['confirm']) {
     switch ($form_state['values']['block_action']) {
-      case 'block_user':
-        db_query('INSERT INTO {pm_block_user} (author, recipient) VALUES (%d, %d)', $form_state['values']['author'], $form_state['values']['recipient']);
-        drupal_set_message(t('@author has been blocked from sending you any further messages.', array('@author' => $form_state['values']['author_name'])));
-      break;
-      case 'unblock_user':
-        db_query('DELETE FROM {pm_block_user} WHERE author = %d AND recipient = %d', $form_state['values']['author'], $form_state['values']['recipient']);
-        drupal_set_message(t('@author is now allowed to send you new messages.', array('@author' => $form_state['values']['author_name'])));
-      break;
+    case 'block_user':
+      db_query('INSERT INTO {pm_block_user} (author, recipient) VALUES (%d, %d)', $form_state['values']['author'], $form_state['values']['recipient']);
+      drupal_set_message(t('@author has been blocked from sending you any further messages.', array('@author' => $form_state['values']['author_name'])));
+    break;
+    case 'unblock_user':
+      db_query('DELETE FROM {pm_block_user} WHERE author = %d AND recipient = %d', $form_state['values']['author'], $form_state['values']['recipient']);
+      drupal_set_message(t('@author is now allowed to send you new messages.', array('@author' => $form_state['values']['author_name'])));
+    break;
     }
   }
   $form_state['redirect'] = $form_state['values']['destination'];
@@ -576,9 +576,9 @@ 
  */
 function pm_block_user_user($op, &$edit, &$account, $category = NULL) {
   switch ($op) {
-      case 'delete':
-      // Delete blocking rules which involve this user.
-      db_query("DELETE FROM {pm_block_user} WHERE author = %d OR recipient = %d", $account->uid, $account->uid);
-      break;
+  case 'delete':
+  // Delete blocking rules which involve this user.
+  db_query("DELETE FROM {pm_block_user} WHERE author = %d OR recipient = %d", $account->uid, $account->uid);
+  break;
   }
 }

Spacing +9 added lines, -9 removed lines

@@ -21,7 +21,7 @@ 
 function pm_block_user_help($path) {
   switch ($path) {
     case 'admin/settings/messages/block':
-      return '<p>' . t('This area is used to define user blocking rules for the Privatemsg module. Rules allow control of who may block messages from whom. By default all users are allowed to block messages from anyone else. However, a site may have groups of users that need to contact or get information to others, for example: the site may have administrative staff or be a forum with moderators. Groups of users are defined by roles, which can be managed on the <a href="@roles">roles configuration page</a>.', array('@roles' => url('admin/user/roles'))) . '</p>';
+      return '<p>'.t('This area is used to define user blocking rules for the Privatemsg module. Rules allow control of who may block messages from whom. By default all users are allowed to block messages from anyone else. However, a site may have groups of users that need to contact or get information to others, for example: the site may have administrative staff or be a forum with moderators. Groups of users are defined by roles, which can be managed on the <a href="@roles">roles configuration page</a>.', array('@roles' => url('admin/user/roles'))).'</p>';
   }
 }
 
@@ -62,7 +62,7 @@ 
  * Menu callback for blocked user settings.
  */
 function pm_block_user_settings(&$form_state) {
-  drupal_add_css(drupal_get_path('module', 'pm_block_user') .'/pm_block_user.css');
+  drupal_add_css(drupal_get_path('module', 'pm_block_user').'/pm_block_user.css');
   // Need to cache form for AHAH, so it can be rebuilt from cache later.
   $form = array(
     '#cache' => TRUE,
@@ -96,7 +96,7 @@ 
     '#value' => t('More'),
     '#weight' => 1,
     '#prefix' => '<div id="add-rule-button">',
-    '#suffix' => '<label for="edit-pm-block-actions-more">' . t('Add new rule') . '</label></div>',
+    '#suffix' => '<label for="edit-pm-block-actions-more">'.t('Add new rule').'</label></div>',
     '#submit' => array('pm_block_user_more_submit'),
     '#ahah' => array(
       'path' => 'messages/block/js',
@@ -164,7 +164,7 @@ 
   else {
     // @todo: add whitelist options/default_value here.
   }
-  $form['action']  = array(
+  $form['action'] = array(
     '#type' => 'radios',
     '#options' => $options,
     '#disabled' => $row_disabled,
@@ -181,7 +181,7 @@ 
     '#value' => t('Remove'),
     '#attributes' => array('class' => 'remove-action'),
     '#prefix' => '<div id="remove-rule-button">',
-    '#suffix' => '<label for="edit-remove">' . t('Remove rule') . '</label></div>',
+    '#suffix' => '<label for="edit-remove">'.t('Remove rule').'</label></div>',
     '#ahah' => array(
       'path' => 'messages/block/js',
       'wrapper' => 'block-actions',
@@ -296,7 +296,7 @@ 
   $form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id);
   $output_form = $form['block_actions'];
   unset($output_form['#prefix'], $output_form['#suffix']); // Prevent duplicate wrappers.
-  $output = theme('status_messages') . drupal_render($output_form);
+  $output = theme('status_messages').drupal_render($output_form);
 
   // Hack to make behaviours attach to new HTML controls (delete buttons in
   // this case).
@@ -524,7 +524,7 @@ 
   }
 
   $args = array_merge(array($author->uid), array_keys($recipients));
-  $result = db_query('SELECT recipient FROM {pm_block_user} WHERE author = %d AND recipient IN ('. db_placeholders($recipients) .') GROUP BY recipient', $args);
+  $result = db_query('SELECT recipient FROM {pm_block_user} WHERE author = %d AND recipient IN ('.db_placeholders($recipients).') GROUP BY recipient', $args);
   while ($row = db_fetch_array($result)) {
     $recipient = $recipients[$row['recipient']];
     // If there's a rule disallowing blocking of this message, send it anyway.
@@ -563,10 +563,10 @@ 
 
   if ($user->uid <> $author->uid) {
     if ($vars['message']['is_blocked']) {
-      $vars['message_actions']['unblock_author'] = array('title' => t('Unblock author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
+      $vars['message_actions']['unblock_author'] = array('title' => t('Unblock author'), 'href' => 'messages/block/'.$author->uid, 'query' => 'destination=messages/view/'.$thread_id);
     }
     else {
-      $vars['message_actions']['block_author'] = array('title' => t('Block author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
+      $vars['message_actions']['block_author'] = array('title' => t('Block author'), 'href' => 'messages/block/'.$author->uid, 'query' => 'destination=messages/view/'.$thread_id);
     }
   }
 }

Braces +6 added lines, -12 removed lines

@@ -79,8 +79,7 @@ 
   // Should we populate the form with data from $form_state or the database?
   if (!isset($form_state['pm_block_user']['block_actions'])) {
     $block_actions = variable_get('pm_block_user_actions', array());
-  }
-  else {
+  } else {
     $block_actions = $form_state['pm_block_user']['block_actions'];
   }
   // Work through each rule, adding it as a new element in
@@ -160,8 +159,7 @@ 
       PM_BLOCK_USER_DISALLOW_SENDING => t('Disallow sending message'),
     );
     $default_value = (isset($details['action']) ? $details['action'] : PM_BLOCK_USER_DISALLOW_BLOCKING);
-  }
-  else {
+  } else {
     // @todo: add whitelist options/default_value here.
   }
   $form['action']  = array(
@@ -239,8 +237,7 @@ 
     // builder.
     if (isset($form_state['values']['block_actions'])) {
       variable_set('pm_block_user_actions', _pm_block_user_settings_filter($form_state['values']['block_actions']));
-    }
-    else {
+    } else {
       variable_set('pm_block_user_actions', array());
     }
     drupal_set_message(t('The configuration options have been saved.'));
@@ -272,8 +269,7 @@ 
   }
   if (count($matching) > 0) {
     return $matching;
-  }
-  else {
+  } else {
     return array_map('_pm_block_user_settings_filter', $settings);
   }
 }
@@ -463,8 +459,7 @@ 
       t('Unblock @author', array('@author' => $author->name)),
       t('Cancel')
     );
-  }
-  else {
+  } else {
     $form['block_action'] = array(
       '#type' => 'value',
       '#value' => 'block_user',
@@ -564,8 +559,7 @@ 
   if ($user->uid <> $author->uid) {
     if ($vars['message']['is_blocked']) {
       $vars['message_actions']['unblock_author'] = array('title' => t('Unblock author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
-    }
-    else {
+    } else {
       $vars['message_actions']['block_author'] = array('title' => t('Block author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
     }
   }

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

@@ -65,12 +65,12 @@ 
   drupal_add_css(drupal_get_path('module', 'pm_block_user') .'/pm_block_user.css');
   // Need to cache form for AHAH, so it can be rebuilt from cache later.
   $form = array(
-    '#cache' => TRUE,
+    '#cache' => true,
   );
 
   // Container for just the actions, used for AHAH.
   $form['block_actions'] = array(
-    '#tree' => TRUE,
+    '#tree' => true,
     '#prefix' => '<div id="block-actions">',
     '#suffix' => '</div>',
     '#theme' => 'pm_block_user_actions',
@@ -131,24 +131,24 @@ 
  * @return
  *   Part of a form with controls for sending, receiving and actions.
  */
-function _pm_block_user_actions_form($details, $blacklist = TRUE) {
+function _pm_block_user_actions_form($details, $blacklist = true) {
   $form = array(
-    '#tree' => TRUE,
+    '#tree' => true,
   );
   $delta = $details['delta'];
   // FALSE by default, or if the user has checked the 'Enabled' check box for
   // this row.
-  $row_disabled = (isset($details['enabled']) ? !$details['enabled'] : FALSE);
+  $row_disabled = (isset($details['enabled']) ? !$details['enabled'] : false);
 
   $form['author'] = array(
     '#type' => 'select',
-    '#options' => user_roles(TRUE),
+    '#options' => user_roles(true),
     '#default_value' => (isset($details['author']) ? $details['author'] : DRUPAL_AUTHENTICATED_RID),
     '#disabled' => $row_disabled,
   );
   $form['recipient'] = array(
     '#type' => 'select',
-    '#options' => user_roles(TRUE),
+    '#options' => user_roles(true),
     '#default_value' => (isset($details['recipient']) ? $details['recipient'] : DRUPAL_AUTHENTICATED_RID),
     '#disabled' => $row_disabled,
   );
@@ -173,7 +173,7 @@ 
 
   $form['enabled'] = array(
     '#type' => 'checkbox',
-    '#default_value' => (isset($details['enabled']) ? $details['enabled'] : TRUE),
+    '#default_value' => (isset($details['enabled']) ? $details['enabled'] : true),
   );
   $form['remove'] = array(
     '#type' => 'submit',
@@ -209,7 +209,7 @@ 
   $form_state['pm_block_user'] = $submitted_values;
   // Rebuild the form by passing our $form_state through the
   // pm_block_user_settings() builder function.
-  $form_state['rebuild'] = TRUE;
+  $form_state['rebuild'] = true;
 }
 
 /**
@@ -225,7 +225,7 @@ 
   $delta = $form_state['clicked_button']['#parents'][1];
   unset($submitted_values['block_actions'][$delta]);
   $form_state['pm_block_user'] = $submitted_values;
-  $form_state['rebuild'] = TRUE;
+  $form_state['rebuild'] = true;
 }
 
 /**
@@ -283,14 +283,14 @@ 
  */
 function pm_block_user_js() {
   // See: http://drupal.org/node/331941 for the philosophy of Drupal AHAH.
-  $form_state = array('storage' => NULL, 'submitted' => FALSE);
+  $form_state = array('storage' => null, 'submitted' => false);
   $form_build_id = $_POST['form_build_id'];
   $form = form_get_cache($form_build_id, $form_state);
   $args = $form['#parameters'];
   $form_id = array_shift($args);
   $form['#post'] = $_POST;
-  $form['#redirect'] = FALSE;
-  $form['#programmed'] = FALSE;
+  $form['#redirect'] = false;
+  $form['#programmed'] = false;
   $form_state['post'] = $_POST;
   drupal_process_form($form_id, $form, $form_state);
   $form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id);
@@ -300,8 +300,8 @@ 
 
   // Hack to make behaviours attach to new HTML controls (delete buttons in
   // this case).
-  $javascript = drupal_add_js(NULL, NULL, 'header');
-  drupal_json(array('status' => TRUE, 'data' => $output));
+  $javascript = drupal_add_js(null, null, 'header');
+  drupal_json(array('status' => true, 'data' => $output));
 }
 
 /**
@@ -310,7 +310,7 @@ 
 function pm_block_user_theme() {
   return array(
     'pm_block_user_actions' => array(
-      'arguments' => array('form' => NULL),
+      'arguments' => array('form' => null),
     ),
   );
 }
@@ -379,12 +379,12 @@ 
 function _pm_block_user_access($account) {
   global $user;
   if (!privatemsg_user_access('read privatemsg', $user)) {
-    return FALSE;
+    return false;
   }
   if (_pm_block_user_rule_exists($account, $user, PM_BLOCK_USER_DISALLOW_BLOCKING)) {
-    return FALSE;
+    return false;
   }
-  return TRUE;
+  return true;
 }
 
 /**
@@ -425,10 +425,10 @@ 
     }
     // The author has a role matching the rule and so does the recipient.
     if (isset($author->roles[$details['author']]) && isset($recipient->roles[$details['recipient']])) {
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
 }
 
 function pm_block_user_form($form_state, $author) {
@@ -574,7 +574,7 @@ 
 /**
  * Implement hook_user().
  */
-function pm_block_user_user($op, &$edit, &$account, $category = NULL) {
+function pm_block_user_user($op, &$edit, &$account, $category = null) {
   switch ($op) {
       case 'delete':
       // Delete blocking rules which involve this user.

drupal/sites/default/boinc/modules/contrib/privatemsg/pm_email_notify/pm_email_notify.module

Doc Comments +2 added lines

@@ -148,6 +148,8 @@
  * Implements hook_user().
  *
  * Display settings form and store its information.
+ * @param string $op
+ * @param string $category
  */
 function pm_email_notify_user($op, &$edit, &$account, $category = NULL) {
   switch ($op) {

Switch Indentation +39 added lines, -39 removed lines

@@ -106,10 +106,10 @@ 
   $variables = user_mail_tokens($params['recipient'], $language);
   $variables = array_merge($variables, _pm_email_notify_token($params['recipient'], $params['message'], $language));
   switch ($key) {
-    case 'notice':
-      $message['subject'] = t(variable_get('pm_email_notify_subject', 'New private message at !site.'), $variables, $language->language);
-      $message['body'] = t(variable_get('pm_email_notify_body', _pm_email_notify_default_body()), $variables, $language->language);
-      break;
+  case 'notice':
+    $message['subject'] = t(variable_get('pm_email_notify_subject', 'New private message at !site.'), $variables, $language->language);
+    $message['body'] = t(variable_get('pm_email_notify_body', _pm_email_notify_default_body()), $variables, $language->language);
+    break;
   }
 }
 
@@ -151,42 +151,42 @@ 
  */
 function pm_email_notify_user($op, &$edit, &$account, $category = NULL) {
   switch ($op) {
-    case 'form':
-      if ($category == 'account' && privatemsg_user_access('read privatemsg', $account)) {
-        $form['enable_pm_mail'] = array(
-          '#type' => 'fieldset',
-          '#title' => t('Privatemsg e-mail notification'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE,
-          '#weight' => 10,
-        );
-        $form['enable_pm_mail']['pm_send_notifications'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Receive email notification for incoming private messages'),
-          '#default_value' => _pm_email_notify_is_enabled($account->uid),
-        );
-      }
-      return $form;
+  case 'form':
+    if ($category == 'account' && privatemsg_user_access('read privatemsg', $account)) {
+      $form['enable_pm_mail'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Privatemsg e-mail notification'),
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE,
+        '#weight' => 10,
+      );
+      $form['enable_pm_mail']['pm_send_notifications'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Receive email notification for incoming private messages'),
+        '#default_value' => _pm_email_notify_is_enabled($account->uid),
+      );
+    }
+    return $form;
 
-     case 'submit':
-      if (isset($edit['pm_send_notifications']) && privatemsg_user_access('read privatemsg', $account)) {
-        $pm_email_enabled = $edit['pm_send_notifications'];
-        unset($edit['pm_send_notifications']);
-        // Update database entry with user preference.
-        $exists = db_result(db_query("SELECT 1 FROM {pm_email_notify} WHERE user_id = %d", $account->uid));
-        if ($exists) {
-          // If there is an existing entry, update.
-          db_query("UPDATE {pm_email_notify} SET email_notify_is_enabled = %d WHERE user_id = %d", $pm_email_enabled, $account->uid);
-        }
-        else {
-          // If not, create a new one.
-          db_query("INSERT INTO {pm_email_notify} (email_notify_is_enabled, user_id) VALUES (%d, %d)", $pm_email_enabled, $account->uid);
-        }
-      }
-      break;
+  case 'submit':
+   if (isset($edit['pm_send_notifications']) && privatemsg_user_access('read privatemsg', $account)) {
+     $pm_email_enabled = $edit['pm_send_notifications'];
+     unset($edit['pm_send_notifications']);
+     // Update database entry with user preference.
+     $exists = db_result(db_query("SELECT 1 FROM {pm_email_notify} WHERE user_id = %d", $account->uid));
+     if ($exists) {
+       // If there is an existing entry, update.
+       db_query("UPDATE {pm_email_notify} SET email_notify_is_enabled = %d WHERE user_id = %d", $pm_email_enabled, $account->uid);
+     }
+     else {
+       // If not, create a new one.
+       db_query("INSERT INTO {pm_email_notify} (email_notify_is_enabled, user_id) VALUES (%d, %d)", $pm_email_enabled, $account->uid);
+     }
+   }
+   break;
 
-     case 'delete':
-      db_query("DELETE FROM {pm_email_notify} WHERE user_id = %d", $account->uid);
-      break;
+  case 'delete':
+   db_query("DELETE FROM {pm_email_notify} WHERE user_id = %d", $account->uid);
+   break;
   }
 }

Braces +1 added lines, -2 removed lines

@@ -177,8 +177,7 @@
         if ($exists) {
           // If there is an existing entry, update.
           db_query("UPDATE {pm_email_notify} SET email_notify_is_enabled = %d WHERE user_id = %d", $pm_email_enabled, $account->uid);
-        }
-        else {
+        } else {
           // If not, create a new one.
           db_query("INSERT INTO {pm_email_notify} (email_notify_is_enabled, user_id) VALUES (%d, %d)", $pm_email_enabled, $account->uid);
         }

Indentation +59 added lines, -59 removed lines

@@ -9,7 +9,7 @@ 
  * Implements hook_menu().
  */
 function pm_email_notify_menu() {
-  $items['admin/settings/messages/notify'] = array(
+    $items['admin/settings/messages/notify'] = array(
     'title'            => 'E-mail notify',
     'description'      => 'E-mail notification settings',
     'page callback'    => 'drupal_get_form',
@@ -17,47 +17,47 @@ 
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
     'weight'           => 10,
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Menu callback for administration settings.
  */
 function pm_email_notify_admin_settings_form() {
-  $form['pm_email'] = array(
+    $form['pm_email'] = array(
     '#type' => 'fieldset',
     '#title' => t('Privatemsg e-mail notification'),
     '#collapsible' => FALSE,
     '#collapsed' => FALSE,
-  );
-  $form['pm_email']['pm_email_notify_default'] = array(
+    );
+    $form['pm_email']['pm_email_notify_default'] = array(
     '#type' => 'checkbox',
     '#title' => t('Notify users of new private messages by default'),
     '#default_value' => variable_get('pm_email_notify_default', TRUE),
     '#weight' => 0,
-  );
+    );
 
-  $form['pm_email']['pm_email_notify_desc'] = array(
+    $form['pm_email']['pm_email_notify_desc'] = array(
     '#type' => 'item',
     '#value' => t('Customize the email messages sent to users upon receipt of a new private message. <br />Available variables are: !author, !author_uid, !pm_subject, !pm_body, !thread, !site, !login_url, !uri, !uri_brief, !message (URL), !settings (URL), !boincuser_name, and !author_boincuser_name.'),
     '#weight' => 1,
-  );
+    );
 
-  $form['pm_email']['pm_email_notify_subject'] = array(
+    $form['pm_email']['pm_email_notify_subject'] = array(
     '#type' => 'textfield',
     '#title' => t('Subject of notification messages'),
     '#default_value' => variable_get('pm_email_notify_subject', 'New private message at !site.'),
     '#weight' => 2,
-  );
+    );
 
-  $form['pm_email']['pm_email_notify_body'] = array(
+    $form['pm_email']['pm_email_notify_body'] = array(
     '#type' => 'textarea',
     '#title' => t('Body of notification messages'),
     '#default_value' => variable_get('pm_email_notify_body', _pm_email_notify_default_body()),
     '#weight' => 3,
-  );
-  return system_settings_form($form);
+    );
+    return system_settings_form($form);
 }
 
 /**
@@ -70,47 +70,47 @@ 
  *   User uid
  */
 function _pm_email_notify_is_enabled($uid) {
-  static $notifications = array();
-  // Cache the result set in case this method is executed in batched operation which will perform many unnecessary repeated selects for the same user
-  if ( !isset($notifications[$uid]) ) {
+    static $notifications = array();
+    // Cache the result set in case this method is executed in batched operation which will perform many unnecessary repeated selects for the same user
+    if ( !isset($notifications[$uid]) ) {
     $mail_notification = db_result(db_query('SELECT email_notify_is_enabled FROM {pm_email_notify} WHERE user_id = %d', $uid));
     if ($mail_notification === FALSE) {
-      // db_result() returns FALSE if result was not found.
-      $mail_notification = variable_get('pm_email_notify_default', TRUE);
+        // db_result() returns FALSE if result was not found.
+        $mail_notification = variable_get('pm_email_notify_default', TRUE);
     }
     $notifications[$uid] = $mail_notification;
-  }
-  return $notifications[$uid];
+    }
+    return $notifications[$uid];
 }
 
 /**
  * Implements hook_privatemsg_message_insert().
  */
 function pm_email_notify_privatemsg_message_insert($message) {
-  foreach ($message['recipients'] as $recipient) {
+    foreach ($message['recipients'] as $recipient) {
     // check if recipient enabled email notifications
     if (_pm_email_notify_is_enabled($recipient->uid)) {
-      // send them a new pm notification email if they did
-      $params['recipient'] = $recipient;
-      $params['message'] = $message;
-      drupal_mail('pm_email_notify', 'notice', $recipient->mail, user_preferred_language($recipient), $params);
+        // send them a new pm notification email if they did
+        $params['recipient'] = $recipient;
+        $params['message'] = $message;
+        drupal_mail('pm_email_notify', 'notice', $recipient->mail, user_preferred_language($recipient), $params);
+    }
     }
-  }
 }
 
 /**
  * Implements hook_mail().
  */
 function pm_email_notify_mail($key, &$message, $params) {
-  $language = $message['language'];
-  $variables = user_mail_tokens($params['recipient'], $language);
-  $variables = array_merge($variables, _pm_email_notify_token($params['recipient'], $params['message'], $language));
-  switch ($key) {
+    $language = $message['language'];
+    $variables = user_mail_tokens($params['recipient'], $language);
+    $variables = array_merge($variables, _pm_email_notify_token($params['recipient'], $params['message'], $language));
+    switch ($key) {
     case 'notice':
       $message['subject'] = t(variable_get('pm_email_notify_subject', 'New private message at !site.'), $variables, $language->language);
-      $message['body'] = t(variable_get('pm_email_notify_body', _pm_email_notify_default_body()), $variables, $language->language);
-      break;
-  }
+        $message['body'] = t(variable_get('pm_email_notify_body', _pm_email_notify_default_body()), $variables, $language->language);
+        break;
+    }
 }
 
 /**
@@ -123,7 +123,7 @@ 
  *   Array of mappings from token names to values (for use with strtr()).
  */
 function _pm_email_notify_token($recipient, $message, $language) {
-  $tokens = array(
+    $tokens = array(
     '!author_uid' => $message['author']->uid,
     '!author' => $message['author']->name,
     '!pm_subject' => trim(drupal_html_to_text(check_plain($message['subject']))),
@@ -134,16 +134,16 @@ 
     '!settings' => url('user/' . $recipient->uid . '/edit', array('absolute' => TRUE, 'language' => $language)),
     '!boincuser_name' => $recipient->boincuser_name,
     '!author_boincuser_name' => user_load($message['author']->uid)->boincuser_name,
-  );
+    );
 
-  return $tokens;
+    return $tokens;
 }
 
 /**
  * Returns default email notification body.
  */
 function _pm_email_notify_default_body() {
-  return "Hi !username,\n\nThis is an automatic reminder from the site !site. You have received a new private message from !author.\n\nTo read your message, follow this link:\n!message\n\nIf you don't want to receive these emails again, change your preferences here:\n!settings";
+    return "Hi !username,\n\nThis is an automatic reminder from the site !site. You have received a new private message from !author.\n\nTo read your message, follow this link:\n!message\n\nIf you don't want to receive these emails again, change your preferences here:\n!settings";
 }
 
 /**
@@ -152,43 +152,43 @@ 
  * Display settings form and store its information.
  */
 function pm_email_notify_user($op, &$edit, &$account, $category = NULL) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       if ($category == 'account' && privatemsg_user_access('read privatemsg', $account)) {
         $form['enable_pm_mail'] = array(
-          '#type' => 'fieldset',
-          '#title' => t('Privatemsg e-mail notification'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE,
-          '#weight' => 10,
+            '#type' => 'fieldset',
+            '#title' => t('Privatemsg e-mail notification'),
+            '#collapsible' => TRUE,
+            '#collapsed' => FALSE,
+            '#weight' => 10,
         );
         $form['enable_pm_mail']['pm_send_notifications'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Receive email notification for incoming private messages'),
-          '#default_value' => _pm_email_notify_is_enabled($account->uid),
+            '#type' => 'checkbox',
+            '#title' => t('Receive email notification for incoming private messages'),
+            '#default_value' => _pm_email_notify_is_enabled($account->uid),
         );
-      }
-      return $form;
+        }
+        return $form;
 
-     case 'submit':
+        case 'submit':
       if (isset($edit['pm_send_notifications']) && privatemsg_user_access('read privatemsg', $account)) {
         $pm_email_enabled = $edit['pm_send_notifications'];
         unset($edit['pm_send_notifications']);
         // Update database entry with user preference.
         $exists = db_result(db_query("SELECT 1 FROM {pm_email_notify} WHERE user_id = %d", $account->uid));
         if ($exists) {
-          // If there is an existing entry, update.
-          db_query("UPDATE {pm_email_notify} SET email_notify_is_enabled = %d WHERE user_id = %d", $pm_email_enabled, $account->uid);
+            // If there is an existing entry, update.
+            db_query("UPDATE {pm_email_notify} SET email_notify_is_enabled = %d WHERE user_id = %d", $pm_email_enabled, $account->uid);
         }
         else {
-          // If not, create a new one.
-          db_query("INSERT INTO {pm_email_notify} (email_notify_is_enabled, user_id) VALUES (%d, %d)", $pm_email_enabled, $account->uid);
+            // If not, create a new one.
+            db_query("INSERT INTO {pm_email_notify} (email_notify_is_enabled, user_id) VALUES (%d, %d)", $pm_email_enabled, $account->uid);
+        }
         }
-      }
-      break;
+        break;
 
-     case 'delete':
+        case 'delete':
       db_query("DELETE FROM {pm_email_notify} WHERE user_id = %d", $account->uid);
-      break;
-  }
+        break;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 function _pm_email_notify_is_enabled($uid) {
   static $notifications = array();
   // Cache the result set in case this method is executed in batched operation which will perform many unnecessary repeated selects for the same user
-  if ( !isset($notifications[$uid]) ) {
+  if (!isset($notifications[$uid])) {
     $mail_notification = db_result(db_query('SELECT email_notify_is_enabled FROM {pm_email_notify} WHERE user_id = %d', $uid));
     if ($mail_notification === FALSE) {
       // db_result() returns FALSE if result was not found.
@@ -130,8 +130,8 @@ 
     '!pm_body' => trim(drupal_html_to_text(check_markup($message['body'], $message['format'], FALSE))),
     '!thread' => $message['thread_id'],
     '!user_uid' => $recipient->uid,
-    '!message' => url('messages/view/' . $message['thread_id'], array('absolute' => TRUE, 'language' => $language)),
-    '!settings' => url('user/' . $recipient->uid . '/edit', array('absolute' => TRUE, 'language' => $language)),
+    '!message' => url('messages/view/'.$message['thread_id'], array('absolute' => TRUE, 'language' => $language)),
+    '!settings' => url('user/'.$recipient->uid.'/edit', array('absolute' => TRUE, 'language' => $language)),
     '!boincuser_name' => $recipient->boincuser_name,
     '!author_boincuser_name' => user_load($message['author']->uid)->boincuser_name,
   );

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

@@ -28,13 +28,13 @@ 
   $form['pm_email'] = array(
     '#type' => 'fieldset',
     '#title' => t('Privatemsg e-mail notification'),
-    '#collapsible' => FALSE,
-    '#collapsed' => FALSE,
+    '#collapsible' => false,
+    '#collapsed' => false,
   );
   $form['pm_email']['pm_email_notify_default'] = array(
     '#type' => 'checkbox',
     '#title' => t('Notify users of new private messages by default'),
-    '#default_value' => variable_get('pm_email_notify_default', TRUE),
+    '#default_value' => variable_get('pm_email_notify_default', true),
     '#weight' => 0,
   );
 
@@ -74,9 +74,9 @@ 
   // Cache the result set in case this method is executed in batched operation which will perform many unnecessary repeated selects for the same user
   if ( !isset($notifications[$uid]) ) {
     $mail_notification = db_result(db_query('SELECT email_notify_is_enabled FROM {pm_email_notify} WHERE user_id = %d', $uid));
-    if ($mail_notification === FALSE) {
+    if ($mail_notification === false) {
       // db_result() returns FALSE if result was not found.
-      $mail_notification = variable_get('pm_email_notify_default', TRUE);
+      $mail_notification = variable_get('pm_email_notify_default', true);
     }
     $notifications[$uid] = $mail_notification;
   }
@@ -127,11 +127,11 @@ 
     '!author_uid' => $message['author']->uid,
     '!author' => $message['author']->name,
     '!pm_subject' => trim(drupal_html_to_text(check_plain($message['subject']))),
-    '!pm_body' => trim(drupal_html_to_text(check_markup($message['body'], $message['format'], FALSE))),
+    '!pm_body' => trim(drupal_html_to_text(check_markup($message['body'], $message['format'], false))),
     '!thread' => $message['thread_id'],
     '!user_uid' => $recipient->uid,
-    '!message' => url('messages/view/' . $message['thread_id'], array('absolute' => TRUE, 'language' => $language)),
-    '!settings' => url('user/' . $recipient->uid . '/edit', array('absolute' => TRUE, 'language' => $language)),
+    '!message' => url('messages/view/' . $message['thread_id'], array('absolute' => true, 'language' => $language)),
+    '!settings' => url('user/' . $recipient->uid . '/edit', array('absolute' => true, 'language' => $language)),
     '!boincuser_name' => $recipient->boincuser_name,
     '!author_boincuser_name' => user_load($message['author']->uid)->boincuser_name,
   );
@@ -151,15 +151,15 @@ 
  *
  * Display settings form and store its information.
  */
-function pm_email_notify_user($op, &$edit, &$account, $category = NULL) {
+function pm_email_notify_user($op, &$edit, &$account, $category = null) {
   switch ($op) {
     case 'form':
       if ($category == 'account' && privatemsg_user_access('read privatemsg', $account)) {
         $form['enable_pm_mail'] = array(
           '#type' => 'fieldset',
           '#title' => t('Privatemsg e-mail notification'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE,
+          '#collapsible' => true,
+          '#collapsed' => false,
           '#weight' => 10,
         );
         $form['enable_pm_mail']['pm_send_notifications'] = array(

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

Doc Comments +7 added lines, -5 removed lines

@@ -37,6 +37,7 @@ 
  *
  * @param $userstring
  *   A string with user id, for example 1,2,4. Returned by the list query
+ * @param integer $slice
  *
  * @return
  *   Array with user objects.
@@ -72,7 +73,7 @@ 
  *   Array with user objects, for example the one returnd by
  *   _privatemsg_generate_user_array.
  *
- * @param $limit
+ * @param integer $limit
  *   Limit the number of user objects which should be displayed.
  * @param $no_text
  *   When TRUE, don't display the Participants/From text.
@@ -215,7 +216,7 @@ 
  *   Permission string, defaults to read privatemsg
  *
  * @return
- *   TRUE if user has access, FALSE if not
+ boolean   TRUE if user has access, FALSE if not
  *
  * @ingroup api
  */
@@ -730,7 +731,7 @@ 
  *
  * @param $pmid
  *   Message id
- * @param $status
+ * @param integer $status
  *   Either PRIVATEMSG_READ or PRIVATEMSG_UNREAD
  * @param $account
  *   User object, defaults to the current user
@@ -1949,9 +1950,10 @@ 
  *   Recipient of the message
  * @param $account
  *   Sender of the message, defaults to the current user
+ * @param string $subject
  *
  * @return
- *   Either FALSE or a URL string
+ false|string   Either FALSE or a URL string
  *
  * @ingroup api
  */
@@ -2273,7 +2275,7 @@ 
  *
  * Uses @link theming theme patterns @endlink to theme single headers.
  *
- * @param $has_posts
+ * @param boolean $has_posts
  *   TRUE when there is at least one row. Decides if the select all checkbox
  *   should be displayed.
  * @param $keys

Switch Indentation +38 added lines, -38 removed lines

@@ -1437,43 +1437,43 @@ 
   global $user;
 
   switch ($op) {
-    case 'view':
-      if ($url = privatemsg_get_link(array($account))) {
-        $account->content['privatemsg_send_new_message'] = array(
-          '#type'   => 'markup',
-          '#value'  => l(t('Send this user a message'), $url, array('query' => drupal_get_destination())),
-          '#weight' => 10,
-        );
-      }
-      break;
-    case 'login':
-      if (variable_get('privatemsg_display_loginmessage', TRUE) && privatemsg_user_access()) {
-        $count = privatemsg_unread_count();
-        if ($count) {
-          drupal_set_message(format_plural($count, 'You have <a href="@messages">1 unread message</a>.', 'You have <a href="@messages">@count unread messages</a>', array('@messages' => url('messages'))));
-        }
+  case 'view':
+    if ($url = privatemsg_get_link(array($account))) {
+      $account->content['privatemsg_send_new_message'] = array(
+        '#type'   => 'markup',
+        '#value'  => l(t('Send this user a message'), $url, array('query' => drupal_get_destination())),
+        '#weight' => 10,
+      );
+    }
+    break;
+  case 'login':
+    if (variable_get('privatemsg_display_loginmessage', TRUE) && privatemsg_user_access()) {
+      $count = privatemsg_unread_count();
+      if ($count) {
+        drupal_set_message(format_plural($count, 'You have <a href="@messages">1 unread message</a>.', 'You have <a href="@messages">@count unread messages</a>', array('@messages' => url('messages'))));
       }
-      break;
-    case 'delete':
+    }
+    break;
+  case 'delete':
 
-      // Load all mids of the messages the user wrote.
-      $result = db_query("SELECT mid FROM {pm_message} WHERE author = %d", $account->uid);
-      $mids = array();
-      while ($row = db_fetch_array($result)) {
-        $mids[] = $row['mid'];
-      }
+    // Load all mids of the messages the user wrote.
+    $result = db_query("SELECT mid FROM {pm_message} WHERE author = %d", $account->uid);
+    $mids = array();
+    while ($row = db_fetch_array($result)) {
+      $mids[] = $row['mid'];
+    }
 
-      // Delete messages the user wrote.
-      db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
+    // Delete messages the user wrote.
+    db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
 
-      if (!empty($mids)) {
-        // Delete recipient entries in {pm_index} of the messages the user wrote.
-        db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
-      }
+    if (!empty($mids)) {
+      // Delete recipient entries in {pm_index} of the messages the user wrote.
+      db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
+    }
 
-      // Delete recipient entries of that user.
-      db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
-      break;
+    // Delete recipient entries of that user.
+    db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
+    break;
   }
 }
 
@@ -1494,12 +1494,12 @@ 
   elseif ('view' == $op) {
     $block = array();
     switch ($delta) {
-      case 'privatemsg-menu':
-        $block = _privatemsg_block_menu();
-        break;
-      case 'privatemsg-new':
-        $block = _privatemsg_block_new();
-        break;
+    case 'privatemsg-menu':
+      $block = _privatemsg_block_menu();
+      break;
+    case 'privatemsg-new':
+      $block = _privatemsg_block_new();
+      break;
     }
     return $block;
   }

Indentation +1082 added lines, -1083 removed lines

@@ -22,13 +22,13 @@ 
  * Implements hook_perm().
  */
 function privatemsg_perm() {
-  return array(
+    return array(
     'read privatemsg',
     'read all private messages',
     'administer privatemsg settings',
     'write privatemsg',
     'delete privatemsg',
-  );
+    );
 }
 
 /**
@@ -42,27 +42,27 @@ 
  *   Array with user objects.
  */
 function _privatemsg_generate_user_array($userstring, $slice = NULL) {
-  static $user_cache = array();
-
-  // Convert user uid list (uid1,uid2,uid3) into an array. If $slice is not NULL
-  // pass that as argument to array_slice(). For example, -4 will only load the
-  // last four users.
-  // This is done to avoid loading user objects that are not displayed, for
-  // obvious performance reasons.
-  $users = explode(',', $userstring);
-  if (!is_null($slice)) {
+    static $user_cache = array();
+
+    // Convert user uid list (uid1,uid2,uid3) into an array. If $slice is not NULL
+    // pass that as argument to array_slice(). For example, -4 will only load the
+    // last four users.
+    // This is done to avoid loading user objects that are not displayed, for
+    // obvious performance reasons.
+    $users = explode(',', $userstring);
+    if (!is_null($slice)) {
     $users = array_slice($users, $slice);
-  }
-  $participants = array();
-  foreach ($users as $uid) {
+    }
+    $participants = array();
+    foreach ($users as $uid) {
     if (!array_key_exists($uid, $user_cache)) {
-      $user_cache[$uid] = user_load($uid);
+        $user_cache[$uid] = user_load($uid);
     }
     if (is_object($user_cache[$uid])) {
-      $participants[$uid] = $user_cache[$uid];
+        $participants[$uid] = $user_cache[$uid];
+    }
     }
-  }
-  return $participants;
+    return $participants;
 }
 
 /**
@@ -80,60 +80,60 @@ 
  *   String with formated user objects, like user1, user2.
  */
 function _privatemsg_format_participants($part_array, $limit = NULL, $no_text = FALSE) {
-  if (count($part_array) > 0) {
+    if (count($part_array) > 0) {
     $to = array();
     $limited = FALSE;
     foreach ($part_array as $account) {
-      if (is_int($limit) && count($to) >= $limit) {
+        if (is_int($limit) && count($to) >= $limit) {
         $limited = TRUE;
         break;
-      }
-      $to[] = theme('username', $account);
+        }
+        $to[] = theme('username', $account);
     }
 
     $limit_string = '';
     if ($limited) {
-      $limit_string = t(' and others');
+        $limit_string = t(' and others');
     }
 
 
     if ($no_text) {
-      return implode(', ', $to) . $limit_string;
+        return implode(', ', $to) . $limit_string;
     }
 
     $last = array_pop($to);
     if (count($to) == 0) { // Only one participant
-      return t("From !last", array('!last' => $last));
+        return t("From !last", array('!last' => $last));
     }
     else { // Multipe participants..
-      $participants = implode(', ', $to);
-      return t('Participants: !participants and !last', array('!participants' => $participants, '!last' => $last));
+        $participants = implode(', ', $to);
+        return t('Participants: !participants and !last', array('!participants' => $participants, '!last' => $last));
+    }
     }
-  }
-  return '';
+    return '';
 }
 
 /**
  * Implements hook_menu().
  */
 function privatemsg_menu() {
-  $items['messages'] = array(
+    $items['messages'] = array(
     'title'            => 'Messages',
     'title callback'  => 'privatemsg_title_callback',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_list', 'list'),
     'access callback'  => 'privatemsg_user_access',
     'type'             => MENU_NORMAL_ITEM,
-  );
-  $items['messages/list'] = array(
+    );
+    $items['messages/list'] = array(
     'title'            => 'Messages',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_list', 'list'),
     'access callback'  => 'privatemsg_user_access',
     'type'             => MENU_DEFAULT_LOCAL_TASK,
     'weight'           => -10,
-  );
-  $items['messages/view/%privatemsg_thread'] = array(
+    );
+    $items['messages/view/%privatemsg_thread'] = array(
     'title'            => 'Read message',
     // Set the third argument to TRUE so that we can show access denied instead
     // of not found.
@@ -144,16 +144,16 @@ 
     'access arguments' => array(2),
     'type'             => MENU_LOCAL_TASK,
     'weight'           => -5,
-  );
-  $items['messages/delete/%privatemsg_thread/%privatemsg_message'] = array(
+    );
+    $items['messages/delete/%privatemsg_thread/%privatemsg_message'] = array(
     'title'            => 'Delete message',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_delete', 2, 3),
     'access callback'  => 'privatemsg_user_access',
     'access arguments' => array('delete privatemsg'),
     'type'             => MENU_CALLBACK,
-  );
-  $items['messages/new'] = array(
+    );
+    $items['messages/new'] = array(
     'title'            => 'Write new message',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_new', 2, 3, NULL),
@@ -161,24 +161,24 @@ 
     'access arguments' => array('write privatemsg'),
     'type'             => MENU_LOCAL_TASK,
     'weight'           => -3,
-  );
-  // Auto-completes available user names & removes duplicates.
-  $items['messages/user-name-autocomplete'] = array(
+    );
+    // Auto-completes available user names & removes duplicates.
+    $items['messages/user-name-autocomplete'] = array(
     'page callback'    => 'privatemsg_user_name_autocomplete',
     'access callback'  => 'privatemsg_user_access',
     'access arguments' => array('write privatemsg'),
     'type'             => MENU_CALLBACK,
     'weight'           => -10,
-  );
-  $items['admin/settings/messages'] = array(
+    );
+    $items['admin/settings/messages'] = array(
     'title'            => 'Private messages',
     'description'      => 'Configure private messaging settings.',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('private_message_settings'),
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_NORMAL_ITEM,
-  );
-  $items['admin/settings/messages/default'] = array(
+    );
+    $items['admin/settings/messages/default'] = array(
     'title'            => 'Private messages',
     'description'      => 'Configure private messaging settings.',
     'page callback'    => 'drupal_get_form',
@@ -186,24 +186,24 @@ 
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_DEFAULT_LOCAL_TASK,
     'weight'           => -10,
-  );
-  $items['messages/undo/action'] = array(
+    );
+    $items['messages/undo/action'] = array(
     'title'            => 'Private messages',
     'description'      => 'Undo last thread action',
     'page callback'    => 'privatemsg_undo_action',
     'access arguments' => array('read privatemsg'),
     'type'             => MENU_CALLBACK,
-  );
-  $items['user/%/messages'] = array(
+    );
+    $items['user/%/messages'] = array(
     'title' => 'Messages',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_list', 'list', 1),
     'access callback'  => 'privatemsg_user_access',
     'access arguments' => array('read all private messages'),
     'type' => MENU_LOCAL_TASK,
-  );
+    );
 
-  return $items;
+    return $items;
 }
 
 /**
@@ -220,17 +220,17 @@ 
  * @ingroup api
  */
 function privatemsg_user_access($permission = 'read privatemsg', $account = NULL) {
-  if ( $account === NULL ) {
+    if ( $account === NULL ) {
     global $user;
     $account = $user;
-  }
-  if (!$account->uid) { // Disallow anonymous access, regardless of permissions
+    }
+    if (!$account->uid) { // Disallow anonymous access, regardless of permissions
     return FALSE;
-  }
-  if (!user_access($permission, $account)) {
+    }
+    if (!user_access($permission, $account)) {
     return FALSE;
-  }
-  return TRUE;
+    }
+    return TRUE;
 }
 
 /**
@@ -247,15 +247,15 @@ 
  * @ingroup api
  */
 function privatemsg_view_access($thread = array()) {
-  // Do not allow access to threads without messages.
-  if (empty($thread['messages'])) {
+    // Do not allow access to threads without messages.
+    if (empty($thread['messages'])) {
     // Count all messages, if there
     return FALSE;
-  }
-  if (privatemsg_user_access('read privatemsg') && arg(1) == 'view') {
+    }
+    if (privatemsg_user_access('read privatemsg') && arg(1) == 'view') {
     return TRUE;
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -284,142 +284,141 @@ 
  *
  *   If no messages are found, or the thread_id is invalid, the function returns
  *   FALSE.
-
  * @ingroup api
  */
 function privatemsg_thread_load($thread_id, $account = NULL, $start = NULL, $useAccessDenied = FALSE) {
-  static $threads = array();
-  if ((int)$thread_id > 0) {
+    static $threads = array();
+    if ((int)$thread_id > 0) {
     $thread = array('thread_id' => $thread_id);
 
     if (is_null($account)) {
-      global $user;
-      $account = drupal_clone($user);
+        global $user;
+        $account = drupal_clone($user);
     }
 
     if (!isset($threads[$account->uid])) {
-      $threads[$account->uid] = array();
+        $threads[$account->uid] = array();
     }
 
     if (!array_key_exists($thread_id, $threads[$account->uid])) {
-      // Load the list of participants.
-      $query = _privatemsg_assemble_query('participants', $thread_id);
-      $participants = db_query($query['query']);
-      $thread['participants'] = array();
-      while ($participant = db_fetch_object($participants)) {
+        // Load the list of participants.
+        $query = _privatemsg_assemble_query('participants', $thread_id);
+        $participants = db_query($query['query']);
+        $thread['participants'] = array();
+        while ($participant = db_fetch_object($participants)) {
         $thread['participants'][$participant->uid] = $participant;
-      }
-      $thread['read_all'] = FALSE;
-      if (!array_key_exists($account->uid, $thread['participants']) && privatemsg_user_access('read all private messages', $account)) {
+        }
+        $thread['read_all'] = FALSE;
+        if (!array_key_exists($account->uid, $thread['participants']) && privatemsg_user_access('read all private messages', $account)) {
         $thread['read_all'] = TRUE;
-      }
+        }
 
-      // Load messages returned by the messages query with privatemsg_message_load_multiple().
-      $query = _privatemsg_assemble_query('messages', array($thread_id), $thread['read_all'] ? NULL : $account);
-      $thread['message_count'] = $thread['to'] = db_result(db_query($query['count']));
-      $thread['from'] = 1;
-      // Check if we need to limit the messages.
-      $max_amount = variable_get('privatemsg_view_max_amount', 20);
+        // Load messages returned by the messages query with privatemsg_message_load_multiple().
+        $query = _privatemsg_assemble_query('messages', array($thread_id), $thread['read_all'] ? NULL : $account);
+        $thread['message_count'] = $thread['to'] = db_result(db_query($query['count']));
+        $thread['from'] = 1;
+        // Check if we need to limit the messages.
+        $max_amount = variable_get('privatemsg_view_max_amount', 20);
 
-      // If there is no start value, select based on get params.
-      if (is_null($start)) {
+        // If there is no start value, select based on get params.
+        if (is_null($start)) {
         if (isset($_GET['start']) && $_GET['start'] < $thread['message_count']) {
-          $start = $_GET['start'];
+            $start = $_GET['start'];
         }
         elseif (!variable_get('privatemsg_view_use_max_as_default', FALSE) && $max_amount == PRIVATEMSG_UNLIMITED) {
-          $start = PRIVATEMSG_UNLIMITED;
+            $start = PRIVATEMSG_UNLIMITED;
         }
         else {
-          $start = $thread['message_count'] - (variable_get('privatemsg_view_use_max_as_default', FALSE) ? variable_get('privatemsg_view_default_amount', 10) : $max_amount);
+            $start = $thread['message_count'] - (variable_get('privatemsg_view_use_max_as_default', FALSE) ? variable_get('privatemsg_view_default_amount', 10) : $max_amount);
+        }
         }
-      }
 
-      if ($start != PRIVATEMSG_UNLIMITED) {
+        if ($start != PRIVATEMSG_UNLIMITED) {
         if ($max_amount == PRIVATEMSG_UNLIMITED) {
-          $last_page = 0;
-          $max_amount = $thread['message_count'];
+            $last_page = 0;
+            $max_amount = $thread['message_count'];
         }
         else {
-          // Calculate the number of messages on the "last" page to avoid
-          // message overlap.
-          // Note - the last page lists the earliest messages, not the latest.
-          $paging_count = variable_get('privatemsg_view_use_max_as_default', FALSE) ? $thread['message_count'] - variable_get('privatemsg_view_default_amount', 10) : $thread['message_count'];
-          $last_page = $paging_count % $max_amount;
+            // Calculate the number of messages on the "last" page to avoid
+            // message overlap.
+            // Note - the last page lists the earliest messages, not the latest.
+            $paging_count = variable_get('privatemsg_view_use_max_as_default', FALSE) ? $thread['message_count'] - variable_get('privatemsg_view_default_amount', 10) : $thread['message_count'];
+            $last_page = $paging_count % $max_amount;
         }
 
         // Sanity check - we cannot start from a negative number.
         if ($start < 0) {
-          $start = 0;
+            $start = 0;
         }
         $thread['start'] = $start;
 
         //If there are newer messages on the page, show pager link allowing to go to the newer messages.
         if (($start + $max_amount + 1) < $thread['message_count']) {
-          $thread['to'] = $start + $max_amount;
-          $thread['newer_start'] = $start + $max_amount;
+            $thread['to'] = $start + $max_amount;
+            $thread['newer_start'] = $start + $max_amount;
         }
         if ($start - $max_amount >= 0) {
-          $thread['older_start'] = $start - $max_amount;
+            $thread['older_start'] = $start - $max_amount;
         }
         elseif ($start > 0) {
-          $thread['older_start'] = 0;
+            $thread['older_start'] = 0;
         }
 
         // Do not show messages on the last page that would show on the page
         // before. This will only work when using the visual pager.
         if ($start < $last_page && $max_amount != PRIVATEMSG_UNLIMITED && $max_amount < $thread['message_count']) {
-          unset($thread['older_start']);
-          $thread['to'] = $thread['newer_start'] = $max_amount = $last_page;
-          // Start from the first message - this is a specific hack to make sure
-          // the message display has sane paging on the last page.
-          $start = 0;
+            unset($thread['older_start']);
+            $thread['to'] = $thread['newer_start'] = $max_amount = $last_page;
+            // Start from the first message - this is a specific hack to make sure
+            // the message display has sane paging on the last page.
+            $start = 0;
         }
         // Visual counts start from 1 instead of zero, so plus one.
         $thread['from'] = $start + 1;
         $conversation = db_query_range($query['query'], $start, $max_amount);
-      }
-      else {
+        }
+        else {
         $conversation = db_query($query['query']);
-      }
-      $mids = array();
-      while ($result = db_fetch_array($conversation)) {
+        }
+        $mids = array();
+        while ($result = db_fetch_array($conversation)) {
         $mids[] = $result['mid'];
-      }
-      // Load messages returned by the messages query.
-      $thread['messages'] = privatemsg_message_load_multiple($mids, $thread['read_all'] ? NULL : $account);
+        }
+        // Load messages returned by the messages query.
+        $thread['messages'] = privatemsg_message_load_multiple($mids, $thread['read_all'] ? NULL : $account);
 
-      // If there are no messages, don't allow access to the thread.
-      if (empty($thread['messages'])) {
+        // If there are no messages, don't allow access to the thread.
+        if (empty($thread['messages'])) {
         if ($useAccessDenied) {
-          // Generate new query with read all to see if the thread does exist.
-          $query = _privatemsg_assemble_query('messages', array($thread_id), NULL);
-          $exists = db_result(db_query($query['count']));
-          if (!$exists) {
+            // Generate new query with read all to see if the thread does exist.
+            $query = _privatemsg_assemble_query('messages', array($thread_id), NULL);
+            $exists = db_result(db_query($query['count']));
+            if (!$exists) {
             // Thread does not exist, display 404.
             $thread = FALSE;
-          }
+            }
         }
         else {
-          $thread = FALSE;
+            $thread = FALSE;
+        }
         }
-      }
-      else {
+        else {
         // General data, assume subject is the same for all messages of that thread.
         $thread['user'] = $account;
         $message = current($thread['messages']);
         $thread['subject'] = $message['subject'];
-      }
-      $threads[$account->uid][$thread_id] = $thread;
+        }
+        $threads[$account->uid][$thread_id] = $thread;
     }
 
     return $threads[$account->uid][$thread_id];
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 function private_message_view_options() {
-  $options = module_invoke_all('privatemsg_view_template');
-  return $options;
+    $options = module_invoke_all('privatemsg_view_template');
+    return $options;
 }
 
 /**
@@ -435,108 +434,108 @@ 
  * };
  */
 function privatemsg_privatemsg_view_template() {
-  return array(
+    return array(
     'privatemsg-view' => 'Default view',
-  );
+    );
 }
 
 function private_message_settings() {
-  $form = array();
+    $form = array();
 
-  $form['theming_settings'] = array(
+    $form['theming_settings'] = array(
     '#type'        => 'fieldset',
     '#collapsible' => TRUE,
     '#collapsed'   => TRUE,
     '#title'       => t('Theming settings'),
-  );
-  $form['theming_settings']['private_message_view_template'] = array(
+    );
+    $form['theming_settings']['private_message_view_template'] = array(
     '#type'          => 'radios',
     '#title'         => t('Private message display template'),
     '#default_value' => variable_get('private_message_view_template', 'privatemsg-view'),
     '#options'       => private_message_view_options(),
-  );
-  $form['privatemsg_display_loginmessage'] = array(
+    );
+    $form['privatemsg_display_loginmessage'] = array(
     '#type' => 'checkbox',
     '#title' => t('Inform the user about new messages on login'),
     '#default_value' => variable_get('privatemsg_display_loginmessage', TRUE),
     '#description' => t('This option can safely be disabled if the "New message indication" block is used instead.'),
-  );
+    );
 
-  $form['flush_deleted'] = array(
+    $form['flush_deleted'] = array(
     '#type'        => 'fieldset',
     '#collapsible' => TRUE,
     '#collapsed'   => TRUE,
     '#title'       => t('Flush deleted messages'),
     '#description' => t('By default, deleted messages are only hidden from the user but still stored in the database. These settings control if and when messages should be removed.'),
-  );
+    );
 
-  $form['flush_deleted']['privatemsg_flush_enabled'] = array(
+    $form['flush_deleted']['privatemsg_flush_enabled'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Flush deleted messages'),
     '#default_value' => variable_get('privatemsg_flush_enabled', FALSE),
     '#description'   => t('Enable the flushing of deleted messages. Requires that cron is enabled'),
-  );
+    );
 
-  $form['flush_deleted']['privatemsg_flush_days'] = array(
+    $form['flush_deleted']['privatemsg_flush_days'] = array(
     '#type' => 'select',
     '#title' => t('Flush messages after they have been deleted for more days than'),
     '#default_value' => variable_get('privatemsg_flush_days', 30),
     '#options' => drupal_map_assoc(array(0, 1, 2, 5, 10, 30, 100)),
-  );
+    );
 
-  $form['flush_deleted']['privatemsg_flush_max'] = array(
+    $form['flush_deleted']['privatemsg_flush_max'] = array(
     '#type' => 'select',
     '#title' => t('Maximum number of messages to flush per cron run'),
     '#default_value' => variable_get('privatemsg_flush_max', 200),
     '#options' => drupal_map_assoc(array(50, 100, 200, 500, 1000)),
-  );
+    );
 
-  $form['privatemsg_listing'] = array(
+    $form['privatemsg_listing'] = array(
     '#type' => 'fieldset',
     '#title' => t('Configure listings'),
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
-  );
+    );
 
-  $form['privatemsg_listing']['privatemsg_per_page'] = array(
+    $form['privatemsg_listing']['privatemsg_per_page'] = array(
     '#type' => 'select',
     '#title' => t('Threads per page'),
     '#default_value' => variable_get('privatemsg_per_page', 25),
     '#options' => drupal_map_assoc(array(10, 25, 50, 75, 100)),
     '#description' => t('Choose the number of conversations that should be listed per page.'),
-  );
+    );
 
-  $form['privatemsg_listing']['privatemsg_display_fields'] = array(
+    $form['privatemsg_listing']['privatemsg_display_fields'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Configure fields'),
     '#description' => t('Select which columns/fields should be displayed in the message listings. Subject and Last updated cannot be disabled.'),
     '#options' => array(
-      'participants'    => t('Participants'),
-      'thread_started'  => t('Started'),
-      'count'           => t('Messages'),
+        'participants'    => t('Participants'),
+        'thread_started'  => t('Started'),
+        'count'           => t('Messages'),
     ),
     '#default_value' => variable_get('privatemsg_display_fields', array('participants')),
-  );
+    );
 
-  $amounts = drupal_map_assoc(array(5, 10, 20, 30, 50, 70, 90, 150, 200, 250, 300));
-  $form['privatemsg_listing']['privatemsg_view_max_amount'] = array(
+    $amounts = drupal_map_assoc(array(5, 10, 20, 30, 50, 70, 90, 150, 200, 250, 300));
+    $form['privatemsg_listing']['privatemsg_view_max_amount'] = array(
     '#type'          => 'select',
     '#title'         => t('Number of messages on thread pages'),
     '#options'       => $amounts + array(PRIVATEMSG_UNLIMITED => t('Unlimited')),
     '#default_value' => variable_get('privatemsg_view_max_amount', 20),
     '#description'   => t('Threads will not show more than this number of messages on a single page.'),
     '#weight'        => 10,
-  );
+    );
 
-  $form['privatemsg_listing']['privatemsg_view_use_max_as_default'] = array(
+    $form['privatemsg_listing']['privatemsg_view_use_max_as_default'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Display different amount of messages on first thread page'),
     '#default_value' => variable_get('privatemsg_view_use_max_as_default', FALSE),
     '#description'   => t('By default, the first thread page shows the maximally allowed amount of messages. Enable this checkbox to set a different value.'),
     '#weight'        => 15,
-  );
+    );
 
-  $form['privatemsg_listing']['privatemsg_view_default_amount'] = array(
+    $form['privatemsg_listing']['privatemsg_view_default_amount'] = array(
     '#prefix'        => '<div id="privatemsg-view-default-button">',
     '#suffix'        => '</div>',
     '#type'          => 'select',
@@ -545,15 +544,15 @@ 
     '#description'   => t('The number of messages to be displayed on first thread page. Displays the newest messages.'),
     '#options'       => $amounts,
     '#weight'        => 20,
-  );
-  drupal_add_js(drupal_get_path('module', 'privatemsg') .'/privatemsg-admin.js');
+    );
+    drupal_add_js(drupal_get_path('module', 'privatemsg') .'/privatemsg-admin.js');
 
-  $form['#submit'][] = 'private_message_settings_submit';
-  return system_settings_form($form);
+    $form['#submit'][] = 'private_message_settings_submit';
+    return system_settings_form($form);
 }
 
 function private_message_settings_submit() {
-  drupal_rebuild_theme_registry();
+    drupal_rebuild_theme_registry();
 }
 
 /**
@@ -563,107 +562,107 @@ 
  * old enough are flushed.
  */
 function privatemsg_cron() {
-  if (variable_get('privatemsg_flush_enabled', FALSE)) {
+    if (variable_get('privatemsg_flush_enabled', FALSE)) {
     $query = _privatemsg_assemble_query('deleted', variable_get('privatemsg_flush_days', 30));
     $result = db_query($query['query']);
 
     $flushed = 0;
     while (($row = db_fetch_array($result)) && ($flushed < variable_get('privatemsg_flush_max', 200))) {
-      $message = privatemsg_message_load($row['mid']);
-      module_invoke_all('privatemsg_message_flush', $message);
+        $message = privatemsg_message_load($row['mid']);
+        module_invoke_all('privatemsg_message_flush', $message);
 
-      // Delete recipients of the message.
-      db_query('DELETE FROM {pm_index} WHERE mid = %d', $row['mid']);
-      // Delete message itself.
-      db_query('DELETE FROM {pm_message} WHERE mid = %d', $row['mid']);
-      $flushed++;
+        // Delete recipients of the message.
+        db_query('DELETE FROM {pm_index} WHERE mid = %d', $row['mid']);
+        // Delete message itself.
+        db_query('DELETE FROM {pm_message} WHERE mid = %d', $row['mid']);
+        $flushed++;
+    }
     }
-  }
 }
 
 function privatemsg_theme() {
-  return array(
+    return array(
     'privatemsg_view'    => array(
-      'arguments'        => array('message' => NULL),
-      'template'         => variable_get('private_message_view_template', 'privatemsg-view'), // 'privatemsg',
+        'arguments'        => array('message' => NULL),
+        'template'         => variable_get('private_message_view_template', 'privatemsg-view'), // 'privatemsg',
     ),
     'privatemsg_from'    => array(
-      'arguments'        => array('author' => NULL),
-      'template'         => 'privatemsg-from',
+        'arguments'        => array('author' => NULL),
+        'template'         => 'privatemsg-from',
     ),
     'privatemsg_recipients' => array(
-      'arguments'        => array('message' => NULL),
-      'template'         => 'privatemsg-recipients',
+        'arguments'        => array('message' => NULL),
+        'template'         => 'privatemsg-recipients',
     ),
     'privatemsg_between' => array(
-      'arguments'        => array('recipients' => NULL),
-      'template'         => 'privatemsg-between',
+        'arguments'        => array('recipients' => NULL),
+        'template'         => 'privatemsg-between',
     ),
     'privatemsg_list'    => array(
-      'file'                  => 'privatemsg.theme.inc',
-      'path'                  => drupal_get_path('module', 'privatemsg'),
-      'arguments'        => array('form'),
+        'file'                  => 'privatemsg.theme.inc',
+        'path'                  => drupal_get_path('module', 'privatemsg'),
+        'arguments'        => array('form'),
     ),
     // Define pattern for header/field templates. The theme system will register all
     // theme functions that start with the defined pattern.
     'privatemsg_list_header'  => array(
-      'file'                  => 'privatemsg.theme.inc',
-      'path'                  => drupal_get_path('module', 'privatemsg'),
-      'pattern'               => 'privatemsg_list_header__',
-      'arguments'             => array(),
+        'file'                  => 'privatemsg.theme.inc',
+        'path'                  => drupal_get_path('module', 'privatemsg'),
+        'pattern'               => 'privatemsg_list_header__',
+        'arguments'             => array(),
     ),
     'privatemsg_list_field'   => array(
-      'file'                  => 'privatemsg.theme.inc',
-      'path'                  => drupal_get_path('module', 'privatemsg'),
-      'pattern'               => 'privatemsg_list_field__',
-      'arguments'             => array('thread'),
+        'file'                  => 'privatemsg.theme.inc',
+        'path'                  => drupal_get_path('module', 'privatemsg'),
+        'pattern'               => 'privatemsg_list_field__',
+        'arguments'             => array('thread'),
     ),
     'privatemsg_new_block'  => array(
-      'file'                  => 'privatemsg.theme.inc',
-      'path'                  => drupal_get_path('module', 'privatemsg'),
-      'arguments'             => array('count'),
+        'file'                  => 'privatemsg.theme.inc',
+        'path'                  => drupal_get_path('module', 'privatemsg'),
+        'arguments'             => array('count'),
     ),
-  );
+    );
 }
 
 function template_preprocess_privatemsg_view(&$vars) {
 //  drupal_set_message('<pre>'. print_r($vars,1 ) . '</pre>');
 
-  $message = $vars['message'];
-  $vars['mid'] = isset($message['mid']) ? $message['mid'] : NULL;
-  $vars['thread_id'] = isset($message['thread_id']) ? $message['thread_id'] : NULL;
-  $vars['author_picture'] = theme('user_picture', $message['author']);
-  $vars['author_name_link'] = theme('username', $message['author']);
-  /**
-   * @todo perhaps make this timestamp configurable via admin UI?
-   */
-  $vars['message_timestamp'] = format_date($message['timestamp'], 'small');
-  $vars['message_body'] = check_markup($message['body'], $message['format'], FALSE);
-  if (isset($vars['mid']) && isset($vars['thread_id']) && privatemsg_user_access('delete privatemsg')) {
+    $message = $vars['message'];
+    $vars['mid'] = isset($message['mid']) ? $message['mid'] : NULL;
+    $vars['thread_id'] = isset($message['thread_id']) ? $message['thread_id'] : NULL;
+    $vars['author_picture'] = theme('user_picture', $message['author']);
+    $vars['author_name_link'] = theme('username', $message['author']);
+    /**
+     * @todo perhaps make this timestamp configurable via admin UI?
+     */
+    $vars['message_timestamp'] = format_date($message['timestamp'], 'small');
+    $vars['message_body'] = check_markup($message['body'], $message['format'], FALSE);
+    if (isset($vars['mid']) && isset($vars['thread_id']) && privatemsg_user_access('delete privatemsg')) {
     $vars['message_actions'][] = array('title' => t('Delete message'), 'href' => 'messages/delete/' . $vars['thread_id'] . '/' . $vars['mid']);
-  }
-  $vars['message_anchors'][] = 'privatemsg-mid-' . $vars['mid'];
-  if (!empty($message['is_new'])) {
+    }
+    $vars['message_anchors'][] = 'privatemsg-mid-' . $vars['mid'];
+    if (!empty($message['is_new'])) {
     $vars['message_anchors'][] = 'new';
     $vars['new'] = drupal_ucfirst(t('new'));
-  }
+    }
 
-  // call hook_privatemsg_message_view_alter
-  drupal_alter('privatemsg_message_view', $vars);
+    // call hook_privatemsg_message_view_alter
+    drupal_alter('privatemsg_message_view', $vars);
 
-  $vars['message_actions'] = !empty($vars['message_actions']) ? theme('links', $vars['message_actions'], array('class' => 'message-actions')) : '';
+    $vars['message_actions'] = !empty($vars['message_actions']) ? theme('links', $vars['message_actions'], array('class' => 'message-actions')) : '';
 
-  $vars['anchors'] = '';
-  foreach ($vars['message_anchors'] as $anchor) {
+    $vars['anchors'] = '';
+    foreach ($vars['message_anchors'] as $anchor) {
     $vars['anchors'] .= '<a name="' . $anchor . '"></a>';
-  }
+    }
 }
 
 function template_preprocess_privatemsg_recipients(&$vars) {
-  $vars['participants'] = ''; // assign a default empty value
-  if (isset($vars['message']['participants'])) {
+    $vars['participants'] = ''; // assign a default empty value
+    if (isset($vars['message']['participants'])) {
     $vars['participants'] = _privatemsg_format_participants($vars['message']['participants']);
-  }
+    }
 }
 
 /**
@@ -680,49 +679,49 @@ 
  *   Form array
  */
 function privatemsg_list(&$form_state, $argument = 'list', $uid = NULL) {
-  global $user;
+    global $user;
 
-  // Setting default behavior...
-  $account = $user;
-  // Because uid is submitted by the menu system, it's a string not a integer.
-  if ((int)$uid > 0 && $uid != $user->uid) {
+    // Setting default behavior...
+    $account = $user;
+    // Because uid is submitted by the menu system, it's a string not a integer.
+    if ((int)$uid > 0 && $uid != $user->uid) {
     // Trying to view someone else's messages...
     if (!privatemsg_user_access('read all private messages')) {
-      drupal_set_message(t("You do not have sufficient rights to view someone else's messages"), 'warning');
+        drupal_set_message(t("You do not have sufficient rights to view someone else's messages"), 'warning');
     }
     elseif ($account_check = user_load(array('uid' => $uid))) {
-      // Has rights and user_load return an array so user does exist
-      $account = $account_check;
+        // Has rights and user_load return an array so user does exist
+        $account = $account_check;
+    }
     }
-  }
-  // By this point we have figured out for which user we are listing messages and now it is safe to use $account->uid in the listing query.
+    // By this point we have figured out for which user we are listing messages and now it is safe to use $account->uid in the listing query.
 
-  $query = _privatemsg_assemble_query('list', $account, $argument);
-  $result = pager_query($query['query'], variable_get('privatemsg_per_page', 25), 0, $query['count']);
+    $query = _privatemsg_assemble_query('list', $account, $argument);
+    $result = pager_query($query['query'], variable_get('privatemsg_per_page', 25), 0, $query['count']);
 
-  $threads = array();
-  $form['#data'] = array();
-  while ($row = db_fetch_array($result)) {
+    $threads = array();
+    $form['#data'] = array();
+    while ($row = db_fetch_array($result)) {
     // Store the raw row data.
     $form['#data'][$row['thread_id']] = $row;
     // store thread id for the checkboxes array
     $threads[$row['thread_id']] = '';
-  }
-  if (!empty($form['#data'])) {
+    }
+    if (!empty($form['#data'])) {
     $form['actions'] = _privatemsg_action_form();
-  }
+    }
 
-  // Save the currently active account, used for actions.
-  $form['account'] = array('#type' => 'value', '#value' => $account);
+    // Save the currently active account, used for actions.
+    $form['account'] = array('#type' => 'value', '#value' => $account);
 
-  // Define checkboxes, pager and theme
-  $form['threads'] = array('#type' => 'checkboxes', '#options' => $threads);
-  $form['pager'] = array('#value' => theme('pager'), '#weight' => 20);
-  $form['#theme'] = 'privatemsg_list';
+    // Define checkboxes, pager and theme
+    $form['threads'] = array('#type' => 'checkboxes', '#options' => $threads);
+    $form['pager'] = array('#value' => theme('pager'), '#weight' => 20);
+    $form['#theme'] = 'privatemsg_list';
 
-  // Store the account for which the threads are displayed.
-  $form['#account'] = $account;
-  return $form;
+    // Store the account for which the threads are displayed.
+    $form['#account'] = $account;
+    return $form;
 }
 
 /**
@@ -736,12 +735,12 @@ 
  *   User object, defaults to the current user
  */
 function privatemsg_message_change_status($pmid, $status, $account = NULL) {
-  if (!$account) {
+    if (!$account) {
     global $user;
     $account = $user;
-  }
-  $query = "UPDATE {pm_index} SET is_new = %d WHERE mid = %d AND uid = %d";
-  db_query($query, $status, $pmid, $account->uid);
+    }
+    $query = "UPDATE {pm_index} SET is_new = %d WHERE mid = %d AND uid = %d";
+    db_query($query, $status, $pmid, $account->uid);
 }
 
 /**
@@ -753,16 +752,16 @@ 
  * @ingroup api
  */
 function privatemsg_unread_count($account = NULL) {
-  static $counts = array();
-  if (!$account || $account->uid == 0) {
+    static $counts = array();
+    if (!$account || $account->uid == 0) {
     global $user;
     $account = $user;
-  }
-  if ( !isset($counts[$account->uid])) {
+    }
+    if ( !isset($counts[$account->uid])) {
     $query = _privatemsg_assemble_query('unread_count', $account);
     $counts[$account->uid] = db_result(db_query($query['query']));
-  }
-  return $counts[$account->uid];
+    }
+    return $counts[$account->uid];
 }
 
 /**
@@ -776,285 +775,285 @@ 
  * @see privatemsg_thread_load()
  */
 function privatemsg_view($thread) {
-  drupal_set_title(check_plain($thread['subject']));
+    drupal_set_title(check_plain($thread['subject']));
 
-  // Generate paging links.
-  $older = '';
-  if (isset($thread['older_start'])) {
+    // Generate paging links.
+    $older = '';
+    if (isset($thread['older_start'])) {
     $options = array(
-      'query' => array('start' => $thread['older_start']),
-      'title' => t('Display older messages'),
+        'query' => array('start' => $thread['older_start']),
+        'title' => t('Display older messages'),
     );
-     $older = l(t('<<'), 'messages/view/' . $thread['thread_id'], $options);
-  }
-  $newer = '';
-  if (isset($thread['newer_start'])) {
+        $older = l(t('<<'), 'messages/view/' . $thread['thread_id'], $options);
+    }
+    $newer = '';
+    if (isset($thread['newer_start'])) {
     $options = array(
-      'query' => array('start' => $thread['newer_start']),
-      'title' => t('Display newer messages'),
+        'query' => array('start' => $thread['newer_start']),
+        'title' => t('Display newer messages'),
     );
     $newer = l(t('>>'), 'messages/view/' . $thread['thread_id'], $options);
-  }
-  $substitutions = array('@from' => $thread['from'], '@to' => $thread['to'], '@total' => $thread['message_count'], '!previous_link' => $older, '!newer_link' => $newer);
-  $title = t('!previous_link Displaying messages @from - @to of @total !newer_link', $substitutions);
-  $content['pager_top'] = array(
+    }
+    $substitutions = array('@from' => $thread['from'], '@to' => $thread['to'], '@total' => $thread['message_count'], '!previous_link' => $older, '!newer_link' => $newer);
+    $title = t('!previous_link Displaying messages @from - @to of @total !newer_link', $substitutions);
+    $content['pager_top'] = array(
     '#value'  => trim($title),
     '#prefix' => '<div class="privatemsg-view-pager">',
     '#suffix' => '</div>',
     '#weight' => -10,
-  );
+    );
 
-  // Display a copy at the end.
-  $content['pager_bottom'] = $content['pager_top'];
-  $content['pager_bottom']['#weight'] = 3;
+    // Display a copy at the end.
+    $content['pager_bottom'] = $content['pager_top'];
+    $content['pager_bottom']['#weight'] = 3;
 
-  // Render the participants.
-  $content['participants']['#value'] = theme('privatemsg_recipients', $thread);
-  $content['participants']['#weight'] = -5;
+    // Render the participants.
+    $content['participants']['#value'] = theme('privatemsg_recipients', $thread);
+    $content['participants']['#weight'] = -5;
 
-  // Render the messages.
-  $output = '';
-  foreach ($thread['messages'] as $pmid => $message) {
+    // Render the messages.
+    $output = '';
+    foreach ($thread['messages'] as $pmid => $message) {
     // Set message as read and theme it.
     if (!empty($message['is_new'])) {
-      privatemsg_message_change_status($pmid, PRIVATEMSG_READ, $thread['user']);
+        privatemsg_message_change_status($pmid, PRIVATEMSG_READ, $thread['user']);
     }
     $output .= theme('privatemsg_view', $message);
-  }
-  $content['messages']['#value'] = $output;
-  $content['messages']['#weight'] = 0;
+    }
+    $content['messages']['#value'] = $output;
+    $content['messages']['#weight'] = 0;
 
-  // Display the reply form if user is allowed to use it.
-  if (privatemsg_user_access('write privatemsg')) {
+    // Display the reply form if user is allowed to use it.
+    if (privatemsg_user_access('write privatemsg')) {
     $content['reply']['#value'] = drupal_get_form('privatemsg_new', $thread['participants'], $thread['subject'], $thread['thread_id'], $thread['read_all']);
     $content['reply']['#weight'] = 5;
-  }
+    }
 
-  // Check after calling the privatemsg_new form so that this message is only
-  // displayed when we are not sending a message.
-  if ($thread['read_all']) {
+    // Check after calling the privatemsg_new form so that this message is only
+    // displayed when we are not sending a message.
+    if ($thread['read_all']) {
     // User has permission to read all messages AND is not a participant of the current thread.
     drupal_set_message(t('This conversation is being viewed with escalated priviledges and may not be the same as shown to normal users.'), 'warning');
-  }
+    }
 
-  // Allow other modules to hook into the $content array and alter it.
-  drupal_alter('privatemsg_view_messages', $content, $thread);
-  return drupal_render($content);
+    // Allow other modules to hook into the $content array and alter it.
+    drupal_alter('privatemsg_view_messages', $content, $thread);
+    return drupal_render($content);
 }
 
 
 function privatemsg_new(&$form_state, $recipients = array(), $subject = '', $thread_id = NULL, $read_all = FALSE) {
-  global $user;
+    global $user;
 
-  $recipients_string = '';
-  $body      = '';
+    $recipients_string = '';
+    $body      = '';
 
-  // convert recipients to array of user objects
-  if (!empty($recipients) && is_string($recipients) || is_int($recipients)) {
+    // convert recipients to array of user objects
+    if (!empty($recipients) && is_string($recipients) || is_int($recipients)) {
     $recipients = _privatemsg_generate_user_array($recipients);
-  }
-  elseif (is_object($recipients)) {
+    }
+    elseif (is_object($recipients)) {
     $recipients = array($recipients);
-  }
-  elseif (empty($recipients) && is_string($recipients)) {
+    }
+    elseif (empty($recipients) && is_string($recipients)) {
     $recipients = array();
-  }
+    }
 
-  $usercount = 0;
-  $to = array();
-  $to_themed = array();
-  $blocked = FALSE;
-  foreach ($recipients as $recipient) {
+    $usercount = 0;
+    $to = array();
+    $to_themed = array();
+    $blocked = FALSE;
+    foreach ($recipients as $recipient) {
     if (in_array($recipient->name, $to)) {
-      // We already added the recipient to the list, skip him.
-      continue;
+        // We already added the recipient to the list, skip him.
+        continue;
     }
     // Check if another module is blocking the sending of messages to the recipient by current user.
     $user_blocked = module_invoke_all('privatemsg_block_message', $user, array($recipient->uid => $recipient));
     if (!count($user_blocked) <> 0 && $recipient->uid) {
-      if ($recipient->uid == $user->uid) {
+        if ($recipient->uid == $user->uid) {
         $usercount++;
         // Skip putting author in the recipients list for now.
         continue;
-      }
-      $myuser = user_load(array('uid' => $recipient->uid));
-      $myname = preg_replace("/ /", "\xc2\xa0", $myuser->boincuser_name);
-      $to[] = $myname . "_" . $myuser->boincuser_id;
-      $to_themed[$recipient->uid] = $myname;
+        }
+        $myuser = user_load(array('uid' => $recipient->uid));
+        $myname = preg_replace("/ /", "\xc2\xa0", $myuser->boincuser_name);
+        $to[] = $myname . "_" . $myuser->boincuser_id;
+        $to_themed[$recipient->uid] = $myname;
     }
     else {
-      // Recipient list contains blocked users.
-      $blocked = TRUE;
+        // Recipient list contains blocked users.
+        $blocked = TRUE;
+    }
     }
-  }
 
-  if (empty($to) && $usercount >= 1 && !$blocked) {
+    if (empty($to) && $usercount >= 1 && !$blocked) {
     // Assume the user sent message to own account as if the usercount is one or less, then the user sent a message but not to self.
     $myuser = user_load(array('uid' => $user->uid));
     $myname = preg_replace("/ /", "\xc2\xa0", $myuser->boincuser_name);
     $to[] = $myname . "_" . $myuser->boincuser_id;
     $to_themed[$user->uid] = $myname;
-  }
-  if (!empty($to)) {
+    }
+    if (!empty($to)) {
     $recipients_string = implode(' ', $to);
     $recipients_string .= ' ';
-  }
-  if (isset($form_state['values'])) {
+    }
+    if (isset($form_state['values'])) {
     if (isset($form_state['values']['recipient'])) {
-      $recipients_string = $form_state['values']['recipient'];
+        $recipients_string = $form_state['values']['recipient'];
 
     }
     $subject   = $form_state['values']['subject'];
     $body      = $form_state['values']['body'];
-  }
-  if (!$thread_id && !empty($recipients_string)) {
+    }
+    if (!$thread_id && !empty($recipients_string)) {
     drupal_set_title(t('Write new message to %recipient', array('%recipient' => $recipients_string)));
-  }
-  elseif (!$thread_id) {
+    }
+    elseif (!$thread_id) {
     drupal_set_title(t('Write new message'));
-  }
+    }
 
-  $form = array();
-  if (isset($form_state['privatemsg_preview'])) {
+    $form = array();
+    if (isset($form_state['privatemsg_preview'])) {
     $form['message_header'] = array(
-      '#type' => 'fieldset',
-      '#attributes' => array('class' => 'preview'),
+        '#type' => 'fieldset',
+        '#attributes' => array('class' => 'preview'),
     );
     $form['message_header']['message_preview'] = array(
-      '#value'  => $form_state['privatemsg_preview'],
+        '#value'  => $form_state['privatemsg_preview'],
     );
-  }
-  $form['privatemsg'] = array(
+    }
+    $form['privatemsg'] = array(
     '#type'               => 'fieldset',
     '#access'             => privatemsg_user_access('write privatemsg'),
-  );
-  $form['privatemsg']['author'] = array(
+    );
+    $form['privatemsg']['author'] = array(
     '#type' => 'value',
     '#value' => $user,
-  );
-  if (is_null($thread_id)) {
+    );
+    if (is_null($thread_id)) {
     $form['privatemsg']['recipient'] = array(
-      '#type'               => 'textfield',
-      '#title'              => t('To'),
-      '#description'        => t('Separate multiple names with a space. The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.'),
-      '#default_value'      => $recipients_string,
-      '#required'           => TRUE,
-      '#weight'             => -10,
-      '#size'               => 50,
-      '#autocomplete_path'  => 'messages/user-name-autocomplete',
-      // Do not hardcode #maxlength, make it configurable by number of recipients, not their name length.
+        '#type'               => 'textfield',
+        '#title'              => t('To'),
+        '#description'        => t('Separate multiple names with a space. The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.'),
+        '#default_value'      => $recipients_string,
+        '#required'           => TRUE,
+        '#weight'             => -10,
+        '#size'               => 50,
+        '#autocomplete_path'  => 'messages/user-name-autocomplete',
+        // Do not hardcode #maxlength, make it configurable by number of recipients, not their name length.
     );
-  }
-  $form['privatemsg']['subject'] = array(
+    }
+    $form['privatemsg']['subject'] = array(
     '#type'               => 'textfield',
     '#title'              => t('Subject'),
     '#size'               => 50,
     '#maxlength'          => 255,
     '#default_value'      => $subject,
     '#weight'             => -5,
-  );
-  $form['privatemsg']['body'] = array(
+    );
+    $form['privatemsg']['body'] = array(
     '#type'               => 'textarea',
     '#title'              => t('Message'),
     '#rows'               => 6,
     '#weight'             => 0,
     '#default_value'      => $body,
     '#resizable'          => TRUE,
-  );
-  $format = FILTER_FORMAT_DEFAULT;
-  // The input filter widget looses the format during preview, specify it
-  // explicitly.
-  if (isset($form_state['values']) && array_key_exists('format', $form_state['values'])) {
+    );
+    $format = FILTER_FORMAT_DEFAULT;
+    // The input filter widget looses the format during preview, specify it
+    // explicitly.
+    if (isset($form_state['values']) && array_key_exists('format', $form_state['values'])) {
     $format = $form_state['values']['format'];
-  }
-  $form['privatemsg']['format'] = filter_form($format);
-  $form['privatemsg']['preview'] = array(
+    }
+    $form['privatemsg']['format'] = filter_form($format);
+    $form['privatemsg']['preview'] = array(
     '#type'               => 'submit',
     '#value'              => t('Preview message'),
     '#submit'             => array('pm_preview'),
     '#validate'           => array('pm_send_validate'),
     '#weight'             => 10,
-  );
-  $form['privatemsg']['submit'] = array(
+    );
+    $form['privatemsg']['submit'] = array(
     '#type'               => 'submit',
     '#value'              => t('Send message'),
     '#submit'             => array('pm_send'),
     '#validate'           => array('pm_send_validate'),
     '#weight'             => 15,
-  );
-  $url = 'messages';
-  $title = t('Cancel');
-  if (isset($_REQUEST['destination'])) {
+    );
+    $url = 'messages';
+    $title = t('Cancel');
+    if (isset($_REQUEST['destination'])) {
     $url = $_REQUEST['destination'];
-  }
-  elseif (!is_null($thread_id)) {
+    }
+    elseif (!is_null($thread_id)) {
     $url = $_GET['q'];
     $title = t('Clear');
-  }
+    }
 
-  $form['privatemsg']['cancel'] = array(
+    $form['privatemsg']['cancel'] = array(
     '#value'              => l($title, $url, array('attributes' => array('id' => 'edit-cancel'))),
     '#weight'             => 20,
-  );
+    );
 
-  if (!is_null($thread_id)) {
+    if (!is_null($thread_id)) {
     $form['privatemsg']['thread_id'] = array(
-      '#type' => 'value',
-      '#value' => $thread_id,
+        '#type' => 'value',
+        '#value' => $thread_id,
     );
     $form['privatemsg']['subject'] = array(
-          '#type' => 'value',
-          '#default_value' => $subject,
+            '#type' => 'value',
+            '#default_value' => $subject,
     );
     $recipients_string_themed = implode(', ', $to_themed);
     $form['privatemsg']['recipient_display'] = array(
-      '#value' =>  '<p>'. t('<strong>Reply to thread</strong>:<br /> Recipients: !to', array('!to' => $recipients_string_themed)) .'</p>',
-      '#weight' => -10,
+        '#value' =>  '<p>'. t('<strong>Reply to thread</strong>:<br /> Recipients: !to', array('!to' => $recipients_string_themed)) .'</p>',
+        '#weight' => -10,
     );
     if (empty($recipients_string)) {
-      // If there are no valid recipients, unset the message reply form.
-      $form['privatemsg']['#access'] = FALSE;
+        // If there are no valid recipients, unset the message reply form.
+        $form['privatemsg']['#access'] = FALSE;
+    }
     }
-  }
-  $form['privatemsg']['read_all'] = array(
+    $form['privatemsg']['read_all'] = array(
     '#type'  => 'value',
     '#value' => $read_all,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 function pm_send_validate($form, &$form_state) {
-  // The actual message that is being sent, we create this during validation and pass to submit to send out.
-  $message = $form_state['values'];
-  $message['timestamp'] = time();
-  // Avoid subjects which only consist of a space as these can not be clicked.
-  $message['subject'] = trim($message['subject']);
+    // The actual message that is being sent, we create this during validation and pass to submit to send out.
+    $message = $form_state['values'];
+    $message['timestamp'] = time();
+    // Avoid subjects which only consist of a space as these can not be clicked.
+    $message['subject'] = trim($message['subject']);
 
 
-  $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
-  if (empty($message['subject']) && !empty($trimed_body)) {
+    $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
+    if (empty($message['subject']) && !empty($trimed_body)) {
     $message['subject'] = $trimed_body;
-  }
-  // Only parse the user string for a new thread.
-  if (!isset($message['thread_id'])) {
+    }
+    // Only parse the user string for a new thread.
+    if (!isset($message['thread_id'])) {
     list($message['recipients'], $invalid) = _privatemsg_parse_userstring($message['recipient']);
-  }
-  else {
+    }
+    else {
     // Load participants.
     $message['recipients'] = _privatemsg_load_thread_participants($message['thread_id']);
     // Remove author.
     if (isset($message['recipients'][$message['author']->uid]) && count($message['recipients']) > 1) {
-      unset($message['recipients'][$message['author']->uid]);
+        unset($message['recipients'][$message['author']->uid]);
     }
-  }
-  $validated = _privatemsg_validate_message($message, TRUE);
-  foreach ($validated['messages'] as $type => $text) {
+    }
+    $validated = _privatemsg_validate_message($message, TRUE);
+    foreach ($validated['messages'] as $type => $text) {
     drupal_set_message($text, $type);
-  }
-  $form_state['validate_built_message'] = $message;
-  if (!empty($invalid)) {
+    }
+    $form_state['validate_built_message'] = $message;
+    if (!empty($invalid)) {
     drupal_set_message(t('The following users will not receive this private message: @invalid', array('@invalid' => implode(", ", $invalid))), 'error');
-  }
+    }
 }
 
 /**
@@ -1064,15 +1063,15 @@ 
  *   Thread ID for wich the participants should be loaded.
  */
 function _privatemsg_load_thread_participants($thread_id) {
-  $query = _privatemsg_assemble_query('participants', $thread_id);
-  $result = db_query($query['query']);
-  $participants = array();
-  while ($uid = db_fetch_object($result)) {
+    $query = _privatemsg_assemble_query('participants', $thread_id);
+    $result = db_query($query['query']);
+    $participants = array();
+    while ($uid = db_fetch_object($result)) {
     if (($recipient = user_load($uid->uid))) {
-      $participants[$recipient->uid] = $recipient;
+        $participants[$recipient->uid] = $recipient;
+    }
     }
-  }
-  return $participants;
+    return $participants;
 }
 
 /**
@@ -1088,67 +1087,67 @@ 
  *   with invalid names.
  */
 function _privatemsg_parse_userstring($input) {
-  if (is_string($input)) {
+    if (is_string($input)) {
     $input = explode(' ', $input);
-  }
+    }
 
-  // Start working through the input array.
-  $invalid = array();
-  $recipients = array();
-  foreach ($input as $string) {
+    // Start working through the input array.
+    $invalid = array();
+    $recipients = array();
+    foreach ($input as $string) {
     $string = trim($string);
     if (!empty($string)) { // We don't care about white space names.
 
-      // First, check if another module is able to resolve the string into an
-      // user object.
-      foreach (module_implements('privatemsg_name_lookup') as $module) {
+        // First, check if another module is able to resolve the string into an
+        // user object.
+        foreach (module_implements('privatemsg_name_lookup') as $module) {
         $function = $module . '_privatemsg_name_lookup';
         if (($recipient = $function($string)) && is_object($recipient)) {
-          // If there is a match, continue with the next input string.
-          $recipients[$recipient->uid] = $recipient;
-          continue 2;
+            // If there is a match, continue with the next input string.
+            $recipients[$recipient->uid] = $recipient;
+            continue 2;
         }
-      }
-      // Fall back to the default username lookup.
-      if (!$error = module_invoke('user', 'validate_name', $string)) {
+        }
+        // Fall back to the default username lookup.
+        if (!$error = module_invoke('user', 'validate_name', $string)) {
         // String is a valid username, look it up.
         if ($recipient = user_load(array('name' => $string))) {
-          $recipients[$recipient->uid] = $recipient;
-          continue;
+            $recipients[$recipient->uid] = $recipient;
+            continue;
+        }
         }
-      }
-      $invalid[$string] = $string;
+        $invalid[$string] = $string;
     }
-  }
-  return array($recipients, $invalid);
+    }
+    return array($recipients, $invalid);
 }
 
 /**
  * Submit callback for the privatemsg_new form.
  */
 function pm_send($form, &$form_state) {
-  $status = _privatemsg_send($form_state['validate_built_message']);
-  // Load usernames to which the message was sent to.
-  $recipient_names = array();
-  foreach ($form_state['validate_built_message']['recipients'] as $recipient) {
+    $status = _privatemsg_send($form_state['validate_built_message']);
+    // Load usernames to which the message was sent to.
+    $recipient_names = array();
+    foreach ($form_state['validate_built_message']['recipients'] as $recipient) {
     $recipient_names[] = theme('username', $recipient);
-  }
-  if ($status !== FALSE )  {
+    }
+    if ($status !== FALSE )  {
     drupal_set_message(t('A message has been sent to !recipients.', array('!recipients' => implode(', ', $recipient_names))));
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('An attempt to send a message <em>may have failed</em> when sending to !recipients.', array('!recipients' => implode(', ', $recipient_names))), 'error');
-  }
+    }
 }
 
 function pm_preview($form, &$form_state) {
 
     drupal_validate_form($form['form_id']['#value'], $form, $form_state);
     if (!form_get_errors()) {
-      $form_state['privatemsg_preview'] = theme('privatemsg_view', $form_state['validate_built_message']);
+        $form_state['privatemsg_preview'] = theme('privatemsg_view', $form_state['validate_built_message']);
     }
 
-  $form_state['rebuild'] = TRUE; // this forces our form to be rebuilt instead of being submitted.
+    $form_state['rebuild'] = TRUE; // this forces our form to be rebuilt instead of being submitted.
 }
 
 /**
@@ -1169,65 +1168,65 @@ 
  */
 
 function privatemsg_sql_list(&$fragments, $account, $argument = 'list') {
-  $fragments['primary_table'] = '{pm_message} pm';
-
-  // Load enabled columns.
-  $fields = array_filter(variable_get('privatemsg_display_fields', array('participants')));
-
-  // Required columns.
-  $fragments['select'][]      = 'pmi.thread_id';
-  // We have to use MIN as the subject might not be the same in some threads.
-  // MIN() does not have a useful meaning except that it helps to correctly
-  // aggregate the thread on PostgreSQL.
-  $fragments['select'][]      = 'MIN(pm.subject) as subject';
-  $fragments['select'][]      = 'MAX(pm.timestamp) as last_updated';
-  // We use SUM so that we can count the number of unread messages.
-  $fragments['select'][]      = 'SUM(pmi.is_new) as is_new';
-
-  // Select number of messages in the thread if the count is
-  // set to be displayed.
-  if (in_array('count', $fields)) {
+    $fragments['primary_table'] = '{pm_message} pm';
+
+    // Load enabled columns.
+    $fields = array_filter(variable_get('privatemsg_display_fields', array('participants')));
+
+    // Required columns.
+    $fragments['select'][]      = 'pmi.thread_id';
+    // We have to use MIN as the subject might not be the same in some threads.
+    // MIN() does not have a useful meaning except that it helps to correctly
+    // aggregate the thread on PostgreSQL.
+    $fragments['select'][]      = 'MIN(pm.subject) as subject';
+    $fragments['select'][]      = 'MAX(pm.timestamp) as last_updated';
+    // We use SUM so that we can count the number of unread messages.
+    $fragments['select'][]      = 'SUM(pmi.is_new) as is_new';
+
+    // Select number of messages in the thread if the count is
+    // set to be displayed.
+    if (in_array('count', $fields)) {
     $fragments['select'][]      = 'COUNT(distinct pmi.mid) as count';
-  }
-  if (in_array('participants', $fields)) {
+    }
+    if (in_array('participants', $fields)) {
     // Query for a string with uid's, for example "1,6,7".
     // @todo: Replace this with a single query similiar to the tag list.
     if ($GLOBALS['db_type'] == 'pgsql') {
-      // PostgreSQL does not know GROUP_CONCAT, so a subquery is required.
-      $fragments['select'][]      = "array_to_string(array(SELECT DISTINCT textin(int4out(pmia.uid))
+        // PostgreSQL does not know GROUP_CONCAT, so a subquery is required.
+        $fragments['select'][]      = "array_to_string(array(SELECT DISTINCT textin(int4out(pmia.uid))
                                                             FROM {pm_index} pmia
                                                             WHERE pmia.thread_id = pmi.thread_id), ',') AS participants";
     }
     else {
-      $fragments['select'][]      = '(SELECT GROUP_CONCAT(DISTINCT pmia.uid SEPARATOR ",")
+        $fragments['select'][]      = '(SELECT GROUP_CONCAT(DISTINCT pmia.uid SEPARATOR ",")
                                                             FROM {pm_index} pmia
                                                             WHERE pmia.thread_id = pmi.thread_id) AS participants';
     }
-  }
-  if (in_array('thread_started', $fields)) {
+    }
+    if (in_array('thread_started', $fields)) {
     $fragments['select'][]      = 'MIN(pm.timestamp) as thread_started';
-  }
+    }
 
-  $fragments['inner_join'][]  = 'INNER JOIN {pm_index} pmi ON pm.mid = pmi.mid';
+    $fragments['inner_join'][]  = 'INNER JOIN {pm_index} pmi ON pm.mid = pmi.mid';
 
-  // Only load undeleted messages of the current user and group by thread.
-  $fragments['where'][]       = 'pmi.uid = %d';
-  $fragments['query_args']['where'][]  = $account->uid;
-  $fragments['where'][]       = 'pmi.deleted = 0';
-  $fragments['group_by'][]    = 'pmi.thread_id';
+    // Only load undeleted messages of the current user and group by thread.
+    $fragments['where'][]       = 'pmi.uid = %d';
+    $fragments['query_args']['where'][]  = $account->uid;
+    $fragments['where'][]       = 'pmi.deleted = 0';
+    $fragments['group_by'][]    = 'pmi.thread_id';
 
-  $order_by_first = 'MAX(pmi.is_new) DESC, ';
-  // MySQL 4.1 does not allow to order by aggregate functions. MAX() is used
-  // to avoid a ordering bug with multiple new messages.
-  if ($GLOBALS['db_type'] != 'pgsql' && version_compare(db_version(), '5.0.0') < 0) {
+    $order_by_first = 'MAX(pmi.is_new) DESC, ';
+    // MySQL 4.1 does not allow to order by aggregate functions. MAX() is used
+    // to avoid a ordering bug with multiple new messages.
+    if ($GLOBALS['db_type'] != 'pgsql' && version_compare(db_version(), '5.0.0') < 0) {
     $order_by_first = 'is_new DESC, ';
-  }
+    }
 
-  // tablesort_sql() generates a ORDER BY string. However, the "ORDER BY " part 
-  // is not needed and added by the query builder. Discard the first 9
-  // characters of the string.
-  $order_by = drupal_substr(tablesort_sql(_privatemsg_list_headers( FALSE, array_merge(array('subject', 'last_updated'), $fields)), $order_by_first), 9);
-  $fragments['order_by'][]  = $order_by;
+    // tablesort_sql() generates a ORDER BY string. However, the "ORDER BY " part 
+    // is not needed and added by the query builder. Discard the first 9
+    // characters of the string.
+    $order_by = drupal_substr(tablesort_sql(_privatemsg_list_headers( FALSE, array_merge(array('subject', 'last_updated'), $fields)), $order_by_first), 9);
+    $fragments['order_by'][]  = $order_by;
 }
 
 /**
@@ -1241,27 +1240,27 @@ 
  *   Account for which the messages should be loaded.
  */
 function privatemsg_sql_load(&$fragments, $pmids, $account = NULL) {
-  $fragments['primary_table'] = '{pm_message} pm';
-
-  $fragments['select'][]      = "pm.mid";
-  $fragments['select'][]      = "pm.author";
-  $fragments['select'][]      = "pm.subject";
-  $fragments['select'][]      = "pm.body";
-  $fragments['select'][]      = "pm.timestamp";
-  $fragments['select'][]      = "pm.format";
-  $fragments['select'][]      = "pmi.is_new";
-  $fragments['select'][]      = "pmi.thread_id";
-
-  $fragments['inner_join'][]  = 'INNER JOIN {pm_index} pmi ON pm.mid = pmi.mid';
-  // Use IN() to load multiple messages at the same time.
-  $fragments['where'][]       = 'pmi.mid IN (' . db_placeholders($pmids) . ')';
-  $fragments['query_args']['where']  += $pmids;
-  if ($account) {
+    $fragments['primary_table'] = '{pm_message} pm';
+
+    $fragments['select'][]      = "pm.mid";
+    $fragments['select'][]      = "pm.author";
+    $fragments['select'][]      = "pm.subject";
+    $fragments['select'][]      = "pm.body";
+    $fragments['select'][]      = "pm.timestamp";
+    $fragments['select'][]      = "pm.format";
+    $fragments['select'][]      = "pmi.is_new";
+    $fragments['select'][]      = "pmi.thread_id";
+
+    $fragments['inner_join'][]  = 'INNER JOIN {pm_index} pmi ON pm.mid = pmi.mid';
+    // Use IN() to load multiple messages at the same time.
+    $fragments['where'][]       = 'pmi.mid IN (' . db_placeholders($pmids) . ')';
+    $fragments['query_args']['where']  += $pmids;
+    if ($account) {
     $fragments['where'][]       = 'pmi.uid = %d';
     $fragments['query_args']['where'][]  = $account->uid;
-  }
-  $fragments['order_by'][] = 'pm.timestamp ASC';
-  $fragments['order_by'][] = 'pm.mid ASC';
+    }
+    $fragments['order_by'][] = 'pm.timestamp ASC';
+    $fragments['order_by'][] = 'pm.mid ASC';
 }
 
 /**
@@ -1277,30 +1276,30 @@ 
  *   Deleted messages are only loaded if this is set to TRUE.
  */
 function privatemsg_sql_messages(&$fragments, $threads, $account = NULL, $load_all = FALSE) {
-  $fragments['primary_table'] = '{pm_index} pmi';
+    $fragments['primary_table'] = '{pm_index} pmi';
 
-  $fragments['select'][]      = 'pmi.mid';
-  $fragments['where'][]       = 'pmi.thread_id IN ('. db_placeholders($threads) .')';
-  $fragments['query_args']['where']   += $threads;
-  $fragments['inner_join'][]  = 'INNER JOIN {pm_message} pm ON (pm.mid = pmi.mid)';
-  if ($account) {
+    $fragments['select'][]      = 'pmi.mid';
+    $fragments['where'][]       = 'pmi.thread_id IN ('. db_placeholders($threads) .')';
+    $fragments['query_args']['where']   += $threads;
+    $fragments['inner_join'][]  = 'INNER JOIN {pm_message} pm ON (pm.mid = pmi.mid)';
+    if ($account) {
     // Only load the user's messages.
     $fragments['where'][]     = 'pmi.uid = %d';
     $fragments['query_args']['where'][]  = $account->uid;
-  }
-  if (!$load_all) {
+    }
+    if (!$load_all) {
     // Also load deleted messages when requested.
     $fragments['where'][]     = 'pmi.deleted = 0';
-  }
-  // Only load each mid once.
-  $fragments['group_by'][]    = 'pmi.mid';
-  $fragments['group_by'][]    = 'pm.timestamp';
+    }
+    // Only load each mid once.
+    $fragments['group_by'][]    = 'pmi.mid';
+    $fragments['group_by'][]    = 'pm.timestamp';
 
-  // Order by timestamp first.
-  $fragments['order_by'][]    = 'pm.timestamp ASC';
-  // If there are multiple inserts during the same second (tests, for example)
-  // sort by mid second to have them in the same order as they were saved.
-  $fragments['order_by'][]    = 'pmi.mid ASC';
+    // Order by timestamp first.
+    $fragments['order_by'][]    = 'pm.timestamp ASC';
+    // If there are multiple inserts during the same second (tests, for example)
+    // sort by mid second to have them in the same order as they were saved.
+    $fragments['order_by'][]    = 'pmi.mid ASC';
 
 }
 
@@ -1313,16 +1312,16 @@ 
  *   Thread id from which the participants should be loaded.
  */
 function privatemsg_sql_participants(&$fragments, $thread_id) {
-  $fragments['primary_table'] = '{pm_index} pmi';
+    $fragments['primary_table'] = '{pm_index} pmi';
 
-  // Only load each participant once since they are listed as recipient for
-  // every message of that thread.
-  $fragments['select'][]      = 'DISTINCT(pmi.uid) AS uid';
-  $fragments['select'][]      = 'u.name AS name';
+    // Only load each participant once since they are listed as recipient for
+    // every message of that thread.
+    $fragments['select'][]      = 'DISTINCT(pmi.uid) AS uid';
+    $fragments['select'][]      = 'u.name AS name';
 
-  $fragments['inner_join'][]  = 'INNER JOIN {users} u ON (u.uid = pmi.uid)';
-  $fragments['where'][]       = 'pmi.thread_id = %d';
-  $fragments['query_args']['where'][]  = $thread_id;
+    $fragments['inner_join'][]  = 'INNER JOIN {users} u ON (u.uid = pmi.uid)';
+    $fragments['where'][]       = 'pmi.thread_id = %d';
+    $fragments['query_args']['where'][]  = $thread_id;
 }
 
 /**
@@ -1334,15 +1333,15 @@ 
  *   User object for which the messages are being counted.
  */
 function privatemsg_sql_unread_count(&$fragments, $account) {
-  $fragments['primary_table'] = '{pm_index} pmi';
+    $fragments['primary_table'] = '{pm_index} pmi';
 
-  $fragments['select'][]      = 'COUNT(DISTINCT thread_id) as unread_count';
+    $fragments['select'][]      = 'COUNT(DISTINCT thread_id) as unread_count';
 
-  // Only count new messages that have not been deleted.
-  $fragments['where'][]       = 'pmi.deleted = 0';
-  $fragments['where'][]       = 'pmi.is_new = 1';
-  $fragments['where'][]       = 'pmi.uid = %d';
-  $fragments['query_args']['where'][]  = $account->uid;
+    // Only count new messages that have not been deleted.
+    $fragments['where'][]       = 'pmi.deleted = 0';
+    $fragments['where'][]       = 'pmi.is_new = 1';
+    $fragments['where'][]       = 'pmi.uid = %d';
+    $fragments['query_args']['where'][]  = $account->uid;
 }
 
 /**
@@ -1356,27 +1355,27 @@ 
  *   Array of names not to be used as suggestions.
  */
 function privatemsg_sql_autocomplete(&$fragments, $search, $names) {
-  // Select users from BOINC user table by name and id. The id is
-  // unique.
-  $fragments['primary_table'] = '{user} u';
-  $fragments['select'][] = 'u.name,u.id';
-  // Escape the % to get it through the placeholder replacement.
-  $fragments['where'][] = "u.name LIKE '%s'";
-  $fragments['query_args']['where'][] = $search .'%%';
-  if (!empty($names)) {
+    // Select users from BOINC user table by name and id. The id is
+    // unique.
+    $fragments['primary_table'] = '{user} u';
+    $fragments['select'][] = 'u.name,u.id';
+    // Escape the % to get it through the placeholder replacement.
+    $fragments['where'][] = "u.name LIKE '%s'";
+    $fragments['query_args']['where'][] = $search .'%%';
+    if (!empty($names)) {
     // If there are already names selected, exclude them from the
     // suggestions. Extract the BOINC ids from the names array, and
     // use to remove query results.
     $ids = array();
     foreach ($names as $name) {
-      $boincid = substr($name, strrpos($name, '_') + 1);
-      $ids[$boincid] = $boincid;
+        $boincid = substr($name, strrpos($name, '_') + 1);
+        $ids[$boincid] = $boincid;
     }
     $fragments['where'][] = "u.id NOT IN (". db_placeholders($ids, 'int') .")";
     $fragments['query_args']['where'] += $ids;
-  }
-  // Only load active users and sort them by name.
-  $fragments['order_by'][] = 'u.name ASC';
+    }
+    // Only load active users and sort them by name.
+    $fragments['order_by'][] = 'u.name ASC';
 }
 
 /**
@@ -1388,24 +1387,24 @@ 
  *   Select messages older than x days.
  */
 function privatemsg_sql_deleted(&$fragments, $days) {
-  $fragments['primary_table'] = '{pm_message} pm';
+    $fragments['primary_table'] = '{pm_message} pm';
 
-  $fragments['select'][] = 'pm.mid';
-  // The lowest value is higher than 0 if all recipients have deleted a message.
-  $fragments['select'][] = 'MIN(pmi.deleted) as is_deleted';
-  // The time the most recent deletion happened.
-  $fragments['select'][] = 'MAX(pmi.deleted) as last_deleted';
+    $fragments['select'][] = 'pm.mid';
+    // The lowest value is higher than 0 if all recipients have deleted a message.
+    $fragments['select'][] = 'MIN(pmi.deleted) as is_deleted';
+    // The time the most recent deletion happened.
+    $fragments['select'][] = 'MAX(pmi.deleted) as last_deleted';
 
-  $fragments['inner_join'][] = 'INNER JOIN {pm_index} pmi ON (pmi.mid = pm.mid)';
+    $fragments['inner_join'][] = 'INNER JOIN {pm_index} pmi ON (pmi.mid = pm.mid)';
 
-  $fragments['group_by'][] = 'pm.mid';
+    $fragments['group_by'][] = 'pm.mid';
 
-  // Ignore messages that have not been deleted by all users.
-  $fragments['having'][] = 'MIN(pmi.deleted) > 0';
+    // Ignore messages that have not been deleted by all users.
+    $fragments['having'][] = 'MIN(pmi.deleted) > 0';
 
-  // Only select messages that have been deleted more than n days ago.
-  $fragments['having'][] = 'MAX(pmi.deleted) < %d';
-  $fragments['query_args']['having'][] = time() - $days * 86400;
+    // Only select messages that have been deleted more than n days ago.
+    $fragments['having'][] = 'MAX(pmi.deleted) < %d';
+    $fragments['query_args']['having'][] = time() - $days * 86400;
 }
 
 /**
@@ -1418,19 +1417,19 @@ 
  * Prevents usernames from being used and/or suggested twice.
  */
 function privatemsg_user_name_autocomplete($string) {
-  $names = array();
-  // 1: Parse $string and build list of valid user names.
-  $fragments = explode(' ', $string);
-  foreach ($fragments as $index => $name) {
+    $names = array();
+    // 1: Parse $string and build list of valid user names.
+    $fragments = explode(' ', $string);
+    foreach ($fragments as $index => $name) {
     if ($name = trim($name)) {
-      $names[$name] = $name;
-    }
-  }
-  // By using user_validate_user we can ensure that names included in $names are at least logisticaly possible.
-  // 2: Find the next user name suggestion.
-  $fragment = array_pop($names);
-  $matches = array();
-  if (!empty($fragment)) {
+        $names[$name] = $name;
+    }
+    }
+    // By using user_validate_user we can ensure that names included in $names are at least logisticaly possible.
+    // 2: Find the next user name suggestion.
+    $fragment = array_pop($names);
+    $matches = array();
+    if (!empty($fragment)) {
     $query = _privatemsg_assemble_query('autocomplete', $fragment, $names);
     db_set_active('boinc');
     $result = db_query_range($query['query'], $fragment, 0, 10);
@@ -1438,175 +1437,175 @@ 
     $prefix = count($names) ? implode(' ', $names) . ' ' : '';
     // 3: Build proper suggestions and print.
     while ($user = db_fetch_object($result)) {
-      $myname = preg_replace("/ /", "\xc2\xa0", $user->name);
-      $matches[$prefix . $myname . "_" . $user->id . ' '] = htmlentities($myname) . '(' . $user->id . ')';
+        $myname = preg_replace("/ /", "\xc2\xa0", $user->name);
+        $matches[$prefix . $myname . "_" . $user->id . ' '] = htmlentities($myname) . '(' . $user->id . ')';
     }
-  }
-  // convert to object to prevent drupal bug, see http://drupal.org/node/175361
-  drupal_json((object)$matches);
+    }
+    // convert to object to prevent drupal bug, see http://drupal.org/node/175361
+    drupal_json((object)$matches);
 }
 
 function privatemsg_user($op, &$edit, &$account, $category = NULL) {
-  global $user;
+    global $user;
 
-  switch ($op) {
+    switch ($op) {
     case 'view':
       if ($url = privatemsg_get_link(array($account))) {
         $account->content['privatemsg_send_new_message'] = array(
-          '#type'   => 'markup',
-          '#value'  => l(t('Send this user a message'), $url, array('query' => drupal_get_destination())),
-          '#weight' => 10,
+            '#type'   => 'markup',
+            '#value'  => l(t('Send this user a message'), $url, array('query' => drupal_get_destination())),
+            '#weight' => 10,
         );
-      }
-      break;
+        }
+        break;
     case 'login':
       if (variable_get('privatemsg_display_loginmessage', TRUE) && privatemsg_user_access()) {
         $count = privatemsg_unread_count();
         if ($count) {
-          drupal_set_message(format_plural($count, 'You have <a href="@messages">1 unread message</a>.', 'You have <a href="@messages">@count unread messages</a>', array('@messages' => url('messages'))));
+            drupal_set_message(format_plural($count, 'You have <a href="@messages">1 unread message</a>.', 'You have <a href="@messages">@count unread messages</a>', array('@messages' => url('messages'))));
         }
-      }
-      break;
+        }
+        break;
     case 'delete':
 
       // Load all mids of the messages the user wrote.
       $result = db_query("SELECT mid FROM {pm_message} WHERE author = %d", $account->uid);
-      $mids = array();
-      while ($row = db_fetch_array($result)) {
+        $mids = array();
+        while ($row = db_fetch_array($result)) {
         $mids[] = $row['mid'];
-      }
+        }
 
-      // Delete messages the user wrote.
-      db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
+        // Delete messages the user wrote.
+        db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
 
-      if (!empty($mids)) {
+        if (!empty($mids)) {
         // Delete recipient entries in {pm_index} of the messages the user wrote.
         db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
-      }
+        }
 
-      // Delete recipient entries of that user.
-      db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
-      break;
-  }
+        // Delete recipient entries of that user.
+        db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
+        break;
+    }
 }
 
 function privatemsg_block($op = 'list', $delta = 0, $edit = array()) {
-  if ('list' == $op) {
+    if ('list' == $op) {
     $blocks = array();
     $blocks['privatemsg-menu'] = array(
-      'info' => t('Privatemsg links'),
-      'cache' => BLOCK_NO_CACHE,
+        'info' => t('Privatemsg links'),
+        'cache' => BLOCK_NO_CACHE,
     );
     $blocks['privatemsg-new'] = array(
-      'info' => t('New message indication'),
-      'cache' => BLOCK_NO_CACHE,
+        'info' => t('New message indication'),
+        'cache' => BLOCK_NO_CACHE,
     );
 
     return $blocks;
-  }
-  elseif ('view' == $op) {
+    }
+    elseif ('view' == $op) {
     $block = array();
     switch ($delta) {
-      case 'privatemsg-menu':
+        case 'privatemsg-menu':
         $block = _privatemsg_block_menu();
         break;
-      case 'privatemsg-new':
+        case 'privatemsg-new':
         $block = _privatemsg_block_new();
         break;
     }
     return $block;
-  }
+    }
 }
 
 function privatemsg_title_callback($title = NULL) {
-  $count = privatemsg_unread_count();
+    $count = privatemsg_unread_count();
 
-  if ($count > 0) {
+    if ($count > 0) {
     return format_plural($count, 'Messages (1 new)', 'Messages (@count new)');
-  }
-  return t('Messages');
+    }
+    return t('Messages');
 }
 
 
 function _privatemsg_block_new() {
-  $block = array();
+    $block = array();
 
-  if (!privatemsg_user_access()) {
+    if (!privatemsg_user_access()) {
     return $block;
-  }
+    }
 
-  $count = privatemsg_unread_count();
-  if ($count) {
+    $count = privatemsg_unread_count();
+    if ($count) {
     $block = array(
-      'subject' => format_plural($count, 'New message', 'New messages'),
-      'content' => theme('privatemsg_new_block', $count),
+        'subject' => format_plural($count, 'New message', 'New messages'),
+        'content' => theme('privatemsg_new_block', $count),
     );
     return $block;
-  }
-  return array();
+    }
+    return array();
 }
 
 function _privatemsg_block_menu() {
-  $block = array();
+    $block = array();
 
-  $links = array();
-  if (privatemsg_user_access('write privatemsg')) {
+    $links = array();
+    if (privatemsg_user_access('write privatemsg')) {
     $links[] = l(t('Write new message'), 'messages/new');
-  }
-  if (privatemsg_user_access('read privatemsg') || privatemsg_user_access('read all private messages') ) {
+    }
+    if (privatemsg_user_access('read privatemsg') || privatemsg_user_access('read all private messages') ) {
     $links[] = l(privatemsg_title_callback(), 'messages');
-  }
-  if ( count( $links ) ) {
+    }
+    if ( count( $links ) ) {
     $block = array(
-      'subject' => t('Private messages'),
-      'content' => theme('item_list', $links),
+        'subject' => t('Private messages'),
+        'content' => theme('item_list', $links),
     );
-  }
-  return $block;
+    }
+    return $block;
 }
 
 function privatemsg_delete($form_state, $thread, $message) {
-  $form['pmid'] = array(
+    $form['pmid'] = array(
     '#type' => 'value',
     '#value' => $message['mid'],
-  );
-  $form['delete_destination'] = array(
+    );
+    $form['delete_destination'] = array(
     '#type' => 'value',
     '#value' => count($thread['messages']) > 1 ? 'messages/view/' . $message['thread_id'] : 'messages',
-  );
+    );
 
-  if (privatemsg_user_access('read all private messages')) {
+    if (privatemsg_user_access('read all private messages')) {
     $form['delete_options'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Delete this message for all users?'),
-      '#description' => t('Tick the box to delete the message for all users.'),
-      '#default_value' => FALSE,
+        '#type' => 'checkbox',
+        '#title' => t('Delete this message for all users?'),
+        '#description' => t('Tick the box to delete the message for all users.'),
+        '#default_value' => FALSE,
     );
-  }
-  return confirm_form($form,
+    }
+    return confirm_form($form,
     t('Are you sure you want to delete this message?'),
     isset($_GET['destination']) ? $_GET['destination'] : 'messages/view/'. $message['thread_id'],
     t('This action cannot be undone.'),
     t('Delete'),
     t('Cancel')
-  );
+    );
 }
 
 function privatemsg_delete_submit($form, &$form_state) {
-  global $user;
-  $account = drupal_clone($user);
+    global $user;
+    $account = drupal_clone($user);
 
-  if ($form_state['values']['confirm']) {
+    if ($form_state['values']['confirm']) {
     if (isset($form_state['values']['delete_options']) && $form_state['values']['delete_options']) {
-      privatemsg_message_change_delete($form_state['values']['pmid'], 1);
-      drupal_set_message(t('Message has been deleted for all users.'));
+        privatemsg_message_change_delete($form_state['values']['pmid'], 1);
+        drupal_set_message(t('Message has been deleted for all users.'));
     }
     else {
-      privatemsg_message_change_delete($form_state['values']['pmid'], 1, $account);
-      drupal_set_message(t('Message has been deleted.'));
+        privatemsg_message_change_delete($form_state['values']['pmid'], 1, $account);
+        drupal_set_message(t('Message has been deleted.'));
     }
-  }
-  $form_state['redirect'] = $form_state['values']['delete_destination'];
+    }
+    $form_state['redirect'] = $form_state['values']['delete_destination'];
 }
 
 /**
@@ -1623,18 +1622,18 @@ 
  * @ingroup api
  */
 function privatemsg_message_change_delete($pmid, $delete, $account = NULL) {
-  $delete_value = 0;
-  if ($delete == TRUE) {
+    $delete_value = 0;
+    if ($delete == TRUE) {
     $delete_value = time();
-  }
+    }
 
-  if ($account) {
+    if ($account) {
     db_query('UPDATE {pm_index} SET deleted = %d WHERE mid = %d AND uid = %d', $delete_value, $pmid, $account->uid);
-  }
-  else {
+    }
+    else {
     // Mark deleted for all users.
     db_query('UPDATE {pm_index} SET deleted = %d WHERE mid = %d', $delete_value, $pmid);
-  }
+    }
 }
 
 /**
@@ -1677,35 +1676,35 @@ 
  * @ingroup api
  */
 function privatemsg_new_thread($recipients, $subject, $body = NULL, $options = array()) {
-  global $user;
-  $author = drupal_clone($user);
-
-  $message = array();
-  $message['subject'] = $subject;
-  $message['body'] = $body;
-  // Make sure that recipients are keyed by user id and are not added
-  // multiple times.
-  foreach ($recipients as $recipient) {
+    global $user;
+    $author = drupal_clone($user);
+
+    $message = array();
+    $message['subject'] = $subject;
+    $message['body'] = $body;
+    // Make sure that recipients are keyed by user id and are not added
+    // multiple times.
+    foreach ($recipients as $recipient) {
     $message['recipients'][$recipient->uid] = $recipient;
-  }
+    }
 
-  // Set custom options, if any.
-  if (!empty($options)) {
+    // Set custom options, if any.
+    if (!empty($options)) {
     $message += $options;
-  }
-  // Apply defaults - this will not overwrite existing keys.
-  $message += array(
+    }
+    // Apply defaults - this will not overwrite existing keys.
+    $message += array(
     'author' => $author,
     'timestamp' => time(),
     'format' => filter_resolve_format(FILTER_FORMAT_DEFAULT),
-  );
+    );
 
-  $validated = _privatemsg_validate_message($message);
-  if ($validated['success']) {
+    $validated = _privatemsg_validate_message($message);
+    if ($validated['success']) {
     $validated['message'] = _privatemsg_send($message);
-  }
+    }
 
-  return $validated;
+    return $validated;
 }
 
 /**
@@ -1742,144 +1741,144 @@ 
  * @ingroup api
  */
 function privatemsg_reply($thread_id, $body, $options = array()) {
-  global $user;
-  $author = drupal_clone($user);
+    global $user;
+    $author = drupal_clone($user);
 
-  $message = array();
-  $message['body'] = $body;
+    $message = array();
+    $message['body'] = $body;
 
-  // set custom options, if any
-  if (!empty($options)) {
+    // set custom options, if any
+    if (!empty($options)) {
     $message += $options;
-  }
-  // apply defaults
-  $message += array(
+    }
+    // apply defaults
+    $message += array(
     'author' => $author,
     'timestamp' => time(),
     'format' => filter_resolve_format(FILTER_FORMAT_DEFAULT),
-  );
+    );
 
-  // We don't know the subject and the recipients, so we need to load them..
-  // thread_id == mid on the first message of the thread
-  $first_message = privatemsg_message_load($thread_id, $message['author']);
-  if (!$first_message) {
+    // We don't know the subject and the recipients, so we need to load them..
+    // thread_id == mid on the first message of the thread
+    $first_message = privatemsg_message_load($thread_id, $message['author']);
+    if (!$first_message) {
     return array(t('Thread %thread_id not found, unable to answer', array('%thread_id' => $thread_id)));
-  }
+    }
 
-  $message['thread_id'] = $thread_id;
-  // Load participants.
-  $message['recipients'] = _privatemsg_load_thread_participants($thread_id);
-  // Remove author.
-  if (isset($message['recipients'][$message['author']->uid]) && count($message['recipients']) > 1) {
+    $message['thread_id'] = $thread_id;
+    // Load participants.
+    $message['recipients'] = _privatemsg_load_thread_participants($thread_id);
+    // Remove author.
+    if (isset($message['recipients'][$message['author']->uid]) && count($message['recipients']) > 1) {
     unset($message['recipients'][$message['author']->uid]);
-  }
-  $message['subject'] = $first_message['subject'];
+    }
+    $message['subject'] = $first_message['subject'];
 
-  $validated = _privatemsg_validate_message($message);
-  if ($validated['success']) {
+    $validated = _privatemsg_validate_message($message);
+    if ($validated['success']) {
     $validated['message'] = _privatemsg_send($message);
-  }
-  return $validated;
+    }
+    return $validated;
 }
 
 function _privatemsg_validate_message(&$message, $form = FALSE) {
-  $messages = array('error' => array(), 'warning' => array());
-  if (!privatemsg_user_access('write privatemsg', $message['author'])) {
+    $messages = array('error' => array(), 'warning' => array());
+    if (!privatemsg_user_access('write privatemsg', $message['author'])) {
     // no need to do further checks in this case...
     if ($form) {
-      form_set_error('author', t('User @user is not allowed to write messages', array('@user' => $message['author']->name)));
-      return array(
+        form_set_error('author', t('User @user is not allowed to write messages', array('@user' => $message['author']->name)));
+        return array(
         'success'  => FALSE,
         'messages'   => $messages,
-      );
+        );
     }
     else {
-      $messages['error'][] = t('User @user is not allowed to write messages', array('@user' => $message['author']->name));
-      return array(
-         'success'  => FALSE,
-         'messages'   => $messages,
-      );
+        $messages['error'][] = t('User @user is not allowed to write messages', array('@user' => $message['author']->name));
+        return array(
+            'success'  => FALSE,
+            'messages'   => $messages,
+        );
+    }
     }
-  }
 
-  // Prevent subjects which only consist of a space as these can not be clicked.
-  $message['subject'] = trim($message['subject']);
-  if (empty($message['subject'])) {
+    // Prevent subjects which only consist of a space as these can not be clicked.
+    $message['subject'] = trim($message['subject']);
+    if (empty($message['subject'])) {
     if ($form) {
-      form_set_error('subject', t('Disallowed to send a message without subject'));
+        form_set_error('subject', t('Disallowed to send a message without subject'));
     }
     else {
-      $messages['error'][] = t('Disallowed to send a message without subject');
+        $messages['error'][] = t('Disallowed to send a message without subject');
+    }
     }
-  }
 
-  // Don't allow replies without a body.
-  if (!empty($message['thread_id']) && ($message['body'] === NULL || $message['body'] === '') ) {
+    // Don't allow replies without a body.
+    if (!empty($message['thread_id']) && ($message['body'] === NULL || $message['body'] === '') ) {
     if ($form) {
-      form_set_error('body', t('Disallowed to send reply without a message.'));
+        form_set_error('body', t('Disallowed to send reply without a message.'));
     }
     else {
-      $messages['error'][] = t('Disallowed to send reply without a message.');
+        $messages['error'][] = t('Disallowed to send reply without a message.');
+    }
     }
-  }
-  // Check if an allowed format is used. global $user needs to be changed since
-  // it is not possible to do the check for a specific user.
-  global $user;
-  $original_user = drupal_clone($user);
-  session_save_session(FALSE);
-  $user = $message['author'];
+    // Check if an allowed format is used. global $user needs to be changed since
+    // it is not possible to do the check for a specific user.
+    global $user;
+    $original_user = drupal_clone($user);
+    session_save_session(FALSE);
+    $user = $message['author'];
 
-  if (!filter_access($message['format'])) {
+    if (!filter_access($message['format'])) {
     if ($form) {
-      form_set_error('format', t('You are not allowed to use the specified input format.'));
+        form_set_error('format', t('You are not allowed to use the specified input format.'));
     }
     else {
-      $messages['error'][] = t('User @user is not allowed to use the specified input format.', array('@user' => $message['author']->name));
+        $messages['error'][] = t('User @user is not allowed to use the specified input format.', array('@user' => $message['author']->name));
+    }
     }
-  }
 
-  $user = $original_user;
-  session_save_session(TRUE);
+    $user = $original_user;
+    session_save_session(TRUE);
 
-  if (empty($message['recipients']) || !is_array($message['recipients'])) {
+    if (empty($message['recipients']) || !is_array($message['recipients'])) {
     if ($form) {
-      form_set_error('to', t('Disallowed to send a message without at least one valid recipient'));
+        form_set_error('to', t('Disallowed to send a message without at least one valid recipient'));
     }
     else {
-      $messages['error'][] = t('Disallowed to send a message without at least one valid recipient');
+        $messages['error'][] = t('Disallowed to send a message without at least one valid recipient');
+    }
     }
-  }
 
-  if (!empty($message['recipients']) && is_array($message['recipients'])) {
+    if (!empty($message['recipients']) && is_array($message['recipients'])) {
     foreach (module_invoke_all('privatemsg_block_message', $message['author'], $message['recipients']) as $blocked) {
-      unset($message['recipients'][$blocked['uid']]);
-      if ($form) {
+        unset($message['recipients'][$blocked['uid']]);
+        if ($form) {
         drupal_set_message($blocked['message'], 'warning');
-      }
-      else {
+        }
+        else {
         $messages['warning'][] = $blocked['message'];
-      }
+        }
+    }
     }
-  }
 
-  // Check again, give another error message if all recipients are blocked
-  if (empty($message['recipients'])) {
+    // Check again, give another error message if all recipients are blocked
+    if (empty($message['recipients'])) {
     if ($form) {
-      form_set_error('to', t('Disallowed to send message because all recipients are blocked'));
+        form_set_error('to', t('Disallowed to send message because all recipients are blocked'));
     }
     else {
-      $messages['error'][] = t('Disallowed to send message because all recipients are blocked');
+        $messages['error'][] = t('Disallowed to send message because all recipients are blocked');
+    }
     }
-  }
 
-  $messages = array_merge_recursive(module_invoke_all('privatemsg_message_validate', $message, $form), $messages);
+    $messages = array_merge_recursive(module_invoke_all('privatemsg_message_validate', $message, $form), $messages);
 
-  // Check if there are errors in $messages or if $form is TRUE, there are form errors.
-  $success = empty($messages['error']) || ($form && count((array)form_get_errors()) > 0);
-  return array(
+    // Check if there are errors in $messages or if $form is TRUE, there are form errors.
+    $success = empty($messages['error']) || ($form && count((array)form_get_errors()) > 0);
+    return array(
     'success'  => $success,
     'messages'   => $messages,
-  );
+    );
 }
 
 /**
@@ -1895,61 +1894,61 @@ 
  */
 function _privatemsg_send($message) {
 
-  drupal_alter('privatemsg_message_presave', $message);
+    drupal_alter('privatemsg_message_presave', $message);
 
-  $index_sql = "INSERT INTO {pm_index} (mid, thread_id, uid, is_new, deleted) VALUES (%d, %d, %d, %d, 0)";
-  if (isset($message['read_all']) && $message['read_all']) {
+    $index_sql = "INSERT INTO {pm_index} (mid, thread_id, uid, is_new, deleted) VALUES (%d, %d, %d, %d, 0)";
+    if (isset($message['read_all']) && $message['read_all']) {
     // The message was sent in read all mode, add the author as recipient to all
     // existing messages.
     $query_messages = _privatemsg_assemble_query('messages', array($message['thread_id']), NULL);
     $conversation = db_query($query_messages['query']);
     while ($result = db_fetch_array($conversation)) {
-      if (!db_query($index_sql, $result['mid'], $message['thread_id'], $message['author']->uid, 0)) {
+        if (!db_query($index_sql, $result['mid'], $message['thread_id'], $message['author']->uid, 0)) {
         return FALSE;
-      }
-    }
-  }
-
-  // 1) Save the message body first.
-  $args = array();
-  $args[] = $message['subject'];
-  $args[] = $message['author']->uid;
-  $args[] = $message['body'];
-  $args[] = $message['format'];
-  $args[] = $message['timestamp'];
-  $message_sql = "INSERT INTO {pm_message} (subject, author, body, format, timestamp) VALUES ('%s', %d, '%s', %d, %d)";
-  db_query($message_sql, $args);
-  $mid = db_last_insert_id('pm_message', 'mid');
-  $message['mid'] = $mid;
-
-  // Thread ID is the same as the mid if it's the first message in the thread.
-  if (!isset($message['thread_id'])) {
+        }
+    }
+    }
+
+    // 1) Save the message body first.
+    $args = array();
+    $args[] = $message['subject'];
+    $args[] = $message['author']->uid;
+    $args[] = $message['body'];
+    $args[] = $message['format'];
+    $args[] = $message['timestamp'];
+    $message_sql = "INSERT INTO {pm_message} (subject, author, body, format, timestamp) VALUES ('%s', %d, '%s', %d, %d)";
+    db_query($message_sql, $args);
+    $mid = db_last_insert_id('pm_message', 'mid');
+    $message['mid'] = $mid;
+
+    // Thread ID is the same as the mid if it's the first message in the thread.
+    if (!isset($message['thread_id'])) {
     $message['thread_id'] = $mid;
-  }
+    }
 
-  // 2) Save message to recipients.
-  // Each recipient gets a record in the pm_index table.
-  foreach ($message['recipients'] as $recipient) {
+    // 2) Save message to recipients.
+    // Each recipient gets a record in the pm_index table.
+    foreach ($message['recipients'] as $recipient) {
     if (!db_query($index_sql, $mid, $message['thread_id'], $recipient->uid, 1) ) {
-      // We assume if one insert failed then the rest may fail too against the
-      // same table.
-      return FALSE;
+        // We assume if one insert failed then the rest may fail too against the
+        // same table.
+        return FALSE;
+    }
     }
-  }
 
-  // When author is also the recipient, we want to set message to UNREAD.
-  // All other times the message is set to READ.
-  $is_new = isset($message['recipients'][$message['author']->uid]) ? 1 : 0;
+    // When author is also the recipient, we want to set message to UNREAD.
+    // All other times the message is set to READ.
+    $is_new = isset($message['recipients'][$message['author']->uid]) ? 1 : 0;
 
-  // Also add a record for the author to the pm_index table.
-  if (!db_query($index_sql, $mid, $message['thread_id'], $message['author']->uid, $is_new)) {
+    // Also add a record for the author to the pm_index table.
+    if (!db_query($index_sql, $mid, $message['thread_id'], $message['author']->uid, $is_new)) {
     return FALSE;
-  }
+    }
 
-  module_invoke_all('privatemsg_message_insert', $message);
+    module_invoke_all('privatemsg_message_insert', $message);
 
-  // If we reached here that means we were successful at writing all messages to db.
-  return $message;
+    // If we reached here that means we were successful at writing all messages to db.
+    return $message;
 }
 
 /**
@@ -1969,37 +1968,37 @@ 
  * @ingroup api
  */
 function privatemsg_get_link($recipients, $account = array(), $subject = NULL) {
-  if ($account == NULL) {
+    if ($account == NULL) {
     global $user;
     $account = $user;
-  }
+    }
 
-  if (!is_array($recipients)) {
+    if (!is_array($recipients)) {
     $recipients = array($recipients);
-  }
+    }
 
-  if (!privatemsg_user_access('write privatemsg', $account) || $account->uid == 0) {
+    if (!privatemsg_user_access('write privatemsg', $account) || $account->uid == 0) {
     return FALSE;
-  }
+    }
 
-  $validated = array();
-  foreach ($recipients as $recipient) {
+    $validated = array();
+    foreach ($recipients as $recipient) {
     if (!privatemsg_user_access('read privatemsg', $recipient)) {
-      continue;
+        continue;
     }
     if (count(module_invoke_all('privatemsg_block_message', $account, array($recipient->uid => $recipient))) > 0) {
-      continue;
+        continue;
     }
     $validated[] = $recipient->uid;
-  }
-  if (empty($validated)) {
+    }
+    if (empty($validated)) {
     return FALSE;
-  }
-  $url = 'messages/new/'. implode(',', $validated);
-  if (!is_null($subject)) {
+    }
+    $url = 'messages/new/'. implode(',', $validated);
+    if (!is_null($subject)) {
     $url .= '/'. $subject;
-  }
-  return $url;
+    }
+    return $url;
 }
 
 /**
@@ -2014,8 +2013,8 @@ 
  * @ingroup api
  */
 function privatemsg_message_load($pmid, $account = NULL) {
-  $messages = privatemsg_message_load_multiple(array($pmid), $account);
-  return current($messages);
+    $messages = privatemsg_message_load_multiple(array($pmid), $account);
+    return current($messages);
 }
 
 /**
@@ -2030,27 +2029,27 @@ 
  * @ingroup api
  */
 function privatemsg_message_load_multiple($pmids, $account = NULL) {
-  // Avoid SQL error that would happen with an empty pm.mid IN () clause.
-  if (empty($pmids)) {
+    // Avoid SQL error that would happen with an empty pm.mid IN () clause.
+    if (empty($pmids)) {
     return array();
-  }
+    }
 
-  $query = _privatemsg_assemble_query('load', $pmids, $account);
-  $result = db_query($query['query']);
-  $messages = array();
-  while ($message = db_fetch_array($result)) {
+    $query = _privatemsg_assemble_query('load', $pmids, $account);
+    $result = db_query($query['query']);
+    $messages = array();
+    while ($message = db_fetch_array($result)) {
     // Load author of message.
     if (!($message['author'] = user_load($message['author']))) {
-      // If user does not exist, load anonymous user.
-      $message['author'] = user_load(array('uid' => 0));
+        // If user does not exist, load anonymous user.
+        $message['author'] = user_load(array('uid' => 0));
     }
     $returned = module_invoke_all('privatemsg_message_load', $message);
     if (!empty($returned)) {
-      $message = array_merge_recursive($returned, $message);
+        $message = array_merge_recursive($returned, $message);
     }
     $messages[$message['mid']] = $message;
-  }
-  return $messages;
+    }
+    return $messages;
 }
 
 /**
@@ -2069,26 +2068,26 @@ 
  */
 function _privatemsg_assemble_query($query) {
 
-  // Modules will be allowed to choose the prefix for the querybuilder, but if there is not one supplied, 'privatemsg' will be taken by default.
-  if (is_array($query)) {
+    // Modules will be allowed to choose the prefix for the querybuilder, but if there is not one supplied, 'privatemsg' will be taken by default.
+    if (is_array($query)) {
     $query_id = $query[0];
     $query_group = $query[1];
-  }
-  else {
+    }
+    else {
     $query_id = $query;
     $query_group = 'privatemsg';
-  }
-
-  $SELECT = array();
-  $INNER_JOIN = array();
-  $WHERE = array();
-  $GROUP_BY = array();
-  $HAVING   = array();
-  $ORDER_BY = array();
-  $QUERY_ARGS = array('select' => array(), 'where' => array(), 'join' => array(), 'having' => array());
-  $primary_table = '';
-
-  $fragments = array(
+    }
+
+    $SELECT = array();
+    $INNER_JOIN = array();
+    $WHERE = array();
+    $GROUP_BY = array();
+    $HAVING   = array();
+    $ORDER_BY = array();
+    $QUERY_ARGS = array('select' => array(), 'where' => array(), 'join' => array(), 'having' => array());
+    $primary_table = '';
+
+    $fragments = array(
     'select'      => $SELECT,
     'inner_join'  => $INNER_JOIN,
     'where'       => $WHERE,
@@ -2097,52 +2096,52 @@ 
     'order_by'    => $ORDER_BY,
     'query_args'  => $QUERY_ARGS,
     'primary_table'  => $primary_table,
-  );
-
-  /**
-   * Begin: dynamic arguments
-   */
-  $args = func_get_args();
-  unset($args[0]);
-  // we do the merge because we call call_user_func_array and not drupal_alter
-  // this is necessary because otherwise we would not be able to use $args correctly (otherwise it doesnt unfold)
-  $alterargs = array(&$fragments);
-  $query_function = $query_group .'_sql_'. $query_id;
-  if (!empty($args)) {
+    );
+
+    /**
+     * Begin: dynamic arguments
+     */
+    $args = func_get_args();
+    unset($args[0]);
+    // we do the merge because we call call_user_func_array and not drupal_alter
+    // this is necessary because otherwise we would not be able to use $args correctly (otherwise it doesnt unfold)
+    $alterargs = array(&$fragments);
+    $query_function = $query_group .'_sql_'. $query_id;
+    if (!empty($args)) {
     $alterargs = array_merge($alterargs, $args);
-  }
-  /**
-   * END: Dynamic arguments
-   */
-  if (!function_exists($query_function)) {
+    }
+    /**
+     * END: Dynamic arguments
+     */
+    if (!function_exists($query_function)) {
     drupal_set_message(t('Query function %function does not exist', array('%function' => $query_function)), 'error');
     return FALSE;
-  }
-  call_user_func_array($query_function, $alterargs);
-
-  array_unshift($alterargs, $query_function);
-  call_user_func_array('drupal_alter', $alterargs);
-
-  $SELECT = $fragments['select'];
-  $INNER_JOIN = $fragments['inner_join'];
-  $WHERE = $fragments['where'];
-  $GROUP_BY = $fragments['group_by'];
-  $HAVING   = $fragments['having'];
-  $ORDER_BY = $fragments['order_by'];
-  $QUERY_ARGS = $fragments['query_args'];
-  $primary_table = $fragments['primary_table'];
-
-  // pgsql has a case sensitive LIKE - replace it with ILIKE. see http://drupal.org/node/462982
-  if ($GLOBALS['db_type'] == 'pgsql') {
+    }
+    call_user_func_array($query_function, $alterargs);
+
+    array_unshift($alterargs, $query_function);
+    call_user_func_array('drupal_alter', $alterargs);
+
+    $SELECT = $fragments['select'];
+    $INNER_JOIN = $fragments['inner_join'];
+    $WHERE = $fragments['where'];
+    $GROUP_BY = $fragments['group_by'];
+    $HAVING   = $fragments['having'];
+    $ORDER_BY = $fragments['order_by'];
+    $QUERY_ARGS = $fragments['query_args'];
+    $primary_table = $fragments['primary_table'];
+
+    // pgsql has a case sensitive LIKE - replace it with ILIKE. see http://drupal.org/node/462982
+    if ($GLOBALS['db_type'] == 'pgsql') {
     $WHERE = str_replace('LIKE', 'ILIKE', $WHERE);
-  }
+    }
 
-  if (empty($primary_table)) {
+    if (empty($primary_table)) {
     $primary_table = '{privatemsg} pm';
-  }
+    }
 
-  // Perform the whole query assembly only if we have something to select.
-  if (!empty($SELECT)) {
+    // Perform the whole query assembly only if we have something to select.
+    if (!empty($SELECT)) {
     $str_select = implode(", ", $SELECT);
     $query = "SELECT {$str_select} FROM ". $primary_table;
 
@@ -2150,51 +2149,51 @@ 
     // In most cases,  "COUNT(*)" is enough to get the count query, but in queries involving a GROUP BY, we want a count of the number of groups we have, not the count of elements inside each group.
     // So we test if there is GROUP BY and if there is, count the number of distinct groups. If not, we go the normal wal and do a plain COUNT(*).
     if (!empty($GROUP_BY)) {
-      // PostgreSQL does not support COUNT(sometextfield, someintfield), so I'm only using the first one
-      // Works fine for thread_id/list but may generate an error when a more complex GROUP BY is used.
-      $str_group_by_count = current($GROUP_BY);
-      $count = "SELECT COUNT(DISTINCT {$str_group_by_count}) FROM ". $primary_table;
+        // PostgreSQL does not support COUNT(sometextfield, someintfield), so I'm only using the first one
+        // Works fine for thread_id/list but may generate an error when a more complex GROUP BY is used.
+        $str_group_by_count = current($GROUP_BY);
+        $count = "SELECT COUNT(DISTINCT {$str_group_by_count}) FROM ". $primary_table;
     }
     else {
-      $count = "SELECT COUNT(*) FROM ". $primary_table;
+        $count = "SELECT COUNT(*) FROM ". $primary_table;
     }
 
     if (!empty($INNER_JOIN)) {
-      $str_inner_join = implode(' ', $INNER_JOIN);
-      $query .= " {$str_inner_join}";
-      $count .= " {$str_inner_join}";
+        $str_inner_join = implode(' ', $INNER_JOIN);
+        $query .= " {$str_inner_join}";
+        $count .= " {$str_inner_join}";
     }
     if (!empty($WHERE)) {
-      $str_where = '('. implode(') AND (', $WHERE) .')';
-      $query .= " WHERE {$str_where}";
-      $count .= " WHERE {$str_where}";
+        $str_where = '('. implode(') AND (', $WHERE) .')';
+        $query .= " WHERE {$str_where}";
+        $count .= " WHERE {$str_where}";
     }
     if (!empty($GROUP_BY)) {
-      $str_group_by = ' GROUP BY '. implode(", ", $GROUP_BY) ;
-      $query .= " {$str_group_by}";
+        $str_group_by = ' GROUP BY '. implode(", ", $GROUP_BY) ;
+        $query .= " {$str_group_by}";
     }
     if (!empty($HAVING)) {
-      $str_having = '('. implode(') AND (', $HAVING) .')';
-      $query .= " HAVING {$str_having}";
-      // queries containing a HAVING break the count query on pgsql.
-      // In this case, use the subquery method as outlined in http://drupal.org/node/303087#comment-1370752 .
-      // The subquery method will work for all COUNT queries, but it is thought to be much slower, so we are only using it where other cross database approaches fail.
-      $count = 'SELECT COUNT(*) FROM ('. $query .') as count';
+        $str_having = '('. implode(') AND (', $HAVING) .')';
+        $query .= " HAVING {$str_having}";
+        // queries containing a HAVING break the count query on pgsql.
+        // In this case, use the subquery method as outlined in http://drupal.org/node/303087#comment-1370752 .
+        // The subquery method will work for all COUNT queries, but it is thought to be much slower, so we are only using it where other cross database approaches fail.
+        $count = 'SELECT COUNT(*) FROM ('. $query .') as count';
     }
     if (!empty($ORDER_BY)) {
-      $str_order_by = ' ORDER BY '. implode(", ", $ORDER_BY) ;
-      $query .= " {$str_order_by}";
+        $str_order_by = ' ORDER BY '. implode(", ", $ORDER_BY) ;
+        $query .= " {$str_order_by}";
     }
     $QUERY_ARGS = array_merge($QUERY_ARGS['select'], $QUERY_ARGS['join'], $QUERY_ARGS['where'], $QUERY_ARGS['having']);
     if (!empty($QUERY_ARGS)) {
-      _db_query_callback($QUERY_ARGS, TRUE);
-      $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query);
-      _db_query_callback($QUERY_ARGS, TRUE);
-      $count = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $count);
+        _db_query_callback($QUERY_ARGS, TRUE);
+        $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query);
+        _db_query_callback($QUERY_ARGS, TRUE);
+        $count = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $count);
     }
     return array('query' => $query, 'count' => $count);
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -2211,44 +2210,44 @@ 
  *   The FAPI definitions for the thread action form.
  */
 function _privatemsg_action_form() {
-  $form = array(
-      '#type'        => 'fieldset',
-      '#title'       => t('Actions'),
-      '#prefix'      => '<div class="container-inline">',
-      '#suffix'      => '</div>',
-      '#collapsible' => TRUE,
-      '#collapsed'   => FALSE,
-      '#weight'      => 15,
-  );
-  if (privatemsg_user_access('delete privatemsg')) {
+    $form = array(
+        '#type'        => 'fieldset',
+        '#title'       => t('Actions'),
+        '#prefix'      => '<div class="container-inline">',
+        '#suffix'      => '</div>',
+        '#collapsible' => TRUE,
+        '#collapsed'   => FALSE,
+        '#weight'      => 15,
+    );
+    if (privatemsg_user_access('delete privatemsg')) {
     $form['delete'] = array(
         '#type'   => 'submit',
         '#value'  => t('Delete'),
     );
-  }
-  // Display all operations which have a label.
-  $options = array(0 => t('More actions...'));
-  foreach (module_invoke_all('privatemsg_thread_operations') as $operation => $array) {
+    }
+    // Display all operations which have a label.
+    $options = array(0 => t('More actions...'));
+    foreach (module_invoke_all('privatemsg_thread_operations') as $operation => $array) {
     if (isset($array['label'])) {
-      $options[$operation] = $array['label'];
-    }
-  }
-  $form['operation'] = array(
-      '#type'          => 'select',
-      '#options'       => $options,
-      '#default_value' => 0,
-  );
-  $form['submit'] = array(
-      '#prefix'     => '<div class="privatemsg-op-button">',
-      '#suffix'    => '</div>',
-      '#type'       => 'submit',
-      '#value'      => t('Execute'),
-      '#submit'     => array('privatemsg_list_submit'),
-      '#attributes' => array('class' => 'privatemsg-action-button'),
-  );
-  // JS for hiding the execute button.
-  drupal_add_js(drupal_get_path('module', 'privatemsg') .'/privatemsg-list.js');
-  return $form;
+        $options[$operation] = $array['label'];
+    }
+    }
+    $form['operation'] = array(
+        '#type'          => 'select',
+        '#options'       => $options,
+        '#default_value' => 0,
+    );
+    $form['submit'] = array(
+        '#prefix'     => '<div class="privatemsg-op-button">',
+        '#suffix'    => '</div>',
+        '#type'       => 'submit',
+        '#value'      => t('Execute'),
+        '#submit'     => array('privatemsg_list_submit'),
+        '#attributes' => array('class' => 'privatemsg-action-button'),
+    );
+    // JS for hiding the execute button.
+    drupal_add_js(drupal_get_path('module', 'privatemsg') .'/privatemsg-list.js');
+    return $form;
 }
 
 /**
@@ -2263,23 +2262,23 @@ 
  *   current user.
  */
 function privatemsg_thread_change_status($threads, $status, $account = NULL) {
-  if (!is_array($threads)) {
+    if (!is_array($threads)) {
     $threads = array($threads);
-  }
-  if (empty($account)) {
+    }
+    if (empty($account)) {
     global $user;
     $account = drupal_clone($user);
-  }
-  // Merge status and uid with the threads list. array_merge() will not overwrite/ignore thread_id 1.
-  $params = array_merge(array($status, $account->uid), $threads);
-  db_query('UPDATE {pm_index} SET is_new = %d WHERE uid = %d AND thread_id IN ('. db_placeholders($threads) .')', $params);
+    }
+    // Merge status and uid with the threads list. array_merge() will not overwrite/ignore thread_id 1.
+    $params = array_merge(array($status, $account->uid), $threads);
+    db_query('UPDATE {pm_index} SET is_new = %d WHERE uid = %d AND thread_id IN ('. db_placeholders($threads) .')', $params);
 
-  if ($status == PRIVATEMSG_UNREAD) {
+    if ($status == PRIVATEMSG_UNREAD) {
     drupal_set_message(format_plural(count($threads), 'Marked 1 thread as unread.', 'Marked @count threads as unread.'));
-  }
-  else {
+    }
+    else {
     drupal_set_message(format_plural(count($threads), 'Marked 1 thread as read.', 'Marked @count threads as read.'));
-  }
+    }
 }
 /**
  * Returns a table header definition based on the submitted keys.
@@ -2295,25 +2294,25 @@ 
  *   Array with header defintions for tablesort_sql and theme('table').
  */
 function _privatemsg_list_headers($has_posts, $keys) {
-  $select_header = $has_posts ? theme('table_select_header_cell') : '';
-  $select_header['#weight'] = -50;
+    $select_header = $has_posts ? theme('table_select_header_cell') : '';
+    $select_header['#weight'] = -50;
 
-  // theme() doesn't include the theme file for patterns, we need to do it manually.
-  include_once drupal_get_path('module', 'privatemsg') .'/privatemsg.theme.inc';
+    // theme() doesn't include the theme file for patterns, we need to do it manually.
+    include_once drupal_get_path('module', 'privatemsg') .'/privatemsg.theme.inc';
 
-  $header = array($select_header);
-  foreach ($keys as $key) {
+    $header = array($select_header);
+    foreach ($keys as $key) {
     // First, try to load a specific theme for that header, if not present, use the default.
     if ($return = theme(array('privatemsg_list_header__'. $key, 'privatemsg_list_header'))) {
-      // The default theme returns nothing, only store the value if we have something.
-      $header[$key] = $return;
+        // The default theme returns nothing, only store the value if we have something.
+        $header[$key] = $return;
+    }
     }
-  }
-  if (count($header) == 1) {
+    if (count($header) == 1) {
     // No header definition returned, fallback to the default.
     $header += _privatemsg_list_headers_fallback($keys);
-  }
-  return $header;
+    }
+    return $header;
 }
 
 /**
@@ -2323,15 +2322,15 @@ 
  *   Array with the correct headers.
  */
 function _privatemsg_list_headers_fallback($keys) {
-  $header = array();
-  foreach ($keys as $key) {
+    $header = array();
+    foreach ($keys as $key) {
     $theme_function = 'phptemplate_privatemsg_list_header__' . $key;
     if (function_exists($theme_function)) {
-      $header[$key] = $theme_function();
+        $header[$key] = $theme_function();
+    }
     }
-  }
 
-  return $header;
+    return $header;
 }
 
 /**
@@ -2345,23 +2344,23 @@ 
  *   Row definition for use with theme('table')
  */
 function _privatemsg_list_thread($thread) {
-  $row = array('data' => array());
+    $row = array('data' => array());
 
-  if (!empty($thread['is_new'])) {
+    if (!empty($thread['is_new'])) {
     // Set the css class in the tr tag.
     $row['class'] = 'privatemsg-unread';
-  }
-  foreach ($thread as $key => $data) {
+    }
+    foreach ($thread as $key => $data) {
     // First, try to load a specific theme for that field, if not present, use the default.
     if ($return = theme(array('privatemsg_list_field__'. $key, 'privatemsg_list_field'), $thread)) {
-      // The default theme returns nothing, only store the value if we have something.
-      $row['data'][$key] = $return;
+        // The default theme returns nothing, only store the value if we have something.
+        $row['data'][$key] = $return;
+    }
     }
-  }
-  if (empty($row['data'])) {
+    if (empty($row['data'])) {
     $row['data'] = _privatemsg_list_thread_fallback($thread);
-  }
-  return $row;
+    }
+    return $row;
 }
 
 /**
@@ -2371,15 +2370,15 @@ 
  *   Array with row data.
  */
 function _privatemsg_list_thread_fallback($thread) {
-  $row_data = array();
-  foreach ($thread as $key => $data) {
+    $row_data = array();
+    foreach ($thread as $key => $data) {
     $theme_function = 'phptemplate_privatemsg_list_field__' . $key;
     if (function_exists($theme_function)) {
-      $row_data[$key] = $theme_function($thread);
+        $row_data[$key] = $theme_function($thread);
+    }
     }
-  }
 
-  return $row_data;
+    return $row_data;
 }
 
 /**
@@ -2389,20 +2388,20 @@ 
  * execute it.
  */
 function privatemsg_undo_action() {
-  // Check if a undo callback for that user exists.
-  if (isset($_SESSION['privatemsg']['undo callback']) && is_array($_SESSION['privatemsg']['undo callback'])) {
+    // Check if a undo callback for that user exists.
+    if (isset($_SESSION['privatemsg']['undo callback']) && is_array($_SESSION['privatemsg']['undo callback'])) {
     $undo = $_SESSION['privatemsg']['undo callback'];
     // If the defined undo callback exists, execute it
     if (isset($undo['function']) && isset($undo['args'])) {
-      // Load the user object.
-      if (isset($undo['args']['account']) && $undo['args']['account'] > 0) {
+        // Load the user object.
+        if (isset($undo['args']['account']) && $undo['args']['account'] > 0) {
         $undo['args']['account'] = user_load((int)$undo['args']['account']);
-      }
-      call_user_func_array($undo['function'], $undo['args']);
+        }
+        call_user_func_array($undo['function'], $undo['args']);
     }
     // Return back to the site defined by the destination GET param.
     drupal_goto();
-  }
+    }
 }
 
 /**
@@ -2412,29 +2411,29 @@ 
  * based on node_admin_nodes_submit().
  */
 function privatemsg_list_submit($form, &$form_state) {
-  // Load all available operation definitions.
-  $operations = module_invoke_all('privatemsg_thread_operations');
+    // Load all available operation definitions.
+    $operations = module_invoke_all('privatemsg_thread_operations');
 
-  // Default "default" operation, which won't do anything.
-  $operation = array('callback' => 0);
+    // Default "default" operation, which won't do anything.
+    $operation = array('callback' => 0);
 
-  // Check if a valid operation has been submitted.
-  if (isset($form_state['values']['operation']) && isset($operations[$form_state['values']['operation']])) {
+    // Check if a valid operation has been submitted.
+    if (isset($form_state['values']['operation']) && isset($operations[$form_state['values']['operation']])) {
     $operation = $operations[$form_state['values']['operation']];
-  }
+    }
 
-  // Load all keys where the value is the current op.
-  $keys = array_keys($form_state['values'], $form_state['values']['op']);
+    // Load all keys where the value is the current op.
+    $keys = array_keys($form_state['values'], $form_state['values']['op']);
 
-  // The first one is op itself, we need to use the second.
-  if (isset($keys[1]) && isset($operations[$keys[1]])) {
+    // The first one is op itself, we need to use the second.
+    if (isset($keys[1]) && isset($operations[$keys[1]])) {
     $operation = $operations[$keys[1]];
-  }
+    }
 
-  // Only execute something if we have a valid callback and at least one checked thread.
-  if (!empty($operation['callback'])) {
+    // Only execute something if we have a valid callback and at least one checked thread.
+    if (!empty($operation['callback'])) {
     privatemsg_operation_execute($operation, $form_state['values']['threads'], $form_state['values']['account']);
-  }
+    }
 }
 
 /**
@@ -2448,42 +2447,42 @@ 
  *   array can be directly passed to it.
  */
 function privatemsg_operation_execute($operation, $threads, $account = null) {
-  // Filter out unchecked threads, this gives us an array of "checked" threads.
-  $threads = array_filter($threads);
+    // Filter out unchecked threads, this gives us an array of "checked" threads.
+    $threads = array_filter($threads);
 
-  if (empty($threads)) {
+    if (empty($threads)) {
     // Do not execute anything if there are no checked threads.
     return;
-  }
-  // Add in callback arguments if present.
-  if (isset($operation['callback arguments'])) {
+    }
+    // Add in callback arguments if present.
+    if (isset($operation['callback arguments'])) {
     $args = array_merge(array($threads), $operation['callback arguments']);
-  }
-  else {
+    }
+    else {
     $args = array($threads);
-  }
+    }
 
-  // Add the user object to the arguments.
-  if ($account) {
+    // Add the user object to the arguments.
+    if ($account) {
     $args[] = $account;
-  }
+    }
 
-  // Execute the chosen action and pass the defined arguments.
-  call_user_func_array($operation['callback'], $args);
+    // Execute the chosen action and pass the defined arguments.
+    call_user_func_array($operation['callback'], $args);
 
-  // Check if that operation has defined an undo callback.
-  if (isset($operation['undo callback']) && $undo_function = $operation['undo callback']) {
+    // Check if that operation has defined an undo callback.
+    if (isset($operation['undo callback']) && $undo_function = $operation['undo callback']) {
     // Add in callback arguments if present.
     if (isset($operation['undo callback arguments'])) {
-      $undo_args = array_merge(array($threads), $operation['undo callback arguments']);
+        $undo_args = array_merge(array($threads), $operation['undo callback arguments']);
     }
     else {
-      $undo_args = array($threads);
+        $undo_args = array($threads);
     }
 
     // Avoid saving the complete user object in the session.
     if ($account) {
-      $undo_args['account'] = $account->uid;
+        $undo_args['account'] = $account->uid;
     }
     // Store the undo callback in the session and display a "Undo" link.
     // @todo: Provide a more flexible solution for such an undo action, operation defined string for example.
@@ -2491,7 +2490,7 @@ 
     $undo = url('messages/undo/action', array('query' => drupal_get_destination()));
 
     drupal_set_message(t('The previous action can be <a href="!undo">undone</a>.', array('!undo' => $undo)));
-  }
+    }
 }
 
 /**
@@ -2507,71 +2506,71 @@ 
  *   defaults to the current user.
  */
 function privatemsg_thread_change_delete($threads, $delete, $account = NULL) {
-  if (!is_array($threads)) {
+    if (!is_array($threads)) {
     $threads = array($threads);
-  }
-  if (empty($account)) {
+    }
+    if (empty($account)) {
     global $user;
     $account = drupal_clone($user);
-  }
+    }
 
-  // Merge status and uid with the threads list. array_merge() will not overwrite/ignore thread_id 1.
-  $params = array_merge(array($delete, $account->uid), $threads);
+    // Merge status and uid with the threads list. array_merge() will not overwrite/ignore thread_id 1.
+    $params = array_merge(array($delete, $account->uid), $threads);
 
-  // Load all messages of those threads including the deleted.
-  $query = _privatemsg_assemble_query('messages', $threads, $account, TRUE);
-  $result = db_query($query['query']);
+    // Load all messages of those threads including the deleted.
+    $query = _privatemsg_assemble_query('messages', $threads, $account, TRUE);
+    $result = db_query($query['query']);
 
-  // Delete each message. We need to do that to trigger the delete hook.
-  while ($row = db_fetch_array($result)) {
+    // Delete each message. We need to do that to trigger the delete hook.
+    while ($row = db_fetch_array($result)) {
     privatemsg_message_change_delete($row['mid'], $delete, $account);
-  }
+    }
 
-  if ($delete) {
+    if ($delete) {
     drupal_set_message(format_plural(count($threads), 'Deleted 1 thread.', 'Deleted @count threads.'));
-  }
-  else {
+    }
+    else {
     drupal_set_message(format_plural(count($threads), 'Restored 1 thread.', 'Restored @count threads.'));
-  }
+    }
 }
 
 /**
  * Implements hook_privatemsg_thread_operations().
  */
 function privatemsg_privatemsg_thread_operations() {
-  $operations = array(
+    $operations = array(
     'mark as read' => array(
-      'label' => t('Mark as read'),
-      'callback' => 'privatemsg_thread_change_status',
-      'callback arguments' => array('status' => PRIVATEMSG_READ),
-      'undo callback' => 'privatemsg_thread_change_status',
-      'undo callback arguments' => array('status' => PRIVATEMSG_UNREAD),
+        'label' => t('Mark as read'),
+        'callback' => 'privatemsg_thread_change_status',
+        'callback arguments' => array('status' => PRIVATEMSG_READ),
+        'undo callback' => 'privatemsg_thread_change_status',
+        'undo callback arguments' => array('status' => PRIVATEMSG_UNREAD),
     ),
     'mark as unread' => array(
-      'label' => t('Mark as unread'),
-      'callback' => 'privatemsg_thread_change_status',
-      'callback arguments' => array('status' => PRIVATEMSG_UNREAD),
-      'undo callback' => 'privatemsg_thread_change_status',
-      'undo callback arguments' => array('status' => PRIVATEMSG_READ),
+        'label' => t('Mark as unread'),
+        'callback' => 'privatemsg_thread_change_status',
+        'callback arguments' => array('status' => PRIVATEMSG_UNREAD),
+        'undo callback' => 'privatemsg_thread_change_status',
+        'undo callback arguments' => array('status' => PRIVATEMSG_READ),
     ),
-  );
-  if (privatemsg_user_access('delete privatemsg')) {
+    );
+    if (privatemsg_user_access('delete privatemsg')) {
     $operations['delete'] = array(
-      'callback' => 'privatemsg_thread_change_delete',
-      'callback arguments' => array('delete' => 1),
-      'undo callback' => 'privatemsg_thread_change_delete',
-      'undo callback arguments' => array('delete' => 0),
+        'callback' => 'privatemsg_thread_change_delete',
+        'callback arguments' => array('delete' => 1),
+        'undo callback' => 'privatemsg_thread_change_delete',
+        'undo callback arguments' => array('delete' => 0),
     );
-  }
-  return $operations;
+    }
+    return $operations;
 }
 
 /**
  * Implementation of hook_views_api().
  */
 function privatemsg_views_api() {
-  return array(
+    return array(
     'api' => 2,
     'path' => drupal_get_path('module', 'privatemsg') . '/views',
-  );
+    );
 }

Spacing +64 added lines, -64 removed lines

@@ -98,7 +98,7 @@ 
 
 
     if ($no_text) {
-      return implode(', ', $to) . $limit_string;
+      return implode(', ', $to).$limit_string;
     }
 
     $last = array_pop($to);
@@ -220,7 +220,7 @@ 
  * @ingroup api
  */
 function privatemsg_user_access($permission = 'read privatemsg', $account = NULL) {
-  if ( $account === NULL ) {
+  if ($account === NULL) {
     global $user;
     $account = $user;
   }
@@ -344,7 +344,7 @@ 
           // message overlap.
           // Note - the last page lists the earliest messages, not the latest.
           $paging_count = variable_get('privatemsg_view_use_max_as_default', FALSE) ? $thread['message_count'] - variable_get('privatemsg_view_default_amount', 10) : $thread['message_count'];
-          $last_page = $paging_count % $max_amount;
+          $last_page = $paging_count%$max_amount;
         }
 
         // Sanity check - we cannot start from a negative number.
@@ -546,7 +546,7 @@ 
     '#options'       => $amounts,
     '#weight'        => 20,
   );
-  drupal_add_js(drupal_get_path('module', 'privatemsg') .'/privatemsg-admin.js');
+  drupal_add_js(drupal_get_path('module', 'privatemsg').'/privatemsg-admin.js');
 
   $form['#submit'][] = 'private_message_settings_submit';
   return system_settings_form($form);
@@ -640,9 +640,9 @@ 
   $vars['message_timestamp'] = format_date($message['timestamp'], 'small');
   $vars['message_body'] = check_markup($message['body'], $message['format'], FALSE);
   if (isset($vars['mid']) && isset($vars['thread_id']) && privatemsg_user_access('delete privatemsg')) {
-    $vars['message_actions'][] = array('title' => t('Delete message'), 'href' => 'messages/delete/' . $vars['thread_id'] . '/' . $vars['mid']);
+    $vars['message_actions'][] = array('title' => t('Delete message'), 'href' => 'messages/delete/'.$vars['thread_id'].'/'.$vars['mid']);
   }
-  $vars['message_anchors'][] = 'privatemsg-mid-' . $vars['mid'];
+  $vars['message_anchors'][] = 'privatemsg-mid-'.$vars['mid'];
   if (!empty($message['is_new'])) {
     $vars['message_anchors'][] = 'new';
     $vars['new'] = drupal_ucfirst(t('new'));
@@ -655,7 +655,7 @@ 
 
   $vars['anchors'] = '';
   foreach ($vars['message_anchors'] as $anchor) {
-    $vars['anchors'] .= '<a name="' . $anchor . '"></a>';
+    $vars['anchors'] .= '<a name="'.$anchor.'"></a>';
   }
 }
 
@@ -758,7 +758,7 @@ 
     global $user;
     $account = $user;
   }
-  if ( !isset($counts[$account->uid])) {
+  if (!isset($counts[$account->uid])) {
     $query = _privatemsg_assemble_query('unread_count', $account);
     $counts[$account->uid] = db_result(db_query($query['query']));
   }
@@ -785,7 +785,7 @@ 
       'query' => array('start' => $thread['older_start']),
       'title' => t('Display older messages'),
     );
-     $older = l(t('<<'), 'messages/view/' . $thread['thread_id'], $options);
+     $older = l(t('<<'), 'messages/view/'.$thread['thread_id'], $options);
   }
   $newer = '';
   if (isset($thread['newer_start'])) {
@@ -793,7 +793,7 @@ 
       'query' => array('start' => $thread['newer_start']),
       'title' => t('Display newer messages'),
     );
-    $newer = l(t('>>'), 'messages/view/' . $thread['thread_id'], $options);
+    $newer = l(t('>>'), 'messages/view/'.$thread['thread_id'], $options);
   }
   $substitutions = array('@from' => $thread['from'], '@to' => $thread['to'], '@total' => $thread['message_count'], '!previous_link' => $older, '!newer_link' => $newer);
   $title = t('!previous_link Displaying messages @from - @to of @total !newer_link', $substitutions);
@@ -847,7 +847,7 @@ 
   global $user;
 
   $recipients_string = '';
-  $body      = '';
+  $body = '';
 
   // convert recipients to array of user objects
   if (!empty($recipients) && is_string($recipients) || is_int($recipients)) {
@@ -879,7 +879,7 @@ 
       }
       $myuser = user_load(array('uid' => $recipient->uid));
       $myname = preg_replace("/ /", "\xc2\xa0", $myuser->boincuser_name);
-      $to[] = $myname . "_" . $myuser->boincuser_id;
+      $to[] = $myname."_".$myuser->boincuser_id;
       $to_themed[$recipient->uid] = $myname;
     }
     else {
@@ -892,7 +892,7 @@ 
     // Assume the user sent message to own account as if the usercount is one or less, then the user sent a message but not to self.
     $myuser = user_load(array('uid' => $user->uid));
     $myname = preg_replace("/ /", "\xc2\xa0", $myuser->boincuser_name);
-    $to[] = $myname . "_" . $myuser->boincuser_id;
+    $to[] = $myname."_".$myuser->boincuser_id;
     $to_themed[$user->uid] = $myname;
   }
   if (!empty($to)) {
@@ -1008,7 +1008,7 @@ 
     );
     $recipients_string_themed = implode(', ', $to_themed);
     $form['privatemsg']['recipient_display'] = array(
-      '#value' =>  '<p>'. t('<strong>Reply to thread</strong>:<br /> Recipients: !to', array('!to' => $recipients_string_themed)) .'</p>',
+      '#value' =>  '<p>'.t('<strong>Reply to thread</strong>:<br /> Recipients: !to', array('!to' => $recipients_string_themed)).'</p>',
       '#weight' => -10,
     );
     if (empty($recipients_string)) {
@@ -1102,7 +1102,7 @@ 
       // First, check if another module is able to resolve the string into an
       // user object.
       foreach (module_implements('privatemsg_name_lookup') as $module) {
-        $function = $module . '_privatemsg_name_lookup';
+        $function = $module.'_privatemsg_name_lookup';
         if (($recipient = $function($string)) && is_object($recipient)) {
           // If there is a match, continue with the next input string.
           $recipients[$recipient->uid] = $recipient;
@@ -1133,7 +1133,7 @@ 
   foreach ($form_state['validate_built_message']['recipients'] as $recipient) {
     $recipient_names[] = theme('username', $recipient);
   }
-  if ($status !== FALSE )  {
+  if ($status !== FALSE) {
     drupal_set_message(t('A message has been sent to !recipients.', array('!recipients' => implode(', ', $recipient_names))));
   }
   else {
@@ -1175,7 +1175,7 @@ 
   $fields = array_filter(variable_get('privatemsg_display_fields', array('participants')));
 
   // Required columns.
-  $fragments['select'][]      = 'pmi.thread_id';
+  $fragments['select'][] = 'pmi.thread_id';
   // We have to use MIN as the subject might not be the same in some threads.
   // MIN() does not have a useful meaning except that it helps to correctly
   // aggregate the thread on PostgreSQL.
@@ -1187,32 +1187,32 @@ 
   // Select number of messages in the thread if the count is
   // set to be displayed.
   if (in_array('count', $fields)) {
-    $fragments['select'][]      = 'COUNT(distinct pmi.mid) as count';
+    $fragments['select'][] = 'COUNT(distinct pmi.mid) as count';
   }
   if (in_array('participants', $fields)) {
     // Query for a string with uid's, for example "1,6,7".
     // @todo: Replace this with a single query similiar to the tag list.
     if ($GLOBALS['db_type'] == 'pgsql') {
       // PostgreSQL does not know GROUP_CONCAT, so a subquery is required.
-      $fragments['select'][]      = "array_to_string(array(SELECT DISTINCT textin(int4out(pmia.uid))
+      $fragments['select'][] = "array_to_string(array(SELECT DISTINCT textin(int4out(pmia.uid))
                                                             FROM {pm_index} pmia
                                                             WHERE pmia.thread_id = pmi.thread_id), ',') AS participants";
     }
     else {
-      $fragments['select'][]      = '(SELECT GROUP_CONCAT(DISTINCT pmia.uid SEPARATOR ",")
+      $fragments['select'][] = '(SELECT GROUP_CONCAT(DISTINCT pmia.uid SEPARATOR ",")
                                                             FROM {pm_index} pmia
                                                             WHERE pmia.thread_id = pmi.thread_id) AS participants';
     }
   }
   if (in_array('thread_started', $fields)) {
-    $fragments['select'][]      = 'MIN(pm.timestamp) as thread_started';
+    $fragments['select'][] = 'MIN(pm.timestamp) as thread_started';
   }
 
   $fragments['inner_join'][]  = 'INNER JOIN {pm_index} pmi ON pm.mid = pmi.mid';
 
   // Only load undeleted messages of the current user and group by thread.
   $fragments['where'][]       = 'pmi.uid = %d';
-  $fragments['query_args']['where'][]  = $account->uid;
+  $fragments['query_args']['where'][] = $account->uid;
   $fragments['where'][]       = 'pmi.deleted = 0';
   $fragments['group_by'][]    = 'pmi.thread_id';
 
@@ -1226,8 +1226,8 @@ 
   // tablesort_sql() generates a ORDER BY string. However, the "ORDER BY " part 
   // is not needed and added by the query builder. Discard the first 9
   // characters of the string.
-  $order_by = drupal_substr(tablesort_sql(_privatemsg_list_headers( FALSE, array_merge(array('subject', 'last_updated'), $fields)), $order_by_first), 9);
-  $fragments['order_by'][]  = $order_by;
+  $order_by = drupal_substr(tablesort_sql(_privatemsg_list_headers(FALSE, array_merge(array('subject', 'last_updated'), $fields)), $order_by_first), 9);
+  $fragments['order_by'][] = $order_by;
 }
 
 /**
@@ -1254,11 +1254,11 @@ 
 
   $fragments['inner_join'][]  = 'INNER JOIN {pm_index} pmi ON pm.mid = pmi.mid';
   // Use IN() to load multiple messages at the same time.
-  $fragments['where'][]       = 'pmi.mid IN (' . db_placeholders($pmids) . ')';
-  $fragments['query_args']['where']  += $pmids;
+  $fragments['where'][]       = 'pmi.mid IN ('.db_placeholders($pmids).')';
+  $fragments['query_args']['where'] += $pmids;
   if ($account) {
-    $fragments['where'][]       = 'pmi.uid = %d';
-    $fragments['query_args']['where'][]  = $account->uid;
+    $fragments['where'][] = 'pmi.uid = %d';
+    $fragments['query_args']['where'][] = $account->uid;
   }
   $fragments['order_by'][] = 'pm.timestamp ASC';
   $fragments['order_by'][] = 'pm.mid ASC';
@@ -1280,13 +1280,13 @@ 
   $fragments['primary_table'] = '{pm_index} pmi';
 
   $fragments['select'][]      = 'pmi.mid';
-  $fragments['where'][]       = 'pmi.thread_id IN ('. db_placeholders($threads) .')';
-  $fragments['query_args']['where']   += $threads;
+  $fragments['where'][]       = 'pmi.thread_id IN ('.db_placeholders($threads).')';
+  $fragments['query_args']['where'] += $threads;
   $fragments['inner_join'][]  = 'INNER JOIN {pm_message} pm ON (pm.mid = pmi.mid)';
   if ($account) {
     // Only load the user's messages.
     $fragments['where'][]     = 'pmi.uid = %d';
-    $fragments['query_args']['where'][]  = $account->uid;
+    $fragments['query_args']['where'][] = $account->uid;
   }
   if (!$load_all) {
     // Also load deleted messages when requested.
@@ -1322,7 +1322,7 @@ 
 
   $fragments['inner_join'][]  = 'INNER JOIN {users} u ON (u.uid = pmi.uid)';
   $fragments['where'][]       = 'pmi.thread_id = %d';
-  $fragments['query_args']['where'][]  = $thread_id;
+  $fragments['query_args']['where'][] = $thread_id;
 }
 
 /**
@@ -1342,7 +1342,7 @@ 
   $fragments['where'][]       = 'pmi.deleted = 0';
   $fragments['where'][]       = 'pmi.is_new = 1';
   $fragments['where'][]       = 'pmi.uid = %d';
-  $fragments['query_args']['where'][]  = $account->uid;
+  $fragments['query_args']['where'][] = $account->uid;
 }
 
 /**
@@ -1362,7 +1362,7 @@ 
   $fragments['select'][] = 'u.name,u.id';
   // Escape the % to get it through the placeholder replacement.
   $fragments['where'][] = "u.name LIKE '%s'";
-  $fragments['query_args']['where'][] = $search .'%%';
+  $fragments['query_args']['where'][] = $search.'%%';
   if (!empty($names)) {
     // If there are already names selected, exclude them from the
     // suggestions. Extract the BOINC ids from the names array, and
@@ -1372,7 +1372,7 @@ 
       $boincid = substr($name, strrpos($name, '_') + 1);
       $ids[$boincid] = $boincid;
     }
-    $fragments['where'][] = "u.id NOT IN (". db_placeholders($ids, 'int') .")";
+    $fragments['where'][] = "u.id NOT IN (".db_placeholders($ids, 'int').")";
     $fragments['query_args']['where'] += $ids;
   }
   // Only load active users and sort them by name.
@@ -1405,7 +1405,7 @@ 
 
   // Only select messages that have been deleted more than n days ago.
   $fragments['having'][] = 'MAX(pmi.deleted) < %d';
-  $fragments['query_args']['having'][] = time() - $days * 86400;
+  $fragments['query_args']['having'][] = time() - $days*86400;
 }
 
 /**
@@ -1435,11 +1435,11 @@ 
     db_set_active('boinc');
     $result = db_query_range($query['query'], $fragment, 0, 10);
     db_set_active('default');
-    $prefix = count($names) ? implode(' ', $names) . ' ' : '';
+    $prefix = count($names) ? implode(' ', $names).' ' : '';
     // 3: Build proper suggestions and print.
     while ($user = db_fetch_object($result)) {
       $myname = preg_replace("/ /", "\xc2\xa0", $user->name);
-      $matches[$prefix . $myname . "_" . $user->id . ' '] = htmlentities($myname) . '(' . $user->id . ')';
+      $matches[$prefix.$myname."_".$user->id.' '] = htmlentities($myname).'('.$user->id.')';
     }
   }
   // convert to object to prevent drupal bug, see http://drupal.org/node/175361
@@ -1481,7 +1481,7 @@ 
 
       if (!empty($mids)) {
         // Delete recipient entries in {pm_index} of the messages the user wrote.
-        db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
+        db_query('DELETE FROM {pm_index} WHERE mid IN ('.db_placeholders($mids).')', $mids);
       }
 
       // Delete recipient entries of that user.
@@ -1553,10 +1553,10 @@ 
   if (privatemsg_user_access('write privatemsg')) {
     $links[] = l(t('Write new message'), 'messages/new');
   }
-  if (privatemsg_user_access('read privatemsg') || privatemsg_user_access('read all private messages') ) {
+  if (privatemsg_user_access('read privatemsg') || privatemsg_user_access('read all private messages')) {
     $links[] = l(privatemsg_title_callback(), 'messages');
   }
-  if ( count( $links ) ) {
+  if (count($links)) {
     $block = array(
       'subject' => t('Private messages'),
       'content' => theme('item_list', $links),
@@ -1572,7 +1572,7 @@ 
   );
   $form['delete_destination'] = array(
     '#type' => 'value',
-    '#value' => count($thread['messages']) > 1 ? 'messages/view/' . $message['thread_id'] : 'messages',
+    '#value' => count($thread['messages']) > 1 ? 'messages/view/'.$message['thread_id'] : 'messages',
   );
 
   if (privatemsg_user_access('read all private messages')) {
@@ -1585,7 +1585,7 @@ 
   }
   return confirm_form($form,
     t('Are you sure you want to delete this message?'),
-    isset($_GET['destination']) ? $_GET['destination'] : 'messages/view/'. $message['thread_id'],
+    isset($_GET['destination']) ? $_GET['destination'] : 'messages/view/'.$message['thread_id'],
     t('This action cannot be undone.'),
     t('Delete'),
     t('Cancel')
@@ -1814,7 +1814,7 @@ 
   }
 
   // Don't allow replies without a body.
-  if (!empty($message['thread_id']) && ($message['body'] === NULL || $message['body'] === '') ) {
+  if (!empty($message['thread_id']) && ($message['body'] === NULL || $message['body'] === '')) {
     if ($form) {
       form_set_error('body', t('Disallowed to send reply without a message.'));
     }
@@ -1930,7 +1930,7 @@ 
   // 2) Save message to recipients.
   // Each recipient gets a record in the pm_index table.
   foreach ($message['recipients'] as $recipient) {
-    if (!db_query($index_sql, $mid, $message['thread_id'], $recipient->uid, 1) ) {
+    if (!db_query($index_sql, $mid, $message['thread_id'], $recipient->uid, 1)) {
       // We assume if one insert failed then the rest may fail too against the
       // same table.
       return FALSE;
@@ -1995,9 +1995,9 @@ 
   if (empty($validated)) {
     return FALSE;
   }
-  $url = 'messages/new/'. implode(',', $validated);
+  $url = 'messages/new/'.implode(',', $validated);
   if (!is_null($subject)) {
-    $url .= '/'. $subject;
+    $url .= '/'.$subject;
   }
   return $url;
 }
@@ -2107,7 +2107,7 @@ 
   // we do the merge because we call call_user_func_array and not drupal_alter
   // this is necessary because otherwise we would not be able to use $args correctly (otherwise it doesnt unfold)
   $alterargs = array(&$fragments);
-  $query_function = $query_group .'_sql_'. $query_id;
+  $query_function = $query_group.'_sql_'.$query_id;
   if (!empty($args)) {
     $alterargs = array_merge($alterargs, $args);
   }
@@ -2144,7 +2144,7 @@ 
   // Perform the whole query assembly only if we have something to select.
   if (!empty($SELECT)) {
     $str_select = implode(", ", $SELECT);
-    $query = "SELECT {$str_select} FROM ". $primary_table;
+    $query = "SELECT {$str_select} FROM ".$primary_table;
 
     // Also build a count query which can be passed to pager_query to get a "page count" as that does not play well with queries including "GROUP BY".
     // In most cases,  "COUNT(*)" is enough to get the count query, but in queries involving a GROUP BY, we want a count of the number of groups we have, not the count of elements inside each group.
@@ -2153,10 +2153,10 @@ 
       // PostgreSQL does not support COUNT(sometextfield, someintfield), so I'm only using the first one
       // Works fine for thread_id/list but may generate an error when a more complex GROUP BY is used.
       $str_group_by_count = current($GROUP_BY);
-      $count = "SELECT COUNT(DISTINCT {$str_group_by_count}) FROM ". $primary_table;
+      $count = "SELECT COUNT(DISTINCT {$str_group_by_count}) FROM ".$primary_table;
     }
     else {
-      $count = "SELECT COUNT(*) FROM ". $primary_table;
+      $count = "SELECT COUNT(*) FROM ".$primary_table;
     }
 
     if (!empty($INNER_JOIN)) {
@@ -2165,24 +2165,24 @@ 
       $count .= " {$str_inner_join}";
     }
     if (!empty($WHERE)) {
-      $str_where = '('. implode(') AND (', $WHERE) .')';
+      $str_where = '('.implode(') AND (', $WHERE).')';
       $query .= " WHERE {$str_where}";
       $count .= " WHERE {$str_where}";
     }
     if (!empty($GROUP_BY)) {
-      $str_group_by = ' GROUP BY '. implode(", ", $GROUP_BY) ;
+      $str_group_by = ' GROUP BY '.implode(", ", $GROUP_BY);
       $query .= " {$str_group_by}";
     }
     if (!empty($HAVING)) {
-      $str_having = '('. implode(') AND (', $HAVING) .')';
+      $str_having = '('.implode(') AND (', $HAVING).')';
       $query .= " HAVING {$str_having}";
       // queries containing a HAVING break the count query on pgsql.
       // In this case, use the subquery method as outlined in http://drupal.org/node/303087#comment-1370752 .
       // The subquery method will work for all COUNT queries, but it is thought to be much slower, so we are only using it where other cross database approaches fail.
-      $count = 'SELECT COUNT(*) FROM ('. $query .') as count';
+      $count = 'SELECT COUNT(*) FROM ('.$query.') as count';
     }
     if (!empty($ORDER_BY)) {
-      $str_order_by = ' ORDER BY '. implode(", ", $ORDER_BY) ;
+      $str_order_by = ' ORDER BY '.implode(", ", $ORDER_BY);
       $query .= " {$str_order_by}";
     }
     $QUERY_ARGS = array_merge($QUERY_ARGS['select'], $QUERY_ARGS['join'], $QUERY_ARGS['where'], $QUERY_ARGS['having']);
@@ -2247,7 +2247,7 @@ 
       '#attributes' => array('class' => 'privatemsg-action-button'),
   );
   // JS for hiding the execute button.
-  drupal_add_js(drupal_get_path('module', 'privatemsg') .'/privatemsg-list.js');
+  drupal_add_js(drupal_get_path('module', 'privatemsg').'/privatemsg-list.js');
   return $form;
 }
 
@@ -2272,7 +2272,7 @@ 
   }
   // Merge status and uid with the threads list. array_merge() will not overwrite/ignore thread_id 1.
   $params = array_merge(array($status, $account->uid), $threads);
-  db_query('UPDATE {pm_index} SET is_new = %d WHERE uid = %d AND thread_id IN ('. db_placeholders($threads) .')', $params);
+  db_query('UPDATE {pm_index} SET is_new = %d WHERE uid = %d AND thread_id IN ('.db_placeholders($threads).')', $params);
 
   if ($status == PRIVATEMSG_UNREAD) {
     drupal_set_message(format_plural(count($threads), 'Marked 1 thread as unread.', 'Marked @count threads as unread.'));
@@ -2299,12 +2299,12 @@ 
   $select_header['#weight'] = -50;
 
   // theme() doesn't include the theme file for patterns, we need to do it manually.
-  include_once drupal_get_path('module', 'privatemsg') .'/privatemsg.theme.inc';
+  include_once drupal_get_path('module', 'privatemsg').'/privatemsg.theme.inc';
 
   $header = array($select_header);
   foreach ($keys as $key) {
     // First, try to load a specific theme for that header, if not present, use the default.
-    if ($return = theme(array('privatemsg_list_header__'. $key, 'privatemsg_list_header'))) {
+    if ($return = theme(array('privatemsg_list_header__'.$key, 'privatemsg_list_header'))) {
       // The default theme returns nothing, only store the value if we have something.
       $header[$key] = $return;
     }
@@ -2325,7 +2325,7 @@ 
 function _privatemsg_list_headers_fallback($keys) {
   $header = array();
   foreach ($keys as $key) {
-    $theme_function = 'phptemplate_privatemsg_list_header__' . $key;
+    $theme_function = 'phptemplate_privatemsg_list_header__'.$key;
     if (function_exists($theme_function)) {
       $header[$key] = $theme_function();
     }
@@ -2353,7 +2353,7 @@ 
   }
   foreach ($thread as $key => $data) {
     // First, try to load a specific theme for that field, if not present, use the default.
-    if ($return = theme(array('privatemsg_list_field__'. $key, 'privatemsg_list_field'), $thread)) {
+    if ($return = theme(array('privatemsg_list_field__'.$key, 'privatemsg_list_field'), $thread)) {
       // The default theme returns nothing, only store the value if we have something.
       $row['data'][$key] = $return;
     }
@@ -2373,7 +2373,7 @@ 
 function _privatemsg_list_thread_fallback($thread) {
   $row_data = array();
   foreach ($thread as $key => $data) {
-    $theme_function = 'phptemplate_privatemsg_list_field__' . $key;
+    $theme_function = 'phptemplate_privatemsg_list_field__'.$key;
     if (function_exists($theme_function)) {
       $row_data[$key] = $theme_function($thread);
     }
@@ -2572,6 +2572,6 @@ 
 function privatemsg_views_api() {
   return array(
     'api' => 2,
-    'path' => drupal_get_path('module', 'privatemsg') . '/views',
+    'path' => drupal_get_path('module', 'privatemsg').'/views',
   );
 }

Braces +41 added lines, -70 removed lines

@@ -102,10 +102,11 @@ 
     }
 
     $last = array_pop($to);
-    if (count($to) == 0) { // Only one participant
+    if (count($to) == 0) {
+// Only one participant
       return t("From !last", array('!last' => $last));
-    }
-    else { // Multipe participants..
+    } else {
+// Multipe participants..
       $participants = implode(', ', $to);
       return t('Participants: !participants and !last', array('!participants' => $participants, '!last' => $last));
     }
@@ -224,7 +225,8 @@ 
     global $user;
     $account = $user;
   }
-  if (!$account->uid) { // Disallow anonymous access, regardless of permissions
+  if (!$account->uid) {
+// Disallow anonymous access, regardless of permissions
     return FALSE;
   }
   if (!user_access($permission, $account)) {
@@ -325,11 +327,9 @@ 
       if (is_null($start)) {
         if (isset($_GET['start']) && $_GET['start'] < $thread['message_count']) {
           $start = $_GET['start'];
-        }
-        elseif (!variable_get('privatemsg_view_use_max_as_default', FALSE) && $max_amount == PRIVATEMSG_UNLIMITED) {
+        } elseif (!variable_get('privatemsg_view_use_max_as_default', FALSE) && $max_amount == PRIVATEMSG_UNLIMITED) {
           $start = PRIVATEMSG_UNLIMITED;
-        }
-        else {
+        } else {
           $start = $thread['message_count'] - (variable_get('privatemsg_view_use_max_as_default', FALSE) ? variable_get('privatemsg_view_default_amount', 10) : $max_amount);
         }
       }
@@ -338,8 +338,7 @@ 
         if ($max_amount == PRIVATEMSG_UNLIMITED) {
           $last_page = 0;
           $max_amount = $thread['message_count'];
-        }
-        else {
+        } else {
           // Calculate the number of messages on the "last" page to avoid
           // message overlap.
           // Note - the last page lists the earliest messages, not the latest.
@@ -360,8 +359,7 @@ 
         }
         if ($start - $max_amount >= 0) {
           $thread['older_start'] = $start - $max_amount;
-        }
-        elseif ($start > 0) {
+        } elseif ($start > 0) {
           $thread['older_start'] = 0;
         }
 
@@ -377,8 +375,7 @@ 
         // Visual counts start from 1 instead of zero, so plus one.
         $thread['from'] = $start + 1;
         $conversation = db_query_range($query['query'], $start, $max_amount);
-      }
-      else {
+      } else {
         $conversation = db_query($query['query']);
       }
       $mids = array();
@@ -398,12 +395,10 @@ 
             // Thread does not exist, display 404.
             $thread = FALSE;
           }
-        }
-        else {
+        } else {
           $thread = FALSE;
         }
-      }
-      else {
+      } else {
         // General data, assume subject is the same for all messages of that thread.
         $thread['user'] = $account;
         $message = current($thread['messages']);
@@ -689,8 +684,7 @@ 
     // Trying to view someone else's messages...
     if (!privatemsg_user_access('read all private messages')) {
       drupal_set_message(t("You do not have sufficient rights to view someone else's messages"), 'warning');
-    }
-    elseif ($account_check = user_load(array('uid' => $uid))) {
+    } elseif ($account_check = user_load(array('uid' => $uid))) {
       // Has rights and user_load return an array so user does exist
       $account = $account_check;
     }
@@ -852,11 +846,9 @@ 
   // convert recipients to array of user objects
   if (!empty($recipients) && is_string($recipients) || is_int($recipients)) {
     $recipients = _privatemsg_generate_user_array($recipients);
-  }
-  elseif (is_object($recipients)) {
+  } elseif (is_object($recipients)) {
     $recipients = array($recipients);
-  }
-  elseif (empty($recipients) && is_string($recipients)) {
+  } elseif (empty($recipients) && is_string($recipients)) {
     $recipients = array();
   }
 
@@ -881,8 +873,7 @@ 
       $myname = preg_replace("/ /", "\xc2\xa0", $myuser->boincuser_name);
       $to[] = $myname . "_" . $myuser->boincuser_id;
       $to_themed[$recipient->uid] = $myname;
-    }
-    else {
+    } else {
       // Recipient list contains blocked users.
       $blocked = TRUE;
     }
@@ -909,8 +900,7 @@ 
   }
   if (!$thread_id && !empty($recipients_string)) {
     drupal_set_title(t('Write new message to %recipient', array('%recipient' => $recipients_string)));
-  }
-  elseif (!$thread_id) {
+  } elseif (!$thread_id) {
     drupal_set_title(t('Write new message'));
   }
 
@@ -986,8 +976,7 @@ 
   $title = t('Cancel');
   if (isset($_REQUEST['destination'])) {
     $url = $_REQUEST['destination'];
-  }
-  elseif (!is_null($thread_id)) {
+  } elseif (!is_null($thread_id)) {
     $url = $_GET['q'];
     $title = t('Clear');
   }
@@ -1038,8 +1027,7 @@ 
   // Only parse the user string for a new thread.
   if (!isset($message['thread_id'])) {
     list($message['recipients'], $invalid) = _privatemsg_parse_userstring($message['recipient']);
-  }
-  else {
+  } else {
     // Load participants.
     $message['recipients'] = _privatemsg_load_thread_participants($message['thread_id']);
     // Remove author.
@@ -1097,7 +1085,8 @@ 
   $recipients = array();
   foreach ($input as $string) {
     $string = trim($string);
-    if (!empty($string)) { // We don't care about white space names.
+    if (!empty($string)) {
+// We don't care about white space names.
 
       // First, check if another module is able to resolve the string into an
       // user object.
@@ -1133,10 +1122,9 @@ 
   foreach ($form_state['validate_built_message']['recipients'] as $recipient) {
     $recipient_names[] = theme('username', $recipient);
   }
-  if ($status !== FALSE )  {
+  if ($status !== FALSE ) {
     drupal_set_message(t('A message has been sent to !recipients.', array('!recipients' => implode(', ', $recipient_names))));
-  }
-  else {
+  } else {
     drupal_set_message(t('An attempt to send a message <em>may have failed</em> when sending to !recipients.', array('!recipients' => implode(', ', $recipient_names))), 'error');
   }
 }
@@ -1197,8 +1185,7 @@ 
       $fragments['select'][]      = "array_to_string(array(SELECT DISTINCT textin(int4out(pmia.uid))
                                                             FROM {pm_index} pmia
                                                             WHERE pmia.thread_id = pmi.thread_id), ',') AS participants";
-    }
-    else {
+    } else {
       $fragments['select'][]      = '(SELECT GROUP_CONCAT(DISTINCT pmia.uid SEPARATOR ",")
                                                             FROM {pm_index} pmia
                                                             WHERE pmia.thread_id = pmi.thread_id) AS participants';
@@ -1503,8 +1490,7 @@ 
     );
 
     return $blocks;
-  }
-  elseif ('view' == $op) {
+  } elseif ('view' == $op) {
     $block = array();
     switch ($delta) {
       case 'privatemsg-menu':
@@ -1600,8 +1586,7 @@ 
     if (isset($form_state['values']['delete_options']) && $form_state['values']['delete_options']) {
       privatemsg_message_change_delete($form_state['values']['pmid'], 1);
       drupal_set_message(t('Message has been deleted for all users.'));
-    }
-    else {
+    } else {
       privatemsg_message_change_delete($form_state['values']['pmid'], 1, $account);
       drupal_set_message(t('Message has been deleted.'));
     }
@@ -1630,8 +1615,7 @@ 
 
   if ($account) {
     db_query('UPDATE {pm_index} SET deleted = %d WHERE mid = %d AND uid = %d', $delete_value, $pmid, $account->uid);
-  }
-  else {
+  } else {
     // Mark deleted for all users.
     db_query('UPDATE {pm_index} SET deleted = %d WHERE mid = %d', $delete_value, $pmid);
   }
@@ -1792,8 +1776,7 @@ 
         'success'  => FALSE,
         'messages'   => $messages,
       );
-    }
-    else {
+    } else {
       $messages['error'][] = t('User @user is not allowed to write messages', array('@user' => $message['author']->name));
       return array(
          'success'  => FALSE,
@@ -1807,8 +1790,7 @@ 
   if (empty($message['subject'])) {
     if ($form) {
       form_set_error('subject', t('Disallowed to send a message without subject'));
-    }
-    else {
+    } else {
       $messages['error'][] = t('Disallowed to send a message without subject');
     }
   }
@@ -1817,8 +1799,7 @@ 
   if (!empty($message['thread_id']) && ($message['body'] === NULL || $message['body'] === '') ) {
     if ($form) {
       form_set_error('body', t('Disallowed to send reply without a message.'));
-    }
-    else {
+    } else {
       $messages['error'][] = t('Disallowed to send reply without a message.');
     }
   }
@@ -1832,8 +1813,7 @@ 
   if (!filter_access($message['format'])) {
     if ($form) {
       form_set_error('format', t('You are not allowed to use the specified input format.'));
-    }
-    else {
+    } else {
       $messages['error'][] = t('User @user is not allowed to use the specified input format.', array('@user' => $message['author']->name));
     }
   }
@@ -1844,8 +1824,7 @@ 
   if (empty($message['recipients']) || !is_array($message['recipients'])) {
     if ($form) {
       form_set_error('to', t('Disallowed to send a message without at least one valid recipient'));
-    }
-    else {
+    } else {
       $messages['error'][] = t('Disallowed to send a message without at least one valid recipient');
     }
   }
@@ -1855,8 +1834,7 @@ 
       unset($message['recipients'][$blocked['uid']]);
       if ($form) {
         drupal_set_message($blocked['message'], 'warning');
-      }
-      else {
+      } else {
         $messages['warning'][] = $blocked['message'];
       }
     }
@@ -1866,8 +1844,7 @@ 
   if (empty($message['recipients'])) {
     if ($form) {
       form_set_error('to', t('Disallowed to send message because all recipients are blocked'));
-    }
-    else {
+    } else {
       $messages['error'][] = t('Disallowed to send message because all recipients are blocked');
     }
   }
@@ -2073,8 +2050,7 @@ 
   if (is_array($query)) {
     $query_id = $query[0];
     $query_group = $query[1];
-  }
-  else {
+  } else {
     $query_id = $query;
     $query_group = 'privatemsg';
   }
@@ -2154,8 +2130,7 @@ 
       // Works fine for thread_id/list but may generate an error when a more complex GROUP BY is used.
       $str_group_by_count = current($GROUP_BY);
       $count = "SELECT COUNT(DISTINCT {$str_group_by_count}) FROM ". $primary_table;
-    }
-    else {
+    } else {
       $count = "SELECT COUNT(*) FROM ". $primary_table;
     }
 
@@ -2276,8 +2251,7 @@ 
 
   if ($status == PRIVATEMSG_UNREAD) {
     drupal_set_message(format_plural(count($threads), 'Marked 1 thread as unread.', 'Marked @count threads as unread.'));
-  }
-  else {
+  } else {
     drupal_set_message(format_plural(count($threads), 'Marked 1 thread as read.', 'Marked @count threads as read.'));
   }
 }
@@ -2458,8 +2432,7 @@ 
   // Add in callback arguments if present.
   if (isset($operation['callback arguments'])) {
     $args = array_merge(array($threads), $operation['callback arguments']);
-  }
-  else {
+  } else {
     $args = array($threads);
   }
 
@@ -2476,8 +2449,7 @@ 
     // Add in callback arguments if present.
     if (isset($operation['undo callback arguments'])) {
       $undo_args = array_merge(array($threads), $operation['undo callback arguments']);
-    }
-    else {
+    } else {
       $undo_args = array($threads);
     }
 
@@ -2529,8 +2501,7 @@ 
 
   if ($delete) {
     drupal_set_message(format_plural(count($threads), 'Deleted 1 thread.', 'Deleted @count threads.'));
-  }
-  else {
+  } else {
     drupal_set_message(format_plural(count($threads), 'Restored 1 thread.', 'Restored @count threads.'));
   }
 }

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

@@ -41,7 +41,7 @@ 
  * @return
  *   Array with user objects.
  */
-function _privatemsg_generate_user_array($userstring, $slice = NULL) {
+function _privatemsg_generate_user_array($userstring, $slice = null) {
   static $user_cache = array();
 
   // Convert user uid list (uid1,uid2,uid3) into an array. If $slice is not NULL
@@ -79,13 +79,13 @@ 
  * @return
  *   String with formated user objects, like user1, user2.
  */
-function _privatemsg_format_participants($part_array, $limit = NULL, $no_text = FALSE) {
+function _privatemsg_format_participants($part_array, $limit = null, $no_text = false) {
   if (count($part_array) > 0) {
     $to = array();
-    $limited = FALSE;
+    $limited = false;
     foreach ($part_array as $account) {
       if (is_int($limit) && count($to) >= $limit) {
-        $limited = TRUE;
+        $limited = true;
         break;
       }
       $to[] = theme('username', $account);
@@ -137,7 +137,7 @@ 
     'title'            => 'Read message',
     // Set the third argument to TRUE so that we can show access denied instead
     // of not found.
-    'load arguments'   => array(NULL, NULL, TRUE),
+    'load arguments'   => array(null, null, true),
     'page callback'    => 'privatemsg_view',
     'page arguments'   => array(2),
     'access callback'  => 'privatemsg_view_access',
@@ -156,7 +156,7 @@ 
   $items['messages/new'] = array(
     'title'            => 'Write new message',
     'page callback'    => 'drupal_get_form',
-    'page arguments'   => array('privatemsg_new', 2, 3, NULL),
+    'page arguments'   => array('privatemsg_new', 2, 3, null),
     'access callback'  => 'privatemsg_user_access',
     'access arguments' => array('write privatemsg'),
     'type'             => MENU_LOCAL_TASK,
@@ -219,18 +219,18 @@ 
  *
  * @ingroup api
  */
-function privatemsg_user_access($permission = 'read privatemsg', $account = NULL) {
-  if ( $account === NULL ) {
+function privatemsg_user_access($permission = 'read privatemsg', $account = null) {
+  if ( $account === null ) {
     global $user;
     $account = $user;
   }
   if (!$account->uid) { // Disallow anonymous access, regardless of permissions
-    return FALSE;
+    return false;
   }
   if (!user_access($permission, $account)) {
-    return FALSE;
+    return false;
   }
-  return TRUE;
+  return true;
 }
 
 /**
@@ -250,12 +250,12 @@ 
   // Do not allow access to threads without messages.
   if (empty($thread['messages'])) {
     // Count all messages, if there
-    return FALSE;
+    return false;
   }
   if (privatemsg_user_access('read privatemsg') && arg(1) == 'view') {
-    return TRUE;
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -287,7 +287,7 @@ 
 
  * @ingroup api
  */
-function privatemsg_thread_load($thread_id, $account = NULL, $start = NULL, $useAccessDenied = FALSE) {
+function privatemsg_thread_load($thread_id, $account = null, $start = null, $useAccessDenied = false) {
   static $threads = array();
   if ((int)$thread_id > 0) {
     $thread = array('thread_id' => $thread_id);
@@ -309,13 +309,13 @@ 
       while ($participant = db_fetch_object($participants)) {
         $thread['participants'][$participant->uid] = $participant;
       }
-      $thread['read_all'] = FALSE;
+      $thread['read_all'] = false;
       if (!array_key_exists($account->uid, $thread['participants']) && privatemsg_user_access('read all private messages', $account)) {
-        $thread['read_all'] = TRUE;
+        $thread['read_all'] = true;
       }
 
       // Load messages returned by the messages query with privatemsg_message_load_multiple().
-      $query = _privatemsg_assemble_query('messages', array($thread_id), $thread['read_all'] ? NULL : $account);
+      $query = _privatemsg_assemble_query('messages', array($thread_id), $thread['read_all'] ? null : $account);
       $thread['message_count'] = $thread['to'] = db_result(db_query($query['count']));
       $thread['from'] = 1;
       // Check if we need to limit the messages.
@@ -326,11 +326,11 @@ 
         if (isset($_GET['start']) && $_GET['start'] < $thread['message_count']) {
           $start = $_GET['start'];
         }
-        elseif (!variable_get('privatemsg_view_use_max_as_default', FALSE) && $max_amount == PRIVATEMSG_UNLIMITED) {
+        elseif (!variable_get('privatemsg_view_use_max_as_default', false) && $max_amount == PRIVATEMSG_UNLIMITED) {
           $start = PRIVATEMSG_UNLIMITED;
         }
         else {
-          $start = $thread['message_count'] - (variable_get('privatemsg_view_use_max_as_default', FALSE) ? variable_get('privatemsg_view_default_amount', 10) : $max_amount);
+          $start = $thread['message_count'] - (variable_get('privatemsg_view_use_max_as_default', false) ? variable_get('privatemsg_view_default_amount', 10) : $max_amount);
         }
       }
 
@@ -343,7 +343,7 @@ 
           // Calculate the number of messages on the "last" page to avoid
           // message overlap.
           // Note - the last page lists the earliest messages, not the latest.
-          $paging_count = variable_get('privatemsg_view_use_max_as_default', FALSE) ? $thread['message_count'] - variable_get('privatemsg_view_default_amount', 10) : $thread['message_count'];
+          $paging_count = variable_get('privatemsg_view_use_max_as_default', false) ? $thread['message_count'] - variable_get('privatemsg_view_default_amount', 10) : $thread['message_count'];
           $last_page = $paging_count % $max_amount;
         }
 
@@ -386,21 +386,21 @@ 
         $mids[] = $result['mid'];
       }
       // Load messages returned by the messages query.
-      $thread['messages'] = privatemsg_message_load_multiple($mids, $thread['read_all'] ? NULL : $account);
+      $thread['messages'] = privatemsg_message_load_multiple($mids, $thread['read_all'] ? null : $account);
 
       // If there are no messages, don't allow access to the thread.
       if (empty($thread['messages'])) {
         if ($useAccessDenied) {
           // Generate new query with read all to see if the thread does exist.
-          $query = _privatemsg_assemble_query('messages', array($thread_id), NULL);
+          $query = _privatemsg_assemble_query('messages', array($thread_id), null);
           $exists = db_result(db_query($query['count']));
           if (!$exists) {
             // Thread does not exist, display 404.
-            $thread = FALSE;
+            $thread = false;
           }
         }
         else {
-          $thread = FALSE;
+          $thread = false;
         }
       }
       else {
@@ -414,7 +414,7 @@ 
 
     return $threads[$account->uid][$thread_id];
   }
-  return FALSE;
+  return false;
 }
 
 function private_message_view_options() {
@@ -445,8 +445,8 @@ 
 
   $form['theming_settings'] = array(
     '#type'        => 'fieldset',
-    '#collapsible' => TRUE,
-    '#collapsed'   => TRUE,
+    '#collapsible' => true,
+    '#collapsed'   => true,
     '#title'       => t('Theming settings'),
   );
   $form['theming_settings']['private_message_view_template'] = array(
@@ -458,14 +458,14 @@ 
   $form['privatemsg_display_loginmessage'] = array(
     '#type' => 'checkbox',
     '#title' => t('Inform the user about new messages on login'),
-    '#default_value' => variable_get('privatemsg_display_loginmessage', TRUE),
+    '#default_value' => variable_get('privatemsg_display_loginmessage', true),
     '#description' => t('This option can safely be disabled if the "New message indication" block is used instead.'),
   );
 
   $form['flush_deleted'] = array(
     '#type'        => 'fieldset',
-    '#collapsible' => TRUE,
-    '#collapsed'   => TRUE,
+    '#collapsible' => true,
+    '#collapsed'   => true,
     '#title'       => t('Flush deleted messages'),
     '#description' => t('By default, deleted messages are only hidden from the user but still stored in the database. These settings control if and when messages should be removed.'),
   );
@@ -473,7 +473,7 @@ 
   $form['flush_deleted']['privatemsg_flush_enabled'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Flush deleted messages'),
-    '#default_value' => variable_get('privatemsg_flush_enabled', FALSE),
+    '#default_value' => variable_get('privatemsg_flush_enabled', false),
     '#description'   => t('Enable the flushing of deleted messages. Requires that cron is enabled'),
   );
 
@@ -494,8 +494,8 @@ 
   $form['privatemsg_listing'] = array(
     '#type' => 'fieldset',
     '#title' => t('Configure listings'),
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
+    '#collapsible' => true,
+    '#collapsed' => false,
   );
 
   $form['privatemsg_listing']['privatemsg_per_page'] = array(
@@ -531,7 +531,7 @@ 
   $form['privatemsg_listing']['privatemsg_view_use_max_as_default'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Display different amount of messages on first thread page'),
-    '#default_value' => variable_get('privatemsg_view_use_max_as_default', FALSE),
+    '#default_value' => variable_get('privatemsg_view_use_max_as_default', false),
     '#description'   => t('By default, the first thread page shows the maximally allowed amount of messages. Enable this checkbox to set a different value.'),
     '#weight'        => 15,
   );
@@ -563,7 +563,7 @@ 
  * old enough are flushed.
  */
 function privatemsg_cron() {
-  if (variable_get('privatemsg_flush_enabled', FALSE)) {
+  if (variable_get('privatemsg_flush_enabled', false)) {
     $query = _privatemsg_assemble_query('deleted', variable_get('privatemsg_flush_days', 30));
     $result = db_query($query['query']);
 
@@ -584,19 +584,19 @@ 
 function privatemsg_theme() {
   return array(
     'privatemsg_view'    => array(
-      'arguments'        => array('message' => NULL),
+      'arguments'        => array('message' => null),
       'template'         => variable_get('private_message_view_template', 'privatemsg-view'), // 'privatemsg',
     ),
     'privatemsg_from'    => array(
-      'arguments'        => array('author' => NULL),
+      'arguments'        => array('author' => null),
       'template'         => 'privatemsg-from',
     ),
     'privatemsg_recipients' => array(
-      'arguments'        => array('message' => NULL),
+      'arguments'        => array('message' => null),
       'template'         => 'privatemsg-recipients',
     ),
     'privatemsg_between' => array(
-      'arguments'        => array('recipients' => NULL),
+      'arguments'        => array('recipients' => null),
       'template'         => 'privatemsg-between',
     ),
     'privatemsg_list'    => array(
@@ -630,15 +630,15 @@ 
 //  drupal_set_message('<pre>'. print_r($vars,1 ) . '</pre>');
 
   $message = $vars['message'];
-  $vars['mid'] = isset($message['mid']) ? $message['mid'] : NULL;
-  $vars['thread_id'] = isset($message['thread_id']) ? $message['thread_id'] : NULL;
+  $vars['mid'] = isset($message['mid']) ? $message['mid'] : null;
+  $vars['thread_id'] = isset($message['thread_id']) ? $message['thread_id'] : null;
   $vars['author_picture'] = theme('user_picture', $message['author']);
   $vars['author_name_link'] = theme('username', $message['author']);
   /**
    * @todo perhaps make this timestamp configurable via admin UI?
    */
   $vars['message_timestamp'] = format_date($message['timestamp'], 'small');
-  $vars['message_body'] = check_markup($message['body'], $message['format'], FALSE);
+  $vars['message_body'] = check_markup($message['body'], $message['format'], false);
   if (isset($vars['mid']) && isset($vars['thread_id']) && privatemsg_user_access('delete privatemsg')) {
     $vars['message_actions'][] = array('title' => t('Delete message'), 'href' => 'messages/delete/' . $vars['thread_id'] . '/' . $vars['mid']);
   }
@@ -679,7 +679,7 @@ 
  * @return
  *   Form array
  */
-function privatemsg_list(&$form_state, $argument = 'list', $uid = NULL) {
+function privatemsg_list(&$form_state, $argument = 'list', $uid = null) {
   global $user;
 
   // Setting default behavior...
@@ -735,7 +735,7 @@ 
  * @param $account
  *   User object, defaults to the current user
  */
-function privatemsg_message_change_status($pmid, $status, $account = NULL) {
+function privatemsg_message_change_status($pmid, $status, $account = null) {
   if (!$account) {
     global $user;
     $account = $user;
@@ -752,7 +752,7 @@ 
  *
  * @ingroup api
  */
-function privatemsg_unread_count($account = NULL) {
+function privatemsg_unread_count($account = null) {
   static $counts = array();
   if (!$account || $account->uid == 0) {
     global $user;
@@ -843,7 +843,7 @@ 
 }
 
 
-function privatemsg_new(&$form_state, $recipients = array(), $subject = '', $thread_id = NULL, $read_all = FALSE) {
+function privatemsg_new(&$form_state, $recipients = array(), $subject = '', $thread_id = null, $read_all = false) {
   global $user;
 
   $recipients_string = '';
@@ -863,7 +863,7 @@ 
   $usercount = 0;
   $to = array();
   $to_themed = array();
-  $blocked = FALSE;
+  $blocked = false;
   foreach ($recipients as $recipient) {
     if (in_array($recipient->name, $to)) {
       // We already added the recipient to the list, skip him.
@@ -884,7 +884,7 @@ 
     }
     else {
       // Recipient list contains blocked users.
-      $blocked = TRUE;
+      $blocked = true;
     }
   }
 
@@ -938,7 +938,7 @@ 
       '#title'              => t('To'),
       '#description'        => t('Separate multiple names with a space. The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.'),
       '#default_value'      => $recipients_string,
-      '#required'           => TRUE,
+      '#required'           => true,
       '#weight'             => -10,
       '#size'               => 50,
       '#autocomplete_path'  => 'messages/user-name-autocomplete',
@@ -959,7 +959,7 @@ 
     '#rows'               => 6,
     '#weight'             => 0,
     '#default_value'      => $body,
-    '#resizable'          => TRUE,
+    '#resizable'          => true,
   );
   $format = FILTER_FORMAT_DEFAULT;
   // The input filter widget looses the format during preview, specify it
@@ -1013,7 +1013,7 @@ 
     );
     if (empty($recipients_string)) {
       // If there are no valid recipients, unset the message reply form.
-      $form['privatemsg']['#access'] = FALSE;
+      $form['privatemsg']['#access'] = false;
     }
   }
   $form['privatemsg']['read_all'] = array(
@@ -1031,7 +1031,7 @@ 
   $message['subject'] = trim($message['subject']);
 
 
-  $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
+  $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, true, true));
   if (empty($message['subject']) && !empty($trimed_body)) {
     $message['subject'] = $trimed_body;
   }
@@ -1047,7 +1047,7 @@ 
       unset($message['recipients'][$message['author']->uid]);
     }
   }
-  $validated = _privatemsg_validate_message($message, TRUE);
+  $validated = _privatemsg_validate_message($message, true);
   foreach ($validated['messages'] as $type => $text) {
     drupal_set_message($text, $type);
   }
@@ -1133,7 +1133,7 @@ 
   foreach ($form_state['validate_built_message']['recipients'] as $recipient) {
     $recipient_names[] = theme('username', $recipient);
   }
-  if ($status !== FALSE )  {
+  if ($status !== false )  {
     drupal_set_message(t('A message has been sent to !recipients.', array('!recipients' => implode(', ', $recipient_names))));
   }
   else {
@@ -1148,7 +1148,7 @@ 
       $form_state['privatemsg_preview'] = theme('privatemsg_view', $form_state['validate_built_message']);
     }
 
-  $form_state['rebuild'] = TRUE; // this forces our form to be rebuilt instead of being submitted.
+  $form_state['rebuild'] = true; // this forces our form to be rebuilt instead of being submitted.
 }
 
 /**
@@ -1226,7 +1226,7 @@ 
   // tablesort_sql() generates a ORDER BY string. However, the "ORDER BY " part 
   // is not needed and added by the query builder. Discard the first 9
   // characters of the string.
-  $order_by = drupal_substr(tablesort_sql(_privatemsg_list_headers( FALSE, array_merge(array('subject', 'last_updated'), $fields)), $order_by_first), 9);
+  $order_by = drupal_substr(tablesort_sql(_privatemsg_list_headers( false, array_merge(array('subject', 'last_updated'), $fields)), $order_by_first), 9);
   $fragments['order_by'][]  = $order_by;
 }
 
@@ -1240,7 +1240,7 @@ 
  * @param $account
  *   Account for which the messages should be loaded.
  */
-function privatemsg_sql_load(&$fragments, $pmids, $account = NULL) {
+function privatemsg_sql_load(&$fragments, $pmids, $account = null) {
   $fragments['primary_table'] = '{pm_message} pm';
 
   $fragments['select'][]      = "pm.mid";
@@ -1276,7 +1276,7 @@ 
  * @param $load_all
  *   Deleted messages are only loaded if this is set to TRUE.
  */
-function privatemsg_sql_messages(&$fragments, $threads, $account = NULL, $load_all = FALSE) {
+function privatemsg_sql_messages(&$fragments, $threads, $account = null, $load_all = false) {
   $fragments['primary_table'] = '{pm_index} pmi';
 
   $fragments['select'][]      = 'pmi.mid';
@@ -1446,7 +1446,7 @@ 
   drupal_json((object)$matches);
 }
 
-function privatemsg_user($op, &$edit, &$account, $category = NULL) {
+function privatemsg_user($op, &$edit, &$account, $category = null) {
   global $user;
 
   switch ($op) {
@@ -1460,7 +1460,7 @@ 
       }
       break;
     case 'login':
-      if (variable_get('privatemsg_display_loginmessage', TRUE) && privatemsg_user_access()) {
+      if (variable_get('privatemsg_display_loginmessage', true) && privatemsg_user_access()) {
         $count = privatemsg_unread_count();
         if ($count) {
           drupal_set_message(format_plural($count, 'You have <a href="@messages">1 unread message</a>.', 'You have <a href="@messages">@count unread messages</a>', array('@messages' => url('messages'))));
@@ -1518,7 +1518,7 @@ 
   }
 }
 
-function privatemsg_title_callback($title = NULL) {
+function privatemsg_title_callback($title = null) {
   $count = privatemsg_unread_count();
 
   if ($count > 0) {
@@ -1580,7 +1580,7 @@ 
       '#type' => 'checkbox',
       '#title' => t('Delete this message for all users?'),
       '#description' => t('Tick the box to delete the message for all users.'),
-      '#default_value' => FALSE,
+      '#default_value' => false,
     );
   }
   return confirm_form($form,
@@ -1622,9 +1622,9 @@ 
  *
  * @ingroup api
  */
-function privatemsg_message_change_delete($pmid, $delete, $account = NULL) {
+function privatemsg_message_change_delete($pmid, $delete, $account = null) {
   $delete_value = 0;
-  if ($delete == TRUE) {
+  if ($delete == true) {
     $delete_value = time();
   }
 
@@ -1676,7 +1676,7 @@ 
  *
  * @ingroup api
  */
-function privatemsg_new_thread($recipients, $subject, $body = NULL, $options = array()) {
+function privatemsg_new_thread($recipients, $subject, $body = null, $options = array()) {
   global $user;
   $author = drupal_clone($user);
 
@@ -1782,21 +1782,21 @@ 
   return $validated;
 }
 
-function _privatemsg_validate_message(&$message, $form = FALSE) {
+function _privatemsg_validate_message(&$message, $form = false) {
   $messages = array('error' => array(), 'warning' => array());
   if (!privatemsg_user_access('write privatemsg', $message['author'])) {
     // no need to do further checks in this case...
     if ($form) {
       form_set_error('author', t('User @user is not allowed to write messages', array('@user' => $message['author']->name)));
       return array(
-        'success'  => FALSE,
+        'success'  => false,
         'messages'   => $messages,
       );
     }
     else {
       $messages['error'][] = t('User @user is not allowed to write messages', array('@user' => $message['author']->name));
       return array(
-         'success'  => FALSE,
+         'success'  => false,
          'messages'   => $messages,
       );
     }
@@ -1814,7 +1814,7 @@ 
   }
 
   // Don't allow replies without a body.
-  if (!empty($message['thread_id']) && ($message['body'] === NULL || $message['body'] === '') ) {
+  if (!empty($message['thread_id']) && ($message['body'] === null || $message['body'] === '') ) {
     if ($form) {
       form_set_error('body', t('Disallowed to send reply without a message.'));
     }
@@ -1826,7 +1826,7 @@ 
   // it is not possible to do the check for a specific user.
   global $user;
   $original_user = drupal_clone($user);
-  session_save_session(FALSE);
+  session_save_session(false);
   $user = $message['author'];
 
   if (!filter_access($message['format'])) {
@@ -1839,7 +1839,7 @@ 
   }
 
   $user = $original_user;
-  session_save_session(TRUE);
+  session_save_session(true);
 
   if (empty($message['recipients']) || !is_array($message['recipients'])) {
     if ($form) {
@@ -1901,11 +1901,11 @@ 
   if (isset($message['read_all']) && $message['read_all']) {
     // The message was sent in read all mode, add the author as recipient to all
     // existing messages.
-    $query_messages = _privatemsg_assemble_query('messages', array($message['thread_id']), NULL);
+    $query_messages = _privatemsg_assemble_query('messages', array($message['thread_id']), null);
     $conversation = db_query($query_messages['query']);
     while ($result = db_fetch_array($conversation)) {
       if (!db_query($index_sql, $result['mid'], $message['thread_id'], $message['author']->uid, 0)) {
-        return FALSE;
+        return false;
       }
     }
   }
@@ -1933,7 +1933,7 @@ 
     if (!db_query($index_sql, $mid, $message['thread_id'], $recipient->uid, 1) ) {
       // We assume if one insert failed then the rest may fail too against the
       // same table.
-      return FALSE;
+      return false;
     }
   }
 
@@ -1943,7 +1943,7 @@ 
 
   // Also add a record for the author to the pm_index table.
   if (!db_query($index_sql, $mid, $message['thread_id'], $message['author']->uid, $is_new)) {
-    return FALSE;
+    return false;
   }
 
   module_invoke_all('privatemsg_message_insert', $message);
@@ -1968,8 +1968,8 @@ 
  *
  * @ingroup api
  */
-function privatemsg_get_link($recipients, $account = array(), $subject = NULL) {
-  if ($account == NULL) {
+function privatemsg_get_link($recipients, $account = array(), $subject = null) {
+  if ($account == null) {
     global $user;
     $account = $user;
   }
@@ -1979,7 +1979,7 @@ 
   }
 
   if (!privatemsg_user_access('write privatemsg', $account) || $account->uid == 0) {
-    return FALSE;
+    return false;
   }
 
   $validated = array();
@@ -1993,7 +1993,7 @@ 
     $validated[] = $recipient->uid;
   }
   if (empty($validated)) {
-    return FALSE;
+    return false;
   }
   $url = 'messages/new/'. implode(',', $validated);
   if (!is_null($subject)) {
@@ -2013,7 +2013,7 @@ 
  *
  * @ingroup api
  */
-function privatemsg_message_load($pmid, $account = NULL) {
+function privatemsg_message_load($pmid, $account = null) {
   $messages = privatemsg_message_load_multiple(array($pmid), $account);
   return current($messages);
 }
@@ -2029,7 +2029,7 @@ 
  *
  * @ingroup api
  */
-function privatemsg_message_load_multiple($pmids, $account = NULL) {
+function privatemsg_message_load_multiple($pmids, $account = null) {
   // Avoid SQL error that would happen with an empty pm.mid IN () clause.
   if (empty($pmids)) {
     return array();
@@ -2116,7 +2116,7 @@ 
    */
   if (!function_exists($query_function)) {
     drupal_set_message(t('Query function %function does not exist', array('%function' => $query_function)), 'error');
-    return FALSE;
+    return false;
   }
   call_user_func_array($query_function, $alterargs);
 
@@ -2144,7 +2144,7 @@ 
   // Perform the whole query assembly only if we have something to select.
   if (!empty($SELECT)) {
     $str_select = implode(", ", $SELECT);
-    $query = "SELECT {$str_select} FROM ". $primary_table;
+    $query = "select {$str_select} FROM ". $primary_table;
 
     // Also build a count query which can be passed to pager_query to get a "page count" as that does not play well with queries including "GROUP BY".
     // In most cases,  "COUNT(*)" is enough to get the count query, but in queries involving a GROUP BY, we want a count of the number of groups we have, not the count of elements inside each group.
@@ -2187,14 +2187,14 @@ 
     }
     $QUERY_ARGS = array_merge($QUERY_ARGS['select'], $QUERY_ARGS['join'], $QUERY_ARGS['where'], $QUERY_ARGS['having']);
     if (!empty($QUERY_ARGS)) {
-      _db_query_callback($QUERY_ARGS, TRUE);
+      _db_query_callback($QUERY_ARGS, true);
       $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query);
-      _db_query_callback($QUERY_ARGS, TRUE);
+      _db_query_callback($QUERY_ARGS, true);
       $count = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $count);
     }
     return array('query' => $query, 'count' => $count);
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -2216,8 +2216,8 @@ 
       '#title'       => t('Actions'),
       '#prefix'      => '<div class="container-inline">',
       '#suffix'      => '</div>',
-      '#collapsible' => TRUE,
-      '#collapsed'   => FALSE,
+      '#collapsible' => true,
+      '#collapsed'   => false,
       '#weight'      => 15,
   );
   if (privatemsg_user_access('delete privatemsg')) {
@@ -2262,7 +2262,7 @@ 
  *   User object for which the threads should be deleted, defaults to the
  *   current user.
  */
-function privatemsg_thread_change_status($threads, $status, $account = NULL) {
+function privatemsg_thread_change_status($threads, $status, $account = null) {
   if (!is_array($threads)) {
     $threads = array($threads);
   }
@@ -2506,7 +2506,7 @@ 
  *   User object for which the threads should be deleted,
  *   defaults to the current user.
  */
-function privatemsg_thread_change_delete($threads, $delete, $account = NULL) {
+function privatemsg_thread_change_delete($threads, $delete, $account = null) {
   if (!is_array($threads)) {
     $threads = array($threads);
   }
@@ -2519,7 +2519,7 @@ 
   $params = array_merge(array($delete, $account->uid), $threads);
 
   // Load all messages of those threads including the deleted.
-  $query = _privatemsg_assemble_query('messages', $threads, $account, TRUE);
+  $query = _privatemsg_assemble_query('messages', $threads, $account, true);
   $result = db_query($query['query']);
 
   // Delete each message. We need to do that to trigger the delete hook.

drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/ckeditor.inc

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
  *   An array containing editor properties as returned from hook_editor().
  *
  * @return
- *   The installed editor version.
+ null|string   The installed editor version.
  */
 function wysiwyg_ckeditor_version($editor) {
   $library = $editor['library path'] . '/ckeditor.js';

Indentation +122 added lines, -122 removed lines

@@ -9,23 +9,23 @@ 
  * Plugin implementation of hook_editor().
  */
 function wysiwyg_ckeditor_editor() {
-  $editor['ckeditor'] = array(
+    $editor['ckeditor'] = array(
     'title' => 'CKEditor',
     'vendor url' => 'http://ckeditor.com',
     'download url' => 'http://ckeditor.com/download',
     'libraries' => array(
-      '' => array(
+        '' => array(
         'title' => 'Default',
         'files' => array(
-          'ckeditor.js' => array('preprocess' => FALSE),
+            'ckeditor.js' => array('preprocess' => FALSE),
         ),
-      ),
-      'src' => array(
+        ),
+        'src' => array(
         'title' => 'Source',
         'files' => array(
-          'ckeditor_source.js' => array('preprocess' => FALSE),
+            'ckeditor_source.js' => array('preprocess' => FALSE),
+        ),
         ),
-      ),
     ),
     'version callback' => 'wysiwyg_ckeditor_version',
     'themes callback' => 'wysiwyg_ckeditor_themes',
@@ -33,19 +33,19 @@ 
     'plugin callback' => 'wysiwyg_ckeditor_plugins',
     'plugin settings callback' => 'wysiwyg_ckeditor_plugin_settings',
     'proxy plugin' => array(
-      'drupal' => array(
+        'drupal' => array(
         'load' => TRUE,
         'proxy' => TRUE,
-      ),
+        ),
     ),
     'proxy plugin settings callback' => 'wysiwyg_ckeditor_proxy_plugin_settings',
     'versions' => array(
-      '3.0.0.3665' => array(
+        '3.0.0.3665' => array(
         'js files' => array('ckeditor-3.0.js'),
-      ),
+        ),
     ),
-  );
-  return $editor;
+    );
+    return $editor;
 }
 
 /**
@@ -58,25 +58,25 @@ 
  *   The installed editor version.
  */
 function wysiwyg_ckeditor_version($editor) {
-  $library = $editor['library path'] . '/ckeditor.js';
-  if (!file_exists($library)) {
+    $library = $editor['library path'] . '/ckeditor.js';
+    if (!file_exists($library)) {
     return;
-  }
-  $library = fopen($library, 'r');
-  $max_lines = 8;
-  while ($max_lines && $line = fgets($library, 500)) {
+    }
+    $library = fopen($library, 'r');
+    $max_lines = 8;
+    while ($max_lines && $line = fgets($library, 500)) {
     // version:'CKEditor 3.0 SVN',revision:'3665'
     // version:'3.0 RC',revision:'3753'
     // version:'3.0.1',revision:'4391'
     if (preg_match('@version:\'(?:CKEditor )?([\d\.]+)(?:.+revision:\'([\d]+))?@', $line, $version)) {
-      fclose($library);
-      // Version numbers need to have three parts since 3.0.1.
-      $version[1] = preg_replace('/^(\d+)\.(\d+)$/', '${1}.${2}.0', $version[1]);
-      return $version[1] . '.' . $version[2];
+        fclose($library);
+        // Version numbers need to have three parts since 3.0.1.
+        $version[1] = preg_replace('/^(\d+)\.(\d+)$/', '${1}.${2}.0', $version[1]);
+        return $version[1] . '.' . $version[2];
     }
     $max_lines--;
-  }
-  fclose($library);
+    }
+    fclose($library);
 }
 
 /**
@@ -92,23 +92,23 @@ 
  *   theme name.
  */
 function wysiwyg_ckeditor_themes($editor, $profile) {
-  // @todo Skins are not themes but this will do for now.
-  $path = $editor['library path'] . '/skins/';
-  if (file_exists($path) && ($dir_handle = opendir($path))) {
+    // @todo Skins are not themes but this will do for now.
+    $path = $editor['library path'] . '/skins/';
+    if (file_exists($path) && ($dir_handle = opendir($path))) {
     $themes = array();
     while ($file = readdir($dir_handle)) {
-      if (is_dir($path . $file) && substr($file, 0, 1) != '.' && $file != 'CVS') {
+        if (is_dir($path . $file) && substr($file, 0, 1) != '.' && $file != 'CVS') {
         $themes[] = $file;
-      }
+        }
     }
     closedir($dir_handle);
     natcasesort($themes);
     $themes = array_values($themes);
     return !empty($themes) ? $themes : array('default');
-  }
-  else {
+    }
+    else {
     return array('default');
-  }
+    }
 }
 
 /**
@@ -126,7 +126,7 @@ 
  *   Drupal.settings.wysiwyg.configs.{editor}
  */
 function wysiwyg_ckeditor_settings($editor, $config, $theme) {
-  $settings = array(
+    $settings = array(
     'baseHref' => $GLOBALS['base_url'] . '/',
     'width' => '100%',
     // For better compatibility with smaller textareas.
@@ -142,155 +142,155 @@ 
     // @todo Check whether completely disabling ProcessHTMLEntities is an option.
     'entities_latin' => FALSE,
     'entities_greek' => FALSE,
-  );
+    );
 
-  // Add HTML block format settings; common block formats are already predefined
-  // by CKEditor.
-  if (isset($config['block_formats'])) {
+    // Add HTML block format settings; common block formats are already predefined
+    // by CKEditor.
+    if (isset($config['block_formats'])) {
     $block_formats = explode(',', drupal_strtolower($config['block_formats']));
     $predefined_formats = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'pre', 'address', 'div');
     foreach (array_diff($block_formats, $predefined_formats) as $tag) {
-      $tag = trim($tag);
-      $settings["format_$tag"] = array('element' => $tag);
+        $tag = trim($tag);
+        $settings["format_$tag"] = array('element' => $tag);
     }
     $settings['format_tags'] = implode(';', $block_formats);
-  }
+    }
 
-  if (isset($config['apply_source_formatting'])) {
+    if (isset($config['apply_source_formatting'])) {
     $settings['apply_source_formatting'] = $config['apply_source_formatting'];
-  }
+    }
 
-  if (isset($config['css_setting'])) {
+    if (isset($config['css_setting'])) {
     // Versions below 3.0.1 could only handle one stylesheet.
     if (version_compare($editor['installed version'], '3.0.1.4391', '<')) {
-      if ($config['css_setting'] == 'theme') {
+        if ($config['css_setting'] == 'theme') {
         $settings['contentsCss'] = reset(wysiwyg_get_css());
-      }
-      elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+        }
+        elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
         $settings['contentsCss'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
-      }
+        }
     }
     else {
-      if ($config['css_setting'] == 'theme') {
+        if ($config['css_setting'] == 'theme') {
         $settings['contentsCss'] = wysiwyg_get_css();
-      }
-      elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+        }
+        elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
         $settings['contentsCss'] = explode(',', strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme())));
-      }
+        }
+    }
     }
-  }
 
-  if (isset($config['language'])) {
+    if (isset($config['language'])) {
     $settings['language'] = $config['language'];
-  }
-  if (isset($config['resizing'])) {
+    }
+    if (isset($config['resizing'])) {
     // CKEditor tests "!== false", so ensure it is a Boolean.
     $settings['resize_enabled'] = (bool) $config['resizing'];
-  }
-  if (isset($config['toolbar_loc'])) {
+    }
+    if (isset($config['toolbar_loc'])) {
     $settings['toolbarLocation'] = $config['toolbar_loc'];
-  }
+    }
 
-  $settings['toolbar'] = array();
-  if (!empty($config['buttons'])) {
+    $settings['toolbar'] = array();
+    if (!empty($config['buttons'])) {
     $extra_plugins = array();
     $plugins = wysiwyg_get_plugins($editor['name']);
     foreach ($config['buttons'] as $plugin => $buttons) {
-      foreach ($buttons as $button => $enabled) {
+        foreach ($buttons as $button => $enabled) {
         // Iterate separately over buttons and extensions properties.
         foreach (array('buttons', 'extensions') as $type) {
-          // Skip unavailable plugins.
-          if (!isset($plugins[$plugin][$type][$button])) {
+            // Skip unavailable plugins.
+            if (!isset($plugins[$plugin][$type][$button])) {
             continue;
-          }
-          // Add buttons.
-          if ($type == 'buttons') {
+            }
+            // Add buttons.
+            if ($type == 'buttons') {
             $settings['toolbar'][] = $button;
-          }
-          // Add external Drupal plugins to the list of extensions.
-          if ($type == 'buttons' && !empty($plugins[$plugin]['proxy'])) {
+            }
+            // Add external Drupal plugins to the list of extensions.
+            if ($type == 'buttons' && !empty($plugins[$plugin]['proxy'])) {
             $extra_plugins[] = $button;
-          }
-          // Add external plugins to the list of extensions.
-          elseif ($type == 'buttons' && empty($plugins[$plugin]['internal'])) {
+            }
+            // Add external plugins to the list of extensions.
+            elseif ($type == 'buttons' && empty($plugins[$plugin]['internal'])) {
             $extra_plugins[] = $plugin;
-          }
-          // Add internal buttons that also need to be loaded as extension.
-          elseif ($type == 'buttons' && !empty($plugins[$plugin]['load'])) {
+            }
+            // Add internal buttons that also need to be loaded as extension.
+            elseif ($type == 'buttons' && !empty($plugins[$plugin]['load'])) {
             $extra_plugins[] = $plugin;
-          }
-          // Add plain extensions.
-          elseif ($type == 'extensions' && !empty($plugins[$plugin]['load'])) {
+            }
+            // Add plain extensions.
+            elseif ($type == 'extensions' && !empty($plugins[$plugin]['load'])) {
             $extra_plugins[] = $plugin;
-          }
-          // Allow plugins to add or override global configuration settings.
-          if (!empty($plugins[$plugin]['options'])) {
+            }
+            // Allow plugins to add or override global configuration settings.
+            if (!empty($plugins[$plugin]['options'])) {
             $settings = array_merge($settings, $plugins[$plugin]['options']);
-          }
+            }
+        }
         }
-      }
     }
     if (!empty($extra_plugins)) {
-      $settings['extraPlugins'] = implode(',', $extra_plugins);
+        $settings['extraPlugins'] = implode(',', $extra_plugins);
     }
-  }
-  // For now, all buttons are placed into one row.
-  $settings['toolbar'] = array($settings['toolbar']);
+    }
+    // For now, all buttons are placed into one row.
+    $settings['toolbar'] = array($settings['toolbar']);
 
-  return $settings;
+    return $settings;
 }
 
 /**
  * Build a JS settings array of native external plugins that need to be loaded separately.
  */
 function wysiwyg_ckeditor_plugin_settings($editor, $profile, $plugins) {
-  $settings = array();
-  foreach ($plugins as $name => $plugin) {
+    $settings = array();
+    foreach ($plugins as $name => $plugin) {
     // Register all plugins that need to be loaded.
     if (!empty($plugin['load'])) {
-      $settings[$name] = array();
-      // Add path for native external plugins.
-      if (empty($plugin['internal']) && isset($plugin['path'])) {
+        $settings[$name] = array();
+        // Add path for native external plugins.
+        if (empty($plugin['internal']) && isset($plugin['path'])) {
         $settings[$name]['path'] = base_path() . $plugin['path'] . '/';
-      }
-      // Force native internal plugins to use the standard path.
-      else {
+        }
+        // Force native internal plugins to use the standard path.
+        else {
         $settings[$name]['path'] = base_path() . $editor['library path'] . '/plugins/' . $name . '/';
-      }
-      // CKEditor defaults to 'plugin.js' on its own when filename is not set.
-      if (!empty($plugin['filename'])) {
+        }
+        // CKEditor defaults to 'plugin.js' on its own when filename is not set.
+        if (!empty($plugin['filename'])) {
         $settings[$name]['fileName'] = $plugin['filename'];
-      }
+        }
     }
-  }
-  return $settings;
+    }
+    return $settings;
 }
 
 /**
  * Build a JS settings array for Drupal plugins loaded via the proxy plugin.
  */
 function wysiwyg_ckeditor_proxy_plugin_settings($editor, $profile, $plugins) {
-  $settings = array();
-  foreach ($plugins as $name => $plugin) {
+    $settings = array();
+    foreach ($plugins as $name => $plugin) {
     // Populate required plugin settings.
     $settings[$name] = $plugin['dialog settings'] + array(
-      'title' => $plugin['title'],
-      'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
-      'iconTitle' => $plugin['icon title'],
-      // @todo These should only be set if the plugin defined them.
-      'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
+        'title' => $plugin['title'],
+        'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
+        'iconTitle' => $plugin['icon title'],
+        // @todo These should only be set if the plugin defined them.
+        'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
     );
-  }
-  return $settings;
+    }
+    return $settings;
 }
 
 /**
  * Return internal plugins for this editor; semi-implementation of hook_wysiwyg_plugin().
  */
 function wysiwyg_ckeditor_plugins($editor) {
-  $plugins = array(
+    $plugins = array(
     'default' => array(
-      'buttons' => array(
+        'buttons' => array(
         'Bold' => t('Bold'), 'Italic' => t('Italic'), 'Underline' => t('Underline'),
         'Strike' => t('Strike-through'),
         'JustifyLeft' => t('Align left'), 'JustifyCenter' => t('Align center'), 'JustifyRight' => t('Align right'), 'JustifyBlock' => t('Justify'),
@@ -317,17 +317,17 @@ 
         'Maximize' => t('Maximize'),
         'SpellChecker' => t('Check spelling'), 'Scayt' => t('Check spelling as you type'),
         'About' => t('About'),
-      ),
-      'internal' => TRUE,
+        ),
+        'internal' => TRUE,
     ),
-  );
+    );
 
-  if (version_compare($editor['installed version'], '3.1.0.4885', '<')) {
+    if (version_compare($editor['installed version'], '3.1.0.4885', '<')) {
     unset($plugins['default']['buttons']['CreateDiv']);
-  }
-  if (version_compare($editor['installed version'], '3.5.0.6260', '<')) {
+    }
+    if (version_compare($editor['installed version'], '3.5.0.6260', '<')) {
     unset($plugins['default']['buttons']['Iframe']);
-  }
-  return $plugins;
+    }
+    return $plugins;
 }
 

Spacing +10 added lines, -10 removed lines

@@ -58,7 +58,7 @@ 
  *   The installed editor version.
  */
 function wysiwyg_ckeditor_version($editor) {
-  $library = $editor['library path'] . '/ckeditor.js';
+  $library = $editor['library path'].'/ckeditor.js';
   if (!file_exists($library)) {
     return;
   }
@@ -72,7 +72,7 @@ 
       fclose($library);
       // Version numbers need to have three parts since 3.0.1.
       $version[1] = preg_replace('/^(\d+)\.(\d+)$/', '${1}.${2}.0', $version[1]);
-      return $version[1] . '.' . $version[2];
+      return $version[1].'.'.$version[2];
     }
     $max_lines--;
   }
@@ -93,11 +93,11 @@ 
  */
 function wysiwyg_ckeditor_themes($editor, $profile) {
   // @todo Skins are not themes but this will do for now.
-  $path = $editor['library path'] . '/skins/';
+  $path = $editor['library path'].'/skins/';
   if (file_exists($path) && ($dir_handle = opendir($path))) {
     $themes = array();
     while ($file = readdir($dir_handle)) {
-      if (is_dir($path . $file) && substr($file, 0, 1) != '.' && $file != 'CVS') {
+      if (is_dir($path.$file) && substr($file, 0, 1) != '.' && $file != 'CVS') {
         $themes[] = $file;
       }
     }
@@ -127,7 +127,7 @@ 
  */
 function wysiwyg_ckeditor_settings($editor, $config, $theme) {
   $settings = array(
-    'baseHref' => $GLOBALS['base_url'] . '/',
+    'baseHref' => $GLOBALS['base_url'].'/',
     'width' => '100%',
     // For better compatibility with smaller textareas.
     'resize_minWidth' => 450,
@@ -185,7 +185,7 @@ 
   }
   if (isset($config['resizing'])) {
     // CKEditor tests "!== false", so ensure it is a Boolean.
-    $settings['resize_enabled'] = (bool) $config['resizing'];
+    $settings['resize_enabled'] = (bool)$config['resizing'];
   }
   if (isset($config['toolbar_loc'])) {
     $settings['toolbarLocation'] = $config['toolbar_loc'];
@@ -251,11 +251,11 @@ 
       $settings[$name] = array();
       // Add path for native external plugins.
       if (empty($plugin['internal']) && isset($plugin['path'])) {
-        $settings[$name]['path'] = base_path() . $plugin['path'] . '/';
+        $settings[$name]['path'] = base_path().$plugin['path'].'/';
       }
       // Force native internal plugins to use the standard path.
       else {
-        $settings[$name]['path'] = base_path() . $editor['library path'] . '/plugins/' . $name . '/';
+        $settings[$name]['path'] = base_path().$editor['library path'].'/plugins/'.$name.'/';
       }
       // CKEditor defaults to 'plugin.js' on its own when filename is not set.
       if (!empty($plugin['filename'])) {
@@ -275,10 +275,10 @@ 
     // Populate required plugin settings.
     $settings[$name] = $plugin['dialog settings'] + array(
       'title' => $plugin['title'],
-      'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
+      'icon' => base_path().$plugin['icon path'].'/'.$plugin['icon file'],
       'iconTitle' => $plugin['icon title'],
       // @todo These should only be set if the plugin defined them.
-      'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
+      'css' => base_path().$plugin['css path'].'/'.$plugin['css file'],
     );
   }
   return $settings;

Braces +4 added lines, -8 removed lines

@@ -105,8 +105,7 @@ 
     natcasesort($themes);
     $themes = array_values($themes);
     return !empty($themes) ? $themes : array('default');
-  }
-  else {
+  } else {
     return array('default');
   }
 }
@@ -165,16 +164,13 @@ 
     if (version_compare($editor['installed version'], '3.0.1.4391', '<')) {
       if ($config['css_setting'] == 'theme') {
         $settings['contentsCss'] = reset(wysiwyg_get_css());
-      }
-      elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+      } elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
         $settings['contentsCss'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
       }
-    }
-    else {
+    } else {
       if ($config['css_setting'] == 'theme') {
         $settings['contentsCss'] = wysiwyg_get_css();
-      }
-      elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+      } elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
         $settings['contentsCss'] = explode(',', strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme())));
       }
     }

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

@@ -17,13 +17,13 @@ 
       '' => array(
         'title' => 'Default',
         'files' => array(
-          'ckeditor.js' => array('preprocess' => FALSE),
+          'ckeditor.js' => array('preprocess' => false),
         ),
       ),
       'src' => array(
         'title' => 'Source',
         'files' => array(
-          'ckeditor_source.js' => array('preprocess' => FALSE),
+          'ckeditor_source.js' => array('preprocess' => false),
         ),
       ),
     ),
@@ -34,8 +34,8 @@ 
     'plugin settings callback' => 'wysiwyg_ckeditor_plugin_settings',
     'proxy plugin' => array(
       'drupal' => array(
-        'load' => TRUE,
-        'proxy' => TRUE,
+        'load' => true,
+        'proxy' => true,
       ),
     ),
     'proxy plugin settings callback' => 'wysiwyg_ckeditor_proxy_plugin_settings',
@@ -140,8 +140,8 @@ 
     // disable at least the additional character sets. CKEditor always converts
     // XML default characters '&', '<', '>'.
     // @todo Check whether completely disabling ProcessHTMLEntities is an option.
-    'entities_latin' => FALSE,
-    'entities_greek' => FALSE,
+    'entities_latin' => false,
+    'entities_greek' => false,
   );
 
   // Add HTML block format settings; common block formats are already predefined
@@ -318,7 +318,7 @@ 
         'SpellChecker' => t('Check spelling'), 'Scayt' => t('Check spelling as you type'),
         'About' => t('About'),
       ),
-      'internal' => TRUE,
+      'internal' => true,
     ),
   );
 

drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/fckeditor.inc

Doc Comments +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
  *   An array containing editor properties as returned from hook_editor().
  *
  * @return
- *   The installed editor version.
+ null|string   The installed editor version.
  */
 function wysiwyg_fckeditor_version($editor) {
   $library = $editor['library path'] . '/fckeditor.js';
@@ -75,7 +75,7 @@ 
  *   A wysiwyg editor profile.
  *
  * @return
- *   An array of theme names. The first returned name should be the default
+ string[]   An array of theme names. The first returned name should be the default
  *   theme name.
  */
 function wysiwyg_fckeditor_themes($editor, $profile) {

Indentation +99 added lines, -99 removed lines

@@ -9,15 +9,15 @@ 
  * Plugin implementation of hook_editor().
  */
 function wysiwyg_fckeditor_editor() {
-  $editor['fckeditor'] = array(
+    $editor['fckeditor'] = array(
     'title' => 'FCKeditor',
     'vendor url' => 'http://www.fckeditor.net',
     'download url' => 'http://www.fckeditor.net/download',
     'libraries' => array(
-      '' => array(
+        '' => array(
         'title' => 'Default',
         'files' => array('fckeditor.js'),
-      ),
+        ),
     ),
     'version callback' => 'wysiwyg_fckeditor_version',
     'themes callback' => 'wysiwyg_fckeditor_themes',
@@ -25,19 +25,19 @@ 
     'plugin callback' => 'wysiwyg_fckeditor_plugins',
     'plugin settings callback' => 'wysiwyg_fckeditor_plugin_settings',
     'proxy plugin' => array(
-      'drupal' => array(
+        'drupal' => array(
         'load' => TRUE,
         'proxy' => TRUE,
-      ),
+        ),
     ),
     'proxy plugin settings callback' => 'wysiwyg_fckeditor_proxy_plugin_settings',
     'versions' => array(
-      '2.6' => array(
+        '2.6' => array(
         'js files' => array('fckeditor-2.6.js'),
-      ),
+        ),
     ),
-  );
-  return $editor;
+    );
+    return $editor;
 }
 
 /**
@@ -50,20 +50,20 @@ 
  *   The installed editor version.
  */
 function wysiwyg_fckeditor_version($editor) {
-  $library = $editor['library path'] . '/fckeditor.js';
-  if (!file_exists($library)) {
+    $library = $editor['library path'] . '/fckeditor.js';
+    if (!file_exists($library)) {
     return;
-  }
-  $library = fopen($library, 'r');
-  $max_lines = 100;
-  while ($max_lines && $line = fgets($library, 60)) {
+    }
+    $library = fopen($library, 'r');
+    $max_lines = 100;
+    while ($max_lines && $line = fgets($library, 60)) {
     if (preg_match('@^FCKeditor.prototype.Version\s*= \'([\d\.]+)@', $line, $version)) {
-      fclose($library);
-      return $version[1];
+        fclose($library);
+        return $version[1];
     }
     $max_lines--;
-  }
-  fclose($library);
+    }
+    fclose($library);
 }
 
 /**
@@ -79,7 +79,7 @@ 
  *   theme name.
  */
 function wysiwyg_fckeditor_themes($editor, $profile) {
-  return array('default', 'office2003', 'silver');
+    return array('default', 'office2003', 'silver');
 }
 
 /**
@@ -97,7 +97,7 @@ 
  *   Drupal.settings.wysiwyg.configs.{editor}
  */
 function wysiwyg_fckeditor_settings($editor, $config, $theme) {
-  $settings = array(
+    $settings = array(
     'EditorPath' => base_path() . $editor['library path'] . '/',
     'SkinPath' => base_path() . $editor['library path'] . '/editor/skins/' . $theme . '/',
     'CustomConfigurationsPath' => base_path() . drupal_get_path('module', 'wysiwyg') . '/editors/js/fckeditor.config.js',
@@ -116,105 +116,105 @@ 
     // @todo Check whether completely disabling ProcessHTMLEntities is an option.
     'IncludeLatinEntities' => FALSE,
     'IncludeGreekEntities' => FALSE,
-  );
-  if (isset($config['block_formats'])) {
+    );
+    if (isset($config['block_formats'])) {
     $settings['FontFormats'] = strtr($config['block_formats'], array(',' => ';'));
-  }
-  if (isset($config['apply_source_formatting'])) {
+    }
+    if (isset($config['apply_source_formatting'])) {
     $settings['FormatOutput'] = $settings['FormatSource'] = $config['apply_source_formatting'];
-  }
-  if (isset($config['paste_auto_cleanup_on_paste'])) {
+    }
+    if (isset($config['paste_auto_cleanup_on_paste'])) {
     $settings['AutoDetectPasteFromWord'] = $config['paste_auto_cleanup_on_paste'];
-  }
+    }
 
-  if (isset($config['css_setting'])) {
+    if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
-      $settings['EditorAreaCSS'] = implode(',', wysiwyg_get_css());
+        $settings['EditorAreaCSS'] = implode(',', wysiwyg_get_css());
     }
     else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
-      $settings['EditorAreaCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+        $settings['EditorAreaCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+    }
     }
-  }
 
-  // Use our custom toolbar set.
-  $settings['ToolbarSet'] = 'Wysiwyg';
-  // Populate our custom toolbar set for fckeditor.config.js.
-  $settings['buttons'] = array();
-  if (!empty($config['buttons'])) {
+    // Use our custom toolbar set.
+    $settings['ToolbarSet'] = 'Wysiwyg';
+    // Populate our custom toolbar set for fckeditor.config.js.
+    $settings['buttons'] = array();
+    if (!empty($config['buttons'])) {
     $plugins = wysiwyg_get_plugins($editor['name']);
     foreach ($config['buttons'] as $plugin => $buttons) {
-      foreach ($buttons as $button => $enabled) {
+        foreach ($buttons as $button => $enabled) {
         // Iterate separately over buttons and extensions properties.
         foreach (array('buttons', 'extensions') as $type) {
-          // Skip unavailable plugins.
-          if (!isset($plugins[$plugin][$type][$button])) {
+            // Skip unavailable plugins.
+            if (!isset($plugins[$plugin][$type][$button])) {
             continue;
-          }
-          // Add buttons.
-          if ($type == 'buttons') {
+            }
+            // Add buttons.
+            if ($type == 'buttons') {
             $settings['buttons'][] = $button;
-          }
-          // Allow plugins to add or override global configuration settings.
-          if (!empty($plugins[$plugin]['options'])) {
+            }
+            // Allow plugins to add or override global configuration settings.
+            if (!empty($plugins[$plugin]['options'])) {
             $settings = array_merge($settings, $plugins[$plugin]['options']);
-          }
+            }
         }
-      }
+        }
+    }
     }
-  }
-  // For now, all buttons are placed into one row.
-  $settings['buttons'] = array($settings['buttons']);
+    // For now, all buttons are placed into one row.
+    $settings['buttons'] = array($settings['buttons']);
 
-  return $settings;
+    return $settings;
 }
 
 /**
  * Build a JS settings array of native external plugins that need to be loaded separately.
  */
 function wysiwyg_fckeditor_plugin_settings($editor, $profile, $plugins) {
-  $settings = array();
-  foreach ($plugins as $name => $plugin) {
+    $settings = array();
+    foreach ($plugins as $name => $plugin) {
     // Register all plugins that need to be loaded.
     if (!empty($plugin['load'])) {
-      $settings[$name] = array();
-      // Add path for native external plugins; internal ones do not need a path.
-      if (empty($plugin['internal']) && isset($plugin['path'])) {
+        $settings[$name] = array();
+        // Add path for native external plugins; internal ones do not need a path.
+        if (empty($plugin['internal']) && isset($plugin['path'])) {
         // All native FCKeditor plugins use the filename fckplugin.js.
         $settings[$name]['path'] = base_path() . $plugin['path'] . '/';
-      }
-      if (!empty($plugin['languages'])) {
+        }
+        if (!empty($plugin['languages'])) {
         $settings[$name]['languages'] = $plugin['languages'];
-      }
+        }
+    }
     }
-  }
-  return $settings;
+    return $settings;
 }
 
 /**
  * Build a JS settings array for Drupal plugins loaded via the proxy plugin.
  */
 function wysiwyg_fckeditor_proxy_plugin_settings($editor, $profile, $plugins) {
-  $settings = array();
-  foreach ($plugins as $name => $plugin) {
+    $settings = array();
+    foreach ($plugins as $name => $plugin) {
     // Populate required plugin settings.
     $settings[$name] = $plugin['dialog settings'] + array(
-      'title' => $plugin['title'],
-      'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
-      'iconTitle' => $plugin['icon title'],
-      // @todo These should only be set if the plugin defined them.
-      'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
+        'title' => $plugin['title'],
+        'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
+        'iconTitle' => $plugin['icon title'],
+        // @todo These should only be set if the plugin defined them.
+        'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
     );
-  }
-  return $settings;
+    }
+    return $settings;
 }
 
 /**
  * Return internal plugins for this editor; semi-implementation of hook_wysiwyg_plugin().
  */
 function wysiwyg_fckeditor_plugins($editor) {
-  $plugins = array(
+    $plugins = array(
     'default' => array(
-      'buttons' => array(
+        'buttons' => array(
         'Bold' => t('Bold'), 'Italic' => t('Italic'), 'Underline' => t('Underline'),
         'StrikeThrough' => t('Strike-through'),
         'JustifyLeft' => t('Align left'), 'JustifyCenter' => t('Align center'), 'JustifyRight' => t('Align right'), 'JustifyFull' => t('Justify'),
@@ -240,39 +240,39 @@ 
         'Flash' => t('Flash'), 'Smiley' => t('Smiley'),
         'FitWindow' => t('FitWindow'),
         'SpellCheck' => t('Check spelling'),
-      ),
-      'internal' => TRUE,
+        ),
+        'internal' => TRUE,
     ),
     'autogrow' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
-      'extensions' => array(
+        'path' => $editor['library path'] . '/editor/plugins',
+        'extensions' => array(
         'autogrow' => t('Autogrow'),
-      ),
-      'options' => array(
+        ),
+        'options' => array(
         'AutoGrowMax' => 800,
-      ),
-      'internal' => TRUE,
-      'load' => TRUE,
+        ),
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'bbcode' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
-      'extensions' => array(
+        'path' => $editor['library path'] . '/editor/plugins',
+        'extensions' => array(
         'bbcode' => t('BBCode'),
-      ),
-      'internal' => TRUE,
-      'load' => TRUE,
+        ),
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'dragresizetable' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
-      'extensions' => array(
+        'path' => $editor['library path'] . '/editor/plugins',
+        'extensions' => array(
         'dragresizetable' => t('Table drag/resize'),
-      ),
-      'internal' => TRUE,
-      'load' => TRUE,
+        ),
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'tablecommands' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
-      'buttons' => array(
+        'path' => $editor['library path'] . '/editor/plugins',
+        'buttons' => array(
         'TableCellProp' => t('Table: Cell properties'),
         'TableInsertRowAfter' => t('Table: Insert row after'),
         'TableInsertColumnAfter' => t('Table: Insert column after'),
@@ -282,11 +282,11 @@ 
         'TableDeleteCells' => t('Table: Delete cells'),
         'TableMergeCells' => t('Table: Merge cells'),
         'TableHorizontalSplitCell' => t('Table: Horizontal split cell'),
-      ),
-      'internal' => TRUE,
-      'load' => TRUE,
+        ),
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
-  );
-  return $plugins;
+    );
+    return $plugins;
 }
 

Spacing +11 added lines, -11 removed lines

@@ -50,7 +50,7 @@ 
  *   The installed editor version.
  */
 function wysiwyg_fckeditor_version($editor) {
-  $library = $editor['library path'] . '/fckeditor.js';
+  $library = $editor['library path'].'/fckeditor.js';
   if (!file_exists($library)) {
     return;
   }
@@ -98,9 +98,9 @@ 
  */
 function wysiwyg_fckeditor_settings($editor, $config, $theme) {
   $settings = array(
-    'EditorPath' => base_path() . $editor['library path'] . '/',
-    'SkinPath' => base_path() . $editor['library path'] . '/editor/skins/' . $theme . '/',
-    'CustomConfigurationsPath' => base_path() . drupal_get_path('module', 'wysiwyg') . '/editors/js/fckeditor.config.js',
+    'EditorPath' => base_path().$editor['library path'].'/',
+    'SkinPath' => base_path().$editor['library path'].'/editor/skins/'.$theme.'/',
+    'CustomConfigurationsPath' => base_path().drupal_get_path('module', 'wysiwyg').'/editors/js/fckeditor.config.js',
     'Width' => '100%',
     'Height' => 420,
     'LinkBrowser' => FALSE,
@@ -180,7 +180,7 @@ 
       // Add path for native external plugins; internal ones do not need a path.
       if (empty($plugin['internal']) && isset($plugin['path'])) {
         // All native FCKeditor plugins use the filename fckplugin.js.
-        $settings[$name]['path'] = base_path() . $plugin['path'] . '/';
+        $settings[$name]['path'] = base_path().$plugin['path'].'/';
       }
       if (!empty($plugin['languages'])) {
         $settings[$name]['languages'] = $plugin['languages'];
@@ -199,10 +199,10 @@ 
     // Populate required plugin settings.
     $settings[$name] = $plugin['dialog settings'] + array(
       'title' => $plugin['title'],
-      'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
+      'icon' => base_path().$plugin['icon path'].'/'.$plugin['icon file'],
       'iconTitle' => $plugin['icon title'],
       // @todo These should only be set if the plugin defined them.
-      'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
+      'css' => base_path().$plugin['css path'].'/'.$plugin['css file'],
     );
   }
   return $settings;
@@ -244,7 +244,7 @@ 
       'internal' => TRUE,
     ),
     'autogrow' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
+      'path' => $editor['library path'].'/editor/plugins',
       'extensions' => array(
         'autogrow' => t('Autogrow'),
       ),
@@ -255,7 +255,7 @@ 
       'load' => TRUE,
     ),
     'bbcode' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
+      'path' => $editor['library path'].'/editor/plugins',
       'extensions' => array(
         'bbcode' => t('BBCode'),
       ),
@@ -263,7 +263,7 @@ 
       'load' => TRUE,
     ),
     'dragresizetable' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
+      'path' => $editor['library path'].'/editor/plugins',
       'extensions' => array(
         'dragresizetable' => t('Table drag/resize'),
       ),
@@ -271,7 +271,7 @@ 
       'load' => TRUE,
     ),
     'tablecommands' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
+      'path' => $editor['library path'].'/editor/plugins',
       'buttons' => array(
         'TableCellProp' => t('Table: Cell properties'),
         'TableInsertRowAfter' => t('Table: Insert row after'),

Braces +1 added lines, -2 removed lines

@@ -130,8 +130,7 @@
   if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
       $settings['EditorAreaCSS'] = implode(',', wysiwyg_get_css());
-    }
-    else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+    } else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
       $settings['EditorAreaCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
     }
   }

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

@@ -26,8 +26,8 @@ 
     'plugin settings callback' => 'wysiwyg_fckeditor_plugin_settings',
     'proxy plugin' => array(
       'drupal' => array(
-        'load' => TRUE,
-        'proxy' => TRUE,
+        'load' => true,
+        'proxy' => true,
       ),
     ),
     'proxy plugin settings callback' => 'wysiwyg_fckeditor_proxy_plugin_settings',
@@ -103,19 +103,19 @@ 
     'CustomConfigurationsPath' => base_path() . drupal_get_path('module', 'wysiwyg') . '/editors/js/fckeditor.config.js',
     'Width' => '100%',
     'Height' => 420,
-    'LinkBrowser' => FALSE,
-    'LinkUpload' => FALSE,
-    'ImageBrowser' => FALSE,
-    'ImageUpload' => FALSE,
-    'FlashBrowser' => FALSE,
-    'FlashUpload' => FALSE,
+    'LinkBrowser' => false,
+    'LinkUpload' => false,
+    'ImageBrowser' => false,
+    'ImageUpload' => false,
+    'FlashBrowser' => false,
+    'FlashUpload' => false,
     // By default, FCKeditor converts most characters into HTML entities. Since
     // it does not support a custom definition, but Drupal supports Unicode, we
     // disable at least the additional character sets. FCKeditor always converts
     // XML default characters '&', '<', '>'.
     // @todo Check whether completely disabling ProcessHTMLEntities is an option.
-    'IncludeLatinEntities' => FALSE,
-    'IncludeGreekEntities' => FALSE,
+    'IncludeLatinEntities' => false,
+    'IncludeGreekEntities' => false,
   );
   if (isset($config['block_formats'])) {
     $settings['FontFormats'] = strtr($config['block_formats'], array(',' => ';'));
@@ -241,7 +241,7 @@ 
         'FitWindow' => t('FitWindow'),
         'SpellCheck' => t('Check spelling'),
       ),
-      'internal' => TRUE,
+      'internal' => true,
     ),
     'autogrow' => array(
       'path' => $editor['library path'] . '/editor/plugins',
@@ -251,24 +251,24 @@ 
       'options' => array(
         'AutoGrowMax' => 800,
       ),
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'bbcode' => array(
       'path' => $editor['library path'] . '/editor/plugins',
       'extensions' => array(
         'bbcode' => t('BBCode'),
       ),
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'dragresizetable' => array(
       'path' => $editor['library path'] . '/editor/plugins',
       'extensions' => array(
         'dragresizetable' => t('Table drag/resize'),
       ),
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'tablecommands' => array(
       'path' => $editor['library path'] . '/editor/plugins',
@@ -283,8 +283,8 @@ 
         'TableMergeCells' => t('Table: Merge cells'),
         'TableHorizontalSplitCell' => t('Table: Horizontal split cell'),
       ),
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
   );
   return $plugins;