BOINC / boinc

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

Indentation +314 added lines, -314 removed lines

@@ -9,34 +9,34 @@ 
  * Implements hook_perm().
  */
 function privatemsg_filter_perm() {
-  return array(
+    return array(
     'filter private messages',
     'tag private messages',
     'create private message tags',
-  );
+    );
 }
 
 /**
  * Implements hook_menu().
  */
 function privatemsg_filter_menu() {
-  $items['admin/settings/messages/filter'] = array(
+    $items['admin/settings/messages/filter'] = array(
     'title'            => 'Filter',
     'description'      => 'Configure filter settings.',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_filter_admin'),
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
-  );
-  $items['admin/settings/messages/tags'] = array(
+    );
+    $items['admin/settings/messages/tags'] = array(
     'title'            => 'Tags',
     'description'      => 'Configure tags.',
     'page callback'    => 'privatemsg_tags_admin',
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
     'file'             => 'privatemsg_filter.admin.inc',
-  );
-  $items['admin/settings/messages/tags/list'] = array(
+    );
+    $items['admin/settings/messages/tags/list'] = array(
     'title'            => 'List',
     'description'      => 'Configure tags.',
     'page callback'    => 'privatemsg_tags_admin',
@@ -44,8 +44,8 @@ 
     'type'             => MENU_DEFAULT_LOCAL_TASK,
     'file'             => 'privatemsg_filter.admin.inc',
     'weight'           => -10,
-  );
-  $items['admin/settings/messages/tags/add'] = array(
+    );
+    $items['admin/settings/messages/tags/add'] = array(
     'title'            => 'Add',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',
@@ -53,8 +53,8 @@ 
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
     'file'             => 'privatemsg_filter.admin.inc',
-  );
-  $items['admin/settings/messages/tags/edit/%'] = array(
+    );
+    $items['admin/settings/messages/tags/edit/%'] = array(
     'title'            => 'Add',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',
@@ -62,8 +62,8 @@ 
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_CALLBACK,
     'file'             => 'privatemsg_filter.admin.inc',
-  );
-  $items['admin/settings/messages/tags/delete/%'] = array(
+    );
+    $items['admin/settings/messages/tags/delete/%'] = array(
     'title'            => 'Add',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',
@@ -71,62 +71,62 @@ 
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_CALLBACK,
     'file'             => 'privatemsg_filter.admin.inc',
-  );
-  $items['messages/inbox'] = array(
+    );
+    $items['messages/inbox'] = array(
     'title'            => 'Inbox',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_list', 'inbox'),
     'access callback'  => 'privatemsg_user_access',
     'type'             => variable_get('privatemsg_filter_default_list', 0) ? MENU_LOCAL_TASK : MENU_DEFAULT_LOCAL_TASK,
     'weight'           => -15,
-  );
-  $items['messages/sent'] = array(
+    );
+    $items['messages/sent'] = array(
     'title'            => 'Sent messages',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_list', 'sent'),
     'access callback'  => 'privatemsg_user_access',
     'type'             => MENU_LOCAL_TASK,
     'weight'           => -12,
-  );
-  $items['messages/filter/user-name-autocomplete'] = array(
+    );
+    $items['messages/filter/user-name-autocomplete'] = array(
     'page callback'    => 'privatemsg_user_name_autocomplete',
     'access callback'  => 'privatemsg_user_access',
     'access arguments' => array('write privatemsg'),
     'type'             => MENU_CALLBACK,
-  );
-  $items['messages/filter/tag-autocomplete'] = array(
+    );
+    $items['messages/filter/tag-autocomplete'] = array(
     'page callback'    => 'privatemsg_filter_tags_autocomplete',
     'access callback'  => 'privatemsg_user_access',
     'access arguments' => array('tag private messages'),
     'type'             => MENU_CALLBACK,
     'weight'           => -10,
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implements hook_menu_alter().
  */
 function privatemsg_filter_menu_alter(&$items) {
-  // Rename messages to "All messages".
-  $items['messages/list']['title'] = 'All messages';
+    // Rename messages to "All messages".
+    $items['messages/list']['title'] = 'All messages';
 
-  if (variable_get('privatemsg_filter_default_list', 0) == 0) {
+    if (variable_get('privatemsg_filter_default_list', 0) == 0) {
     // Change default argument of /messages to inbox. and set the task to MENU_LOCAL_TASK.
     $items['messages']['page arguments'] = array('privatemsg_list', 'inbox');
     $items['messages/list']['type'] = MENU_LOCAL_TASK;
-  }
+    }
 }
 
 function privatemsg_filter_admin() {
-  $form = array();
+    $form = array();
 
-  $form['privatemsg_filter_searchbody'] = array(
+    $form['privatemsg_filter_searchbody'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Search message body'),
     '#description'   => t('WARNING: turning on this feature will slow down search performance by a large factor. Gets worse as your messages database increases.'),
     '#default_value' => variable_get('privatemsg_filter_searchbody', FALSE),
-  );
+    );
 
     $form['privatemsg_filter_tagfield_weight'] = array(
     '#type'          => 'textfield',
@@ -134,9 +134,9 @@ 
     '#description'   => t('Use higher values to push the form lower down the page, lower or negative values to raise it higher.'),
     '#size'          => 4,
     '#default_value' => variable_get('privatemsg_filter_tagfield_weight', 10),
-  );
+    );
 
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
@@ -145,26 +145,26 @@ 
  * Add a filter widget to the message listing pages.
  */
 function privatemsg_filter_form_private_message_settings_alter(&$form, $form_state) {
-  $form['privatemsg_listing']['privatemsg_filter_default_list'] = array(
+    $form['privatemsg_listing']['privatemsg_filter_default_list'] = array(
     '#type' => 'radios',
     '#default_value' => variable_get('privatemsg_filter_default_list', 0),
     '#options' => array(t('Inbox'), t('All messages')),
     '#title' => t('Choose the default list option'),
     '#description' => t('Choose which of the two lists are shown by default when following the messages link.'),
-  );
-  // Add tags to the list of possible columns.
-  $form['privatemsg_listing']['privatemsg_display_fields']['#options']['tags'] = t('Tags');
+    );
+    // Add tags to the list of possible columns.
+    $form['privatemsg_listing']['privatemsg_display_fields']['#options']['tags'] = t('Tags');
 
-  $form['#submit'][] = 'privatemsg_filter_settings_submit';
+    $form['#submit'][] = 'privatemsg_filter_settings_submit';
 }
 
 /**
  * Rebuilding the menu if necessary.
  */
 function privatemsg_filter_settings_submit($form, &$form_state) {
-  if ($form['privatemsg_listing']['privatemsg_filter_default_list']['#default_value'] != $form_state['values']['privatemsg_filter_default_list']) {
+    if ($form['privatemsg_listing']['privatemsg_filter_default_list']['#default_value'] != $form_state['values']['privatemsg_filter_default_list']) {
     menu_rebuild();
-  }
+    }
 }
 
 /**
@@ -174,33 +174,33 @@ 
  *   A single tag or an array of tags.
  */
 function privatemsg_filter_create_tags($tags) {
-  if (!is_array($tags)) {
+    if (!is_array($tags)) {
     $tags = array($tags);
-  }
+    }
 
-  $tag_ids = array();
+    $tag_ids = array();
 
-  foreach ($tags as $tag) {
+    foreach ($tags as $tag) {
     $tag = trim($tag);
     if (empty($tag)) {
-      // Do not save a blank tag.
-      continue;
+        // Do not save a blank tag.
+        continue;
     }
 
     // Check if the tag already exists and only create the tag if it does not.
     $tag_id = db_result(db_query("SELECT tag_id FROM {pm_tags} WHERE tag = '%s'", $tag));
     if (empty($tag_id) && privatemsg_user_access('create private message tags')) {
-      db_query("INSERT INTO {pm_tags} (tag) VALUES ('%s')", $tag);
-      $tag_id = db_last_insert_id('pm_tags', 'tag_id');
+        db_query("INSERT INTO {pm_tags} (tag) VALUES ('%s')", $tag);
+        $tag_id = db_last_insert_id('pm_tags', 'tag_id');
     }
     elseif (empty($tag_id)) {
-      // The user does not have permission to create new tags - disregard this tag and move onto the next.
-      drupal_set_message(t('Tag %tag was ignored because you do not have permission to create new tags.', array('%tag' => $tag)));
-      continue;
+        // The user does not have permission to create new tags - disregard this tag and move onto the next.
+        drupal_set_message(t('Tag %tag was ignored because you do not have permission to create new tags.', array('%tag' => $tag)));
+        continue;
     }
     $tag_ids[] = $tag_id;
-  }
-  return $tag_ids;
+    }
+    return $tag_ids;
 }
 
 /**
@@ -212,21 +212,21 @@ 
  *   Id of the tag.
  */
 function privatemsg_filter_add_tags($threads, $tag_id, $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);
-  }
+    }
 
-  foreach ($threads as $thread) {
+    foreach ($threads as $thread) {
     // Make sure that we don't add a tag to a thread twice,
     // only insert if there is no such tag yet.
     if (db_result(db_query('SELECT COUNT(*) FROM {pm_tags_index} WHERE tag_id = %d AND (uid = %d AND thread_id = %d)', $tag_id, $account->uid, $thread)) == 0) {
-      db_query('INSERT INTO {pm_tags_index} (tag_id, uid, thread_id) VALUES (%d, %d, %d)', $tag_id, $account->uid, $thread);
+        db_query('INSERT INTO {pm_tags_index} (tag_id, uid, thread_id) VALUES (%d, %d, %d)', $tag_id, $account->uid, $thread);
+    }
     }
-  }
 }
 
 /**
@@ -238,238 +238,238 @@ 
  *   Id of the tag - set to NULL to remove all tags.
  */
 function privatemsg_filter_remove_tags($threads, $tag_id = NULL, $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);
-  }
+    }
 
-  if (is_null($tag_id)) {
+    if (is_null($tag_id)) {
     // Delete all tag mapping.
     foreach ($threads as $thread) {
-      db_query('DELETE FROM {pm_tags_index} WHERE uid = %d AND thread_id = %d', $account->uid, $thread);
+        db_query('DELETE FROM {pm_tags_index} WHERE uid = %d AND thread_id = %d', $account->uid, $thread);
+    }
     }
-  }
-  else {
+    else {
     // Delete tag mapping for the specified tag.
     foreach ($threads as $thread) {
-      db_query('DELETE FROM {pm_tags_index} WHERE uid = %d AND thread_id = %d AND tag_id = %d', $account->uid, $thread, $tag_id);
+        db_query('DELETE FROM {pm_tags_index} WHERE uid = %d AND thread_id = %d AND tag_id = %d', $account->uid, $thread, $tag_id);
+    }
     }
-  }
 }
 
 function privatemsg_filter_get_filter($account) {
-  $filter = array();
-  if (isset($_GET['tags'])) {
+    $filter = array();
+    if (isset($_GET['tags'])) {
     $_GET['tags'] = urldecode($_GET['tags']);
     $tag_data = privatemsg_filter_get_tags_data($account);
     foreach (explode(',', $_GET['tags']) as $tag) {
-      if (isset($tag_data[$tag])) {
+        if (isset($tag_data[$tag])) {
         $filter['tags'][$tag] = $tag;
-      }
-      elseif (in_array($tag, $tag_data)) {
+        }
+        elseif (in_array($tag, $tag_data)) {
         $filter['tags'][array_search($tag, $tag_data)] = array_search($tag, $tag_data);
-      }
+        }
+    }
     }
-  }
 
-  if (isset($_GET['author'])) {
+    if (isset($_GET['author'])) {
     list($filter['author']) = _privatemsg_parse_userstring($_GET['author']);
-  }
+    }
 
-  if (isset($_GET['search'])) {
+    if (isset($_GET['search'])) {
     $filter['search'] = $_GET['search'];
-  }
+    }
 
-  if (!empty($filter)) {
+    if (!empty($filter)) {
     return $filter;
-  }
+    }
 
-  if (!empty($_SESSION['privatemsg_filter'])) {
+    if (!empty($_SESSION['privatemsg_filter'])) {
     return $_SESSION['privatemsg_filter'];
-  }
+    }
 
 }
 
 function privatemsg_filter_get_tags_data($account) {
-  static $tag_data;
+    static $tag_data;
 
-  if (is_array($tag_data)) {
+    if (is_array($tag_data)) {
     return $tag_data;
-  }
+    }
 
-  // Only show the tags that a user have used.
-  $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'), $account);
-  $results = db_query($query['query']);
+    // Only show the tags that a user have used.
+    $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'), $account);
+    $results = db_query($query['query']);
 
-  $tag_data = array();
-  while ($result = db_fetch_object($results)) {
+    $tag_data = array();
+    while ($result = db_fetch_object($results)) {
     $tag_data[$result->tag_id] = $result->tag;
-  }
-  return $tag_data;
+    }
+    return $tag_data;
 }
 
 function privatemsg_filter_dropdown(&$form_state, $account) {
 
-  drupal_add_css(drupal_get_path('module', 'privatemsg_filter') .'/privatemsg_filter.css');
+    drupal_add_css(drupal_get_path('module', 'privatemsg_filter') .'/privatemsg_filter.css');
 
-  $form['filter'] = array(
+    $form['filter'] = array(
     '#type' => 'fieldset',
     '#title' => t('Filter messages'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
-  $form['filter']['search'] = array(
+    );
+    $form['filter']['search'] = array(
     '#type' => 'textfield',
     '#title' => variable_get('privatemsg_filter_searchbody', FALSE) ? t('Search messages') : t('Search subjects'),
     '#weight' => -20
-  );
+    );
 
-  $form['filter']['author'] = array(
+    $form['filter']['author'] = array(
     '#type'               => 'textfield',
     '#title'              => t('Participants'),
     '#description'        => t('Separate multiple names with commas.'),
     '#weight'             => -5,
     '#size'               => 50,
     '#autocomplete_path'  => 'messages/filter/user-name-autocomplete',
-  );
+    );
 
-  // Only show form if the user has some messages tagged.
-  if (count($tag_data = privatemsg_filter_get_tags_data($account))) {
+    // Only show form if the user has some messages tagged.
+    if (count($tag_data = privatemsg_filter_get_tags_data($account))) {
     $form['filter']['tags'] = array(
-      '#type' => 'select',
-      '#title' => t('Tags'),
-      '#options' => $tag_data,
-      '#multiple' => TRUE,
-      '#size' => 5,
-      '#weight' => 0
-    );
-  }
+        '#type' => 'select',
+        '#title' => t('Tags'),
+        '#options' => $tag_data,
+        '#multiple' => TRUE,
+        '#size' => 5,
+        '#weight' => 0
+    );
+    }
     $form['filter']['submit'] = array(
-      '#type'     => 'submit',
-      '#value'    => t('Filter'),
-      '#prefix'   => '<div id="privatemsg-filter-buttons">',
-      '#weight'   => 10,
-      '#submit'   => array('privatemsg_filter_dropdown_submit'),
+        '#type'     => 'submit',
+        '#value'    => t('Filter'),
+        '#prefix'   => '<div id="privatemsg-filter-buttons">',
+        '#weight'   => 10,
+        '#submit'   => array('privatemsg_filter_dropdown_submit'),
     );
 
     $form['filter']['save'] = array(
-      '#type'     => 'submit',
-      '#value'    => t('Save filter'),
-      '#suffix'   => '</div>',
-      '#weight'   => 11,
-      '#submit'   => array('privatemsg_filter_dropdown_submit'),
+        '#type'     => 'submit',
+        '#value'    => t('Save filter'),
+        '#suffix'   => '</div>',
+        '#weight'   => 11,
+        '#submit'   => array('privatemsg_filter_dropdown_submit'),
     );
 
     if ($filter = privatemsg_filter_get_filter($account)) {
-      privatemsg_filter_dropdown_set_active($form, $filter);
+        privatemsg_filter_dropdown_set_active($form, $filter);
     }
 
     return $form;
 }
 
 function privatemsg_filter_dropdown_set_active(&$form, $filter) {
-  $form['filter']['#title'] = t('Filter messages (active)');
-  $form['filter']['#collapsed'] = FALSE;
+    $form['filter']['#title'] = t('Filter messages (active)');
+    $form['filter']['#collapsed'] = FALSE;
 
-  if (isset($filter['author'])) {
+    if (isset($filter['author'])) {
     $string = '';
     foreach ($filter['author'] as $author) {
-      $string .= $author->name . ', ';
+        $string .= $author->name . ', ';
     }
     $form['filter']['author']['#default_value'] = $string;
-  }
-  if (isset($filter['tags'])) {
+    }
+    if (isset($filter['tags'])) {
     $form['filter']['tags']['#default_value'] = $filter['tags'];
-  }
-  if (isset($filter['search'])) {
+    }
+    if (isset($filter['search'])) {
     $form['filter']['search']['#default_value'] = $filter['search'];
-  }
-
-  $form['filter']['reset'] = array(
-      '#type'     => 'submit',
-      '#value'    => t('Reset'),
-      '#suffix'   => '</div>',
-      '#weight'   => 12,
-      '#submit'   => array('privatemsg_filter_dropdown_submit'),
-  );
-  unset($form['filter']['save']['#suffix']);
+    }
+
+    $form['filter']['reset'] = array(
+        '#type'     => 'submit',
+        '#value'    => t('Reset'),
+        '#suffix'   => '</div>',
+        '#weight'   => 12,
+        '#submit'   => array('privatemsg_filter_dropdown_submit'),
+    );
+    unset($form['filter']['save']['#suffix']);
 }
 
 function privatemsg_filter_dropdown_submit($form, &$form_state) {
 
-  if (!empty($form_state['values']['author'])) {
+    if (!empty($form_state['values']['author'])) {
     list($form_state['values']['author']) = _privatemsg_parse_userstring($form_state['values']['author']);
-  }
+    }
 
-  switch ($form_state['values']['op']) {
+    switch ($form_state['values']['op']) {
     case t('Save filter'):
       $filter = array();
-      if (!empty($form_state['values']['tags'])) {
+        if (!empty($form_state['values']['tags'])) {
         $filter['tags'] = $form_state['values']['tags'];
-      }
-      if (!empty($form_state['values']['author'])) {
+        }
+        if (!empty($form_state['values']['author'])) {
         $filter['author'] = $form_state['values']['author'];
-      }
-      if (!empty($form_state['values']['search'])) {
+        }
+        if (!empty($form_state['values']['search'])) {
         $filter['search'] = $form_state['values']['search'];
-      }
-      $_SESSION['privatemsg_filter'] = $filter;
-      break;
+        }
+        $_SESSION['privatemsg_filter'] = $filter;
+        break;
     case t('Filter'):
       drupal_goto($_GET['q'], privatemsg_filter_create_get_query($form_state['values']));
-      return;
-      break;
+        return;
+        break;
     case t('Reset'):
       $_SESSION['privatemsg_filter'] = array();
-      break;
-  }
-  $form_state['redirect'] = $_GET['q'];
+        break;
+    }
+    $form_state['redirect'] = $_GET['q'];
 }
 
 function privatemsg_filter_create_get_query($filter) {
-  $query = array();
-  if (isset($filter['tags']) && !empty($filter['tags'])) {
+    $query = array();
+    if (isset($filter['tags']) && !empty($filter['tags'])) {
     $ids = array();
     foreach ($filter['tags'] as $tag) {
-      if ((int)$tag > 0) {
+        if ((int)$tag > 0) {
         $ids[] = $tag;
-      }
-      else {
+        }
+        else {
         $query['tags'][] = $tag;
-      }
+        }
     }
     $sql = 'SELECT pmt.tag FROM {pm_tags} pmt WHERE pmt.tag_id IN ('. implode(', ', $filter['tags']) .')';
     $result = db_query($sql);
     while ($row = db_fetch_object($result)) {
-      $query['tags'][] = $row->tag;
+        $query['tags'][] = $row->tag;
     }
 
     if (isset($query['tags'])) {
-      $query['tags'] = implode(',', $query['tags']);
+        $query['tags'] = implode(',', $query['tags']);
+    }
     }
-  }
 
-  if (isset($filter['author']) && !empty($filter['author'])) {
+    if (isset($filter['author']) && !empty($filter['author'])) {
     foreach ($filter['author'] as $author) {
-      if (is_object($author) && isset($author->uid) && isset($author->name)) {
+        if (is_object($author) && isset($author->uid) && isset($author->name)) {
         $query['author'][] = $author->name;
-      }
-      elseif ($author_obj = user_load($author)) {
+        }
+        elseif ($author_obj = user_load($author)) {
         $query['author'][] = $author_obj->name;
-      }
+        }
     }
     if (isset($query['author'])) {
-      $query['author'] = implode(',', $query['author']);
+        $query['author'] = implode(',', $query['author']);
+    }
     }
-  }
 
-  if (isset($filter['search']) && !empty($filter['search'])) {
+    if (isset($filter['search']) && !empty($filter['search'])) {
     $query['search'] = $filter['search'];
-  }
-  return $query;
+    }
+    return $query;
 }
 
 /**
@@ -478,14 +478,14 @@ 
  * Adds a filter widget to the message listing pages.
  */
 function privatemsg_filter_form_privatemsg_list_alter(&$form, $form_state) {
-  global $user;
+    global $user;
 
-  if (privatemsg_user_access('filter private messages') && !empty($form['#data'])) {
+    if (privatemsg_user_access('filter private messages') && !empty($form['#data'])) {
     $form += privatemsg_filter_dropdown($form_state, $form['#account']);
-  }
+    }
 
-  $fields = array_filter(variable_get('privatemsg_display_fields', array('participants')));
-  if (in_array('tags', $fields)) {
+    $fields = array_filter(variable_get('privatemsg_display_fields', array('participants')));
+    if (in_array('tags', $fields)) {
     // Load thread id's of the current list.
     $threads = array_keys($form['#data']);
 
@@ -495,21 +495,21 @@ 
     // Add them to #data
     $result = db_query($query['query']);
     while ($tag = db_fetch_array($result)) {
-      $form['#data'][$tag['thread_id']]['tags'][$tag['tag_id']] = $tag['tag'];
+        $form['#data'][$tag['thread_id']]['tags'][$tag['tag_id']] = $tag['tag'];
+    }
     }
-  }
 
-  $tags = privatemsg_filter_get_tags_data($user);
-  if (privatemsg_user_access('tag private messages') && !empty($tags) && !empty($form['#data'])) {
+    $tags = privatemsg_filter_get_tags_data($user);
+    if (privatemsg_user_access('tag private messages') && !empty($tags) && !empty($form['#data'])) {
     $options = array();
     $options[] = t('Apply tag...');
     foreach ($tags as $tag_id => $tag) {
-      $options[$tag_id] = $tag;
+        $options[$tag_id] = $tag;
     }
     $form['actions']['tag-add'] = array(
-      '#type'          => 'select',
-      '#options'       => $options,
-      '#default_value' => 0,
+        '#type'          => 'select',
+        '#options'       => $options,
+        '#default_value' => 0,
     );
     $form['actions']['tag-add-submit'] = array(
         '#prefix'     => '<div class="privatemsg-tag-add-submit">',
@@ -521,9 +521,9 @@ 
     );
     $options[0] = t('Remove Tag...');
     $form['actions']['tag-remove'] = array(
-      '#type'          => 'select',
-      '#options'       => $options,
-      '#default_value' => 0,
+        '#type'          => 'select',
+        '#options'       => $options,
+        '#default_value' => 0,
     );
     $form['actions']['tag-remove-submit'] = array(
         '#prefix'     => '<div class="privatemsg-tag-remove-submit">',
@@ -536,7 +536,7 @@ 
 
     // JS for hiding the submit buttons.
     drupal_add_js(drupal_get_path('module', 'privatemsg_filter') .'/privatemsg-filter-list.js');
-  }
+    }
 }
 
 /**
@@ -545,12 +545,12 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__tags() {
-   return array(
+    return array(
     'data' => t('Tags'),
     'key' => 'tags',
     'class' => 'privatemsg-header-tags',
     '#weight' => -42,
-  );
+    );
 }
 
 
@@ -560,48 +560,48 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__tags($thread) {
-  if (!empty($thread['tags'])) {
+    if (!empty($thread['tags'])) {
     $tags = array();
 
     foreach ($thread['tags'] as $tag_id => $tag) {
-      $tags[] = l(strlen($tag) > 15 ? substr($tag, 0, 13) . '...' : $tag, 'messages', array(
+        $tags[] = l(strlen($tag) > 15 ? substr($tag, 0, 13) . '...' : $tag, 'messages', array(
         'attributes' => array('title' => $tag),
         'query' => array('tags' => $tag)
-      ));
+        ));
     }
     return array(
-      'data'  => implode(', ', $tags),
-      'class' => 'privatemsg-list-tags',
+        'data'  => implode(', ', $tags),
+        'class' => 'privatemsg-list-tags',
     );
-  }
+    }
 }
 
 /**
  * Form callback for adding a tag to threads.
  */
 function privatemsg_filter_add_tag_submit($form, &$form_state) {
-  $operation = array(
+    $operation = array(
     'callback' => 'privatemsg_filter_add_tags',
     'callback arguments' => array('tag_id' => $form_state['values']['tag-add']),
     'undo callback' => 'privatemsg_filter_remove_tags',
     'undo callback arguments' => array('tag_id' => $form_state['values']['tag-add']),
-  );
-  drupal_set_message(t('The selected conversations have been tagged.'));
-  privatemsg_operation_execute($operation, $form_state['values']['threads']);
+    );
+    drupal_set_message(t('The selected conversations have been tagged.'));
+    privatemsg_operation_execute($operation, $form_state['values']['threads']);
 }
 
 /**
  * Form callback for removing a tag to threads.
  */
 function privatemsg_filter_remove_tag_submit($form, &$form_state) {
-  $operation = array(
+    $operation = array(
     'callback' => 'privatemsg_filter_remove_tags',
     'callback arguments' => array('tag_id' => $form_state['values']['tag-remove']),
     'undo callback' => 'privatemsg_filter_add_tags',
     'undo callback arguments' => array('tag_id' => $form_state['values']['tag-remove']),
-  );
-  drupal_set_message(t('The tag has been removed from the selected conversations.'));
-  privatemsg_operation_execute($operation, $form_state['values']['threads']);
+    );
+    drupal_set_message(t('The tag has been removed from the selected conversations.'));
+    privatemsg_operation_execute($operation, $form_state['values']['threads']);
 }
 
 /**
@@ -609,114 +609,114 @@ 
  */
 function privatemsg_filter_privatemsg_sql_list_alter(&$fragments, $account, $argument) {
 
-  // Check if its a filtered view.
-  if ($argument == 'sent') {
+    // Check if its a filtered view.
+    if ($argument == 'sent') {
     $fragments['where'][]       = "pm.author = %d";
     $fragments['query_args']['where'][]   = $account->uid;
-  }
-  if ($argument == 'inbox') {
+    }
+    if ($argument == 'inbox') {
     $fragments['having'][]       = '((SELECT pmf.author FROM {pm_message} pmf WHERE pmf.mid = pmi.thread_id) = %d AND COUNT(pmi.thread_id) > 1) OR (SELECT COUNT(*) FROM {pm_message} pmf INNER JOIN {pm_index} pmif ON (pmf.mid = pmif.mid) WHERE pmif.thread_id = pmi.thread_id AND pmf.author <> %d) > 0';
     $fragments['query_args']['having'][]   = $account->uid;
     $fragments['query_args']['having'][]   = $account->uid;
-  }
+    }
 
-  // Filter the message listing by any set tags.
-  if ($filter = privatemsg_filter_get_filter($account)) {
+    // Filter the message listing by any set tags.
+    if ($filter = privatemsg_filter_get_filter($account)) {
     $count = 0;
     if (isset($filter['tags']) && !empty($filter['tags'])) {
-      foreach ($filter['tags'] as $tag) {
+        foreach ($filter['tags'] as $tag) {
         $fragments['inner_join'][]  = "INNER JOIN {pm_tags_index} pmti$count ON (pmti$count.thread_id = pmi.thread_id AND pmti$count.uid = pmi.uid)";
         $fragments['where'][]       = "pmti$count.tag_id = %d";
         $fragments['query_args']['where'][]   = $tag;
         $count++;
-      }
+        }
     }
 
     if (isset($filter['author']) && !empty($filter['author'])) {
-      foreach ($filter['author'] as $author) {
+        foreach ($filter['author'] as $author) {
         $fragments['inner_join'][]  = "INNER JOIN {pm_index} pmi$count ON (pmi$count.mid = pm.mid)";
         $fragments['where'][]       = "pmi$count.uid = %d";
         $fragments['query_args']['where'][]   = $author->uid;
         $count++;
-      }
+        }
     }
 
     if (isset($filter['search']) && !empty($filter['search'])) {
-      if (variable_get('privatemsg_filter_searchbody', FALSE)) {
+        if (variable_get('privatemsg_filter_searchbody', FALSE)) {
         $fragments['where'][]       = "pm.subject LIKE '%s' OR pm.body LIKE '%s'";
         $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
         $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
-      }
-      else {
+        }
+        else {
         $fragments['where'][]       = "pm.subject LIKE '%s'";
         $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Hook into the view messages page to add a form for tagging purposes.
  */
 function privatemsg_filter_privatemsg_view_messages_alter(&$content, $thread) {
-  if (count($thread['messages']) > 0) {
+    if (count($thread['messages']) > 0) {
     $content['tags']['#value'] = drupal_get_form('privatemsg_filter_form');
     $content['tags']['#weight'] = variable_get('privatemsg_filter_tagfield_weight', 10);
-  }
+    }
 }
 
 /**
  * Form to show and allow modification of tagging information of a conversation.
  */
 function privatemsg_filter_form(&$form_state) {
-  global $user;
-  $thread_id = arg(2);
-
-  // Get a list of current tags for this thread
-  $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'), $user, array($thread_id));
-  $results = db_query($query['query']);
-  $count = db_result(db_query($query['count']));
-  $tags = '';
-  while ($tag = db_fetch_array($results)) {
+    global $user;
+    $thread_id = arg(2);
+
+    // Get a list of current tags for this thread
+    $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'), $user, array($thread_id));
+    $results = db_query($query['query']);
+    $count = db_result(db_query($query['count']));
+    $tags = '';
+    while ($tag = db_fetch_array($results)) {
     $tags .= $tag['tag'] . ', ';
-  }
+    }
 
-  $form['tags'] = array(
+    $form['tags'] = array(
     '#type' => 'fieldset',
     '#title' => t('Tags'),
     '#access' => privatemsg_user_access('tag private messages'),
     '#collapsible' => TRUE,
     '#collapsed' => empty($count) ? TRUE : FALSE,
-  );
-  $form['tags']['user_id'] = array(
+    );
+    $form['tags']['user_id'] = array(
     '#type' => 'value',
     '#value' => $user->uid,
-  );
-  $form['tags']['thread_id'] = array(
+    );
+    $form['tags']['thread_id'] = array(
     '#type' => 'value',
     '#value' => $thread_id,
-  );
+    );
 
-  $form['tags']['tags'] = array(
+    $form['tags']['tags'] = array(
     '#type'               => 'textfield',
     '#title'              => t('Tags for this conversation'),
     '#description'        => t('Separate multiple tags with commas.'),
     '#size'               => 50,
     '#default_value'      => $tags,
     '#autocomplete_path'  => 'messages/filter/tag-autocomplete',
-  );
+    );
 
-  $form['tags']['submit'] = array(
+    $form['tags']['submit'] = array(
     '#type'     => 'submit',
     '#value'    => t('Tag this conversation'),
     '#submit'   => array('privatemsg_filter_form_submit'),
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 function privatemsg_filter_form_submit($form, &$form_state) {
-  if (isset($form_state['values']['submit'])) {
+    if (isset($form_state['values']['submit'])) {
     $tags = explode(',', $form_state['values']['tags']);
 
     // Step 1 - Delete all tag mapping. I cannot think of a better way to remove tags that are no longer in the textfield, so ideas welcome.
@@ -727,10 +727,10 @@ 
 
     // Step 3 - Save all the tagging data.
     foreach ($tag_ids as $tag_id) {
-      privatemsg_filter_add_tags($form_state['values']['thread_id'], $tag_id);
+        privatemsg_filter_add_tags($form_state['values']['thread_id'], $tag_id);
     }
     drupal_set_message(t('Tagging information has been saved.'));
-  }
+    }
 }
 
 /**
@@ -741,28 +741,28 @@ 
  */
 function privatemsg_filter_tags_autocomplete($string) {
 
-  // 1: Parse $string and build a list of tags.
-  $tags = array();
-  $fragments = explode(',', $string);
-  foreach ($fragments as $index => $tag) {
+    // 1: Parse $string and build a list of tags.
+    $tags = array();
+    $fragments = explode(',', $string);
+    foreach ($fragments as $index => $tag) {
     $tag = trim($tag);
     $tags[$tag] = $tag;
-  }
+    }
 
-  // 2: Find the next tag suggestion.
-  $fragment = array_pop($tags);
-  $matches = array();
-  if (!empty($fragment)) {
+    // 2: Find the next tag suggestion.
+    $fragment = array_pop($tags);
+    $matches = array();
+    if (!empty($fragment)) {
     $query = _privatemsg_assemble_query(array('tags_autocomplete', 'privatemsg_filter'), $fragment, $tags);
     $result = db_query_range($query['query'], $fragment, 0, 10);
     $prefix = count($tags) ? implode(", ", $tags) .", " : '';
     // 3: Build proper suggestions and print.
     while ($tag = db_fetch_object($result)) {
-      $matches[$prefix . $tag->tag .", "] = $tag->tag;
+        $matches[$prefix . $tag->tag .", "] = $tag->tag;
     }
-  }
-  // 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);
 }
 
 /**
@@ -781,19 +781,19 @@ 
  *   Array of names that are already part of the autocomplete field.
  */
 function privatemsg_filter_privatemsg_sql_autocomplete_alter(&$fragments, $search, $names) {
-  global $user;
-  // arg(1) is an additional URL argument passed to the URL when only
-  // users that are listed as recipient for threads of that user should be
-  // displayed.
-  // @todo: Check if these results can be grouped to avoid unecessary loops.
-  if (arg(1) == 'filter') {
+    global $user;
+    // arg(1) is an additional URL argument passed to the URL when only
+    // users that are listed as recipient for threads of that user should be
+    // displayed.
+    // @todo: Check if these results can be grouped to avoid unecessary loops.
+    if (arg(1) == 'filter') {
     // JOIN on index entries where the to be selected user is a recipient.
     $fragments['inner_join'][] = 'INNER JOIN {pm_index} pip ON pip.uid = u.uid';
     // JOIN on rows where the current user is the recipient and that have the
     // same mid as those above.
     $fragments['inner_join'][] = 'INNER JOIN {pm_index} piu ON piu.uid = %d AND pip.mid = piu.mid';
     $fragments['query_args']['join'][] = $user->uid;
-  }
+    }
 }
 
 /**
@@ -809,19 +809,19 @@ 
  *   Limit the number of tags *per thread*.
  */
 function privatemsg_filter_sql_tags(&$fragments, $user = NULL, $threads = NULL, $limit = NULL) {
-  $fragments['primary_table'] = '{pm_tags} t';
-  $fragments['select'][] = 't.tag';
-  $fragments['select'][] = 't.tag_id';
-  $fragments['select'][] = 't.public';
+    $fragments['primary_table'] = '{pm_tags} t';
+    $fragments['select'][] = 't.tag';
+    $fragments['select'][] = 't.tag_id';
+    $fragments['select'][] = 't.public';
 
-  if (!empty($threads)) {
+    if (!empty($threads)) {
     // If the tag list needs to be for specific threads.
     $fragments['select'][] = 'ti.thread_id';
     $fragments['inner_join'][]  = 'INNER JOIN {pm_tags_index} ti on ti.tag_id = t.tag_id';
     $fragments['where'][] = 'ti.thread_id IN (' . db_placeholders($threads) . ')';
     $fragments['query_args']['where'] += $threads;
-  }
-  else {
+    }
+    else {
     // Tag usage counter is only used when we select all tags.
     $fragments['select'][]      = 'COUNT(ti.thread_id) as count';
     // LEFT JOIN so that unused tags are displayed too.
@@ -829,33 +829,33 @@ 
     $fragments['group_by'][]    = 't.tag_id';
     $fragments['group_by'][]    = 't.tag';
     $fragments['group_by'][]    = 't.public';
-  }
-  if (!empty($user)) {
+    }
+    if (!empty($user)) {
     $fragments['where'][]       = 'ti.uid = %d';
     $fragments['query_args']['where'][] = $user->uid;
-  }
-
-  // Only select n tags per thread (ordered per tag_id), see
-  // http://www.xaprb.com/blog/2006/12/07/how-to-select-the-firstleastmax-row-per-group-in-sql/.
-  //
-  // It does select how many tags for that thread/uid combination exist that
-  // have a lower tag_id and does only select those that have less than $limit.
-  //
-  // This should only have a very minor performance impact as most users won't
-  // tag a thread with 1000 different tags.
-  //
-  if ($limit) {
+    }
+
+    // Only select n tags per thread (ordered per tag_id), see
+    // http://www.xaprb.com/blog/2006/12/07/how-to-select-the-firstleastmax-row-per-group-in-sql/.
+    //
+    // It does select how many tags for that thread/uid combination exist that
+    // have a lower tag_id and does only select those that have less than $limit.
+    //
+    // This should only have a very minor performance impact as most users won't
+    // tag a thread with 1000 different tags.
+    //
+    if ($limit) {
     $fragments['where'][] = '(SELECT count(*) FROM {pm_tags_index} AS pmtic
                               WHERE pmtic.thread_id = ti.thread_id
                               AND pmtic.uid = ti.uid
                               AND pmtic.tag_id < ti.tag_id) < %d';
     $fragments['query_args']['where'][] = $limit;
-  }
-  elseif (!empty($threads) || !empty($user)) {
+    }
+    elseif (!empty($threads) || !empty($user)) {
     // Only add a sort when we are not loading the tags for the admin page.
     // Sorting is handled through tablesort_sql() then.
     $fragments['order_by'][] = 't.tag ASC';
-  }
+    }
 }
 
 /**
@@ -869,25 +869,25 @@ 
  *   Array of tags not to be used as suggestions.
  */
 function privatemsg_filter_sql_tags_autocomplete(&$fragments, $search, $tags) {
-  global $user;
-
-  $fragments['primary_table'] = '{pm_tags} pmt';
-  $fragments['select'][] = 'pmt.tag';
-  $fragments['where'][] = "pmt.tag LIKE '%s'";
-  // Escape % to get through the placeholder replacement.
-  $fragments['query_args']['where'][] = $search .'%%';
-  if (!empty($tags)) {
+    global $user;
+
+    $fragments['primary_table'] = '{pm_tags} pmt';
+    $fragments['select'][] = 'pmt.tag';
+    $fragments['where'][] = "pmt.tag LIKE '%s'";
+    // Escape % to get through the placeholder replacement.
+    $fragments['query_args']['where'][] = $search .'%%';
+    if (!empty($tags)) {
     // Exclude tags.
     $fragments['where'][] = "pmt.tag NOT IN (". db_placeholders($tags, 'text') .")";
     $fragments['query_args']['where'] += $tags;
-  }
-  // LEFT JOIN to be able to load public, unused tags.
-  $fragments['inner_join'][]  = 'LEFT JOIN {pm_tags_index} pmti ON pmt.tag_id = pmti.tag_id AND pmti.uid = %d';
-  $fragments['query_args']['join'][] = $user->uid;
-  // Autocomplete should only display Tags used by that user or public tags.
-  // This is done to avoid information disclosure as part of tag names.
-  $fragments['where'][] = '(pmti.uid IS NOT NULL OR pmt.public = 1)';
-  $fragments['order_by'][] = 'pmt.tag ASC';
+    }
+    // LEFT JOIN to be able to load public, unused tags.
+    $fragments['inner_join'][]  = 'LEFT JOIN {pm_tags_index} pmti ON pmt.tag_id = pmti.tag_id AND pmti.uid = %d';
+    $fragments['query_args']['join'][] = $user->uid;
+    // Autocomplete should only display Tags used by that user or public tags.
+    // This is done to avoid information disclosure as part of tag names.
+    $fragments['where'][] = '(pmti.uid IS NOT NULL OR pmt.public = 1)';
+    $fragments['order_by'][] = 'pmt.tag ASC';
 }
 
 /**
@@ -898,10 +898,10 @@ 
  * Implement hook_user().
  */
 function privatemsg_filter_user($op, &$edit, &$account, $category = NULL) {
-  switch ($op) {
-      case 'delete':
+    switch ($op) {
+        case 'delete':
       // Delete tag information of that user.
       db_query("DELETE FROM {pm_tags_index} WHERE uid = %d", $account->uid, $account->uid);
-      break;
-  }
+        break;
+    }
 }

Switch Indentation +24 added lines, -24 removed lines

@@ -405,26 +405,26 @@ 
   }
 
   switch ($form_state['values']['op']) {
-    case t('Save filter'):
-      $filter = array();
-      if (!empty($form_state['values']['tags'])) {
-        $filter['tags'] = $form_state['values']['tags'];
-      }
-      if (!empty($form_state['values']['author'])) {
-        $filter['author'] = $form_state['values']['author'];
-      }
-      if (!empty($form_state['values']['search'])) {
-        $filter['search'] = $form_state['values']['search'];
-      }
-      $_SESSION['privatemsg_filter'] = $filter;
-      break;
-    case t('Filter'):
-      drupal_goto($_GET['q'], privatemsg_filter_create_get_query($form_state['values']));
-      return;
-      break;
-    case t('Reset'):
-      $_SESSION['privatemsg_filter'] = array();
-      break;
+  case t('Save filter'):
+    $filter = array();
+    if (!empty($form_state['values']['tags'])) {
+      $filter['tags'] = $form_state['values']['tags'];
+    }
+    if (!empty($form_state['values']['author'])) {
+      $filter['author'] = $form_state['values']['author'];
+    }
+    if (!empty($form_state['values']['search'])) {
+      $filter['search'] = $form_state['values']['search'];
+    }
+    $_SESSION['privatemsg_filter'] = $filter;
+    break;
+  case t('Filter'):
+    drupal_goto($_GET['q'], privatemsg_filter_create_get_query($form_state['values']));
+    return;
+    break;
+  case t('Reset'):
+    $_SESSION['privatemsg_filter'] = array();
+    break;
   }
   $form_state['redirect'] = $_GET['q'];
 }
@@ -899,9 +899,9 @@ 
  */
 function privatemsg_filter_user($op, &$edit, &$account, $category = NULL) {
   switch ($op) {
-      case 'delete':
-      // Delete tag information of that user.
-      db_query("DELETE FROM {pm_tags_index} WHERE uid = %d", $account->uid, $account->uid);
-      break;
+  case 'delete':
+  // Delete tag information of that user.
+  db_query("DELETE FROM {pm_tags_index} WHERE uid = %d", $account->uid, $account->uid);
+  break;
   }
 }

Spacing +23 added lines, -23 removed lines

@@ -313,7 +313,7 @@ 
 
 function privatemsg_filter_dropdown(&$form_state, $account) {
 
-  drupal_add_css(drupal_get_path('module', 'privatemsg_filter') .'/privatemsg_filter.css');
+  drupal_add_css(drupal_get_path('module', 'privatemsg_filter').'/privatemsg_filter.css');
 
   $form['filter'] = array(
     '#type' => 'fieldset',
@@ -377,7 +377,7 @@ 
   if (isset($filter['author'])) {
     $string = '';
     foreach ($filter['author'] as $author) {
-      $string .= $author->name . ', ';
+      $string .= $author->name.', ';
     }
     $form['filter']['author']['#default_value'] = $string;
   }
@@ -441,7 +441,7 @@ 
         $query['tags'][] = $tag;
       }
     }
-    $sql = 'SELECT pmt.tag FROM {pm_tags} pmt WHERE pmt.tag_id IN ('. implode(', ', $filter['tags']) .')';
+    $sql = 'SELECT pmt.tag FROM {pm_tags} pmt WHERE pmt.tag_id IN ('.implode(', ', $filter['tags']).')';
     $result = db_query($sql);
     while ($row = db_fetch_object($result)) {
       $query['tags'][] = $row->tag;
@@ -535,7 +535,7 @@ 
     );
 
     // JS for hiding the submit buttons.
-    drupal_add_js(drupal_get_path('module', 'privatemsg_filter') .'/privatemsg-filter-list.js');
+    drupal_add_js(drupal_get_path('module', 'privatemsg_filter').'/privatemsg-filter-list.js');
   }
 }
 
@@ -564,7 +564,7 @@ 
     $tags = array();
 
     foreach ($thread['tags'] as $tag_id => $tag) {
-      $tags[] = l(strlen($tag) > 15 ? substr($tag, 0, 13) . '...' : $tag, 'messages', array(
+      $tags[] = l(strlen($tag) > 15 ? substr($tag, 0, 13).'...' : $tag, 'messages', array(
         'attributes' => array('title' => $tag),
         'query' => array('tags' => $tag)
       ));
@@ -611,11 +611,11 @@ 
 
   // Check if its a filtered view.
   if ($argument == 'sent') {
-    $fragments['where'][]       = "pm.author = %d";
-    $fragments['query_args']['where'][]   = $account->uid;
+    $fragments['where'][] = "pm.author = %d";
+    $fragments['query_args']['where'][] = $account->uid;
   }
   if ($argument == 'inbox') {
-    $fragments['having'][]       = '((SELECT pmf.author FROM {pm_message} pmf WHERE pmf.mid = pmi.thread_id) = %d AND COUNT(pmi.thread_id) > 1) OR (SELECT COUNT(*) FROM {pm_message} pmf INNER JOIN {pm_index} pmif ON (pmf.mid = pmif.mid) WHERE pmif.thread_id = pmi.thread_id AND pmf.author <> %d) > 0';
+    $fragments['having'][] = '((SELECT pmf.author FROM {pm_message} pmf WHERE pmf.mid = pmi.thread_id) = %d AND COUNT(pmi.thread_id) > 1) OR (SELECT COUNT(*) FROM {pm_message} pmf INNER JOIN {pm_index} pmif ON (pmf.mid = pmif.mid) WHERE pmif.thread_id = pmi.thread_id AND pmf.author <> %d) > 0';
     $fragments['query_args']['having'][]   = $account->uid;
     $fragments['query_args']['having'][]   = $account->uid;
   }
@@ -627,7 +627,7 @@ 
       foreach ($filter['tags'] as $tag) {
         $fragments['inner_join'][]  = "INNER JOIN {pm_tags_index} pmti$count ON (pmti$count.thread_id = pmi.thread_id AND pmti$count.uid = pmi.uid)";
         $fragments['where'][]       = "pmti$count.tag_id = %d";
-        $fragments['query_args']['where'][]   = $tag;
+        $fragments['query_args']['where'][] = $tag;
         $count++;
       }
     }
@@ -636,20 +636,20 @@ 
       foreach ($filter['author'] as $author) {
         $fragments['inner_join'][]  = "INNER JOIN {pm_index} pmi$count ON (pmi$count.mid = pm.mid)";
         $fragments['where'][]       = "pmi$count.uid = %d";
-        $fragments['query_args']['where'][]   = $author->uid;
+        $fragments['query_args']['where'][] = $author->uid;
         $count++;
       }
     }
 
     if (isset($filter['search']) && !empty($filter['search'])) {
       if (variable_get('privatemsg_filter_searchbody', FALSE)) {
-        $fragments['where'][]       = "pm.subject LIKE '%s' OR pm.body LIKE '%s'";
-        $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
-        $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
+        $fragments['where'][] = "pm.subject LIKE '%s' OR pm.body LIKE '%s'";
+        $fragments['query_args']['where'][]    = '%%'.$filter['search'].'%%';
+        $fragments['query_args']['where'][]    = '%%'.$filter['search'].'%%';
       }
       else {
-        $fragments['where'][]       = "pm.subject LIKE '%s'";
-        $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
+        $fragments['where'][] = "pm.subject LIKE '%s'";
+        $fragments['query_args']['where'][] = '%%'.$filter['search'].'%%';
       }
     }
   }
@@ -678,7 +678,7 @@ 
   $count = db_result(db_query($query['count']));
   $tags = '';
   while ($tag = db_fetch_array($results)) {
-    $tags .= $tag['tag'] . ', ';
+    $tags .= $tag['tag'].', ';
   }
 
   $form['tags'] = array(
@@ -755,10 +755,10 @@ 
   if (!empty($fragment)) {
     $query = _privatemsg_assemble_query(array('tags_autocomplete', 'privatemsg_filter'), $fragment, $tags);
     $result = db_query_range($query['query'], $fragment, 0, 10);
-    $prefix = count($tags) ? implode(", ", $tags) .", " : '';
+    $prefix = count($tags) ? implode(", ", $tags).", " : '';
     // 3: Build proper suggestions and print.
     while ($tag = db_fetch_object($result)) {
-      $matches[$prefix . $tag->tag .", "] = $tag->tag;
+      $matches[$prefix.$tag->tag.", "] = $tag->tag;
     }
   }
   // convert to object to prevent drupal bug, see http://drupal.org/node/175361
@@ -817,8 +817,8 @@ 
   if (!empty($threads)) {
     // If the tag list needs to be for specific threads.
     $fragments['select'][] = 'ti.thread_id';
-    $fragments['inner_join'][]  = 'INNER JOIN {pm_tags_index} ti on ti.tag_id = t.tag_id';
-    $fragments['where'][] = 'ti.thread_id IN (' . db_placeholders($threads) . ')';
+    $fragments['inner_join'][] = 'INNER JOIN {pm_tags_index} ti on ti.tag_id = t.tag_id';
+    $fragments['where'][] = 'ti.thread_id IN ('.db_placeholders($threads).')';
     $fragments['query_args']['where'] += $threads;
   }
   else {
@@ -875,14 +875,14 @@ 
   $fragments['select'][] = 'pmt.tag';
   $fragments['where'][] = "pmt.tag LIKE '%s'";
   // Escape % to get through the placeholder replacement.
-  $fragments['query_args']['where'][] = $search .'%%';
+  $fragments['query_args']['where'][] = $search.'%%';
   if (!empty($tags)) {
     // Exclude tags.
-    $fragments['where'][] = "pmt.tag NOT IN (". db_placeholders($tags, 'text') .")";
+    $fragments['where'][] = "pmt.tag NOT IN (".db_placeholders($tags, 'text').")";
     $fragments['query_args']['where'] += $tags;
   }
   // LEFT JOIN to be able to load public, unused tags.
-  $fragments['inner_join'][]  = 'LEFT JOIN {pm_tags_index} pmti ON pmt.tag_id = pmti.tag_id AND pmti.uid = %d';
+  $fragments['inner_join'][] = 'LEFT JOIN {pm_tags_index} pmti ON pmt.tag_id = pmti.tag_id AND pmti.uid = %d';
   $fragments['query_args']['join'][] = $user->uid;
   // Autocomplete should only display Tags used by that user or public tags.
   // This is done to avoid information disclosure as part of tag names.

Braces +8 added lines, -16 removed lines

@@ -192,8 +192,7 @@ 
     if (empty($tag_id) && privatemsg_user_access('create private message tags')) {
       db_query("INSERT INTO {pm_tags} (tag) VALUES ('%s')", $tag);
       $tag_id = db_last_insert_id('pm_tags', 'tag_id');
-    }
-    elseif (empty($tag_id)) {
+    } elseif (empty($tag_id)) {
       // The user does not have permission to create new tags - disregard this tag and move onto the next.
       drupal_set_message(t('Tag %tag was ignored because you do not have permission to create new tags.', array('%tag' => $tag)));
       continue;
@@ -251,8 +250,7 @@ 
     foreach ($threads as $thread) {
       db_query('DELETE FROM {pm_tags_index} WHERE uid = %d AND thread_id = %d', $account->uid, $thread);
     }
-  }
-  else {
+  } else {
     // Delete tag mapping for the specified tag.
     foreach ($threads as $thread) {
       db_query('DELETE FROM {pm_tags_index} WHERE uid = %d AND thread_id = %d AND tag_id = %d', $account->uid, $thread, $tag_id);
@@ -268,8 +266,7 @@ 
     foreach (explode(',', $_GET['tags']) as $tag) {
       if (isset($tag_data[$tag])) {
         $filter['tags'][$tag] = $tag;
-      }
-      elseif (in_array($tag, $tag_data)) {
+      } elseif (in_array($tag, $tag_data)) {
         $filter['tags'][array_search($tag, $tag_data)] = array_search($tag, $tag_data);
       }
     }
@@ -436,8 +433,7 @@ 
     foreach ($filter['tags'] as $tag) {
       if ((int)$tag > 0) {
         $ids[] = $tag;
-      }
-      else {
+      } else {
         $query['tags'][] = $tag;
       }
     }
@@ -456,8 +452,7 @@ 
     foreach ($filter['author'] as $author) {
       if (is_object($author) && isset($author->uid) && isset($author->name)) {
         $query['author'][] = $author->name;
-      }
-      elseif ($author_obj = user_load($author)) {
+      } elseif ($author_obj = user_load($author)) {
         $query['author'][] = $author_obj->name;
       }
     }
@@ -646,8 +641,7 @@ 
         $fragments['where'][]       = "pm.subject LIKE '%s' OR pm.body LIKE '%s'";
         $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
         $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
-      }
-      else {
+      } else {
         $fragments['where'][]       = "pm.subject LIKE '%s'";
         $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
       }
@@ -820,8 +814,7 @@ 
     $fragments['inner_join'][]  = 'INNER JOIN {pm_tags_index} ti on ti.tag_id = t.tag_id';
     $fragments['where'][] = 'ti.thread_id IN (' . db_placeholders($threads) . ')';
     $fragments['query_args']['where'] += $threads;
-  }
-  else {
+  } else {
     // Tag usage counter is only used when we select all tags.
     $fragments['select'][]      = 'COUNT(ti.thread_id) as count';
     // LEFT JOIN so that unused tags are displayed too.
@@ -850,8 +843,7 @@ 
                               AND pmtic.uid = ti.uid
                               AND pmtic.tag_id < ti.tag_id) < %d';
     $fragments['query_args']['where'][] = $limit;
-  }
-  elseif (!empty($threads) || !empty($user)) {
+  } elseif (!empty($threads) || !empty($user)) {
     // Only add a sort when we are not loading the tags for the admin page.
     // Sorting is handled through tablesort_sql() then.
     $fragments['order_by'][] = 't.tag ASC';

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

@@ -125,7 +125,7 @@ 
     '#type'          => 'checkbox',
     '#title'         => t('Search message body'),
     '#description'   => t('WARNING: turning on this feature will slow down search performance by a large factor. Gets worse as your messages database increases.'),
-    '#default_value' => variable_get('privatemsg_filter_searchbody', FALSE),
+    '#default_value' => variable_get('privatemsg_filter_searchbody', false),
   );
 
     $form['privatemsg_filter_tagfield_weight'] = array(
@@ -211,7 +211,7 @@ 
  * @param $tag_id
  *   Id of the tag.
  */
-function privatemsg_filter_add_tags($threads, $tag_id, $account = NULL) {
+function privatemsg_filter_add_tags($threads, $tag_id, $account = null) {
   if (!is_array($threads)) {
     $threads = array($threads);
   }
@@ -237,7 +237,7 @@ 
  * @param $tag_id
  *   Id of the tag - set to NULL to remove all tags.
  */
-function privatemsg_filter_remove_tags($threads, $tag_id = NULL, $account = NULL) {
+function privatemsg_filter_remove_tags($threads, $tag_id = null, $account = null) {
   if (!is_array($threads)) {
     $threads = array($threads);
   }
@@ -318,12 +318,12 @@ 
   $form['filter'] = array(
     '#type' => 'fieldset',
     '#title' => t('Filter messages'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
   $form['filter']['search'] = array(
     '#type' => 'textfield',
-    '#title' => variable_get('privatemsg_filter_searchbody', FALSE) ? t('Search messages') : t('Search subjects'),
+    '#title' => variable_get('privatemsg_filter_searchbody', false) ? t('Search messages') : t('Search subjects'),
     '#weight' => -20
   );
 
@@ -342,7 +342,7 @@ 
       '#type' => 'select',
       '#title' => t('Tags'),
       '#options' => $tag_data,
-      '#multiple' => TRUE,
+      '#multiple' => true,
       '#size' => 5,
       '#weight' => 0
     );
@@ -372,7 +372,7 @@ 
 
 function privatemsg_filter_dropdown_set_active(&$form, $filter) {
   $form['filter']['#title'] = t('Filter messages (active)');
-  $form['filter']['#collapsed'] = FALSE;
+  $form['filter']['#collapsed'] = false;
 
   if (isset($filter['author'])) {
     $string = '';
@@ -642,7 +642,7 @@ 
     }
 
     if (isset($filter['search']) && !empty($filter['search'])) {
-      if (variable_get('privatemsg_filter_searchbody', FALSE)) {
+      if (variable_get('privatemsg_filter_searchbody', false)) {
         $fragments['where'][]       = "pm.subject LIKE '%s' OR pm.body LIKE '%s'";
         $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
         $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
@@ -685,8 +685,8 @@ 
     '#type' => 'fieldset',
     '#title' => t('Tags'),
     '#access' => privatemsg_user_access('tag private messages'),
-    '#collapsible' => TRUE,
-    '#collapsed' => empty($count) ? TRUE : FALSE,
+    '#collapsible' => true,
+    '#collapsed' => empty($count) ? true : false,
   );
   $form['tags']['user_id'] = array(
     '#type' => 'value',
@@ -808,7 +808,7 @@ 
  * @param $limit
  *   Limit the number of tags *per thread*.
  */
-function privatemsg_filter_sql_tags(&$fragments, $user = NULL, $threads = NULL, $limit = NULL) {
+function privatemsg_filter_sql_tags(&$fragments, $user = null, $threads = null, $limit = null) {
   $fragments['primary_table'] = '{pm_tags} t';
   $fragments['select'][] = 't.tag';
   $fragments['select'][] = 't.tag_id';
@@ -897,7 +897,7 @@ 
 /**
  * Implement hook_user().
  */
-function privatemsg_filter_user($op, &$edit, &$account, $category = NULL) {
+function privatemsg_filter_user($op, &$edit, &$account, $category = null) {
   switch ($op) {
       case 'delete':
       // Delete tag information of that user.

drupal/sites/default/boinc/modules/contrib/privatemsg/privatemsg.theme.inc

Indentation +75 added lines, -75 removed lines

@@ -75,11 +75,11 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__participants($thread) {
-  $participants = _privatemsg_generate_user_array($thread['participants'], -4);
-  $field = array();
-  $field['data'] = _privatemsg_format_participants($participants, 3, TRUE);
-  $field['class'] = 'privatemsg-list-participants';
-  return $field;
+    $participants = _privatemsg_generate_user_array($thread['participants'], -4);
+    $field = array();
+    $field['data'] = _privatemsg_format_participants($participants, 3, TRUE);
+    $field['class'] = 'privatemsg-list-participants';
+    return $field;
 }
 
 /**
@@ -88,16 +88,16 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__subject($thread) {
-  $field = array();
-  $options = array();
-  $is_new = '';
-  if (!empty($thread['is_new'])) {
+    $field = array();
+    $options = array();
+    $is_new = '';
+    if (!empty($thread['is_new'])) {
     $is_new = theme_mark(MARK_NEW);
     $options['fragment'] = 'new';
-  }
-  $field['data'] = l($thread['subject'], 'messages/view/' . $thread['thread_id'], $options) . $is_new;
-  $field['class'] = 'privatemsg-list-subject';
-  return $field;
+    }
+    $field['data'] = l($thread['subject'], 'messages/view/' . $thread['thread_id'], $options) . $is_new;
+    $field['class'] = 'privatemsg-list-subject';
+    return $field;
 }
 
 /**
@@ -106,15 +106,15 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__count($thread) {
-  $field = array();
-  $field['data'] = $thread['count'];
-  $options = array();
-  if (!empty($thread['is_new']) && $thread['is_new'] < $thread['count']) {
+    $field = array();
+    $field['data'] = $thread['count'];
+    $options = array();
+    if (!empty($thread['is_new']) && $thread['is_new'] < $thread['count']) {
     $options['fragment'] = 'new';
     $field['data'] .= '<br />' . l((format_plural($thread['is_new'], '(1 new)', '(@count new)')), 'messages/view/' . $thread['thread_id'], $options);
-  }
-  $field['class'] = 'privatemsg-list-count';
-  return $field;
+    }
+    $field['class'] = 'privatemsg-list-count';
+    return $field;
 }
 
 /**
@@ -123,10 +123,10 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__last_updated($thread) {
-  $field = array();
-  $field['data'] = format_date($thread['last_updated'], 'small');
-  $field['class'] = 'privatemsg-list-date';
-  return $field;
+    $field = array();
+    $field['data'] = format_date($thread['last_updated'], 'small');
+    $field['class'] = 'privatemsg-list-date';
+    return $field;
 }
 
 /**
@@ -135,10 +135,10 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__thread_started($thread) {
-  $field = array();
-  $field['data'] = format_date($thread['thread_started'], 'small');
-  $field['class'] = 'privatemsg-list-date-started';
-  return $field;
+    $field = array();
+    $field['data'] = format_date($thread['thread_started'], 'small');
+    $field['class'] = 'privatemsg-list-date-started';
+    return $field;
 }
 
 /**
@@ -162,13 +162,13 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__subject() {
-  return array(
+    return array(
     'data'    => t('Subject'),
     'field'   => 'subject',
     'key'     => 'subject',
     'class'   => 'privatemsg-header-subject',
     '#weight' => -40,
-  );
+    );
 }
 
 /**
@@ -177,12 +177,12 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__count() {
-  return array(
+    return array(
     'data'    => t('Messages'),
     'key'     => 'count',
     'class'   => 'privatemsg-header-count',
     '#weight' => -25,
-  );
+    );
 }
 
 /**
@@ -191,12 +191,12 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__participants() {
-  return array(
+    return array(
     'data'    => t('Participants'),
     'key'     => 'participants',
     'class'   => 'privatemsg-header-participants',
     '#weight' => -30,
-  );
+    );
 }
 
 /**
@@ -205,14 +205,14 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__last_updated() {
-  return array(
+    return array(
     'data'    => t('Last Updated'),
     'field'   => 'last_updated',
     'key'     => 'last_updated',
     'sort'    => 'desc',
     'class'   => 'privatemsg-header-lastupdated',
     '#weight' => -20,
-  );
+    );
 }
 
 /**
@@ -221,13 +221,13 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__thread_started() {
-  return array(
+    return array(
     'data'    => t('Started'),
     'field'   => 'thread_started',
     'key'     => 'thread_started',
     'class'   => 'privatemsg-header-threadstarted',
     '#weight' => -15,
-  );
+    );
 }
 
 /**
@@ -237,70 +237,70 @@ 
  * by the header and field theme patterns.
  */
 function theme_privatemsg_list($form) {
-  $has_posts = !empty($form['#data']);
+    $has_posts = !empty($form['#data']);
 
-  drupal_add_css(drupal_get_path('module', 'privatemsg') .'/styles/privatemsg-list.css');
+    drupal_add_css(drupal_get_path('module', 'privatemsg') .'/styles/privatemsg-list.css');
 
-  // Load the table columns.
-  $columns = array_merge(array('subject', 'last_updated'), array_filter(variable_get('privatemsg_display_fields', array('participants'))));
+    // Load the table columns.
+    $columns = array_merge(array('subject', 'last_updated'), array_filter(variable_get('privatemsg_display_fields', array('participants'))));
 
-  // Load the themed list headers based on the available data.
-  $headers = _privatemsg_list_headers(!empty($form['#data']), $columns);
-  // sort the headers array based on the #weight property.
-  usort($headers, 'element_sort');
+    // Load the themed list headers based on the available data.
+    $headers = _privatemsg_list_headers(!empty($form['#data']), $columns);
+    // sort the headers array based on the #weight property.
+    usort($headers, 'element_sort');
 
-  $themed_rows = array();
-  // Check if there is atleast a single thread.
-  if ($has_posts) {
+    $themed_rows = array();
+    // Check if there is atleast a single thread.
+    if ($has_posts) {
     foreach ($form['#data'] as $thread_id => $data) {
-      // Theme the row.
-      $row = _privatemsg_list_thread($data);
-      $data = array();
-      // Render the checkbox.
-      $data[] = array('data' => drupal_render($form['threads'][$thread_id]), 'class' => 'privatemsg-list-select');
+        // Theme the row.
+        $row = _privatemsg_list_thread($data);
+        $data = array();
+        // Render the checkbox.
+        $data[] = array('data' => drupal_render($form['threads'][$thread_id]), 'class' => 'privatemsg-list-select');
 
-      // Store the #rows data in the same order as the header is, the key property of the header refers to the field that belongs to it.
-      foreach ($headers as $header) {
+        // Store the #rows data in the same order as the header is, the key property of the header refers to the field that belongs to it.
+        foreach ($headers as $header) {
         if (!empty($header['key'])) {
-          if (isset($row['data'][$header['key']])) {
+            if (isset($row['data'][$header['key']])) {
             $data[] = $row['data'][$header['key']];
-          }
-          else {
+            }
+            else {
             // Store a empty value so that the order is still correct.
             $data[] = '';
-          }
+            }
+        }
         }
-      }
-      // Replace the data
-      $row['data'] = $data;
-      $themed_rows[] = $row;
+        // Replace the data
+        $row['data'] = $data;
+        $themed_rows[] = $row;
     }
-  }
-  else {
+    }
+    else {
     // Display a message if now messages are available.
     $themed_rows[] = array(array('data' => t('No messages available.'), 'colspan' => count($headers)));
-  }
+    }
 
-  // Remove any data in header that we don't need anymore.
-  foreach ($headers as $id => $header) {
+    // Remove any data in header that we don't need anymore.
+    foreach ($headers as $id => $header) {
     unset($headers[$id]['key']);
     unset($headers[$id]['#weight']);
-  }
+    }
 
-  // Theme the table, pass all generated information to the table theme function.
-  $form['list'] = array('#value' => theme('table', $headers, $themed_rows, array('class' => 'privatemsg-list')), '#weight' => 5);
-  return drupal_render($form);
+    // Theme the table, pass all generated information to the table theme function.
+    $form['list'] = array('#value' => theme('table', $headers, $themed_rows, array('class' => 'privatemsg-list')), '#weight' => 5);
+    return drupal_render($form);
 }
 
 /**
  * Theme a block which displays the number of new messages a user has.
  */
 function theme_privatemsg_new_block($count) {
-  $text = format_plural($count, 'You have a new message, click here to read it',
+    $text = format_plural($count, 'You have a new message, click here to read it',
                         'You have @count new messages, click here to read them',
                         array('@count' => $count));
 
-  return l($text, 'messages', array('attributes' => array('id' => 'privatemsg-new-link')));
+    return l($text, 'messages', array('attributes' => array('id' => 'privatemsg-new-link')));
 }
 
 /**

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
     $is_new = theme_mark(MARK_NEW);
     $options['fragment'] = 'new';
   }
-  $field['data'] = l($thread['subject'], 'messages/view/' . $thread['thread_id'], $options) . $is_new;
+  $field['data'] = l($thread['subject'], 'messages/view/'.$thread['thread_id'], $options).$is_new;
   $field['class'] = 'privatemsg-list-subject';
   return $field;
 }
@@ -111,7 +111,7 @@ 
   $options = array();
   if (!empty($thread['is_new']) && $thread['is_new'] < $thread['count']) {
     $options['fragment'] = 'new';
-    $field['data'] .= '<br />' . l((format_plural($thread['is_new'], '(1 new)', '(@count new)')), 'messages/view/' . $thread['thread_id'], $options);
+    $field['data'] .= '<br />'.l((format_plural($thread['is_new'], '(1 new)', '(@count new)')), 'messages/view/'.$thread['thread_id'], $options);
   }
   $field['class'] = 'privatemsg-list-count';
   return $field;
@@ -239,7 +239,7 @@ 
 function theme_privatemsg_list($form) {
   $has_posts = !empty($form['#data']);
 
-  drupal_add_css(drupal_get_path('module', 'privatemsg') .'/styles/privatemsg-list.css');
+  drupal_add_css(drupal_get_path('module', 'privatemsg').'/styles/privatemsg-list.css');
 
   // Load the table columns.
   $columns = array_merge(array('subject', 'last_updated'), array_filter(variable_get('privatemsg_display_fields', array('participants'))));

Braces +2 added lines, -4 removed lines

@@ -264,8 +264,7 @@ 
         if (!empty($header['key'])) {
           if (isset($row['data'][$header['key']])) {
             $data[] = $row['data'][$header['key']];
-          }
-          else {
+          } else {
             // Store a empty value so that the order is still correct.
             $data[] = '';
           }
@@ -275,8 +274,7 @@ 
       $row['data'] = $data;
       $themed_rows[] = $row;
     }
-  }
-  else {
+  } else {
     // Display a message if now messages are available.
     $themed_rows[] = array(array('data' => t('No messages available.'), 'colspan' => count($headers)));
   }

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

@@ -77,7 +77,7 @@
 function phptemplate_privatemsg_list_field__participants($thread) {
   $participants = _privatemsg_generate_user_array($thread['participants'], -4);
   $field = array();
-  $field['data'] = _privatemsg_format_participants($participants, 3, TRUE);
+  $field['data'] = _privatemsg_format_participants($participants, 3, true);
   $field['class'] = 'privatemsg-list-participants';
   return $field;
 }

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

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

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'));
   }
   $form = array();
@@ -985,8 +975,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');
   }
@@ -1037,8 +1026,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.
@@ -1096,7 +1084,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.
@@ -1132,10 +1121,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');
   }
 }
@@ -1196,8 +1184,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';
@@ -1502,8 +1489,7 @@ 
     );
 
     return $blocks;
-  }
-  elseif ('view' == $op) {
+  } elseif ('view' == $op) {
     $block = array();
     switch ($delta) {
       case 'privatemsg-menu':
@@ -1599,8 +1585,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.'));
     }
@@ -1629,8 +1614,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);
   }
@@ -1791,8 +1775,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,
@@ -1806,8 +1789,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');
     }
   }
@@ -1816,8 +1798,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.');
     }
   }
@@ -1831,8 +1812,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));
     }
   }
@@ -1843,8 +1823,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');
     }
   }
@@ -1854,8 +1833,7 @@ 
       unset($message['recipients'][$blocked['uid']]);
       if ($form) {
         drupal_set_message($blocked['message'], 'warning');
-      }
-      else {
+      } else {
         $messages['warning'][] = $blocked['message'];
       }
     }
@@ -1865,8 +1843,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');
     }
   }
@@ -2072,8 +2049,7 @@ 
   if (is_array($query)) {
     $query_id = $query[0];
     $query_group = $query[1];
-  }
-  else {
+  } else {
     $query_id = $query;
     $query_group = 'privatemsg';
   }
@@ -2153,8 +2129,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;
     }
 
@@ -2275,8 +2250,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.'));
   }
 }
@@ -2457,8 +2431,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);
   }
 
@@ -2475,8 +2448,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);
     }
 
@@ -2528,8 +2500,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;
     }
   }
 
@@ -937,7 +937,7 @@ 
       '#title'              => t('To'),
       '#description'        => t('Separate multiple names with a comma followed by one 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',
@@ -958,7 +958,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
@@ -1012,7 +1012,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(
@@ -1030,7 +1030,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;
   }
@@ -1046,7 +1046,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);
   }
@@ -1132,7 +1132,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 {
@@ -1147,7 +1147,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.
 }
 
 /**
@@ -1225,7 +1225,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;
 }
 
@@ -1239,7 +1239,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";
@@ -1275,7 +1275,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';
@@ -1445,7 +1445,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) {
@@ -1459,7 +1459,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'))));
@@ -1517,7 +1517,7 @@ 
   }
 }
 
-function privatemsg_title_callback($title = NULL) {
+function privatemsg_title_callback($title = null) {
   $count = privatemsg_unread_count();
 
   if ($count > 0) {
@@ -1579,7 +1579,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,
@@ -1621,9 +1621,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();
   }
 
@@ -1675,7 +1675,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);
 
@@ -1781,21 +1781,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,
       );
     }
@@ -1813,7 +1813,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.'));
     }
@@ -1825,7 +1825,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'])) {
@@ -1838,7 +1838,7 @@ 
   }
 
   $user = $original_user;
-  session_save_session(TRUE);
+  session_save_session(true);
 
   if (empty($message['recipients']) || !is_array($message['recipients'])) {
     if ($form) {
@@ -1900,11 +1900,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;
       }
     }
   }
@@ -1932,7 +1932,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;
     }
   }
 
@@ -1942,7 +1942,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);
@@ -1967,8 +1967,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;
   }
@@ -1978,7 +1978,7 @@ 
   }
 
   if (!privatemsg_user_access('write privatemsg', $account) || $account->uid == 0) {
-    return FALSE;
+    return false;
   }
 
   $validated = array();
@@ -1992,7 +1992,7 @@ 
     $validated[] = $recipient->uid;
   }
   if (empty($validated)) {
-    return FALSE;
+    return false;
   }
   $url = 'messages/new/'. implode(',', $validated);
   if (!is_null($subject)) {
@@ -2012,7 +2012,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);
 }
@@ -2028,7 +2028,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();
@@ -2115,7 +2115,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);
 
@@ -2143,7 +2143,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.
@@ -2186,14 +2186,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;
 }
 
 /**
@@ -2215,8 +2215,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')) {
@@ -2261,7 +2261,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);
   }
@@ -2505,7 +2505,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);
   }
@@ -2518,7 +2518,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.

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,284 +775,284 @@ 
  * @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 comma followed by one 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 comma followed by one 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');
-  }
+    }
 }
 
 /**
@@ -1063,15 +1062,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;
 }
 
 /**
@@ -1087,67 +1086,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.
 }
 
 /**
@@ -1168,65 +1167,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;
 }
 
 /**
@@ -1240,27 +1239,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';
 }
 
 /**
@@ -1276,30 +1275,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';
 
 }
 
@@ -1312,16 +1311,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;
 }
 
 /**
@@ -1333,15 +1332,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;
 }
 
 /**
@@ -1355,27 +1354,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';
 }
 
 /**
@@ -1387,24 +1386,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;
 }
 
 /**
@@ -1417,19 +1416,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_rw');
     $result = db_query_range($query['query'], $fragment, 0, 10);
@@ -1437,175 +1436,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'];
 }
 
 /**
@@ -1622,18 +1621,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);
-  }
+    }
 }
 
 /**
@@ -1676,35 +1675,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;
 }
 
 /**
@@ -1741,144 +1740,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,
-  );
+    );
 }
 
 /**
@@ -1894,61 +1893,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;
 }
 
 /**
@@ -1968,37 +1967,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;
 }
 
 /**
@@ -2013,8 +2012,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);
 }
 
 /**
@@ -2029,27 +2028,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;
 }
 
 /**
@@ -2068,26 +2067,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,
@@ -2096,52 +2095,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;
 
@@ -2149,51 +2148,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;
 }
 
 /**
@@ -2210,44 +2209,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;
 }
 
 /**
@@ -2262,23 +2261,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.
@@ -2294,25 +2293,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;
 }
 
 /**
@@ -2322,15 +2321,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;
 }
 
 /**
@@ -2344,23 +2343,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;
 }
 
 /**
@@ -2370,15 +2369,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;
 }
 
 /**
@@ -2388,20 +2387,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();
-  }
+    }
 }
 
 /**
@@ -2411,29 +2410,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']);
-  }
+    }
 }
 
 /**
@@ -2447,42 +2446,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.
@@ -2490,7 +2489,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)));
-  }
+    }
 }
 
 /**
@@ -2506,71 +2505,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)) {
@@ -1007,7 +1007,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)) {
@@ -1101,7 +1101,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;
@@ -1132,7 +1132,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 {
@@ -1174,7 +1174,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.
@@ -1186,32 +1186,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';
 
@@ -1225,8 +1225,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;
 }
 
 /**
@@ -1253,11 +1253,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';
@@ -1279,13 +1279,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.
@@ -1321,7 +1321,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;
 }
 
 /**
@@ -1341,7 +1341,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;
 }
 
 /**
@@ -1361,7 +1361,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
@@ -1371,7 +1371,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.
@@ -1404,7 +1404,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;
 }
 
 /**
@@ -1434,11 +1434,11 @@ 
     db_set_active('boinc_rw');
     $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
@@ -1480,7 +1480,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.
@@ -1552,10 +1552,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),
@@ -1571,7 +1571,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')) {
@@ -1584,7 +1584,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')
@@ -1813,7 +1813,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.'));
     }
@@ -1929,7 +1929,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;
@@ -1994,9 +1994,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;
 }
@@ -2106,7 +2106,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);
   }
@@ -2143,7 +2143,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.
@@ -2152,10 +2152,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)) {
@@ -2164,24 +2164,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']);
@@ -2246,7 +2246,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;
 }
 
@@ -2271,7 +2271,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.'));
@@ -2298,12 +2298,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;
     }
@@ -2324,7 +2324,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();
     }
@@ -2352,7 +2352,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;
     }
@@ -2372,7 +2372,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);
     }
@@ -2571,6 +2571,6 @@ 
 function privatemsg_views_api() {
   return array(
     'api' => 2,
-    'path' => drupal_get_path('module', 'privatemsg') . '/views',
+    'path' => drupal_get_path('module', 'privatemsg').'/views',
   );
 }

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

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

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.

Indentation +211 added lines, -211 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,143 +406,143 @@ 
  *   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)';
 }
 
 /**
@@ -558,10 +558,10 @@ 
  * 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;
+    }
 }

Spacing +7 added lines, -7 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.

Braces +5 added lines, -10 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',

drupal/sites/default/boinc/modules/node_comment_block/node_comment_block.module

Indentation +35 added lines, -35 removed lines

@@ -9,45 +9,45 @@ 
  * Implements hook_block() for Drupal 6 compatibility
  */
 function node_comment_block_block($op = 'list', $delta = 0, $edit = array()) {
-  switch ($op) {
-  case 'view':
+    switch ($op) {
+    case 'view':
     //$block = node_comment_block_block_view($delta);
     $block = array();
     if ($delta == 'node_comments') {
-      if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
+        if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
         $node = node_load($nid);
         if ($node->comment !== 0) {
-          $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
-          $block['content'] = '';
-          if ($node->comment) {
+            $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
+            $block['content'] = '';
+            if ($node->comment) {
             $block['content'] .= comment_render($node);
-          }
+            }
+        }
         }
-      }
     }
     break;
-  case 'list':
+    case 'list':
     $blocks = node_comment_block_block_info();
     return $blocks;
     break;
-  default:
+    default:
   }
-  return $block;
+    return $block;
 }
 
 /**
  * Port Drupal 7 render() function to Drupal 6
  */
 function render(&$element) {
-  if (is_array($element)) {
+    if (is_array($element)) {
     show($element);
     return drupal_render($element);
-  }
-  else {
+    }
+    else {
     // Safe-guard for inappropriate use of render() on flat variables: return
     // the variable as-is.
     return $element;
-  }
+    }
 }
 
 
@@ -56,50 +56,50 @@ 
  * Implements hook_block_info().
  */
 function node_comment_block_block_info() {
-  $blocks['node_comments'] = array(
+    $blocks['node_comments'] = array(
     'info' => t('Node comments'),
-  );
+    );
 
-  return $blocks;
+    return $blocks;
 }
 
 /**
  * Implements hook_block_view().
  */
 function node_comment_block_block_view($delta = '') {
-  $block = array();
+    $block = array();
 
-  if ($delta == 'node_comments') {
+    if ($delta == 'node_comments') {
     if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
-      $node = node_load($nid);
+        $node = node_load($nid);
 
-      if ($node->comment !== 0) {
+        if ($node->comment !== 0) {
         $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
         $block['content'] = '';
 
         $node = node_view($node);
 
         if ($node['comments']) {
-          $block['content'] .= render($node['comments']);
+            $block['content'] .= render($node['comments']);
+        }
         }
-      }
     }
-  }
+    }
 
-  return $block;
+    return $block;
 }
 
 /**
  * Implements hook_preprocess_HOOK() for nodes.
  */
 function node_comment_block_preprocess_node(&$variables) {
-  $node = $variables['node'];
-  // Only hide standard comments for news content
-  if ($variables['type'] == 'news') {
+    $node = $variables['node'];
+    // Only hide standard comments for news content
+    if ($variables['type'] == 'news') {
     $variables['node']->comment = 0;
-  }
+    }
   
-  /* Drupal 7...
+    /* Drupal 7...
   if ($node->comment !== 0 && $variables['view_mode'] == 'full') {
     if (isset($variables['content']['comments'])) {
       unset($variables['content']['comments']);
@@ -113,10 +113,10 @@ 
  * Implements hook_form_FORM_ID_alter() for block_admin_configure.
  */
 function node_comment_block_form_block_admin_configure_alter(&$form, &$form_state) {
-  if (isset($form['delta'])) {
+    if (isset($form['delta'])) {
     if ($form['delta']['#value'] == 'node_comments') {
-      $form['settings']['title']['#disabled'] = TRUE;
-      $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
+        $form['settings']['title']['#disabled'] = TRUE;
+        $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
+    }
     }
-  }
 }

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
   if (is_array($element)) {
     show($element);
     return drupal_render($element);
-  }
-  else {
+  } else {
     // Safe-guard for inappropriate use of render() on flat variables: return
     // the variable as-is.
     return $element;

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

@@ -17,7 +17,7 @@ 
       if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
         $node = node_load($nid);
         if ($node->comment !== 0) {
-          $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
+          $block['subject'] = null; // This should be NULL otherwise there will be duplicate h2 elements.
           $block['content'] = '';
           if ($node->comment) {
             $block['content'] .= comment_render($node);
@@ -74,7 +74,7 @@ 
       $node = node_load($nid);
 
       if ($node->comment !== 0) {
-        $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
+        $block['subject'] = null; // This should be NULL otherwise there will be duplicate h2 elements.
         $block['content'] = '';
 
         $node = node_view($node);
@@ -115,7 +115,7 @@ 
 function node_comment_block_form_block_admin_configure_alter(&$form, &$form_state) {
   if (isset($form['delta'])) {
     if ($form['delta']['#value'] == 'node_comments') {
-      $form['settings']['title']['#disabled'] = TRUE;
+      $form['settings']['title']['#disabled'] = true;
       $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
     }
   }

Switch Indentation +23 added lines, -23 removed lines

@@ -9,29 +9,29 @@
  * Implements hook_block() for Drupal 6 compatibility
  */
 function node_comment_block_block($op = 'list', $delta = 0, $edit = array()) {
-  switch ($op) {
-  case 'view':
-    //$block = node_comment_block_block_view($delta);
-    $block = array();
-    if ($delta == 'node_comments') {
-      if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
-        $node = node_load($nid);
-        if ($node->comment !== 0) {
-          $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
-          $block['content'] = '';
-          if ($node->comment) {
-            $block['content'] .= comment_render($node);
-          }
-        }
-      }
-    }
-    break;
-  case 'list':
-    $blocks = node_comment_block_block_info();
-    return $blocks;
-    break;
-  default:
-  }
+switch ($op) {
+case 'view':
+//$block = node_comment_block_block_view($delta);
+$block = array();
+if ($delta == 'node_comments') {
+if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
+$node = node_load($nid);
+if ($node->comment !== 0) {
+$block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
+$block['content'] = '';
+if ($node->comment) {
+  $block['content'] .= comment_render($node);
+}
+}
+}
+}
+break;
+case 'list':
+$blocks = node_comment_block_block_info();
+return $blocks;
+break;
+default:
+}
   return $block;
 }
 

drupal/sites/default/boinc/modules/boinc_solr_search/boinc_solr_comments/boinc_solr_comments.module

Switch Indentation +13 added lines, -13 removed lines

@@ -280,12 +280,12 @@ 
   }
 
   switch ($op) {
-    case 'delete':
-      // Only call delete function on certain node types
-      if (in_array( $node->type, $node_types)) {
-        boinc_solr_comments_delete($node);
-      }
-      break;
+  case 'delete':
+    // Only call delete function on certain node types
+    if (in_array( $node->type, $node_types)) {
+      boinc_solr_comments_delete($node);
+    }
+    break;
   } //switch
 }
 
@@ -335,13 +335,13 @@ 
  */
 function boinc_solr_comments_comment(&$a1, $op) {
   switch ($op) {
-    case 'view':
-    case 'update':
-      break;
-    case 'delete':
-      // $a1 should be a comment object
-      boinc_solr_comments_deletecomment($a1);
-      break;
+  case 'view':
+  case 'update':
+    break;
+  case 'delete':
+    // $a1 should be a comment object
+    boinc_solr_comments_deletecomment($a1);
+    break;
   }// switch
 }
 

Braces +3 added lines, -6 removed lines

@@ -131,8 +131,7 @@ 
         if ($comment->uid == 0 || strlen($comment->name) == 0) {
           // @see user_validate_name(). !'0' === TRUE.
           $comment_document->ss_name = '0';
-        }
-        else {
+        } else {
           $comment_document->ss_name = $comment->name;
           // We want the name to be searchable for keywords.
           $comment_document->tos_name = $comment->name;
@@ -318,8 +317,7 @@ 
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
-  }
-  catch (Exception $e) {
+  } catch (Exception $e) {
       watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
       return FALSE;
   }// try
@@ -376,8 +374,7 @@ 
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
-    }
-  catch (Exception $e) {
+    } catch (Exception $e) {
     watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
     return FALSE;
   }// try

Indentation +116 added lines, -116 removed lines

@@ -14,19 +14,19 @@ 
  * Implementation of hook_menu()
  */
 function boinc_solr_comments_menu() {
-  $items = array();
-  $base_path = 'admin/settings/apachesolr/indexcomments';
-  $items[$base_path] = array(
-      'title' => 'Index Comments',
-      'description' => 'Administer Indexing of Comments',
-      'page callback' => 'drupal_get_form',
-      'page arguments' => array('boinc_solr_comments_form'),
-      'access arguments' => array('administer search'),
-      'file' => 'boinc_solr_comments.admin.inc',
-      'weight' => '10',
-  );
-
-  return $items;
+    $items = array();
+    $base_path = 'admin/settings/apachesolr/indexcomments';
+    $items[$base_path] = array(
+        'title' => 'Index Comments',
+        'description' => 'Administer Indexing of Comments',
+        'page callback' => 'drupal_get_form',
+        'page arguments' => array('boinc_solr_comments_form'),
+        'access arguments' => array('administer search'),
+        'file' => 'boinc_solr_comments.admin.inc',
+        'weight' => '10',
+    );
+
+    return $items;
 }
 
 
@@ -58,11 +58,11 @@ 
  *   Environment ID for apache solr.
  */
 function boinc_solr_comments_apachesolr_index_documents_alter(array &$documents, $entity, $entity_type, $env_id) {
-  $comdocs = array();
+    $comdocs = array();
 
-  // Array of node types that will have comments indexed.
-  $node_types = variable_get('boinc_solr_comments_nodetypes', '');
-  if (empty($node_types)) {
+    // Array of node types that will have comments indexed.
+    $node_types = variable_get('boinc_solr_comments_nodetypes', '');
+    if (empty($node_types)) {
     // If the variable has not been set, then by default index
     // comments for all known node types.
     $node_types = array(
@@ -72,28 +72,28 @@ 
         'story'      => 'story',
         'team_forum' => 'team_forum',
     );
-  }
+    }
   
-  // Loop over all documents and alter:
-  foreach ($documents as $document) {
+    // Loop over all documents and alter:
+    foreach ($documents as $document) {
     //dd($document, "index documents alter - document");
 
     $to_process = ( array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle] );
     if ( $document->entity_type=='node' AND $to_process) {
       
-      // Remove ts_comments if present.
-      if (isset($document->ts_comments)) {
+        // Remove ts_comments if present.
+        if (isset($document->ts_comments)) {
         unset($document->ts_comments);
-      }
-      // Node information.
-      $nid = $document->entity_id;
-      $node = node_load($nid);
+        }
+        // Node information.
+        $nid = $document->entity_id;
+        $node = node_load($nid);
       
-      // Query database for comments of node. Only return comments
-      // with status 0 (0 is published for comments).
-      $sql = 'SELECT cid from {comments} WHERE nid = %d AND status = 0 ORDER by timestamp DESC';
-      $resource = db_query($sql, $nid);
-      while ($row = db_fetch_array($resource)) {
+        // Query database for comments of node. Only return comments
+        // with status 0 (0 is published for comments).
+        $sql = 'SELECT cid from {comments} WHERE nid = %d AND status = 0 ORDER by timestamp DESC';
+        $resource = db_query($sql, $nid);
+        while ($row = db_fetch_array($resource)) {
         // Load the comment from cid.
         $comment = _comment_load($row['cid']);
 
@@ -116,10 +116,10 @@ 
         // Comment object has no language
         $comment_document->ss_language = 'und';
         if (function_exists('drupal_get_path_alias')) {
-          $output = drupal_get_path_alias($comment_document->path, NULL);
-          if ($output && $output != $document->path) {
+            $output = drupal_get_path_alias($comment_document->path, NULL);
+            if ($output && $output != $document->path) {
             $comment_document->path_alias = $output;
-          }
+            }
         }
         
         // Code derived from apachesolr_index_node_solr_document
@@ -129,13 +129,13 @@ 
 
         // Author information
         if ($comment->uid == 0 || strlen($comment->name) == 0) {
-          // @see user_validate_name(). !'0' === TRUE.
-          $comment_document->ss_name = '0';
+            // @see user_validate_name(). !'0' === TRUE.
+            $comment_document->ss_name = '0';
         }
         else {
-          $comment_document->ss_name = $comment->name;
-          // We want the name to be searchable for keywords.
-          $comment_document->tos_name = $comment->name;
+            $comment_document->ss_name = $comment->name;
+            // We want the name to be searchable for keywords.
+            $comment_document->tos_name = $comment->name;
         }
 
         // Index formatted username so it can be searched and sorted
@@ -157,59 +157,59 @@ 
         // Unset the following fields (if set) that don't make sense
         // for a comment.
         if (isset($comment_document->bs_sticky)) {
-          unset($comment_document->bs_sticky);
+            unset($comment_document->bs_sticky);
         }
         if (isset($comment_document->bs_promote)) {
-          unset($comment_document->bs_promote);
+            unset($comment_document->bs_promote);
         }    
         if (isset($comment_document->is_tnid)) {
-          unset($comment_document->is_tnid);
+            unset($comment_document->is_tnid);
         }
         if (isset($comment_document->bs_translate)) {
-          unset($comment_document->bs_translate);
+            unset($comment_document->bs_translate);
         }
         if (isset($comment_document->ts_last_comment_timestamp)) {
-          unset($comment_document->ts_last_comment_timestamp);
+            unset($comment_document->ts_last_comment_timestamp);
         }
         if (isset($comment_document->ds_last_comment_or_change)) {
-          unset($comment_document->ds_last_comment_or_change);
+            unset($comment_document->ds_last_comment_or_change);
         }
         if (isset($comment_document->is_comment_count)) {
-          unset($comment_document->is_comment_count);
+            unset($comment_document->is_comment_count);
         }
 
         // Loop over fields in document and copy relevant values into
         // comment_document.
         foreach ($document as $fieldName => $fieldValue) {
 
-          // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
-          // [im_vid_Forums], [tm_vid_1_names]
-          if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
+            // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
+            // [im_vid_Forums], [tm_vid_1_names]
+            if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
             foreach ($fieldValue as $subkey => $subvalue) {
-              $comment_document->addField($fieldName, $subvalue);
+                $comment_document->addField($fieldName, $subvalue);
             }
-          }// if preg_match
+            }// if preg_match
                
-          // Set the access keys so this module will work with
-          // apachesolr_access.
-          if (module_exists('apachesolr_access')) {
+            // Set the access keys so this module will work with
+            // apachesolr_access.
+            if (module_exists('apachesolr_access')) {
             if (preg_match('/^access/', $fieldName) AND is_array($fieldValue)) {
-              foreach ($fieldValue as $subkey => $subvalue) {
+                foreach ($fieldValue as $subkey => $subvalue) {
                 $comment_document->addField($fieldName, $subvalue);
-              }
+                }
             }// if preg_match
-          }// if module_exist
+            }// if module_exist
             
         }// foreach document
         
         $comdocs[] = $comment_document;
-      }// while
+        }// while
     }// if entity_type=node
-  }// documents
+    }// documents
 
-  // Merge the comment documents with the input documents array. These
-  // documents will now be added to the Solr search index.
-  $documents = array_merge($documents, $comdocs);
+    // Merge the comment documents with the input documents array. These
+    // documents will now be added to the Solr search index.
+    $documents = array_merge($documents, $comdocs);
 }
 
 /**
@@ -225,19 +225,19 @@ 
  *   The Solr query used for the search.
  */
 function boinc_solr_comments_apachesolr_process_results(&$results, DrupalSolrQueryInterface $query) {
-  //dpm($query->getSolrParams(), "process_results query getSolrParams");
-  foreach($results as $id => $result) {
+    //dpm($query->getSolrParams(), "process_results query getSolrParams");
+    foreach($results as $id => $result) {
     if ($result['entity_type']=='comment') {
         $results[$id]['type'] = 'Comment';
         $results[$id]['date'] = $result['fields']['changed'];
         if (isset($result['fields']['is_uid'])) {
-          $uid = $result['fields']['is_uid'];
-          $results[$id]['uid']  = $uid;
-          $results[$id]['user'] = theme('username', user_load($uid));
+            $uid = $result['fields']['is_uid'];
+            $results[$id]['uid']  = $uid;
+            $results[$id]['user'] = theme('username', user_load($uid));
         }
     } //if result entity_type == comment
-  }// foreach $result
-  //dpm($results, "process_results array_results");
+    }// foreach $result
+    //dpm($results, "process_results array_results");
 }
 
 /**
@@ -251,8 +251,8 @@ 
  *   The Solr query used for the search.
  */
 function boinc_solr_comments_apachesolr_query_alter($query) {
-  // Add custom field to query results
-  $query->addParam('fl','tos_content_extra');
+    // Add custom field to query results
+    $query->addParam('fl','tos_content_extra');
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -265,9 +265,9 @@ 
  * 
  */
 function boinc_solr_comments_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
-  // Array of node types that will have comments indexed.
-  $node_types = variable_get('boinc_solr_comments_nodetypes', '');
-  if (empty($node_types)) {
+    // Array of node types that will have comments indexed.
+    $node_types = variable_get('boinc_solr_comments_nodetypes', '');
+    if (empty($node_types)) {
     // If the variable has not been set, then by default index
     // comments for all known node types.
     $node_types = array(
@@ -277,16 +277,16 @@ 
         'story'      => 'story',
         'team_forum' => 'team_forum',
     );
-  }
+    }
 
-  switch ($op) {
+    switch ($op) {
     case 'delete':
       // Only call delete function on certain node types
       if (in_array( $node->type, $node_types)) {
         boinc_solr_comments_delete($node);
-      }
-      break;
-  } //switch
+        }
+        break;
+    } //switch
 }
 
 
@@ -303,30 +303,30 @@ 
  *   Returns TRUE if the comment was deleted, otherwise return FALSE.
  */
 function boinc_solr_comments_delete($node) {
-  // Load the Solr environment.
-  $env_id = apachesolr_default_environment();
-  // Check to see if Solr is read-only.
-  if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
+    // Load the Solr environment.
+    $env_id = apachesolr_default_environment();
+    // Check to see if Solr is read-only.
+    if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
     return FALSE;
-  }
+    }
   
-  // Code derived from apachesolr_index_delete_entity_from_index
-  try {
+    // Code derived from apachesolr_index_delete_entity_from_index
+    try {
     $solr = apachesolr_get_solr($env_id);
     // Custom query to find all comments with parent nid of the node bing deleted.
     $query = "entity_type:comment AND tos_content_extra:" . $node->nid;
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
-  }
-  catch (Exception $e) {
-      watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
-      return FALSE;
-  }// try
-
-  // all deletions sucessful
-  apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
-  return TRUE;
+    }
+    catch (Exception $e) {
+        watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
+        return FALSE;
+    }// try
+
+    // all deletions sucessful
+    apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
+    return TRUE;
 }
 
 /**
@@ -334,15 +334,15 @@ 
  *
  */
 function boinc_solr_comments_comment(&$a1, $op) {
-  switch ($op) {
+    switch ($op) {
     case 'view':
     case 'update':
       break;
     case 'delete':
       // $a1 should be a comment object
       boinc_solr_comments_deletecomment($a1);
-      break;
-  }// switch
+        break;
+    }// switch
 }
 
 /** 
@@ -358,16 +358,16 @@ 
  *   Returns TRUE if the comment was deleted, otherwise return FALSE.
  */
 function boinc_solr_comments_deletecomment($comment) {
-  // Load the Solr environment.
-  $env_id = apachesolr_default_environment();
-  // Check to see if Solr is read-only.
-  if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
+    // Load the Solr environment.
+    $env_id = apachesolr_default_environment();
+    // Check to see if Solr is read-only.
+    if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
     return FALSE;
-  }
-  //dd($comment->cid, "delete - nid begin");
+    }
+    //dd($comment->cid, "delete - nid begin");
     
-  // Code derived from apachesolr_index_delete_entity_from_index.
-  try {
+    // Code derived from apachesolr_index_delete_entity_from_index.
+    try {
     $solr = apachesolr_get_solr($env_id);
     $entity_id = $comment->cid;
     $entity_type = 'comment';
@@ -377,14 +377,14 @@ 
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
     }
-  catch (Exception $e) {
+    catch (Exception $e) {
     watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
     return FALSE;
-  }// try
+    }// try
 
-  // deletion sucessful
-  apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
-  return TRUE;
+    // deletion sucessful
+    apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
+    return TRUE;
 }
 
 
@@ -399,7 +399,7 @@ 
  */
 
 function boinc_solr_comments_enable() {
-  drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
+    drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
 }
 
 /** 
@@ -410,12 +410,12 @@ 
  *   The comment to be published (unhidden).
  */
 function boinc_solr_comments_publish($comment) {
-  if ( ($comment->cid) AND ($comment->nid) ) {
+    if ( ($comment->cid) AND ($comment->nid) ) {
     $node = node_load($comment->nid);
     // Tell Solr that the node has been updated, so the comment can be
     // indexed.
     apachesolr_entity_update($node, 'node');
-  }
+    }
 }
 
 /** 
@@ -426,9 +426,9 @@ 
  *   The comment to be unpublished (hidden). 
  */
 function boinc_solr_comments_unpublish($comment) {
-  if ( ($comment->cid) ) {
+    if ( ($comment->cid) ) {
     // Call the deletecomment function for hook comment.
     boinc_solr_comments_deletecomment($comment);
-  }
+    }
 }
 

Spacing +13 added lines, -13 removed lines

@@ -78,8 +78,8 @@ 
   foreach ($documents as $document) {
     //dd($document, "index documents alter - document");
 
-    $to_process = ( array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle] );
-    if ( $document->entity_type=='node' AND $to_process) {
+    $to_process = (array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle]);
+    if ($document->entity_type == 'node' AND $to_process) {
       
       // Remove ts_comments if present.
       if (isset($document->ts_comments)) {
@@ -110,7 +110,7 @@ 
         $comment_document->bundle = 'Comment';
         $comment_document->bundle_name = 'Comment';
 
-        $comment_document->path = 'goto/comment/' . $comment->cid;
+        $comment_document->path = 'goto/comment/'.$comment->cid;
         $comment_document->url = url($comment_document->path, $url_options);
 
         // Comment object has no language
@@ -140,7 +140,7 @@ 
 
         // Index formatted username so it can be searched and sorted
         // on.
-        $account = (object) array('uid' => $comment->uid, 'name' => $comment->name);
+        $account = (object)array('uid' => $comment->uid, 'name' => $comment->name);
         $username = check_plain($account->name);
         $comment_document->ss_name_formatted = $username;
         $comment_document->tos_name_formatted = $username;
@@ -184,7 +184,7 @@ 
 
           // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
           // [im_vid_Forums], [tm_vid_1_names]
-          if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
+          if ((preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName)) AND is_array($fieldValue)) {
             foreach ($fieldValue as $subkey => $subvalue) {
               $comment_document->addField($fieldName, $subvalue);
             }
@@ -226,8 +226,8 @@ 
  */
 function boinc_solr_comments_apachesolr_process_results(&$results, DrupalSolrQueryInterface $query) {
   //dpm($query->getSolrParams(), "process_results query getSolrParams");
-  foreach($results as $id => $result) {
-    if ($result['entity_type']=='comment') {
+  foreach ($results as $id => $result) {
+    if ($result['entity_type'] == 'comment') {
         $results[$id]['type'] = 'Comment';
         $results[$id]['date'] = $result['fields']['changed'];
         if (isset($result['fields']['is_uid'])) {
@@ -252,7 +252,7 @@ 
  */
 function boinc_solr_comments_apachesolr_query_alter($query) {
   // Add custom field to query results
-  $query->addParam('fl','tos_content_extra');
+  $query->addParam('fl', 'tos_content_extra');
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -282,7 +282,7 @@ 
   switch ($op) {
     case 'delete':
       // Only call delete function on certain node types
-      if (in_array( $node->type, $node_types)) {
+      if (in_array($node->type, $node_types)) {
         boinc_solr_comments_delete($node);
       }
       break;
@@ -314,7 +314,7 @@ 
   try {
     $solr = apachesolr_get_solr($env_id);
     // Custom query to find all comments with parent nid of the node bing deleted.
-    $query = "entity_type:comment AND tos_content_extra:" . $node->nid;
+    $query = "entity_type:comment AND tos_content_extra:".$node->nid;
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
@@ -399,7 +399,7 @@ 
  */
 
 function boinc_solr_comments_enable() {
-  drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
+  drupal_set_message(bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
 }
 
 /** 
@@ -410,7 +410,7 @@ 
  *   The comment to be published (unhidden).
  */
 function boinc_solr_comments_publish($comment) {
-  if ( ($comment->cid) AND ($comment->nid) ) {
+  if (($comment->cid) AND ($comment->nid)) {
     $node = node_load($comment->nid);
     // Tell Solr that the node has been updated, so the comment can be
     // indexed.
@@ -426,7 +426,7 @@ 
  *   The comment to be unpublished (hidden). 
  */
 function boinc_solr_comments_unpublish($comment) {
-  if ( ($comment->cid) ) {
+  if (($comment->cid)) {
     // Call the deletecomment function for hook comment.
     boinc_solr_comments_deletecomment($comment);
   }

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

@@ -78,8 +78,8 @@ 
   foreach ($documents as $document) {
     //dd($document, "index documents alter - document");
 
-    $to_process = ( array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle] );
-    if ( $document->entity_type=='node' AND $to_process) {
+    $to_process = ( array_key_exists($document->bundle, $node_types) and $node_types[$document->bundle] );
+    if ( $document->entity_type=='node' and $to_process) {
       
       // Remove ts_comments if present.
       if (isset($document->ts_comments)) {
@@ -98,7 +98,7 @@ 
         $comment = _comment_load($row['cid']);
 
         // Code derived from _apachesolr_index_process_entity_get_document
-        $url_options = array('absolute' => TRUE);
+        $url_options = array('absolute' => true);
         $comment_document = new ApacheSolrdocument();
 
         $comment_document->id = apachesolr_document_id($comment->cid, 'comment');
@@ -116,16 +116,16 @@ 
         // Comment object has no language
         $comment_document->ss_language = 'und';
         if (function_exists('drupal_get_path_alias')) {
-          $output = drupal_get_path_alias($comment_document->path, NULL);
+          $output = drupal_get_path_alias($comment_document->path, null);
           if ($output && $output != $document->path) {
             $comment_document->path_alias = $output;
           }
         }
         
         // Code derived from apachesolr_index_node_solr_document
-        $comment_document->label = truncate_utf8(apachesolr_clean_text($comment->comment), 32, TRUE);
+        $comment_document->label = truncate_utf8(apachesolr_clean_text($comment->comment), 32, true);
         $comment_document->content = apachesolr_clean_text($comment->comment);
-        $comment_document->teaser = truncate_utf8($document->content, 300, TRUE);
+        $comment_document->teaser = truncate_utf8($document->content, 300, true);
 
         // Author information
         if ($comment->uid == 0 || strlen($comment->name) == 0) {
@@ -184,7 +184,7 @@ 
 
           // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
           // [im_vid_Forums], [tm_vid_1_names]
-          if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
+          if ( ( preg_match('/tid/', $fieldName) or preg_match('/vid/', $fieldName) ) and is_array($fieldValue) ) {
             foreach ($fieldValue as $subkey => $subvalue) {
               $comment_document->addField($fieldName, $subvalue);
             }
@@ -193,7 +193,7 @@ 
           // Set the access keys so this module will work with
           // apachesolr_access.
           if (module_exists('apachesolr_access')) {
-            if (preg_match('/^access/', $fieldName) AND is_array($fieldValue)) {
+            if (preg_match('/^access/', $fieldName) and is_array($fieldValue)) {
               foreach ($fieldValue as $subkey => $subvalue) {
                 $comment_document->addField($fieldName, $subvalue);
               }
@@ -264,7 +264,7 @@ 
  * Implementation of hook_nodeapi()
  * 
  */
-function boinc_solr_comments_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
+function boinc_solr_comments_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
   // Array of node types that will have comments indexed.
   $node_types = variable_get('boinc_solr_comments_nodetypes', '');
   if (empty($node_types)) {
@@ -307,7 +307,7 @@ 
   $env_id = apachesolr_default_environment();
   // Check to see if Solr is read-only.
   if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
-    return FALSE;
+    return false;
   }
   
   // Code derived from apachesolr_index_delete_entity_from_index
@@ -320,13 +320,13 @@ 
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
   }
   catch (Exception $e) {
-      watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
-      return FALSE;
+      watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), null, WATCHDOG_ERROR);
+      return false;
   }// try
 
   // all deletions sucessful
   apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
-  return TRUE;
+  return true;
 }
 
 /**
@@ -362,7 +362,7 @@ 
   $env_id = apachesolr_default_environment();
   // Check to see if Solr is read-only.
   if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
-    return FALSE;
+    return false;
   }
   //dd($comment->cid, "delete - nid begin");
     
@@ -378,13 +378,13 @@ 
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
     }
   catch (Exception $e) {
-    watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
-    return FALSE;
+    watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), null, WATCHDOG_ERROR);
+    return false;
   }// try
 
   // deletion sucessful
   apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
-  return TRUE;
+  return true;
 }
 
 
@@ -399,7 +399,7 @@ 
  */
 
 function boinc_solr_comments_enable() {
-  drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
+  drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), null, 'boinc:admin-solr-index-comments-message'), 'warning');
 }
 
 /** 
@@ -410,7 +410,7 @@ 
  *   The comment to be published (unhidden).
  */
 function boinc_solr_comments_publish($comment) {
-  if ( ($comment->cid) AND ($comment->nid) ) {
+  if ( ($comment->cid) and ($comment->nid) ) {
     $node = node_load($comment->nid);
     // Tell Solr that the node has been updated, so the comment can be
     // indexed.

drupal/sites/default/boinc/modules/boinc_solr_search/boinc_solr_comments/boinc_solr_comments.admin.inc

Switch Indentation +4 added lines, -4 removed lines

@@ -19,10 +19,10 @@
   foreach (content_types() as $key => $info) {
     // Exclude node types profile, team, and panel
     switch ($key) {
-      case 'profile':
-      case 'team':
-      case 'panel':
-        continue 2;
+    case 'profile':
+    case 'team':
+    case 'panel':
+      continue 2;
     }// switch key
     $options[$key] = $info['name'];
   }

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     'boinc_solr_comments_nodetypes' => variable_get('boinc_solr_comments_nodetypes', ''),
   );
   if (empty($default['boinc_solr_comments_nodetypes'])) {
-    $default['boinc_solr_comments_nodetypes'] = array('forum','team_forum','news','page','story');
+    $default['boinc_solr_comments_nodetypes'] = array('forum', 'team_forum', 'news', 'page', 'story');
   }
   
   // Define the form

Indentation +19 added lines, -19 removed lines

@@ -7,48 +7,48 @@
  */
 
 function boinc_solr_comments_form(&$form_state) {
-  $form = array();
+    $form = array();
 
-  $form['config'] = array(
+    $form['config'] = array(
     '#type' => 'fieldset',
     '#title' => t('Configuration'),
     '#collapsible' => TRUE,
-  );
+    );
 
-  $options = array();
-  foreach (content_types() as $key => $info) {
+    $options = array();
+    foreach (content_types() as $key => $info) {
     // Exclude node types profile, team, and panel
     switch ($key) {
-      case 'profile':
+        case 'profile':
       case 'team':
       case 'panel':
         continue 2;
     }// switch key
     $options[$key] = $info['name'];
-  }
-  asort($options);
+    }
+    asort($options);
   
-  // Form defaults
-  $default = array(
+    // Form defaults
+    $default = array(
     'boinc_solr_comments_nodetypes' => variable_get('boinc_solr_comments_nodetypes', ''),
-  );
-  if (empty($default['boinc_solr_comments_nodetypes'])) {
+    );
+    if (empty($default['boinc_solr_comments_nodetypes'])) {
     $default['boinc_solr_comments_nodetypes'] = array('forum','team_forum','news','page','story');
-  }
+    }
   
-  // Define the form
-  $form['config']['nodes'] = array(
+    // Define the form
+    $form['config']['nodes'] = array(
     '#type'  => 'markup',
     '#value' => bts('Select the content types where the comments are indexed by Apace Solr. Your content must be re-indexed after changing this configuration.', array(), NULL, 'boinc:admin-solr-search-comments-option'),
-  );
+    );
       
-  $form['config']['boinc_solr_comments_nodetypes'] = array(
+    $form['config']['boinc_solr_comments_nodetypes'] = array(
     '#type'          => 'checkboxes',
     '#title'         => 'node',
     '#options'       => $options,
     '#default_value' => $default['boinc_solr_comments_nodetypes'],
-  );
+    );
 
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 

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

@@ -12,7 +12,7 @@ 
   $form['config'] = array(
     '#type' => 'fieldset',
     '#title' => t('Configuration'),
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
   );
 
   $options = array();
@@ -39,7 +39,7 @@ 
   // Define the form
   $form['config']['nodes'] = array(
     '#type'  => 'markup',
-    '#value' => bts('Select the content types where the comments are indexed by Apace Solr. Your content must be re-indexed after changing this configuration.', array(), NULL, 'boinc:admin-solr-search-comments-option'),
+    '#value' => bts('Select the content types where the comments are indexed by Apace Solr. Your content must be re-indexed after changing this configuration.', array(), null, 'boinc:admin-solr-search-comments-option'),
   );
       
   $form['config']['boinc_solr_comments_nodetypes'] = array(

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pBarcode39.class.php

Indentation +139 added lines, -139 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pBarcode39 - class to create barcodes (39B)
 
      Version     : 2.1.3
@@ -13,188 +13,188 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- /* pData class definition */
- class pBarcode39
-  {
-   var $Codes;
-   var $Reverse;
-   var $Result;
-   var $pChartObject;
-   var $CRC;
-   var $MOD43;
-
-   /* Class creator */
-   function pBarcode39($BasePath="",$EnableMOD43=FALSE)
+    /* pData class definition */
+    class pBarcode39
     {
-     $this->MOD43  = $EnableMOD43;
-     $this->Codes   = "";
-     $this->Reverse = "";
+    var $Codes;
+    var $Reverse;
+    var $Result;
+    var $pChartObject;
+    var $CRC;
+    var $MOD43;
+
+    /* Class creator */
+    function pBarcode39($BasePath="",$EnableMOD43=FALSE)
+    {
+        $this->MOD43  = $EnableMOD43;
+        $this->Codes   = "";
+        $this->Reverse = "";
 
-     $FileHandle = @fopen($BasePath."data/39.db", "r");
+        $FileHandle = @fopen($BasePath."data/39.db", "r");
 
-     if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."data/39.db)."); }
+        if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."data/39.db)."); }
 
-     while (!feof($FileHandle))
-      {
-       $Buffer = fgets($FileHandle,4096);
-       $Buffer = str_replace(chr(10),"",$Buffer);
-       $Buffer = str_replace(chr(13),"",$Buffer);
-       $Values = preg_split("/;/",$Buffer);
+        while (!feof($FileHandle))
+        {
+        $Buffer = fgets($FileHandle,4096);
+        $Buffer = str_replace(chr(10),"",$Buffer);
+        $Buffer = str_replace(chr(13),"",$Buffer);
+        $Values = preg_split("/;/",$Buffer);
 
-       $this->Codes[$Values[0]] = $Values[1];
-      }
-     fclose($FileHandle);
+        $this->Codes[$Values[0]] = $Values[1];
+        }
+        fclose($FileHandle);
     }
 
-   /* Return the projected size of a barcode */
-   function getSize($TextString,$Format="")
+    /* Return the projected size of a barcode */
+    function getSize($TextString,$Format="")
     {
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
-     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+        $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+        $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+        $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
+        $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
 
-     $TextString    = $this->encode39($TextString);
-     $BarcodeLength = strlen($this->Result);
+        $TextString    = $this->encode39($TextString);
+        $BarcodeLength = strlen($this->Result);
 
-     if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
-     if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
+        if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
+        if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
 
-     $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
-     $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+        $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+        $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
 
-     $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
-     $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
+        $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
+        $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
 
 
-     $AreaWidth  = max(abs($X1),abs($X2));
-     $AreaHeight = max(abs($Y1),abs($Y2));
+        $AreaWidth  = max(abs($X1),abs($X2));
+        $AreaHeight = max(abs($Y1),abs($Y2));
 
-     return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
+        return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
     }
 
-   /* Create the encoded string */
-   function encode39($Value)
+    /* Create the encoded string */
+    function encode39($Value)
     {
-     $this->Result = "100101101101"."0";
-     $TextString   = "";
-     for($i=1;$i<=strlen($Value);$i++)
-      {
-       $CharCode = ord($this->mid($Value,$i,1));
-       if ( $CharCode >= 97 && $CharCode <= 122 ) { $CharCode = $CharCode - 32; }
-
-       if ( isset($this->Codes[chr($CharCode)]) )
+        $this->Result = "100101101101"."0";
+        $TextString   = "";
+        for($i=1;$i<=strlen($Value);$i++)
+        {
+        $CharCode = ord($this->mid($Value,$i,1));
+        if ( $CharCode >= 97 && $CharCode <= 122 ) { $CharCode = $CharCode - 32; }
+
+        if ( isset($this->Codes[chr($CharCode)]) )
         {
-         $this->Result = $this->Result.$this->Codes[chr($CharCode)]."0";
-         $TextString = $TextString.chr($CharCode);
+            $this->Result = $this->Result.$this->Codes[chr($CharCode)]."0";
+            $TextString = $TextString.chr($CharCode);
+        }
         }
-      }
 
-     if ( $this->MOD43 )
-      {
-       $Checksum = $this->checksum($TextString);
-       $this->Result = $this->Result.$this->Codes[$Checksum]."0";
-      }
+        if ( $this->MOD43 )
+        {
+        $Checksum = $this->checksum($TextString);
+        $this->Result = $this->Result.$this->Codes[$Checksum]."0";
+        }
 
-     $this->Result = $this->Result."100101101101";
-     $TextString   = "*".$TextString."*";
+        $this->Result = $this->Result."100101101101";
+        $TextString   = "*".$TextString."*";
 
-     return($TextString);
+        return($TextString);
     }
 
-   /* Create the encoded string */
-   function draw($Object,$Value,$X,$Y,$Format="")
+    /* Create the encoded string */
+    function draw($Object,$Value,$X,$Y,$Format="")
     {
-     $this->pChartObject = $Object;
-
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
-     $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
-     $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
-     $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
-     $AreaBorderR	= isset($Format["AreaBorderR"]) ? $Format["AreaBorderR"] : $AreaR;
-     $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
-     $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
-
-     $TextString   = $this->encode39($Value);
-
-     if ( $DrawArea )
-      {
-       $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
-       $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
-
-       $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
-       $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
-
-       if ( $ShowLegend )
+        $this->pChartObject = $Object;
+
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+        $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+        $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+        $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
+        $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
+        $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
+        $AreaBorderR	= isset($Format["AreaBorderR"]) ? $Format["AreaBorderR"] : $AreaR;
+        $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
+        $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
+
+        $TextString   = $this->encode39($Value);
+
+        if ( $DrawArea )
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+        $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
+        $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
+
+        $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
+        $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
+
+        if ( $ShowLegend )
+        {
+            $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+            $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
         }
-       else
+        else
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
+            $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
+            $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
         }
 
-       $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
-       $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+        $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+        $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
 
-       $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
-       $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
-       $this->pChartObject->drawPolygon($Polygon,$Settings);
-      }
+        $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
+        $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
+        $this->pChartObject->drawPolygon($Polygon,$Settings);
+        }
 
-     for($i=1;$i<=strlen($this->Result);$i++)
-      {
-       if ( $this->mid($this->Result,$i,1) == 1 )
+        for($i=1;$i<=strlen($this->Result);$i++)
+        {
+        if ( $this->mid($this->Result,$i,1) == 1 )
         {
-         $X1 = $X + cos($Angle * PI / 180) * $i;
-         $Y1 = $Y + sin($Angle * PI / 180) * $i;
-         $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
-         $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
+            $X1 = $X + cos($Angle * PI / 180) * $i;
+            $Y1 = $Y + sin($Angle * PI / 180) * $i;
+            $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
+            $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
 
-         $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+            $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+            $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+        }
         }
-      }
 
-     if ( $ShowLegend )
-      {
-       $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
-       $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
+        if ( $ShowLegend )
+        {
+        $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
+        $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
 
-       $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
-       $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+        $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+        $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
 
-       $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
-       $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
-      }
+        $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
+        $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
+        }
     }
 
-   function checksum( $string )
+    function checksum( $string )
     {
-     $checksum = 0;
-     $length   = strlen( $string );
-     $charset  = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%';
+        $checksum = 0;
+        $length   = strlen( $string );
+        $charset  = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%';
 
-     for( $i=0; $i < $length; ++$i )
-      $checksum += strpos( $charset, $string[$i] );
+        for( $i=0; $i < $length; ++$i )
+        $checksum += strpos( $charset, $string[$i] );
  
-     return substr( $charset, ($checksum % 43), 1 );
+        return substr( $charset, ($checksum % 43), 1 );
     }
 
-   function left($value,$NbChar) { return substr($value,0,$NbChar); }  
-   function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
-   function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
-  }
+    function left($value,$NbChar) { return substr($value,0,$NbChar); }  
+    function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
+    function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
+    }
 ?>
\ No newline at end of file

Spacing +69 added lines, -69 removed lines

@@ -24,9 +24,9 @@ 
    var $MOD43;
 
    /* Class creator */
-   function pBarcode39($BasePath="",$EnableMOD43=FALSE)
+   function pBarcode39($BasePath = "", $EnableMOD43 = FALSE)
     {
-     $this->MOD43  = $EnableMOD43;
+     $this->MOD43 = $EnableMOD43;
      $this->Codes   = "";
      $this->Reverse = "";
 
@@ -36,10 +36,10 @@ 
 
      while (!feof($FileHandle))
       {
-       $Buffer = fgets($FileHandle,4096);
-       $Buffer = str_replace(chr(10),"",$Buffer);
-       $Buffer = str_replace(chr(13),"",$Buffer);
-       $Values = preg_split("/;/",$Buffer);
+       $Buffer = fgets($FileHandle, 4096);
+       $Buffer = str_replace(chr(10), "", $Buffer);
+       $Buffer = str_replace(chr(13), "", $Buffer);
+       $Values = preg_split("/;/", $Buffer);
 
        $this->Codes[$Values[0]] = $Values[1];
       }
@@ -47,32 +47,32 @@ 
     }
 
    /* Return the projected size of a barcode */
-   function getSize($TextString,$Format="")
+   function getSize($TextString, $Format = "")
     {
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $Angle = isset($Format["Angle"]) ? $Format["Angle"] : 0;
+     $ShowLegend = isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset = isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
      $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
      $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+     $Height = isset($Format["Height"]) ? $Format["Height"] : 30;
 
      $TextString    = $this->encode39($TextString);
      $BarcodeLength = strlen($this->Result);
 
-     if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
-     if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
+     if ($DrawArea) { $WOffset = 20; } else { $WOffset = 0; }
+     if ($ShowLegend) { $HOffset = $FontSize + $LegendOffset + $WOffset; } else { $HOffset = 0; }
 
-     $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
-     $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+     $X1 = cos($Angle*PI/180)*($WOffset + $BarcodeLength);
+     $Y1 = sin($Angle*PI/180)*($WOffset + $BarcodeLength);
 
-     $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
-     $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
+     $X2 = $X1 + cos(($Angle + 90)*PI/180)*($HOffset + $Height);
+     $Y2 = $Y1 + sin(($Angle + 90)*PI/180)*($HOffset + $Height);
 
 
-     $AreaWidth  = max(abs($X1),abs($X2));
-     $AreaHeight = max(abs($Y1),abs($Y2));
+     $AreaWidth  = max(abs($X1), abs($X2));
+     $AreaHeight = max(abs($Y1), abs($Y2));
 
-     return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
+     return(array("Width"=>$AreaWidth, "Height"=>$AreaHeight));
     }
 
    /* Create the encoded string */
@@ -80,19 +80,19 @@ 
     {
      $this->Result = "100101101101"."0";
      $TextString   = "";
-     for($i=1;$i<=strlen($Value);$i++)
+     for ($i = 1; $i <= strlen($Value); $i++)
       {
-       $CharCode = ord($this->mid($Value,$i,1));
-       if ( $CharCode >= 97 && $CharCode <= 122 ) { $CharCode = $CharCode - 32; }
+       $CharCode = ord($this->mid($Value, $i, 1));
+       if ($CharCode >= 97 && $CharCode <= 122) { $CharCode = $CharCode - 32; }
 
-       if ( isset($this->Codes[chr($CharCode)]) )
+       if (isset($this->Codes[chr($CharCode)]))
         {
          $this->Result = $this->Result.$this->Codes[chr($CharCode)]."0";
          $TextString = $TextString.chr($CharCode);
         }
       }
 
-     if ( $this->MOD43 )
+     if ($this->MOD43)
       {
        $Checksum = $this->checksum($TextString);
        $this->Result = $this->Result.$this->Codes[$Checksum]."0";
@@ -105,7 +105,7 @@ 
     }
 
    /* Create the encoded string */
-   function draw($Object,$Value,$X,$Y,$Format="")
+   function draw($Object, $Value, $X, $Y, $Format = "")
     {
      $this->pChartObject = $Object;
 
@@ -113,11 +113,11 @@ 
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
      $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+     $Height = isset($Format["Height"]) ? $Format["Height"] : 30;
      $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+     $ShowLegend = isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset = isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $DrawArea = isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
      $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
      $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
      $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
@@ -125,76 +125,76 @@ 
      $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
      $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
 
-     $TextString   = $this->encode39($Value);
+     $TextString = $this->encode39($Value);
 
-     if ( $DrawArea )
+     if ($DrawArea)
       {
-       $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
-       $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
+       $X1 = $X + cos(($Angle - 135)*PI/180)*10;
+       $Y1 = $Y + sin(($Angle - 135)*PI/180)*10;
 
-       $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
-       $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
+       $X2 = $X1 + cos($Angle*PI/180)*(strlen($this->Result) + 20);
+       $Y2 = $Y1 + sin($Angle*PI/180)*(strlen($this->Result) + 20);
 
-       if ( $ShowLegend )
+       if ($ShowLegend)
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+         $X3 = $X2 + cos(($Angle + 90)*PI/180)*($Height + $LegendOffset + $this->pChartObject->FontSize + 10);
+         $Y3 = $Y2 + sin(($Angle + 90)*PI/180)*($Height + $LegendOffset + $this->pChartObject->FontSize + 10);
         }
        else
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
+         $X3 = $X2 + cos(($Angle + 90)*PI/180)*($Height + 20);
+         $Y3 = $Y2 + sin(($Angle + 90)*PI/180)*($Height + 20);
         }
 
-       $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
-       $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+       $X4 = $X3 + cos(($Angle + 180)*PI/180)*(strlen($this->Result) + 20);
+       $Y4 = $Y3 + sin(($Angle + 180)*PI/180)*(strlen($this->Result) + 20);
 
-       $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
-       $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
-       $this->pChartObject->drawPolygon($Polygon,$Settings);
+       $Polygon  = array($X1, $Y1, $X2, $Y2, $X3, $Y3, $X4, $Y4);
+       $Settings = array("R"=>$AreaR, "G"=>$AreaG, "B"=>$AreaB, "BorderR"=>$AreaBorderR, "BorderG"=>$AreaBorderG, "BorderB"=>$AreaBorderB);
+       $this->pChartObject->drawPolygon($Polygon, $Settings);
       }
 
-     for($i=1;$i<=strlen($this->Result);$i++)
+     for ($i = 1; $i <= strlen($this->Result); $i++)
       {
-       if ( $this->mid($this->Result,$i,1) == 1 )
+       if ($this->mid($this->Result, $i, 1) == 1)
         {
-         $X1 = $X + cos($Angle * PI / 180) * $i;
-         $Y1 = $Y + sin($Angle * PI / 180) * $i;
-         $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
-         $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
+         $X1 = $X + cos($Angle*PI/180)*$i;
+         $Y1 = $Y + sin($Angle*PI/180)*$i;
+         $X2 = $X1 + cos(($Angle + 90)*PI/180)*$Height;
+         $Y2 = $Y1 + sin(($Angle + 90)*PI/180)*$Height;
 
-         $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+         $Settings = array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha);
+         $this->pChartObject->drawLine($X1, $Y1, $X2, $Y2, $Settings);
         }
       }
 
-     if ( $ShowLegend )
+     if ($ShowLegend)
       {
-       $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
-       $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
+       $X1 = $X + cos($Angle*PI/180)*(strlen($this->Result)/2);
+       $Y1 = $Y + sin($Angle*PI/180)*(strlen($this->Result)/2);
 
-       $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
-       $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+       $LegendX = $X1 + cos(($Angle + 90)*PI/180)*($Height + $LegendOffset);
+       $LegendY = $Y1 + sin(($Angle + 90)*PI/180)*($Height + $LegendOffset);
 
-       $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
-       $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
+       $Settings = array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "Angle"=>-$Angle, "Align"=>TEXT_ALIGN_TOPMIDDLE);
+       $this->pChartObject->drawText($LegendX, $LegendY, $TextString, $Settings);
       }
     }
 
-   function checksum( $string )
+   function checksum($string)
     {
      $checksum = 0;
-     $length   = strlen( $string );
+     $length   = strlen($string);
      $charset  = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%';
 
-     for( $i=0; $i < $length; ++$i )
-      $checksum += strpos( $charset, $string[$i] );
+     for ($i = 0; $i < $length; ++$i)
+      $checksum += strpos($charset, $string[$i]);
  
-     return substr( $charset, ($checksum % 43), 1 );
+     return substr($charset, ($checksum%43), 1);
     }
 
-   function left($value,$NbChar) { return substr($value,0,$NbChar); }  
-   function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
-   function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
+   function left($value, $NbChar) { return substr($value, 0, $NbChar); }  
+   function right($value, $NbChar) { return substr($value, strlen($value) - $NbChar, $NbChar); }  
+   function mid($value, $Depart, $NbChar) { return substr($value, $Depart - 1, $NbChar); }  
   }
 ?>
\ No newline at end of file

Braces +19 added lines, -35 removed lines

@@ -14,8 +14,7 @@ 
  */
 
  /* pData class definition */
- class pBarcode39
-  {
+ class pBarcode39 {
    var $Codes;
    var $Reverse;
    var $Result;
@@ -24,8 +23,7 @@ 
    var $MOD43;
 
    /* Class creator */
-   function pBarcode39($BasePath="",$EnableMOD43=FALSE)
-    {
+   function pBarcode39($BasePath="",$EnableMOD43=FALSE) {
      $this->MOD43  = $EnableMOD43;
      $this->Codes   = "";
      $this->Reverse = "";
@@ -34,8 +32,7 @@ 
 
      if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."data/39.db)."); }
 
-     while (!feof($FileHandle))
-      {
+     while (!feof($FileHandle)) {
        $Buffer = fgets($FileHandle,4096);
        $Buffer = str_replace(chr(10),"",$Buffer);
        $Buffer = str_replace(chr(13),"",$Buffer);
@@ -47,8 +44,7 @@ 
     }
 
    /* Return the projected size of a barcode */
-   function getSize($TextString,$Format="")
-    {
+   function getSize($TextString,$Format="") {
      $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
      $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
      $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
@@ -76,24 +72,20 @@ 
     }
 
    /* Create the encoded string */
-   function encode39($Value)
-    {
+   function encode39($Value) {
      $this->Result = "100101101101"."0";
      $TextString   = "";
-     for($i=1;$i<=strlen($Value);$i++)
-      {
+     for($i=1;$i<=strlen($Value);$i++) {
        $CharCode = ord($this->mid($Value,$i,1));
        if ( $CharCode >= 97 && $CharCode <= 122 ) { $CharCode = $CharCode - 32; }
 
-       if ( isset($this->Codes[chr($CharCode)]) )
-        {
+       if ( isset($this->Codes[chr($CharCode)]) ) {
          $this->Result = $this->Result.$this->Codes[chr($CharCode)]."0";
          $TextString = $TextString.chr($CharCode);
         }
       }
 
-     if ( $this->MOD43 )
-      {
+     if ( $this->MOD43 ) {
        $Checksum = $this->checksum($TextString);
        $this->Result = $this->Result.$this->Codes[$Checksum]."0";
       }
@@ -105,8 +97,7 @@ 
     }
 
    /* Create the encoded string */
-   function draw($Object,$Value,$X,$Y,$Format="")
-    {
+   function draw($Object,$Value,$X,$Y,$Format="") {
      $this->pChartObject = $Object;
 
      $R			= isset($Format["R"]) ? $Format["R"] : 0;
@@ -127,21 +118,17 @@ 
 
      $TextString   = $this->encode39($Value);
 
-     if ( $DrawArea )
-      {
+     if ( $DrawArea ) {
        $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
        $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
 
        $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
        $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
 
-       if ( $ShowLegend )
-        {
+       if ( $ShowLegend ) {
          $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
          $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
-        }
-       else
-        {
+        } else {
          $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
          $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
         }
@@ -154,10 +141,8 @@ 
        $this->pChartObject->drawPolygon($Polygon,$Settings);
       }
 
-     for($i=1;$i<=strlen($this->Result);$i++)
-      {
-       if ( $this->mid($this->Result,$i,1) == 1 )
-        {
+     for($i=1;$i<=strlen($this->Result);$i++) {
+       if ( $this->mid($this->Result,$i,1) == 1 ) {
          $X1 = $X + cos($Angle * PI / 180) * $i;
          $Y1 = $Y + sin($Angle * PI / 180) * $i;
          $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
@@ -168,8 +153,7 @@ 
         }
       }
 
-     if ( $ShowLegend )
-      {
+     if ( $ShowLegend ) {
        $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
        $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
 
@@ -181,14 +165,14 @@ 
       }
     }
 
-   function checksum( $string )
-    {
+   function checksum( $string ) {
      $checksum = 0;
      $length   = strlen( $string );
      $charset  = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%';
 
-     for( $i=0; $i < $length; ++$i )
-      $checksum += strpos( $charset, $string[$i] );
+     for( $i=0; $i < $length; ++$i ) {
+           $checksum += strpos( $charset, $string[$i] );
+     }
  
      return substr( $charset, ($checksum % 43), 1 );
     }

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

@@ -24,7 +24,7 @@ 
    var $MOD43;
 
    /* Class creator */
-   function pBarcode39($BasePath="",$EnableMOD43=FALSE)
+   function pBarcode39($BasePath="",$EnableMOD43=false)
     {
      $this->MOD43  = $EnableMOD43;
      $this->Codes   = "";
@@ -50,9 +50,9 @@ 
    function getSize($TextString,$Format="")
     {
      $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : false;
      $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : false;
      $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
      $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
 
@@ -115,9 +115,9 @@ 
      $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
      $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
      $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : false;
      $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : false;
      $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
      $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
      $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pIndicator.class.php

Indentation +175 added lines, -175 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pIndicator - class to draw indicators
 
      Version     : 2.1.3
@@ -13,229 +13,229 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("INDICATOR_CAPTION_DEFAULT"	, 700001);
- define("INDICATOR_CAPTION_EXTENDED"	, 700002);
+    define("INDICATOR_CAPTION_DEFAULT"	, 700001);
+    define("INDICATOR_CAPTION_EXTENDED"	, 700002);
 
- define("INDICATOR_CAPTION_INSIDE"	, 700011);
- define("INDICATOR_CAPTION_BOTTOM"	, 700012);
+    define("INDICATOR_CAPTION_INSIDE"	, 700011);
+    define("INDICATOR_CAPTION_BOTTOM"	, 700012);
 
- define("INDICATOR_VALUE_BUBBLE"	, 700021);
- define("INDICATOR_VALUE_LABEL"		, 700022);
+    define("INDICATOR_VALUE_BUBBLE"	, 700021);
+    define("INDICATOR_VALUE_LABEL"		, 700022);
 
- /* pIndicator class definition */
- class pIndicator
-  {
-   var $pChartObject;
+    /* pIndicator class definition */
+    class pIndicator
+    {
+    var $pChartObject;
 
-   /* Class creator */
-   function pIndicator($pChartObject)
+    /* Class creator */
+    function pIndicator($pChartObject)
     {
-     $this->pChartObject = $pChartObject;
+        $this->pChartObject = $pChartObject;
     }
 
-   /* Draw an indicator */
-   function draw($X,$Y,$Width,$Height,$Format="")
+    /* Draw an indicator */
+    function draw($X,$Y,$Width,$Height,$Format="")
     {
-     $Values			= isset($Format["Values"]) ? $Format["Values"] : VOID;
-     $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
-     $ValueDisplay		= isset($Format["ValueDisplay"]) ? $Format["ValueDisplay"] : INDICATOR_VALUE_BUBBLE;
-     $SectionsMargin		= isset($Format["SectionsMargin"]) ? $Format["SectionsMargin"] : 4;
-     $DrawLeftHead		= isset($Format["DrawLeftHead"]) ? $Format["DrawLeftHead"] : TRUE;
-     $DrawRightHead		= isset($Format["DrawRightHead"]) ? $Format["DrawRightHead"] : TRUE;
-     $HeadSize			= isset($Format["HeadSize"]) ? $Format["HeadSize"] : floor($Height/4);
-     $TextPadding		= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 4;
-     $CaptionLayout		= isset($Format["CaptionLayout"]) ? $Format["CaptionLayout"] : INDICATOR_CAPTION_EXTENDED;
-     $CaptionPosition		= isset($Format["CaptionPosition"]) ? $Format["CaptionPosition"] : INDICATOR_CAPTION_INSIDE;
-     $CaptionColorFactor	= isset($Format["CaptionColorFactor"]) ? $Format["CaptionColorFactor"] : NULL;
-     $CaptionR			= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
-     $CaptionG			= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
-     $CaptionB			= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
-     $CaptionAlpha		= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
-     $SubCaptionColorFactor	= isset($Format["SubCaptionColorFactor"]) ? $Format["SubCaptionColorFactor"] : NULL;
-     $SubCaptionR		= isset($Format["SubCaptionR"]) ? $Format["SubCaptionR"] : 50;
-     $SubCaptionG		= isset($Format["SubCaptionG"]) ? $Format["SubCaptionG"] : 50;
-     $SubCaptionB		= isset($Format["SubCaptionB"]) ? $Format["SubCaptionB"] : 50;
-     $SubCaptionAlpha		= isset($Format["SubCaptionAlpha"]) ? $Format["SubCaptionAlpha"] : 100;
-     $ValueFontName		= isset($Format["ValueFontName"]) ? $Format["ValueFontName"] : $this->pChartObject->FontName;
-     $ValueFontSize		= isset($Format["ValueFontSize"]) ? $Format["ValueFontSize"] : $this->pChartObject->FontSize;
-     $CaptionFontName		= isset($Format["CaptionFontName"]) ? $Format["CaptionFontName"] : $this->pChartObject->FontName;
-     $CaptionFontSize		= isset($Format["CaptionFontSize"]) ? $Format["CaptionFontSize"] : $this->pChartObject->FontSize;
-     $Unit			= isset($Format["Unit"]) ? $Format["Unit"] : "";
-
-     /* Convert the Values to display to an array if needed */
-     if ( !is_array($Values) ) { $Value = $Values; $Values = ""; $Values[] = $Value; }
-
-     /* No section, let's die */
-     if ( $IndicatorSections == NULL ) { return(0); }
-
-     /* Determine indicator visual configuration */
-     $OverallMin = $IndicatorSections[0]["End"]; $OverallMax = $IndicatorSections[0]["Start"];
-     foreach ($IndicatorSections as $Key => $Settings)
-      {
-       if ( $Settings["End"] > $OverallMax )   { $OverallMax = $Settings["End"]; }
-       if ( $Settings["Start"] < $OverallMin ) { $OverallMin = $Settings["Start"]; }
-      }
-     $RealWidth = $Width - (count($IndicatorSections)-1)*$SectionsMargin;
-     $XScale    = $RealWidth / ($OverallMax-$OverallMin);
-
-     $X1 = $X; $ValuesPos = "";
-     foreach ($IndicatorSections as $Key => $Settings)
-      {
-       $Color      = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]);
-       $Caption    = $Settings["Caption"];
-       $SubCaption = $Settings["Start"]." - ".$Settings["End"];
-
-       $X2 = $X1 + ($Settings["End"] - $Settings["Start"]) * $XScale;
-
-       if ( $Key == 0 && $DrawLeftHead )
+        $Values			= isset($Format["Values"]) ? $Format["Values"] : VOID;
+        $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
+        $ValueDisplay		= isset($Format["ValueDisplay"]) ? $Format["ValueDisplay"] : INDICATOR_VALUE_BUBBLE;
+        $SectionsMargin		= isset($Format["SectionsMargin"]) ? $Format["SectionsMargin"] : 4;
+        $DrawLeftHead		= isset($Format["DrawLeftHead"]) ? $Format["DrawLeftHead"] : TRUE;
+        $DrawRightHead		= isset($Format["DrawRightHead"]) ? $Format["DrawRightHead"] : TRUE;
+        $HeadSize			= isset($Format["HeadSize"]) ? $Format["HeadSize"] : floor($Height/4);
+        $TextPadding		= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 4;
+        $CaptionLayout		= isset($Format["CaptionLayout"]) ? $Format["CaptionLayout"] : INDICATOR_CAPTION_EXTENDED;
+        $CaptionPosition		= isset($Format["CaptionPosition"]) ? $Format["CaptionPosition"] : INDICATOR_CAPTION_INSIDE;
+        $CaptionColorFactor	= isset($Format["CaptionColorFactor"]) ? $Format["CaptionColorFactor"] : NULL;
+        $CaptionR			= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
+        $CaptionG			= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
+        $CaptionB			= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
+        $CaptionAlpha		= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
+        $SubCaptionColorFactor	= isset($Format["SubCaptionColorFactor"]) ? $Format["SubCaptionColorFactor"] : NULL;
+        $SubCaptionR		= isset($Format["SubCaptionR"]) ? $Format["SubCaptionR"] : 50;
+        $SubCaptionG		= isset($Format["SubCaptionG"]) ? $Format["SubCaptionG"] : 50;
+        $SubCaptionB		= isset($Format["SubCaptionB"]) ? $Format["SubCaptionB"] : 50;
+        $SubCaptionAlpha		= isset($Format["SubCaptionAlpha"]) ? $Format["SubCaptionAlpha"] : 100;
+        $ValueFontName		= isset($Format["ValueFontName"]) ? $Format["ValueFontName"] : $this->pChartObject->FontName;
+        $ValueFontSize		= isset($Format["ValueFontSize"]) ? $Format["ValueFontSize"] : $this->pChartObject->FontSize;
+        $CaptionFontName		= isset($Format["CaptionFontName"]) ? $Format["CaptionFontName"] : $this->pChartObject->FontName;
+        $CaptionFontSize		= isset($Format["CaptionFontSize"]) ? $Format["CaptionFontSize"] : $this->pChartObject->FontSize;
+        $Unit			= isset($Format["Unit"]) ? $Format["Unit"] : "";
+
+        /* Convert the Values to display to an array if needed */
+        if ( !is_array($Values) ) { $Value = $Values; $Values = ""; $Values[] = $Value; }
+
+        /* No section, let's die */
+        if ( $IndicatorSections == NULL ) { return(0); }
+
+        /* Determine indicator visual configuration */
+        $OverallMin = $IndicatorSections[0]["End"]; $OverallMax = $IndicatorSections[0]["Start"];
+        foreach ($IndicatorSections as $Key => $Settings)
+        {
+        if ( $Settings["End"] > $OverallMax )   { $OverallMax = $Settings["End"]; }
+        if ( $Settings["Start"] < $OverallMin ) { $OverallMin = $Settings["Start"]; }
+        }
+        $RealWidth = $Width - (count($IndicatorSections)-1)*$SectionsMargin;
+        $XScale    = $RealWidth / ($OverallMax-$OverallMin);
+
+        $X1 = $X; $ValuesPos = "";
+        foreach ($IndicatorSections as $Key => $Settings)
+        {
+        $Color      = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]);
+        $Caption    = $Settings["Caption"];
+        $SubCaption = $Settings["Start"]." - ".$Settings["End"];
+
+        $X2 = $X1 + ($Settings["End"] - $Settings["Start"]) * $XScale;
+
+        if ( $Key == 0 && $DrawLeftHead )
         {
-         $Poly = ""; $Poly[] = $X1-1; $Poly[] = $Y; $Poly[] = $X1-1; $Poly[] = $Y+$Height; $Poly[] = $X1-1-$HeadSize; $Poly[] = $Y+($Height/2);
-         $this->pChartObject->drawPolygon($Poly,$Color);
-         $this->pChartObject->drawLine($X1-2,$Y,$X1-2-$HeadSize,$Y+($Height/2),$Color);
-         $this->pChartObject->drawLine($X1-2,$Y+$Height,$X1-2-$HeadSize,$Y+($Height/2),$Color);
+            $Poly = ""; $Poly[] = $X1-1; $Poly[] = $Y; $Poly[] = $X1-1; $Poly[] = $Y+$Height; $Poly[] = $X1-1-$HeadSize; $Poly[] = $Y+($Height/2);
+            $this->pChartObject->drawPolygon($Poly,$Color);
+            $this->pChartObject->drawLine($X1-2,$Y,$X1-2-$HeadSize,$Y+($Height/2),$Color);
+            $this->pChartObject->drawLine($X1-2,$Y+$Height,$X1-2-$HeadSize,$Y+($Height/2),$Color);
         }
 
-       /* Determine the position of the breaks */
-       $Break = "";
-       foreach($Values as $iKey => $Value)
+        /* Determine the position of the breaks */
+        $Break = "";
+        foreach($Values as $iKey => $Value)
         {
-         if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
-          {
-           $XBreak  = $X1 + ($Value - $Settings["Start"]) * $XScale;
-           $ValuesPos[$Value] = $XBreak;
-           $Break[] = floor($XBreak);
-          }
+            if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+            {
+            $XBreak  = $X1 + ($Value - $Settings["Start"]) * $XScale;
+            $ValuesPos[$Value] = $XBreak;
+            $Break[] = floor($XBreak);
+            }
         }
 
-       if ( $ValueDisplay == INDICATOR_VALUE_LABEL )
+        if ( $ValueDisplay == INDICATOR_VALUE_LABEL )
         {
-         if ( $Break == "" )
-          $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
-         else
-          {
-           sort($Break);
-           $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = FALSE;
-           foreach($Break as $iKey => $Value)
+            if ( $Break == "" )
+            $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
+            else
+            {
+            sort($Break);
+            $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = FALSE;
+            foreach($Break as $iKey => $Value)
             {
-             if ( $Value-5 >= $X1 )
-              { $Poly[] = $Value-5; $Poly[] = $Y; }
-             elseif ($X1 - ($Value-5) > 0 )
-              {
-               $Offset = $X1 - ($Value-5);
-               $Poly = ""; $Poly[] = $X1; $Poly[] = $Y + $Offset;
-              }
-
-             $Poly[] = $Value;   $Poly[] = $Y+5;
-
-             if ( $Value+5 <= $X2 )
-              { $Poly[] = $Value+5; $Poly[] = $Y; }
-             elseif (($Value+5) > $X2 )
-              {
-               $Offset = ($Value+5) - $X2;
-               $Poly[] = $X2; $Poly[] = $Y + $Offset;
-               $LastPointWritten = TRUE;
-              }
+                if ( $Value-5 >= $X1 )
+                { $Poly[] = $Value-5; $Poly[] = $Y; }
+                elseif ($X1 - ($Value-5) > 0 )
+                {
+                $Offset = $X1 - ($Value-5);
+                $Poly = ""; $Poly[] = $X1; $Poly[] = $Y + $Offset;
+                }
+
+                $Poly[] = $Value;   $Poly[] = $Y+5;
+
+                if ( $Value+5 <= $X2 )
+                { $Poly[] = $Value+5; $Poly[] = $Y; }
+                elseif (($Value+5) > $X2 )
+                {
+                $Offset = ($Value+5) - $X2;
+                $Poly[] = $X2; $Poly[] = $Y + $Offset;
+                $LastPointWritten = TRUE;
+                }
 
             }
-           if ( !$LastPointWritten ) { $Poly[] = $X2; $Poly[] = $Y; }
-           $Poly[] = $X2; $Poly[] = $Y+$Height;
-           $Poly[] = $X1; $Poly[] = $Y+$Height;
+            if ( !$LastPointWritten ) { $Poly[] = $X2; $Poly[] = $Y; }
+            $Poly[] = $X2; $Poly[] = $Y+$Height;
+            $Poly[] = $X1; $Poly[] = $Y+$Height;
 
-           $this->pChartObject->drawPolygon($Poly,$Color);
-          }
+            $this->pChartObject->drawPolygon($Poly,$Color);
+            }
         }
-       else
+        else
         $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
 
-       if ( $Key == count($IndicatorSections)-1 && $DrawRightHead )
+        if ( $Key == count($IndicatorSections)-1 && $DrawRightHead )
         {
-         $Poly = ""; $Poly[] = $X2+1; $Poly[] = $Y; $Poly[] = $X2+1; $Poly[] = $Y+$Height; $Poly[] = $X2+1+$HeadSize; $Poly[] = $Y+($Height/2);
-         $this->pChartObject->drawPolygon($Poly,$Color);
-         $this->pChartObject->drawLine($X2+1,$Y,$X2+1+$HeadSize,$Y+($Height/2),$Color);
-         $this->pChartObject->drawLine($X2+1,$Y+$Height,$X2+1+$HeadSize,$Y+($Height/2),$Color);
+            $Poly = ""; $Poly[] = $X2+1; $Poly[] = $Y; $Poly[] = $X2+1; $Poly[] = $Y+$Height; $Poly[] = $X2+1+$HeadSize; $Poly[] = $Y+($Height/2);
+            $this->pChartObject->drawPolygon($Poly,$Color);
+            $this->pChartObject->drawLine($X2+1,$Y,$X2+1+$HeadSize,$Y+($Height/2),$Color);
+            $this->pChartObject->drawLine($X2+1,$Y+$Height,$X2+1+$HeadSize,$Y+($Height/2),$Color);
         }
 
-       if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE )
+        if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE )
         {
-         $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
-         $YOffset = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding;
+            $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
+            $YOffset = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding;
 
-         if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
-          {
-           $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$SubCaption);
-           $YOffset = $YOffset + ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding*2;
-          }
+            if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
+            {
+            $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$SubCaption);
+            $YOffset = $YOffset + ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding*2;
+            }
 
-         $XOffset = $TextPadding;
+            $XOffset = $TextPadding;
         }
-       else
+        else
         { $YOffset = 0; $XOffset = 0; }
 
-       if ( $CaptionColorFactor == NULL )
+        if ( $CaptionColorFactor == NULL )
         { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); }
-       else
+        else
         { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$CaptionColorFactor,"G"=>$Settings["G"]+$CaptionColorFactor,"B"=>$Settings["B"]+$CaptionColorFactor); }
 
-       if ( $SubCaptionColorFactor == NULL )
+        if ( $SubCaptionColorFactor == NULL )
         $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$SubCaptionR,"G"=>$SubCaptionG,"B"=>$SubCaptionB,"Alpha"=>$SubCaptionAlpha);
-       else
+        else
         $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$SubCaptionColorFactor,"G"=>$Settings["G"]+$SubCaptionColorFactor,"B"=>$Settings["B"]+$SubCaptionColorFactor);
 
-       $RestoreShadow = $this->pChartObject->Shadow;
-       $this->pChartObject->Shadow = FALSE;
+        $RestoreShadow = $this->pChartObject->Shadow;
+        $this->pChartObject->Shadow = FALSE;
 
-       if ( $CaptionLayout == INDICATOR_CAPTION_DEFAULT )
+        if ( $CaptionLayout == INDICATOR_CAPTION_DEFAULT )
         $this->pChartObject->drawText($X1,$Y+$Height+$TextPadding,$Caption,$CaptionColor);
-       elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
+        elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
         {
-         $TxtPos        = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
-         $CaptionHeight = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
+            $TxtPos        = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
+            $CaptionHeight = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
 
-         $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$TextPadding,$Caption,$CaptionColor);
-         $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$CaptionHeight+$TextPadding*2,$SubCaption,$SubCaptionColor);
+            $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$TextPadding,$Caption,$CaptionColor);
+            $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$CaptionHeight+$TextPadding*2,$SubCaption,$SubCaptionColor);
         }
 
-       $this->pChartObject->Shadow = $RestoreShadow;
+        $this->pChartObject->Shadow = $RestoreShadow;
 
-       $X1 = $X2 + $SectionsMargin;
-      }
+        $X1 = $X2 + $SectionsMargin;
+        }
 
-     $RestoreShadow = $this->pChartObject->Shadow;
-     $this->pChartObject->Shadow = FALSE;
+        $RestoreShadow = $this->pChartObject->Shadow;
+        $this->pChartObject->Shadow = FALSE;
 
-     foreach($Values as $Key => $Value)
-      {
-       if ( $Value >= $OverallMin && $Value <= $OverallMax )
+        foreach($Values as $Key => $Value)
+        {
+        if ( $Value >= $OverallMin && $Value <= $OverallMax )
         {
-         foreach ($IndicatorSections as $Key => $Settings)
-          {
-           if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+            foreach ($IndicatorSections as $Key => $Settings)
             {
-             $X1 = $ValuesPos[$Value]; //$X + $Key*$SectionsMargin + ($Value - $OverallMin) * $XScale;
-
-             if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE )
-              {
-               $TxtPos = $this->pChartObject->getTextBox($X1,$Y,$ValueFontName,$ValueFontSize,0,$Value.$Unit);
-               $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $TextPadding*4)/2);
-
-               $this->pChartObject->drawFilledCircle($X1,$Y,$Radius+4,array("R"=>$Settings["R"]+20,"G"=>$Settings["G"]+20,"B"=>$Settings["B"]+20));
-               $this->pChartObject->drawFilledCircle($X1,$Y,$Radius,array("R"=>255,"G"=>255,"B"=>255));
-
-               $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize);
-               $this->pChartObject->drawText($X1-1,$Y-1,$Value.$Unit,$TextSettings);
-              }
-             elseif( $ValueDisplay == INDICATOR_VALUE_LABEL )
-              {
-               $Caption = "";
-               $Caption[] = array("Format"=>array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>100),"Caption"=>$Value.$Unit);
-               $this->pChartObject->drawLabelBox(floor($X1),floor($Y)+2,"Value - ".$Settings["Caption"],$Caption);
-              }
+            if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+            {
+                $X1 = $ValuesPos[$Value]; //$X + $Key*$SectionsMargin + ($Value - $OverallMin) * $XScale;
+
+                if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE )
+                {
+                $TxtPos = $this->pChartObject->getTextBox($X1,$Y,$ValueFontName,$ValueFontSize,0,$Value.$Unit);
+                $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $TextPadding*4)/2);
+
+                $this->pChartObject->drawFilledCircle($X1,$Y,$Radius+4,array("R"=>$Settings["R"]+20,"G"=>$Settings["G"]+20,"B"=>$Settings["B"]+20));
+                $this->pChartObject->drawFilledCircle($X1,$Y,$Radius,array("R"=>255,"G"=>255,"B"=>255));
+
+                $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize);
+                $this->pChartObject->drawText($X1-1,$Y-1,$Value.$Unit,$TextSettings);
+                }
+                elseif( $ValueDisplay == INDICATOR_VALUE_LABEL )
+                {
+                $Caption = "";
+                $Caption[] = array("Format"=>array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>100),"Caption"=>$Value.$Unit);
+                $this->pChartObject->drawLabelBox(floor($X1),floor($Y)+2,"Value - ".$Settings["Caption"],$Caption);
+                }
+            }
+            $X1 = $X2 + $SectionsMargin;
             }
-           $X1 = $X2 + $SectionsMargin;
-          }
         }
-      }
-     $this->pChartObject->Shadow = $RestoreShadow;
+        }
+        $this->pChartObject->Shadow = $RestoreShadow;
+    }
     }
-  }
 ?>
\ No newline at end of file

Spacing +84 added lines, -84 removed lines

@@ -13,14 +13,14 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("INDICATOR_CAPTION_DEFAULT"	, 700001);
- define("INDICATOR_CAPTION_EXTENDED"	, 700002);
+ define("INDICATOR_CAPTION_DEFAULT", 700001);
+ define("INDICATOR_CAPTION_EXTENDED", 700002);
 
- define("INDICATOR_CAPTION_INSIDE"	, 700011);
- define("INDICATOR_CAPTION_BOTTOM"	, 700012);
+ define("INDICATOR_CAPTION_INSIDE", 700011);
+ define("INDICATOR_CAPTION_BOTTOM", 700012);
 
- define("INDICATOR_VALUE_BUBBLE"	, 700021);
- define("INDICATOR_VALUE_LABEL"		, 700022);
+ define("INDICATOR_VALUE_BUBBLE", 700021);
+ define("INDICATOR_VALUE_LABEL", 700022);
 
  /* pIndicator class definition */
  class pIndicator
@@ -34,24 +34,24 @@ 
     }
 
    /* Draw an indicator */
-   function draw($X,$Y,$Width,$Height,$Format="")
+   function draw($X, $Y, $Width, $Height, $Format = "")
     {
-     $Values			= isset($Format["Values"]) ? $Format["Values"] : VOID;
-     $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
+     $Values = isset($Format["Values"]) ? $Format["Values"] : VOID;
+     $IndicatorSections = isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
      $ValueDisplay		= isset($Format["ValueDisplay"]) ? $Format["ValueDisplay"] : INDICATOR_VALUE_BUBBLE;
-     $SectionsMargin		= isset($Format["SectionsMargin"]) ? $Format["SectionsMargin"] : 4;
+     $SectionsMargin = isset($Format["SectionsMargin"]) ? $Format["SectionsMargin"] : 4;
      $DrawLeftHead		= isset($Format["DrawLeftHead"]) ? $Format["DrawLeftHead"] : TRUE;
      $DrawRightHead		= isset($Format["DrawRightHead"]) ? $Format["DrawRightHead"] : TRUE;
-     $HeadSize			= isset($Format["HeadSize"]) ? $Format["HeadSize"] : floor($Height/4);
-     $TextPadding		= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 4;
+     $HeadSize = isset($Format["HeadSize"]) ? $Format["HeadSize"] : floor($Height/4);
+     $TextPadding = isset($Format["TextPadding"]) ? $Format["TextPadding"] : 4;
      $CaptionLayout		= isset($Format["CaptionLayout"]) ? $Format["CaptionLayout"] : INDICATOR_CAPTION_EXTENDED;
-     $CaptionPosition		= isset($Format["CaptionPosition"]) ? $Format["CaptionPosition"] : INDICATOR_CAPTION_INSIDE;
-     $CaptionColorFactor	= isset($Format["CaptionColorFactor"]) ? $Format["CaptionColorFactor"] : NULL;
+     $CaptionPosition = isset($Format["CaptionPosition"]) ? $Format["CaptionPosition"] : INDICATOR_CAPTION_INSIDE;
+     $CaptionColorFactor = isset($Format["CaptionColorFactor"]) ? $Format["CaptionColorFactor"] : NULL;
      $CaptionR			= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
      $CaptionG			= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
      $CaptionB			= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
-     $CaptionAlpha		= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
-     $SubCaptionColorFactor	= isset($Format["SubCaptionColorFactor"]) ? $Format["SubCaptionColorFactor"] : NULL;
+     $CaptionAlpha = isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
+     $SubCaptionColorFactor = isset($Format["SubCaptionColorFactor"]) ? $Format["SubCaptionColorFactor"] : NULL;
      $SubCaptionR		= isset($Format["SubCaptionR"]) ? $Format["SubCaptionR"] : 50;
      $SubCaptionG		= isset($Format["SubCaptionG"]) ? $Format["SubCaptionG"] : 50;
      $SubCaptionB		= isset($Format["SubCaptionB"]) ? $Format["SubCaptionB"] : 50;
@@ -60,109 +60,109 @@ 
      $ValueFontSize		= isset($Format["ValueFontSize"]) ? $Format["ValueFontSize"] : $this->pChartObject->FontSize;
      $CaptionFontName		= isset($Format["CaptionFontName"]) ? $Format["CaptionFontName"] : $this->pChartObject->FontName;
      $CaptionFontSize		= isset($Format["CaptionFontSize"]) ? $Format["CaptionFontSize"] : $this->pChartObject->FontSize;
-     $Unit			= isset($Format["Unit"]) ? $Format["Unit"] : "";
+     $Unit = isset($Format["Unit"]) ? $Format["Unit"] : "";
 
      /* Convert the Values to display to an array if needed */
-     if ( !is_array($Values) ) { $Value = $Values; $Values = ""; $Values[] = $Value; }
+     if (!is_array($Values)) { $Value = $Values; $Values = ""; $Values[] = $Value; }
 
      /* No section, let's die */
-     if ( $IndicatorSections == NULL ) { return(0); }
+     if ($IndicatorSections == NULL) { return(0); }
 
      /* Determine indicator visual configuration */
      $OverallMin = $IndicatorSections[0]["End"]; $OverallMax = $IndicatorSections[0]["Start"];
      foreach ($IndicatorSections as $Key => $Settings)
       {
-       if ( $Settings["End"] > $OverallMax )   { $OverallMax = $Settings["End"]; }
-       if ( $Settings["Start"] < $OverallMin ) { $OverallMin = $Settings["Start"]; }
+       if ($Settings["End"] > $OverallMax) { $OverallMax = $Settings["End"]; }
+       if ($Settings["Start"] < $OverallMin) { $OverallMin = $Settings["Start"]; }
       }
-     $RealWidth = $Width - (count($IndicatorSections)-1)*$SectionsMargin;
-     $XScale    = $RealWidth / ($OverallMax-$OverallMin);
+     $RealWidth = $Width - (count($IndicatorSections) - 1)*$SectionsMargin;
+     $XScale    = $RealWidth/($OverallMax - $OverallMin);
 
      $X1 = $X; $ValuesPos = "";
      foreach ($IndicatorSections as $Key => $Settings)
       {
-       $Color      = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]);
+       $Color      = array("R"=>$Settings["R"], "G"=>$Settings["G"], "B"=>$Settings["B"]);
        $Caption    = $Settings["Caption"];
        $SubCaption = $Settings["Start"]." - ".$Settings["End"];
 
-       $X2 = $X1 + ($Settings["End"] - $Settings["Start"]) * $XScale;
+       $X2 = $X1 + ($Settings["End"] - $Settings["Start"])*$XScale;
 
-       if ( $Key == 0 && $DrawLeftHead )
+       if ($Key == 0 && $DrawLeftHead)
         {
-         $Poly = ""; $Poly[] = $X1-1; $Poly[] = $Y; $Poly[] = $X1-1; $Poly[] = $Y+$Height; $Poly[] = $X1-1-$HeadSize; $Poly[] = $Y+($Height/2);
-         $this->pChartObject->drawPolygon($Poly,$Color);
-         $this->pChartObject->drawLine($X1-2,$Y,$X1-2-$HeadSize,$Y+($Height/2),$Color);
-         $this->pChartObject->drawLine($X1-2,$Y+$Height,$X1-2-$HeadSize,$Y+($Height/2),$Color);
+         $Poly = ""; $Poly[] = $X1 - 1; $Poly[] = $Y; $Poly[] = $X1 - 1; $Poly[] = $Y + $Height; $Poly[] = $X1 - 1 - $HeadSize; $Poly[] = $Y + ($Height/2);
+         $this->pChartObject->drawPolygon($Poly, $Color);
+         $this->pChartObject->drawLine($X1 - 2, $Y, $X1 - 2 - $HeadSize, $Y + ($Height/2), $Color);
+         $this->pChartObject->drawLine($X1 - 2, $Y + $Height, $X1 - 2 - $HeadSize, $Y + ($Height/2), $Color);
         }
 
        /* Determine the position of the breaks */
        $Break = "";
-       foreach($Values as $iKey => $Value)
+       foreach ($Values as $iKey => $Value)
         {
-         if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+         if ($Value >= $Settings["Start"] && $Value <= $Settings["End"])
           {
-           $XBreak  = $X1 + ($Value - $Settings["Start"]) * $XScale;
+           $XBreak  = $X1 + ($Value - $Settings["Start"])*$XScale;
            $ValuesPos[$Value] = $XBreak;
            $Break[] = floor($XBreak);
           }
         }
 
-       if ( $ValueDisplay == INDICATOR_VALUE_LABEL )
+       if ($ValueDisplay == INDICATOR_VALUE_LABEL)
         {
-         if ( $Break == "" )
-          $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
+         if ($Break == "")
+          $this->pChartObject->drawFilledRectangle($X1, $Y, $X2, $Y + $Height, $Color);
          else
           {
            sort($Break);
            $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = FALSE;
-           foreach($Break as $iKey => $Value)
+           foreach ($Break as $iKey => $Value)
             {
-             if ( $Value-5 >= $X1 )
-              { $Poly[] = $Value-5; $Poly[] = $Y; }
-             elseif ($X1 - ($Value-5) > 0 )
+             if ($Value - 5 >= $X1)
+              { $Poly[] = $Value - 5; $Poly[] = $Y; }
+             elseif ($X1 - ($Value - 5) > 0)
               {
-               $Offset = $X1 - ($Value-5);
+               $Offset = $X1 - ($Value - 5);
                $Poly = ""; $Poly[] = $X1; $Poly[] = $Y + $Offset;
               }
 
-             $Poly[] = $Value;   $Poly[] = $Y+5;
+             $Poly[] = $Value; $Poly[] = $Y + 5;
 
-             if ( $Value+5 <= $X2 )
-              { $Poly[] = $Value+5; $Poly[] = $Y; }
-             elseif (($Value+5) > $X2 )
+             if ($Value + 5 <= $X2)
+              { $Poly[] = $Value + 5; $Poly[] = $Y; }
+             elseif (($Value + 5) > $X2)
               {
-               $Offset = ($Value+5) - $X2;
+               $Offset = ($Value + 5) - $X2;
                $Poly[] = $X2; $Poly[] = $Y + $Offset;
                $LastPointWritten = TRUE;
               }
 
             }
-           if ( !$LastPointWritten ) { $Poly[] = $X2; $Poly[] = $Y; }
-           $Poly[] = $X2; $Poly[] = $Y+$Height;
-           $Poly[] = $X1; $Poly[] = $Y+$Height;
+           if (!$LastPointWritten) { $Poly[] = $X2; $Poly[] = $Y; }
+           $Poly[] = $X2; $Poly[] = $Y + $Height;
+           $Poly[] = $X1; $Poly[] = $Y + $Height;
 
-           $this->pChartObject->drawPolygon($Poly,$Color);
+           $this->pChartObject->drawPolygon($Poly, $Color);
           }
         }
        else
-        $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
+        $this->pChartObject->drawFilledRectangle($X1, $Y, $X2, $Y + $Height, $Color);
 
-       if ( $Key == count($IndicatorSections)-1 && $DrawRightHead )
+       if ($Key == count($IndicatorSections) - 1 && $DrawRightHead)
         {
-         $Poly = ""; $Poly[] = $X2+1; $Poly[] = $Y; $Poly[] = $X2+1; $Poly[] = $Y+$Height; $Poly[] = $X2+1+$HeadSize; $Poly[] = $Y+($Height/2);
-         $this->pChartObject->drawPolygon($Poly,$Color);
-         $this->pChartObject->drawLine($X2+1,$Y,$X2+1+$HeadSize,$Y+($Height/2),$Color);
-         $this->pChartObject->drawLine($X2+1,$Y+$Height,$X2+1+$HeadSize,$Y+($Height/2),$Color);
+         $Poly = ""; $Poly[] = $X2 + 1; $Poly[] = $Y; $Poly[] = $X2 + 1; $Poly[] = $Y + $Height; $Poly[] = $X2 + 1 + $HeadSize; $Poly[] = $Y + ($Height/2);
+         $this->pChartObject->drawPolygon($Poly, $Color);
+         $this->pChartObject->drawLine($X2 + 1, $Y, $X2 + 1 + $HeadSize, $Y + ($Height/2), $Color);
+         $this->pChartObject->drawLine($X2 + 1, $Y + $Height, $X2 + 1 + $HeadSize, $Y + ($Height/2), $Color);
         }
 
-       if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE )
+       if ($CaptionPosition == INDICATOR_CAPTION_INSIDE)
         {
-         $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
+         $TxtPos  = $this->pChartObject->getTextBox($X1, $Y + $Height + $TextPadding, $CaptionFontName, $CaptionFontSize, 0, $Caption);
          $YOffset = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding;
 
-         if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
+         if ($CaptionLayout == INDICATOR_CAPTION_EXTENDED)
           {
-           $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$SubCaption);
+           $TxtPos  = $this->pChartObject->getTextBox($X1, $Y + $Height + $TextPadding, $CaptionFontName, $CaptionFontSize, 0, $SubCaption);
            $YOffset = $YOffset + ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding*2;
           }
 
@@ -171,28 +171,28 @@ 
        else
         { $YOffset = 0; $XOffset = 0; }
 
-       if ( $CaptionColorFactor == NULL )
-        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); }
+       if ($CaptionColorFactor == NULL)
+        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT, "FontName"=>$CaptionFontName, "FontSize"=>$CaptionFontSize, "R"=>$CaptionR, "G"=>$CaptionG, "B"=>$CaptionB, "Alpha"=>$CaptionAlpha); }
        else
-        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$CaptionColorFactor,"G"=>$Settings["G"]+$CaptionColorFactor,"B"=>$Settings["B"]+$CaptionColorFactor); }
+        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT, "FontName"=>$CaptionFontName, "FontSize"=>$CaptionFontSize, "R"=>$Settings["R"] + $CaptionColorFactor, "G"=>$Settings["G"] + $CaptionColorFactor, "B"=>$Settings["B"] + $CaptionColorFactor); }
 
-       if ( $SubCaptionColorFactor == NULL )
-        $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$SubCaptionR,"G"=>$SubCaptionG,"B"=>$SubCaptionB,"Alpha"=>$SubCaptionAlpha);
+       if ($SubCaptionColorFactor == NULL)
+        $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT, "FontName"=>$CaptionFontName, "FontSize"=>$CaptionFontSize, "R"=>$SubCaptionR, "G"=>$SubCaptionG, "B"=>$SubCaptionB, "Alpha"=>$SubCaptionAlpha);
        else
-        $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$SubCaptionColorFactor,"G"=>$Settings["G"]+$SubCaptionColorFactor,"B"=>$Settings["B"]+$SubCaptionColorFactor);
+        $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT, "FontName"=>$CaptionFontName, "FontSize"=>$CaptionFontSize, "R"=>$Settings["R"] + $SubCaptionColorFactor, "G"=>$Settings["G"] + $SubCaptionColorFactor, "B"=>$Settings["B"] + $SubCaptionColorFactor);
 
        $RestoreShadow = $this->pChartObject->Shadow;
        $this->pChartObject->Shadow = FALSE;
 
-       if ( $CaptionLayout == INDICATOR_CAPTION_DEFAULT )
-        $this->pChartObject->drawText($X1,$Y+$Height+$TextPadding,$Caption,$CaptionColor);
-       elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
+       if ($CaptionLayout == INDICATOR_CAPTION_DEFAULT)
+        $this->pChartObject->drawText($X1, $Y + $Height + $TextPadding, $Caption, $CaptionColor);
+       elseif ($CaptionLayout == INDICATOR_CAPTION_EXTENDED)
         {
-         $TxtPos        = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
+         $TxtPos        = $this->pChartObject->getTextBox($X1, $Y + $Height + $TextPadding, $CaptionFontName, $CaptionFontSize, 0, $Caption);
          $CaptionHeight = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
 
-         $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$TextPadding,$Caption,$CaptionColor);
-         $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$CaptionHeight+$TextPadding*2,$SubCaption,$SubCaptionColor);
+         $this->pChartObject->drawText($X1 + $XOffset, $Y + $Height - $YOffset + $TextPadding, $Caption, $CaptionColor);
+         $this->pChartObject->drawText($X1 + $XOffset, $Y + $Height - $YOffset + $CaptionHeight + $TextPadding*2, $SubCaption, $SubCaptionColor);
         }
 
        $this->pChartObject->Shadow = $RestoreShadow;
@@ -203,32 +203,32 @@ 
      $RestoreShadow = $this->pChartObject->Shadow;
      $this->pChartObject->Shadow = FALSE;
 
-     foreach($Values as $Key => $Value)
+     foreach ($Values as $Key => $Value)
       {
-       if ( $Value >= $OverallMin && $Value <= $OverallMax )
+       if ($Value >= $OverallMin && $Value <= $OverallMax)
         {
          foreach ($IndicatorSections as $Key => $Settings)
           {
-           if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+           if ($Value >= $Settings["Start"] && $Value <= $Settings["End"])
             {
              $X1 = $ValuesPos[$Value]; //$X + $Key*$SectionsMargin + ($Value - $OverallMin) * $XScale;
 
-             if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE )
+             if ($ValueDisplay == INDICATOR_VALUE_BUBBLE)
               {
-               $TxtPos = $this->pChartObject->getTextBox($X1,$Y,$ValueFontName,$ValueFontSize,0,$Value.$Unit);
+               $TxtPos = $this->pChartObject->getTextBox($X1, $Y, $ValueFontName, $ValueFontSize, 0, $Value.$Unit);
                $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $TextPadding*4)/2);
 
-               $this->pChartObject->drawFilledCircle($X1,$Y,$Radius+4,array("R"=>$Settings["R"]+20,"G"=>$Settings["G"]+20,"B"=>$Settings["B"]+20));
-               $this->pChartObject->drawFilledCircle($X1,$Y,$Radius,array("R"=>255,"G"=>255,"B"=>255));
+               $this->pChartObject->drawFilledCircle($X1, $Y, $Radius + 4, array("R"=>$Settings["R"] + 20, "G"=>$Settings["G"] + 20, "B"=>$Settings["B"] + 20));
+               $this->pChartObject->drawFilledCircle($X1, $Y, $Radius, array("R"=>255, "G"=>255, "B"=>255));
 
-               $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize);
-               $this->pChartObject->drawText($X1-1,$Y-1,$Value.$Unit,$TextSettings);
+               $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE, "FontName"=>$ValueFontName, "FontSize"=>$ValueFontSize);
+               $this->pChartObject->drawText($X1 - 1, $Y - 1, $Value.$Unit, $TextSettings);
               }
-             elseif( $ValueDisplay == INDICATOR_VALUE_LABEL )
+             elseif ($ValueDisplay == INDICATOR_VALUE_LABEL)
               {
                $Caption = "";
-               $Caption[] = array("Format"=>array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>100),"Caption"=>$Value.$Unit);
-               $this->pChartObject->drawLabelBox(floor($X1),floor($Y)+2,"Value - ".$Settings["Caption"],$Caption);
+               $Caption[] = array("Format"=>array("R"=>$Settings["R"], "G"=>$Settings["G"], "B"=>$Settings["B"], "Alpha"=>100), "Caption"=>$Value.$Unit);
+               $this->pChartObject->drawLabelBox(floor($X1), floor($Y) + 2, "Value - ".$Settings["Caption"], $Caption);
               }
             }
            $X1 = $X2 + $SectionsMargin;

Braces +26 added lines, -55 removed lines

@@ -23,19 +23,16 @@ 
  define("INDICATOR_VALUE_LABEL"		, 700022);
 
  /* pIndicator class definition */
- class pIndicator
-  {
+ class pIndicator {
    var $pChartObject;
 
    /* Class creator */
-   function pIndicator($pChartObject)
-    {
+   function pIndicator($pChartObject) {
      $this->pChartObject = $pChartObject;
     }
 
    /* Draw an indicator */
-   function draw($X,$Y,$Width,$Height,$Format="")
-    {
+   function draw($X,$Y,$Width,$Height,$Format="") {
      $Values			= isset($Format["Values"]) ? $Format["Values"] : VOID;
      $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
      $ValueDisplay		= isset($Format["ValueDisplay"]) ? $Format["ValueDisplay"] : INDICATOR_VALUE_BUBBLE;
@@ -70,8 +67,7 @@ 
 
      /* Determine indicator visual configuration */
      $OverallMin = $IndicatorSections[0]["End"]; $OverallMax = $IndicatorSections[0]["Start"];
-     foreach ($IndicatorSections as $Key => $Settings)
-      {
+     foreach ($IndicatorSections as $Key => $Settings) {
        if ( $Settings["End"] > $OverallMax )   { $OverallMax = $Settings["End"]; }
        if ( $Settings["Start"] < $OverallMin ) { $OverallMin = $Settings["Start"]; }
       }
@@ -79,16 +75,14 @@ 
      $XScale    = $RealWidth / ($OverallMax-$OverallMin);
 
      $X1 = $X; $ValuesPos = "";
-     foreach ($IndicatorSections as $Key => $Settings)
-      {
+     foreach ($IndicatorSections as $Key => $Settings) {
        $Color      = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]);
        $Caption    = $Settings["Caption"];
        $SubCaption = $Settings["Start"]." - ".$Settings["End"];
 
        $X2 = $X1 + ($Settings["End"] - $Settings["Start"]) * $XScale;
 
-       if ( $Key == 0 && $DrawLeftHead )
-        {
+       if ( $Key == 0 && $DrawLeftHead ) {
          $Poly = ""; $Poly[] = $X1-1; $Poly[] = $Y; $Poly[] = $X1-1; $Poly[] = $Y+$Height; $Poly[] = $X1-1-$HeadSize; $Poly[] = $Y+($Height/2);
          $this->pChartObject->drawPolygon($Poly,$Color);
          $this->pChartObject->drawLine($X1-2,$Y,$X1-2-$HeadSize,$Y+($Height/2),$Color);
@@ -97,30 +91,23 @@ 
 
        /* Determine the position of the breaks */
        $Break = "";
-       foreach($Values as $iKey => $Value)
-        {
-         if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
-          {
+       foreach($Values as $iKey => $Value) {
+         if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] ) {
            $XBreak  = $X1 + ($Value - $Settings["Start"]) * $XScale;
            $ValuesPos[$Value] = $XBreak;
            $Break[] = floor($XBreak);
           }
         }
 
-       if ( $ValueDisplay == INDICATOR_VALUE_LABEL )
-        {
+       if ( $ValueDisplay == INDICATOR_VALUE_LABEL ) {
          if ( $Break == "" )
           $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
-         else
-          {
+         else {
            sort($Break);
            $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = FALSE;
-           foreach($Break as $iKey => $Value)
-            {
+           foreach($Break as $iKey => $Value) {
              if ( $Value-5 >= $X1 )
-              { $Poly[] = $Value-5; $Poly[] = $Y; }
-             elseif ($X1 - ($Value-5) > 0 )
-              {
+              { $Poly[] = $Value-5; $Poly[] = $Y; } elseif ($X1 - ($Value-5) > 0 ) {
                $Offset = $X1 - ($Value-5);
                $Poly = ""; $Poly[] = $X1; $Poly[] = $Y + $Offset;
               }
@@ -128,9 +115,7 @@ 
              $Poly[] = $Value;   $Poly[] = $Y+5;
 
              if ( $Value+5 <= $X2 )
-              { $Poly[] = $Value+5; $Poly[] = $Y; }
-             elseif (($Value+5) > $X2 )
-              {
+              { $Poly[] = $Value+5; $Poly[] = $Y; } elseif (($Value+5) > $X2 ) {
                $Offset = ($Value+5) - $X2;
                $Poly[] = $X2; $Poly[] = $Y + $Offset;
                $LastPointWritten = TRUE;
@@ -143,37 +128,31 @@ 
 
            $this->pChartObject->drawPolygon($Poly,$Color);
           }
-        }
-       else
+        } else
         $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
 
-       if ( $Key == count($IndicatorSections)-1 && $DrawRightHead )
-        {
+       if ( $Key == count($IndicatorSections)-1 && $DrawRightHead ) {
          $Poly = ""; $Poly[] = $X2+1; $Poly[] = $Y; $Poly[] = $X2+1; $Poly[] = $Y+$Height; $Poly[] = $X2+1+$HeadSize; $Poly[] = $Y+($Height/2);
          $this->pChartObject->drawPolygon($Poly,$Color);
          $this->pChartObject->drawLine($X2+1,$Y,$X2+1+$HeadSize,$Y+($Height/2),$Color);
          $this->pChartObject->drawLine($X2+1,$Y+$Height,$X2+1+$HeadSize,$Y+($Height/2),$Color);
         }
 
-       if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE )
-        {
+       if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE ) {
          $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
          $YOffset = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding;
 
-         if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
-          {
+         if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED ) {
            $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$SubCaption);
            $YOffset = $YOffset + ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding*2;
           }
 
          $XOffset = $TextPadding;
-        }
-       else
+        } else
         { $YOffset = 0; $XOffset = 0; }
 
        if ( $CaptionColorFactor == NULL )
-        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); }
-       else
+        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); } else
         { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$CaptionColorFactor,"G"=>$Settings["G"]+$CaptionColorFactor,"B"=>$Settings["B"]+$CaptionColorFactor); }
 
        if ( $SubCaptionColorFactor == NULL )
@@ -186,8 +165,7 @@ 
 
        if ( $CaptionLayout == INDICATOR_CAPTION_DEFAULT )
         $this->pChartObject->drawText($X1,$Y+$Height+$TextPadding,$Caption,$CaptionColor);
-       elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
-        {
+       elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED ) {
          $TxtPos        = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
          $CaptionHeight = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
 
@@ -203,18 +181,13 @@ 
      $RestoreShadow = $this->pChartObject->Shadow;
      $this->pChartObject->Shadow = FALSE;
 
-     foreach($Values as $Key => $Value)
-      {
-       if ( $Value >= $OverallMin && $Value <= $OverallMax )
-        {
-         foreach ($IndicatorSections as $Key => $Settings)
-          {
-           if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
-            {
+     foreach($Values as $Key => $Value) {
+       if ( $Value >= $OverallMin && $Value <= $OverallMax ) {
+         foreach ($IndicatorSections as $Key => $Settings) {
+           if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] ) {
              $X1 = $ValuesPos[$Value]; //$X + $Key*$SectionsMargin + ($Value - $OverallMin) * $XScale;
 
-             if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE )
-              {
+             if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE ) {
                $TxtPos = $this->pChartObject->getTextBox($X1,$Y,$ValueFontName,$ValueFontSize,0,$Value.$Unit);
                $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $TextPadding*4)/2);
 
@@ -223,9 +196,7 @@ 
 
                $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize);
                $this->pChartObject->drawText($X1-1,$Y-1,$Value.$Unit,$TextSettings);
-              }
-             elseif( $ValueDisplay == INDICATOR_VALUE_LABEL )
-              {
+              } elseif( $ValueDisplay == INDICATOR_VALUE_LABEL ) {
                $Caption = "";
                $Caption[] = array("Format"=>array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>100),"Caption"=>$Value.$Unit);
                $this->pChartObject->drawLabelBox(floor($X1),floor($Y)+2,"Value - ".$Settings["Caption"],$Caption);

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

@@ -37,21 +37,21 @@ 
    function draw($X,$Y,$Width,$Height,$Format="")
     {
      $Values			= isset($Format["Values"]) ? $Format["Values"] : VOID;
-     $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
+     $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : null;
      $ValueDisplay		= isset($Format["ValueDisplay"]) ? $Format["ValueDisplay"] : INDICATOR_VALUE_BUBBLE;
      $SectionsMargin		= isset($Format["SectionsMargin"]) ? $Format["SectionsMargin"] : 4;
-     $DrawLeftHead		= isset($Format["DrawLeftHead"]) ? $Format["DrawLeftHead"] : TRUE;
-     $DrawRightHead		= isset($Format["DrawRightHead"]) ? $Format["DrawRightHead"] : TRUE;
+     $DrawLeftHead		= isset($Format["DrawLeftHead"]) ? $Format["DrawLeftHead"] : true;
+     $DrawRightHead		= isset($Format["DrawRightHead"]) ? $Format["DrawRightHead"] : true;
      $HeadSize			= isset($Format["HeadSize"]) ? $Format["HeadSize"] : floor($Height/4);
      $TextPadding		= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 4;
      $CaptionLayout		= isset($Format["CaptionLayout"]) ? $Format["CaptionLayout"] : INDICATOR_CAPTION_EXTENDED;
      $CaptionPosition		= isset($Format["CaptionPosition"]) ? $Format["CaptionPosition"] : INDICATOR_CAPTION_INSIDE;
-     $CaptionColorFactor	= isset($Format["CaptionColorFactor"]) ? $Format["CaptionColorFactor"] : NULL;
+     $CaptionColorFactor	= isset($Format["CaptionColorFactor"]) ? $Format["CaptionColorFactor"] : null;
      $CaptionR			= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
      $CaptionG			= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
      $CaptionB			= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
      $CaptionAlpha		= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
-     $SubCaptionColorFactor	= isset($Format["SubCaptionColorFactor"]) ? $Format["SubCaptionColorFactor"] : NULL;
+     $SubCaptionColorFactor	= isset($Format["SubCaptionColorFactor"]) ? $Format["SubCaptionColorFactor"] : null;
      $SubCaptionR		= isset($Format["SubCaptionR"]) ? $Format["SubCaptionR"] : 50;
      $SubCaptionG		= isset($Format["SubCaptionG"]) ? $Format["SubCaptionG"] : 50;
      $SubCaptionB		= isset($Format["SubCaptionB"]) ? $Format["SubCaptionB"] : 50;
@@ -66,7 +66,7 @@ 
      if ( !is_array($Values) ) { $Value = $Values; $Values = ""; $Values[] = $Value; }
 
      /* No section, let's die */
-     if ( $IndicatorSections == NULL ) { return(0); }
+     if ( $IndicatorSections == null ) { return(0); }
 
      /* Determine indicator visual configuration */
      $OverallMin = $IndicatorSections[0]["End"]; $OverallMax = $IndicatorSections[0]["Start"];
@@ -114,7 +114,7 @@ 
          else
           {
            sort($Break);
-           $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = FALSE;
+           $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = false;
            foreach($Break as $iKey => $Value)
             {
              if ( $Value-5 >= $X1 )
@@ -133,7 +133,7 @@ 
               {
                $Offset = ($Value+5) - $X2;
                $Poly[] = $X2; $Poly[] = $Y + $Offset;
-               $LastPointWritten = TRUE;
+               $LastPointWritten = true;
               }
 
             }
@@ -171,18 +171,18 @@ 
        else
         { $YOffset = 0; $XOffset = 0; }
 
-       if ( $CaptionColorFactor == NULL )
+       if ( $CaptionColorFactor == null )
         { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); }
        else
         { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$CaptionColorFactor,"G"=>$Settings["G"]+$CaptionColorFactor,"B"=>$Settings["B"]+$CaptionColorFactor); }
 
-       if ( $SubCaptionColorFactor == NULL )
+       if ( $SubCaptionColorFactor == null )
         $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$SubCaptionR,"G"=>$SubCaptionG,"B"=>$SubCaptionB,"Alpha"=>$SubCaptionAlpha);
        else
         $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$SubCaptionColorFactor,"G"=>$Settings["G"]+$SubCaptionColorFactor,"B"=>$Settings["B"]+$SubCaptionColorFactor);
 
        $RestoreShadow = $this->pChartObject->Shadow;
-       $this->pChartObject->Shadow = FALSE;
+       $this->pChartObject->Shadow = false;
 
        if ( $CaptionLayout == INDICATOR_CAPTION_DEFAULT )
         $this->pChartObject->drawText($X1,$Y+$Height+$TextPadding,$Caption,$CaptionColor);
@@ -201,7 +201,7 @@ 
       }
 
      $RestoreShadow = $this->pChartObject->Shadow;
-     $this->pChartObject->Shadow = FALSE;
+     $this->pChartObject->Shadow = false;
 
      foreach($Values as $Key => $Value)
       {