BOINC / boinc

drupal/sites/default/boinc/modules/contrib/privatemsg/privatemsg.api.php

Indentation +55 added lines, -55 removed lines

@@ -122,20 +122,20 @@ 
  *   Names that are already in the list and are excluded
  */
 function hook_privatemsg_sql_autocomplete_alter(&$fragments, $search, $names) {
-  global $user;
-  // Extend the query that searches for usernames
+    global $user;
+    // Extend the query that searches for usernames
 
-  // $fragments is explained in the api documentation in detail
+    // $fragments is explained in the api documentation in detail
 
-  // The query is already set up, it's searching for usernames which start with
-  // $search and are not $names (may be empty)
-  // the main table is {user} a
+    // The query is already set up, it's searching for usernames which start with
+    // $search and are not $names (may be empty)
+    // the main table is {user} a
 
-  // for example, add a join on a table where the user connections are stored
-  // and specify that only users connected with the current user should be
-  // loaded.
-  $fragments['inner_join'] = 'INNER JOIN {my_table} m ON (m.user1 = u.uid AND m.user2 = %d)';
-  $fragments['query_args'][] = $user->uid;
+    // for example, add a join on a table where the user connections are stored
+    // and specify that only users connected with the current user should be
+    // loaded.
+    $fragments['inner_join'] = 'INNER JOIN {my_table} m ON (m.user1 = u.uid AND m.user2 = %d)';
+    $fragments['query_args'][] = $user->uid;
 }
 
 /**
@@ -157,7 +157,7 @@ 
  *   Query fragments array.
  * @param $pmid
  *   the id of the message.
-  * @param $account
+ * @param $account
  *   User object of account for which to load the message.
  */
 function hook_privatemsg_sql_load_alter(&$fragments, $pmid, $account = NULL) {
@@ -274,7 +274,7 @@ 
  *    Message array
  */
 function hook_privatemsg_message_load($message) {
-  return array('my_key' => 'my_value');
+    return array('my_key' => 'my_value');
 }
 
 /**
@@ -302,17 +302,17 @@ 
  *   Message array
  */
 function hook_privatemsg_message_validate($message, $form = FALSE) {
-  global $_privatemsg_invalid_recipients;
-  $_privatemsg_invalid_recipients = array();
+    global $_privatemsg_invalid_recipients;
+    $_privatemsg_invalid_recipients = array();
 
-  $errors = array();
+    $errors = array();
 
-  foreach ($message['recipients'] as $recipient) {
+    foreach ($message['recipients'] as $recipient) {
     if ($recipient->name == 'blocked user') {
-      $_privatemsg_invalid_recipients[] = $recipient->uid;
-      $errors[] = t('%name has chosen to not recieve any more messages from you.', array('%name' => $recipient->name));
+        $_privatemsg_invalid_recipients[] = $recipient->uid;
+        $errors[] = t('%name has chosen to not recieve any more messages from you.', array('%name' => $recipient->name));
+    }
     }
-  }
 }
 
 /**
@@ -325,11 +325,11 @@ 
  *   Message array
  */
 function hook_privatemsg_message_presave_alter(&$message) {
-  // delete recipients which have been marked as invalid
-  global $_privatemsg_invalid_recipients;
-  foreach ($_privatemsg_invalid_recipients as $invalid) {
+    // delete recipients which have been marked as invalid
+    global $_privatemsg_invalid_recipients;
+    foreach ($_privatemsg_invalid_recipients as $invalid) {
     unset($message['recipients'][$invalid]);
-  }
+    }
 }
 /**
  * Act on the $vars before a message is displayed.
@@ -341,8 +341,8 @@ 
  *   Template variables
  */
 function hook_privatemsg_message_view_alter(&$var) {
-  // add a link to each message
-  $vars['message_links'][] = array('title' => t('My link'), 'href' => '/path/to/my/action/'. $vars['message']['mid']);
+    // add a link to each message
+    $vars['message_links'][] = array('title' => t('My link'), 'href' => '/path/to/my/action/'. $vars['message']['mid']);
 }
 
 /**
@@ -355,7 +355,7 @@ 
  *   Message array
  */
 function hook_privatemsg_message_insert($message) {
-  _mymodule_save_data($message['mid']);
+    _mymodule_save_data($message['mid']);
 }
 
 /**
@@ -384,41 +384,41 @@ 
  *   message (The reason why the recipient has been blocked).
  */
 function hook_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 checked 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;
 }
 /**
  * Add content to the view thread page.
@@ -452,16 +452,16 @@ 
  * @see privatemsg_list_submit()
  */
 function hook_privatemsg_thread_operations() {
-  return array(
+    return array(
     'operation key' => array(
-      'label' => 'Label of the operation. Only use this if the operation
+        'label' => 'Label of the operation. Only use this if the operation
                   should be displayed automatically in the action form',
-      'callback' => 'privatemsg_thread_change_status', // Function callback that will be executed.
-      'callback arguments' => array('status' => PRIVATEMSG_READ), // Additional arguments to above function
-      'undo callback' => 'privatemsg_thread_change_status',  // Provide a function which can "undo" the operation. Optional.
-      'undo callback arguments' => array('status' => PRIVATEMSG_UNREAD), // Additional arguments to above function.
+        'callback' => 'privatemsg_thread_change_status', // Function callback that will be executed.
+        'callback arguments' => array('status' => PRIVATEMSG_READ), // Additional arguments to above function
+        'undo callback' => 'privatemsg_thread_change_status',  // Provide a function which can "undo" the operation. Optional.
+        'undo callback arguments' => array('status' => PRIVATEMSG_UNREAD), // Additional arguments to above function.
     ),
-  );
+    );
 }
 
 /**
@@ -474,12 +474,12 @@ 
  * up the string.
  */
 function hook_privatemsg_name_lookup($string) {
-  if ((int)$string > 0) {
+    if ((int)$string > 0) {
     // This is a possible uid, try to load a matching user.
     if ($recipient = user_load(array('uid' => $string))) {
-      return $recipient;
+        return $recipient;
+    }
     }
-  }
 }
 
 /**

Spacing +3 added lines, -3 removed lines

@@ -342,7 +342,7 @@ 
  */
 function hook_privatemsg_message_view_alter(&$var) {
   // add a link to each message
-  $vars['message_links'][] = array('title' => t('My link'), 'href' => '/path/to/my/action/'. $vars['message']['mid']);
+  $vars['message_links'][] = array('title' => t('My link'), 'href' => '/path/to/my/action/'.$vars['message']['mid']);
 }
 
 /**
@@ -406,7 +406,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.
@@ -458,7 +458,7 @@ 
                   should be displayed automatically in the action form',
       'callback' => 'privatemsg_thread_change_status', // Function callback that will be executed.
       'callback arguments' => array('status' => PRIVATEMSG_READ), // Additional arguments to above function
-      'undo callback' => 'privatemsg_thread_change_status',  // Provide a function which can "undo" the operation. Optional.
+      'undo callback' => 'privatemsg_thread_change_status', // Provide a function which can "undo" the operation. Optional.
       'undo callback arguments' => array('status' => PRIVATEMSG_UNREAD), // Additional arguments to above function.
     ),
   );

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

@@ -160,7 +160,7 @@ 
   * @param $account
  *   User object of account for which to load the message.
  */
-function hook_privatemsg_sql_load_alter(&$fragments, $pmid, $account = NULL) {
+function hook_privatemsg_sql_load_alter(&$fragments, $pmid, $account = null) {
 
 }
 
@@ -176,7 +176,7 @@ 
  * @param $load_all
  *   Deleted messages are only loaded if this is set to TRUE.
  */
-function hook_privatemsg_sql_messages_alter(&$fragments, $threads, $account = NULL, $load_all = FALSE) {
+function hook_privatemsg_sql_messages_alter(&$fragments, $threads, $account = null, $load_all = false) {
 
 }
 
@@ -301,7 +301,7 @@ 
  * @param $message
  *   Message array
  */
-function hook_privatemsg_message_validate($message, $form = FALSE) {
+function hook_privatemsg_message_validate($message, $form = false) {
   global $_privatemsg_invalid_recipients;
   $_privatemsg_invalid_recipients = array();
 

drupal/sites/default/boinc/modules/contrib/privatemsg/privatemsg_filter/privatemsg_filter.admin.inc

Indentation +57 added lines, -57 removed lines

@@ -9,39 +9,39 @@ 
  * Display a list of tags to administer them.
  */
 function privatemsg_tags_admin() {
-  drupal_set_title(t('Tags'));
+    drupal_set_title(t('Tags'));
 
-  $header = array(
+    $header = array(
     'tag' => array(
-      'data'    => t('Tag'),
-      'field'   => 'tag',
-      'class'   => 'privatemsg-filter-header-tag',
-      'sort'    => 'asc',
-      '#weight' => -40,
+        'data'    => t('Tag'),
+        'field'   => 'tag',
+        'class'   => 'privatemsg-filter-header-tag',
+        'sort'    => 'asc',
+        '#weight' => -40,
     ),
     'usage' => array(
-      'data'    => t('Usage'),
-      'field'   => 'count',
-      'class'   => 'privatemsg-filter-header-usage',
-      '#weight' => -30,
+        'data'    => t('Usage'),
+        'field'   => 'count',
+        'class'   => 'privatemsg-filter-header-usage',
+        '#weight' => -30,
     ),
     'public' => array(
-      'data'    => t('Public'),
-      'field'   => 'public',
-      'class'   => 'privatemsg-filter-header-public',
-      '#weight' => -20,
+        'data'    => t('Public'),
+        'field'   => 'public',
+        'class'   => 'privatemsg-filter-header-public',
+        '#weight' => -20,
     ),
     'operations' => array(
-      'data'    => t('Operations'),
-      'class'   => 'privatemsg-filter-header-operations',
-      '#weight' => -10,
+        'data'    => t('Operations'),
+        'class'   => 'privatemsg-filter-header-operations',
+        '#weight' => -10,
     ),
-  );
-  $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'));
-  $result = pager_query($query['query'] . tablesort_sql($header), 100);
+    );
+    $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'));
+    $result = pager_query($query['query'] . tablesort_sql($header), 100);
 
-  $rows = array();
-  while ($tag = db_fetch_array($result)) {
+    $rows = array();
+    while ($tag = db_fetch_array($result)) {
     $row = array();
     $row['tag'] = check_plain($tag['tag']);
     $row['count'] = $tag['count'];
@@ -50,14 +50,14 @@ 
     $row['operations'] .= ' ' . l(t('delete'), 'admin/settings/messages/tags/delete/' . $tag['tag_id']);
 
     $rows[] = $row;
-  }
+    }
 
-  if (empty($rows)) {
+    if (empty($rows)) {
     // Display a message if now tags are available.
     $rows[] = array(array('data' => t('No tags available.'), 'colspan' => count($header)));
-  }
+    }
 
-  return theme('table', $header, $rows) . theme('pager');
+    return theme('table', $header, $rows) . theme('pager');
 }
 
 /**
@@ -70,36 +70,36 @@ 
  *   new tag form.
  */
 function privatemsg_tags_form(&$form_state, $tag_id = NULL) {
-  $form = array();
+    $form = array();
 
-  if ($tag_id) {
+    if ($tag_id) {
     $tag = db_fetch_array(db_query('SELECT * from {pm_tags} pmt WHERE pmt.tag_id = %d', $tag_id));
     $form['tag_id'] = array(
-      '#value' => $tag_id,
-      '#type' => 'value',
+        '#value' => $tag_id,
+        '#type' => 'value',
     );
     drupal_set_title(t('Edit @tag', array('@tag' => $tag['tag'])));
-  }
+    }
 
-  $form['tag'] = array(
+    $form['tag'] = array(
     '#title' => t('Name'),
     '#type' => 'textfield',
     '#default_value' => empty($tag_id) ? NULL : $tag['tag'],
-  );
+    );
 
-  $form['public'] = array(
+    $form['public'] = array(
     '#title' => t('Public'),
     '#type' => 'checkbox',
     '#default_value' => empty($tag_id) ? TRUE : $tag['public'],
     '#description' => t('Public tags are visible for all users, private tags are only visible if they use them.'),
-  );
+    );
 
-  $form['submit'] = array(
+    $form['submit'] = array(
     '#value' => empty($tag_id) ? t('Create tag') : t('Save tag'),
     '#type'  => 'submit',
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -108,34 +108,34 @@ 
  * Make sure that a tag name is unique.
  */
 function privatemsg_tags_form_validate($form, &$form_state) {
-  $tag_id = isset($form_state['values']['tag_id']) ? $form_state['values']['tag_id'] : 0;
-  if ($tag_id) {
+    $tag_id = isset($form_state['values']['tag_id']) ? $form_state['values']['tag_id'] : 0;
+    if ($tag_id) {
     // We are editing an existing tag, exclude the current tag from the search.
     $exists = db_result(db_query("SELECT 1 FROM {pm_tags} WHERE tag = '%s' AND tag_id <> %d", $form_state['values']['tag'], $tag_id));
-  }
-  else {
+    }
+    else {
     $exists = db_result(db_query("SELECT 1 FROM {pm_tags} WHERE tag = '%s'", $form_state['values']['tag']));
-  }
-  if ($exists) {
+    }
+    if ($exists) {
     form_set_error('tag', t('Tag already exists, choose a different name.'));
-  }
+    }
 }
 
 /**
  * Form submit handler for add/edit forms.
  */
 function privatemsg_tags_form_submit($form, &$form_state) {
-  if (!empty($form_state['values']['tag_id'])) {
+    if (!empty($form_state['values']['tag_id'])) {
     // Tag already exists, update the existing tag.
     db_query("UPDATE {pm_tags} SET tag = '%s', public = %d WHERE tag_id = %d", $form_state['values']['tag'], $form_state['values']['public'], $form_state['values']['tag_id']);
     drupal_set_message(t('Tag updated.'));
     $form_state['redirect'] = 'admin/settings/messages/tags';
-  }
-  else {
+    }
+    else {
     // Tag does not yet exist, create a new one.
     db_query("INSERT INTO {pm_tags} (tag, public) VALUES ('%s', %d)", $form_state['values']['tag'], $form_state['values']['public']);
     drupal_set_message(t('Tag created.'));
-  }
+    }
 }
 
 /**
@@ -145,28 +145,28 @@ 
  *   Id of the tag that should be deleted.
  */
 function privatemsg_filter_tags_delete(&$form_state, $tag_id) {
-  $form['tag_id'] = array(
+    $form['tag_id'] = array(
     '#type' => 'value',
     '#value' => $tag_id,
-  );
-  return confirm_form($form,
+    );
+    return confirm_form($form,
     t('Are you sure you want to delete?'),
     isset($_GET['destination']) ? $_GET['destination'] : 'admin/settings/messages/tags',
     t('This action cannot be undone.'),
     t('Delete'),
     t('Cancel')
-  );
+    );
 }
 
 /**
  * Submit handler for the confirm delete form.
  */
 function privatemsg_filter_tags_delete_submit($form, &$form_state) {
-  if ($form_state['values']['confirm']) {
+    if ($form_state['values']['confirm']) {
     db_query('DELETE FROM {pm_tags} WHERE tag_id = %d', $form_state['values']['tag_id']);
     db_query('DELETE FROM {pm_tags_index} WHERE tag_id = %d', $form_state['values']['tag_id']);
 
     drupal_set_message(t('Tag has been deleted'));
-  }
-  $form_state['redirect'] = 'admin/settings/messages/tags';
+    }
+    $form_state['redirect'] = 'admin/settings/messages/tags';
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
     ),
   );
   $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'));
-  $result = pager_query($query['query'] . tablesort_sql($header), 100);
+  $result = pager_query($query['query'].tablesort_sql($header), 100);
 
   $rows = array();
   while ($tag = db_fetch_array($result)) {
@@ -46,8 +46,8 @@ 
     $row['tag'] = check_plain($tag['tag']);
     $row['count'] = $tag['count'];
     $row['public'] = $tag['public'] ? t('Yes') : '-';
-    $row['operations'] = l(t('edit'), 'admin/settings/messages/tags/edit/' . $tag['tag_id']);
-    $row['operations'] .= ' ' . l(t('delete'), 'admin/settings/messages/tags/delete/' . $tag['tag_id']);
+    $row['operations'] = l(t('edit'), 'admin/settings/messages/tags/edit/'.$tag['tag_id']);
+    $row['operations'] .= ' '.l(t('delete'), 'admin/settings/messages/tags/delete/'.$tag['tag_id']);
 
     $rows[] = $row;
   }
@@ -57,7 +57,7 @@ 
     $rows[] = array(array('data' => t('No tags available.'), 'colspan' => count($header)));
   }
 
-  return theme('table', $header, $rows) . theme('pager');
+  return theme('table', $header, $rows).theme('pager');
 }
 
 /**

Braces +2 added lines, -4 removed lines

@@ -112,8 +112,7 @@ 
   if ($tag_id) {
     // We are editing an existing tag, exclude the current tag from the search.
     $exists = db_result(db_query("SELECT 1 FROM {pm_tags} WHERE tag = '%s' AND tag_id <> %d", $form_state['values']['tag'], $tag_id));
-  }
-  else {
+  } else {
     $exists = db_result(db_query("SELECT 1 FROM {pm_tags} WHERE tag = '%s'", $form_state['values']['tag']));
   }
   if ($exists) {
@@ -130,8 +129,7 @@ 
     db_query("UPDATE {pm_tags} SET tag = '%s', public = %d WHERE tag_id = %d", $form_state['values']['tag'], $form_state['values']['public'], $form_state['values']['tag_id']);
     drupal_set_message(t('Tag updated.'));
     $form_state['redirect'] = 'admin/settings/messages/tags';
-  }
-  else {
+  } else {
     // Tag does not yet exist, create a new one.
     db_query("INSERT INTO {pm_tags} (tag, public) VALUES ('%s', %d)", $form_state['values']['tag'], $form_state['values']['public']);
     drupal_set_message(t('Tag created.'));

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

@@ -69,7 +69,7 @@ 
  *   Tag Id if an edit form should be displayed, NULL for a create
  *   new tag form.
  */
-function privatemsg_tags_form(&$form_state, $tag_id = NULL) {
+function privatemsg_tags_form(&$form_state, $tag_id = null) {
   $form = array();
 
   if ($tag_id) {
@@ -84,13 +84,13 @@ 
   $form['tag'] = array(
     '#title' => t('Name'),
     '#type' => 'textfield',
-    '#default_value' => empty($tag_id) ? NULL : $tag['tag'],
+    '#default_value' => empty($tag_id) ? null : $tag['tag'],
   );
 
   $form['public'] = array(
     '#title' => t('Public'),
     '#type' => 'checkbox',
-    '#default_value' => empty($tag_id) ? TRUE : $tag['public'],
+    '#default_value' => empty($tag_id) ? true : $tag['public'],
     '#description' => t('Public tags are visible for all users, private tags are only visible if they use them.'),
   );
 

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/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.');
     }
   }

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

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'))), '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'))), '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);
-  }
+    }
 }
 

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
 }
 

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'))), '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'))), '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);
   }

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

Upper-Lower-Casing +18 added lines, -18 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;
 }
 
 
@@ -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

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.'),
-  );
+    );
       
-  $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);
 }
 

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

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

@@ -12,7 +12,7 @@
   $form['config'] = array(
     '#type' => 'fieldset',
     '#title' => t('Configuration'),
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
   );
 
   $options = array();

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

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

Indentation +212 added lines, -212 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pBubble - class to draw bubble charts
 
      Version     : 2.1.3
@@ -13,314 +13,314 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("BUBBLE_SHAPE_ROUND"		, 700001);
- define("BUBBLE_SHAPE_SQUARE"		, 700002);
+    define("BUBBLE_SHAPE_ROUND"		, 700001);
+    define("BUBBLE_SHAPE_SQUARE"		, 700002);
 
- /* pBubble class definition */
- class pBubble
-  {
-   var $pChartObject;
-   var $pDataObject;
+    /* pBubble class definition */
+    class pBubble
+    {
+    var $pChartObject;
+    var $pDataObject;
 
-   /* Class creator */
-   function pBubble($pChartObject,$pDataObject)
+    /* Class creator */
+    function pBubble($pChartObject,$pDataObject)
     {
-     $this->pChartObject = $pChartObject;
-     $this->pDataObject  = $pDataObject;
+        $this->pChartObject = $pChartObject;
+        $this->pDataObject  = $pDataObject;
     }
 
-   /* Prepare the scale */
-   function bubbleScale($DataSeries,$WeightSeries)
+    /* Prepare the scale */
+    function bubbleScale($DataSeries,$WeightSeries)
     {
-     if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
-     if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
+        if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
+        if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
 
-     /* Parse each data series to find the new min & max boundaries to scale */
-     $NewPositiveSerie = ""; $NewNegativeSerie = ""; $MaxValues = 0; $LastPositive = 0; $LastNegative = 0;
-     foreach($DataSeries as $Key => $SerieName)
-      {
-       $SerieWeightName = $WeightSeries[$Key];
+        /* Parse each data series to find the new min & max boundaries to scale */
+        $NewPositiveSerie = ""; $NewNegativeSerie = ""; $MaxValues = 0; $LastPositive = 0; $LastNegative = 0;
+        foreach($DataSeries as $Key => $SerieName)
+        {
+        $SerieWeightName = $WeightSeries[$Key];
 
-       $this->pDataObject->setSerieDrawable($SerieWeightName,FALSE);
+        $this->pDataObject->setSerieDrawable($SerieWeightName,FALSE);
 
-       if ( count($this->pDataObject->Data["Series"][$SerieName]["Data"]) > $MaxValues ) { $MaxValues = count($this->pDataObject->Data["Series"][$SerieName]["Data"]); }
+        if ( count($this->pDataObject->Data["Series"][$SerieName]["Data"]) > $MaxValues ) { $MaxValues = count($this->pDataObject->Data["Series"][$SerieName]["Data"]); }
 
-       foreach($this->pDataObject->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+        foreach($this->pDataObject->Data["Series"][$SerieName]["Data"] as $Key => $Value)
         {
-         if ( $Value >= 0 )
-          {
-           $BubbleBounds = $Value + $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
+            if ( $Value >= 0 )
+            {
+            $BubbleBounds = $Value + $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
-           if ( !isset($NewPositiveSerie[$Key]) )
+            if ( !isset($NewPositiveSerie[$Key]) )
             { $NewPositiveSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
+            elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
             { $NewPositiveSerie[$Key] = $BubbleBounds; }
 
-           $LastPositive = $BubbleBounds;
-          }
-         else
-          {
-           $BubbleBounds = $Value - $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
+            $LastPositive = $BubbleBounds;
+            }
+            else
+            {
+            $BubbleBounds = $Value - $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
-           if ( !isset($NewNegativeSerie[$Key]) )
+            if ( !isset($NewNegativeSerie[$Key]) )
             { $NewNegativeSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
+            elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
             { $NewNegativeSerie[$Key] = $BubbleBounds; }
 
-           $LastNegative = $BubbleBounds;
-          }
+            $LastNegative = $BubbleBounds;
+            }
+        }
         }
-      }
 
-     /* Check for missing values and all the fake positive serie */
-     if ( $NewPositiveSerie != "" )
-      {
-       for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewPositiveSerie[$i])) { $NewPositiveSerie[$i] = $LastPositive; } }
+        /* Check for missing values and all the fake positive serie */
+        if ( $NewPositiveSerie != "" )
+        {
+        for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewPositiveSerie[$i])) { $NewPositiveSerie[$i] = $LastPositive; } }
 
-       $this->pDataObject->addPoints($NewPositiveSerie,"BubbleFakePositiveSerie");
-      }
+        $this->pDataObject->addPoints($NewPositiveSerie,"BubbleFakePositiveSerie");
+        }
 
-     /* Check for missing values and all the fake negative serie */
-     if ( $NewNegativeSerie != "" )
-      {
-       for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewNegativeSerie[$i])) { $NewNegativeSerie[$i] = $LastNegative; } }
+        /* Check for missing values and all the fake negative serie */
+        if ( $NewNegativeSerie != "" )
+        {
+        for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewNegativeSerie[$i])) { $NewNegativeSerie[$i] = $LastNegative; } }
 
-       $this->pDataObject->addPoints($NewNegativeSerie,"BubbleFakeNegativeSerie");
-      }
+        $this->pDataObject->addPoints($NewNegativeSerie,"BubbleFakeNegativeSerie");
+        }
     }
 
-   function resetSeriesColors()
+    function resetSeriesColors()
     {
-     $Data    = $this->pDataObject->getData();
-     $Palette = $this->pDataObject->getPalette();
+        $Data    = $this->pDataObject->getData();
+        $Palette = $this->pDataObject->getPalette();
 
-     $ID = 0;
-     foreach($Data["Series"] as $SerieName => $SeriesParameters)
-      {
-       if ( $SeriesParameters["isDrawable"] )
+        $ID = 0;
+        foreach($Data["Series"] as $SerieName => $SeriesParameters)
         {
-         $this->pDataObject->Data["Series"][$SerieName]["Color"]["R"]     = $Palette[$ID]["R"];
-         $this->pDataObject->Data["Series"][$SerieName]["Color"]["G"]     = $Palette[$ID]["G"];
-         $this->pDataObject->Data["Series"][$SerieName]["Color"]["B"]     = $Palette[$ID]["B"];
-         $this->pDataObject->Data["Series"][$SerieName]["Color"]["Alpha"] = $Palette[$ID]["Alpha"];
-         $ID++;
+        if ( $SeriesParameters["isDrawable"] )
+        {
+            $this->pDataObject->Data["Series"][$SerieName]["Color"]["R"]     = $Palette[$ID]["R"];
+            $this->pDataObject->Data["Series"][$SerieName]["Color"]["G"]     = $Palette[$ID]["G"];
+            $this->pDataObject->Data["Series"][$SerieName]["Color"]["B"]     = $Palette[$ID]["B"];
+            $this->pDataObject->Data["Series"][$SerieName]["Color"]["Alpha"] = $Palette[$ID]["Alpha"];
+            $ID++;
+        }
         }
-      }
     }
 
-   /* Prepare the scale */
-   function drawBubbleChart($DataSeries,$WeightSeries,$Format="")
+    /* Prepare the scale */
+    function drawBubbleChart($DataSeries,$WeightSeries,$Format="")
     {
-     $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : VOID;
-     $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
-     $BorderWidth	= isset($Format["BorderWidth"]) ? $Format["BorderWidth"] : 1;
-     $Shape		= isset($Format["Shape"]) ? $Format["Shape"] : BUBBLE_SHAPE_ROUND;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
-     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+        $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : VOID;
+        $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
+        $BorderWidth	= isset($Format["BorderWidth"]) ? $Format["BorderWidth"] : 1;
+        $Shape		= isset($Format["Shape"]) ? $Format["Shape"] : BUBBLE_SHAPE_ROUND;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
+        $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
 
-     if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
-     if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
+        if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
+        if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
 
-     $Data    = $this->pDataObject->getData();
-     $Palette = $this->pDataObject->getPalette();
+        $Data    = $this->pDataObject->getData();
+        $Palette = $this->pDataObject->getPalette();
 
-     if ( isset($Data["Series"]["BubbleFakePositiveSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakePositiveSerie",FALSE); }
-     if ( isset($Data["Series"]["BubbleFakeNegativeSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakeNegativeSerie",FALSE); }
+        if ( isset($Data["Series"]["BubbleFakePositiveSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakePositiveSerie",FALSE); }
+        if ( isset($Data["Series"]["BubbleFakeNegativeSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakeNegativeSerie",FALSE); }
 
-     $this->resetSeriesColors();
+        $this->resetSeriesColors();
 
-     list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
+        list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
 
-     foreach($DataSeries as $Key => $SerieName)
-      {
-       $AxisID	= $Data["Series"][$SerieName]["Axis"];
-       $Mode	= $Data["Axis"][$AxisID]["Display"];
-       $Format	= $Data["Axis"][$AxisID]["Format"];
-       $Unit	= $Data["Axis"][$AxisID]["Unit"];
+        foreach($DataSeries as $Key => $SerieName)
+        {
+        $AxisID	= $Data["Series"][$SerieName]["Axis"];
+        $Mode	= $Data["Axis"][$AxisID]["Display"];
+        $Format	= $Data["Axis"][$AxisID]["Format"];
+        $Unit	= $Data["Axis"][$AxisID]["Unit"];
 
-       if (isset($Data["Series"][$SerieName]["Description"])) { $SerieDescription = $Data["Series"][$SerieName]["Description"]; } else { $SerieDescription = $SerieName; }
+        if (isset($Data["Series"][$SerieName]["Description"])) { $SerieDescription = $Data["Series"][$SerieName]["Description"]; } else { $SerieDescription = $SerieName; }
 
-       $XStep	= ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
+        $XStep	= ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
 
-       $X = $this->pChartObject->GraphAreaX1 + $XMargin;
-       $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
+        $X = $this->pChartObject->GraphAreaX1 + $XMargin;
+        $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
 
-       $Color = array("R"=>$Palette[$Key]["R"],"G"=>$Palette[$Key]["G"],"B"=>$Palette[$Key]["B"],"Alpha"=>$Palette[$Key]["Alpha"]);
+        $Color = array("R"=>$Palette[$Key]["R"],"G"=>$Palette[$Key]["G"],"B"=>$Palette[$Key]["B"],"Alpha"=>$Palette[$Key]["Alpha"]);
 
-       if ( $ForceAlpha != VOID ) { $Color["Alpha"]=$ForceAlpha; }
+        if ( $ForceAlpha != VOID ) { $Color["Alpha"]=$ForceAlpha; }
 
-       if ( $DrawBorder )
+        if ( $DrawBorder )
         {
-         if ( $BorderWidth != 1 )
-          {
-           if ( $Surrounding != NULL )
+            if ( $BorderWidth != 1 )
+            {
+            if ( $Surrounding != NULL )
             { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; }
-           else
+            else
             { $BorderR = $BorderR; $BorderG = $BorderG; $BorderB = $BorderB; }
-           if ( $ForceAlpha != VOID ) { $BorderAlpha = $ForceAlpha/2; }
-           $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
-          }
-         else
-          {
-           $Color["BorderAlpha"] = $BorderAlpha;
-
-           if ( $Surrounding != NULL )
+            if ( $ForceAlpha != VOID ) { $BorderAlpha = $ForceAlpha/2; }
+            $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
+            }
+            else
+            {
+            $Color["BorderAlpha"] = $BorderAlpha;
+
+            if ( $Surrounding != NULL )
             { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; }
-           else
+            else
             { $Color["BorderR"] = $BorderR; $Color["BorderG"] = $BorderG; $Color["BorderB"] = $BorderB; }
-           if ( $ForceAlpha != VOID ) { $Color["BorderAlpha"] = $ForceAlpha/2; }
-          }
+            if ( $ForceAlpha != VOID ) { $Color["BorderAlpha"] = $ForceAlpha/2; }
+            }
         }
 
-       foreach($Data["Series"][$SerieName]["Data"] as $iKey => $Point)
+        foreach($Data["Series"][$SerieName]["Data"] as $iKey => $Point)
         {
-         $Weight = $Point + $Data["Series"][$WeightSeries[$Key]]["Data"][$iKey];
+            $Weight = $Point + $Data["Series"][$WeightSeries[$Key]]["Data"][$iKey];
 
-         $PosArray    = $this->pChartObject->scaleComputeY($Point,array("AxisID"=>$AxisID));
-         $WeightArray = $this->pChartObject->scaleComputeY($Weight,array("AxisID"=>$AxisID));
+            $PosArray    = $this->pChartObject->scaleComputeY($Point,array("AxisID"=>$AxisID));
+            $WeightArray = $this->pChartObject->scaleComputeY($Weight,array("AxisID"=>$AxisID));
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $Y = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $Y = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
 
-           if ( $Shape == BUBBLE_SHAPE_SQUARE )
+            if ( $Shape == BUBBLE_SHAPE_SQUARE )
             {
-             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
-
-             if ( $BorderWidth != 1 )
-              {
-               $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
-               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-              }
-             else
-              $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+                if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+
+                if ( $BorderWidth != 1 )
+                {
+                $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
+                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+                }
+                else
+                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
             }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
+            elseif ( $Shape == BUBBLE_SHAPE_ROUND )
             {
-             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
-
-             if ( $BorderWidth != 1 )
-              {
-               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
-               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
-              }
-             else
-              $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+                if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+
+                if ( $BorderWidth != 1 )
+                {
+                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
+                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+                }
+                else
+                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
             }
 
-           $X = $X + $XStep;
-          }
-         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-          {
-           if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $X = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
+            $X = $X + $XStep;
+            }
+            elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+            {
+            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $X = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
 
-           if ( $Shape == BUBBLE_SHAPE_SQUARE )
+            if ( $Shape == BUBBLE_SHAPE_SQUARE )
             {
-             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
-
-             if ( $BorderWidth != 1 )
-              {
-               $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
-               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-              }
-             else
-              $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+                if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+
+                if ( $BorderWidth != 1 )
+                {
+                $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
+                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+                }
+                else
+                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
             }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
+            elseif ( $Shape == BUBBLE_SHAPE_ROUND )
             {
-             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
-
-             if ( $BorderWidth != 1 )
-              {
-               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
-               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
-              }
-             else
-              $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+                if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+
+                if ( $BorderWidth != 1 )
+                {
+                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
+                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+                }
+                else
+                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
             }
 
-           $Y = $Y + $XStep;
-          }
+            $Y = $Y + $XStep;
+            }
+        }
         }
-      }
     }
 
-   function writeBubbleLabel($SerieName,$SerieWeightName,$Points,$Format="")
+    function writeBubbleLabel($SerieName,$SerieWeightName,$Points,$Format="")
     {
-     $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
-     $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
+        $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
+        $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
 
-     if ( !is_array($Points) ) { $Point = $Points; $Points = ""; $Points[] = $Point; }
+        if ( !is_array($Points) ) { $Point = $Points; $Points = ""; $Points[] = $Point; }
 
-     $Data    = $this->pDataObject->getData();
-     $Palette = $this->pDataObject->getPalette();
+        $Data    = $this->pDataObject->getData();
+        $Palette = $this->pDataObject->getPalette();
 
-     if ( !isset($Data["Series"][$SerieName]) || !isset($Data["Series"][$SerieWeightName]) )
-      return(0);
+        if ( !isset($Data["Series"][$SerieName]) || !isset($Data["Series"][$SerieWeightName]) )
+        return(0);
 
-     list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
+        list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
 
-     $AxisID	 = $Data["Series"][$SerieName]["Axis"];
-     $AxisMode	 = $Data["Axis"][$AxisID]["Display"];
-     $AxisFormat = $Data["Axis"][$AxisID]["Format"];
-     $AxisUnit	 = $Data["Axis"][$AxisID]["Unit"];
-     $XStep	 = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
+        $AxisID	 = $Data["Series"][$SerieName]["Axis"];
+        $AxisMode	 = $Data["Axis"][$AxisID]["Display"];
+        $AxisFormat = $Data["Axis"][$AxisID]["Format"];
+        $AxisUnit	 = $Data["Axis"][$AxisID]["Unit"];
+        $XStep	 = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
 
-     $X = $this->pChartObject->GraphAreaX1 + $XMargin;
-     $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
+        $X = $this->pChartObject->GraphAreaX1 + $XMargin;
+        $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
 
-     $Color = array("R"=>$Data["Series"][$SerieName]["Color"]["R"],"G"=>$Data["Series"][$SerieName]["Color"]["G"],"B"=>$Data["Series"][$SerieName]["Color"]["B"],"Alpha"=>$Data["Series"][$SerieName]["Color"]["Alpha"]);
+        $Color = array("R"=>$Data["Series"][$SerieName]["Color"]["R"],"G"=>$Data["Series"][$SerieName]["Color"]["G"],"B"=>$Data["Series"][$SerieName]["Color"]["B"],"Alpha"=>$Data["Series"][$SerieName]["Color"]["Alpha"]);
 
-     foreach($Points as $Key => $Point)
-      {
-       $Value    = $Data["Series"][$SerieName]["Data"][$Point];
-       $PosArray = $this->pChartObject->scaleComputeY($Value,array("AxisID"=>$AxisID));
+        foreach($Points as $Key => $Point)
+        {
+        $Value    = $Data["Series"][$SerieName]["Data"][$Point];
+        $PosArray = $this->pChartObject->scaleComputeY($Value,array("AxisID"=>$AxisID));
 
-       if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Point]) )
+        if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Point]) )
         $Abscissa = $Data["Series"][$Data["Abscissa"]]["Data"][$Point]." : ";
-       else
+        else
         $Abscissa = "";
 
-       $Value   = $this->pChartObject->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
-       $Weight  = $Data["Series"][$SerieWeightName]["Data"][$Point];
-       $Caption = $Abscissa.$Value." / ".$Weight;
+        $Value   = $this->pChartObject->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+        $Weight  = $Data["Series"][$SerieWeightName]["Data"][$Point];
+        $Caption = $Abscissa.$Value." / ".$Weight;
 
-       if ( isset($Data["Series"][$SerieName]["Description"]) )
+        if ( isset($Data["Series"][$SerieName]["Description"]) )
         $Description = $Data["Series"][$SerieName]["Description"];
-       else
+        else
         $Description = "No description";
 
-       $Series = "";
-       $Series[] = array("Format"=>$Color,"Caption"=>$Caption);
+        $Series = "";
+        $Series[] = array("Format"=>$Color,"Caption"=>$Caption);
 
-       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
         {
-         if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
+            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
 
-         $X = floor($X + $Point * $XStep);
-         $Y = floor($PosArray);
+            $X = floor($X + $Point * $XStep);
+            $Y = floor($PosArray);
         }
-       else
+        else
         {
-         if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
+            if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
 
-         $X = floor($PosArray);
-         $Y = floor($Y + $Point * $YStep);
+            $X = floor($PosArray);
+            $Y = floor($Y + $Point * $YStep);
         }
 
-       if ( $DrawPoint == LABEL_POINT_CIRCLE )
+        if ( $DrawPoint == LABEL_POINT_CIRCLE )
         $this->pChartObject->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
-       elseif ( $DrawPoint == LABEL_POINT_BOX )
+        elseif ( $DrawPoint == LABEL_POINT_BOX )
         $this->pChartObject->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
 
-       $this->pChartObject->drawLabelBox($X,$Y-3,$Description,$Series,$Format);
-      }
+        $this->pChartObject->drawLabelBox($X,$Y-3,$Description,$Series,$Format);
+        }
+    }
     }
-  }
 ?>
\ No newline at end of file

Spacing +101 added lines, -101 removed lines

@@ -13,8 +13,8 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("BUBBLE_SHAPE_ROUND"		, 700001);
- define("BUBBLE_SHAPE_SQUARE"		, 700002);
+ define("BUBBLE_SHAPE_ROUND", 700001);
+ define("BUBBLE_SHAPE_SQUARE", 700002);
 
  /* pBubble class definition */
  class pBubble
@@ -23,37 +23,37 @@ 
    var $pDataObject;
 
    /* Class creator */
-   function pBubble($pChartObject,$pDataObject)
+   function pBubble($pChartObject, $pDataObject)
     {
      $this->pChartObject = $pChartObject;
      $this->pDataObject  = $pDataObject;
     }
 
    /* Prepare the scale */
-   function bubbleScale($DataSeries,$WeightSeries)
+   function bubbleScale($DataSeries, $WeightSeries)
     {
-     if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
-     if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
+     if (!is_array($DataSeries)) { $DataSeries = array($DataSeries); }
+     if (!is_array($WeightSeries)) { $WeightSeries = array($WeightSeries); }
 
      /* Parse each data series to find the new min & max boundaries to scale */
      $NewPositiveSerie = ""; $NewNegativeSerie = ""; $MaxValues = 0; $LastPositive = 0; $LastNegative = 0;
-     foreach($DataSeries as $Key => $SerieName)
+     foreach ($DataSeries as $Key => $SerieName)
       {
        $SerieWeightName = $WeightSeries[$Key];
 
-       $this->pDataObject->setSerieDrawable($SerieWeightName,FALSE);
+       $this->pDataObject->setSerieDrawable($SerieWeightName, FALSE);
 
-       if ( count($this->pDataObject->Data["Series"][$SerieName]["Data"]) > $MaxValues ) { $MaxValues = count($this->pDataObject->Data["Series"][$SerieName]["Data"]); }
+       if (count($this->pDataObject->Data["Series"][$SerieName]["Data"]) > $MaxValues) { $MaxValues = count($this->pDataObject->Data["Series"][$SerieName]["Data"]); }
 
-       foreach($this->pDataObject->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+       foreach ($this->pDataObject->Data["Series"][$SerieName]["Data"] as $Key => $Value)
         {
-         if ( $Value >= 0 )
+         if ($Value >= 0)
           {
            $BubbleBounds = $Value + $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
-           if ( !isset($NewPositiveSerie[$Key]) )
+           if (!isset($NewPositiveSerie[$Key]))
             { $NewPositiveSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
+           elseif ($NewPositiveSerie[$Key] < $BubbleBounds)
             { $NewPositiveSerie[$Key] = $BubbleBounds; }
 
            $LastPositive = $BubbleBounds;
@@ -62,9 +62,9 @@ 
           {
            $BubbleBounds = $Value - $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
-           if ( !isset($NewNegativeSerie[$Key]) )
+           if (!isset($NewNegativeSerie[$Key]))
             { $NewNegativeSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
+           elseif ($NewNegativeSerie[$Key] > $BubbleBounds)
             { $NewNegativeSerie[$Key] = $BubbleBounds; }
 
            $LastNegative = $BubbleBounds;
@@ -73,19 +73,19 @@ 
       }
 
      /* Check for missing values and all the fake positive serie */
-     if ( $NewPositiveSerie != "" )
+     if ($NewPositiveSerie != "")
       {
-       for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewPositiveSerie[$i])) { $NewPositiveSerie[$i] = $LastPositive; } }
+       for ($i = 0; $i < $MaxValues; $i++) { if (!isset($NewPositiveSerie[$i])) { $NewPositiveSerie[$i] = $LastPositive; } }
 
-       $this->pDataObject->addPoints($NewPositiveSerie,"BubbleFakePositiveSerie");
+       $this->pDataObject->addPoints($NewPositiveSerie, "BubbleFakePositiveSerie");
       }
 
      /* Check for missing values and all the fake negative serie */
-     if ( $NewNegativeSerie != "" )
+     if ($NewNegativeSerie != "")
       {
-       for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewNegativeSerie[$i])) { $NewNegativeSerie[$i] = $LastNegative; } }
+       for ($i = 0; $i < $MaxValues; $i++) { if (!isset($NewNegativeSerie[$i])) { $NewNegativeSerie[$i] = $LastNegative; } }
 
-       $this->pDataObject->addPoints($NewNegativeSerie,"BubbleFakeNegativeSerie");
+       $this->pDataObject->addPoints($NewNegativeSerie, "BubbleFakeNegativeSerie");
       }
     }
 
@@ -95,9 +95,9 @@ 
      $Palette = $this->pDataObject->getPalette();
 
      $ID = 0;
-     foreach($Data["Series"] as $SerieName => $SeriesParameters)
+     foreach ($Data["Series"] as $SerieName => $SeriesParameters)
       {
-       if ( $SeriesParameters["isDrawable"] )
+       if ($SeriesParameters["isDrawable"])
         {
          $this->pDataObject->Data["Series"][$SerieName]["Color"]["R"]     = $Palette[$ID]["R"];
          $this->pDataObject->Data["Series"][$SerieName]["Color"]["G"]     = $Palette[$ID]["G"];
@@ -109,33 +109,33 @@ 
     }
 
    /* Prepare the scale */
-   function drawBubbleChart($DataSeries,$WeightSeries,$Format="")
+   function drawBubbleChart($DataSeries, $WeightSeries, $Format = "")
     {
      $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : VOID;
      $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
      $BorderWidth	= isset($Format["BorderWidth"]) ? $Format["BorderWidth"] : 1;
-     $Shape		= isset($Format["Shape"]) ? $Format["Shape"] : BUBBLE_SHAPE_ROUND;
+     $Shape = isset($Format["Shape"]) ? $Format["Shape"] : BUBBLE_SHAPE_ROUND;
      $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
      $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
      $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
      $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
-     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
+     $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
 
-     if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
-     if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
+     if (!is_array($DataSeries)) { $DataSeries = array($DataSeries); }
+     if (!is_array($WeightSeries)) { $WeightSeries = array($WeightSeries); }
 
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
-     if ( isset($Data["Series"]["BubbleFakePositiveSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakePositiveSerie",FALSE); }
-     if ( isset($Data["Series"]["BubbleFakeNegativeSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakeNegativeSerie",FALSE); }
+     if (isset($Data["Series"]["BubbleFakePositiveSerie"])) { $this->pDataObject->setSerieDrawable("BubbleFakePositiveSerie", FALSE); }
+     if (isset($Data["Series"]["BubbleFakeNegativeSerie"])) { $this->pDataObject->setSerieDrawable("BubbleFakeNegativeSerie", FALSE); }
 
      $this->resetSeriesColors();
 
-     list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
+     list($XMargin, $XDivs) = $this->pChartObject->scaleGetXSettings();
 
-     foreach($DataSeries as $Key => $SerieName)
+     foreach ($DataSeries as $Key => $SerieName)
       {
        $AxisID	= $Data["Series"][$SerieName]["Axis"];
        $Mode	= $Data["Axis"][$AxisID]["Display"];
@@ -144,105 +144,105 @@ 
 
        if (isset($Data["Series"][$SerieName]["Description"])) { $SerieDescription = $Data["Series"][$SerieName]["Description"]; } else { $SerieDescription = $SerieName; }
 
-       $XStep	= ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
+       $XStep = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2)/$XDivs;
 
        $X = $this->pChartObject->GraphAreaX1 + $XMargin;
        $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
 
-       $Color = array("R"=>$Palette[$Key]["R"],"G"=>$Palette[$Key]["G"],"B"=>$Palette[$Key]["B"],"Alpha"=>$Palette[$Key]["Alpha"]);
+       $Color = array("R"=>$Palette[$Key]["R"], "G"=>$Palette[$Key]["G"], "B"=>$Palette[$Key]["B"], "Alpha"=>$Palette[$Key]["Alpha"]);
 
-       if ( $ForceAlpha != VOID ) { $Color["Alpha"]=$ForceAlpha; }
+       if ($ForceAlpha != VOID) { $Color["Alpha"] = $ForceAlpha; }
 
-       if ( $DrawBorder )
+       if ($DrawBorder)
         {
-         if ( $BorderWidth != 1 )
+         if ($BorderWidth != 1)
           {
-           if ( $Surrounding != NULL )
-            { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; }
+           if ($Surrounding != NULL)
+            { $BorderR = $Palette[$Key]["R"] + $Surrounding; $BorderG = $Palette[$Key]["G"] + $Surrounding; $BorderB = $Palette[$Key]["B"] + $Surrounding; }
            else
             { $BorderR = $BorderR; $BorderG = $BorderG; $BorderB = $BorderB; }
-           if ( $ForceAlpha != VOID ) { $BorderAlpha = $ForceAlpha/2; }
-           $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
+           if ($ForceAlpha != VOID) { $BorderAlpha = $ForceAlpha/2; }
+           $BorderColor = array("R"=>$BorderR, "G"=>$BorderG, "B"=>$BorderB, "Alpha"=>$BorderAlpha);
           }
          else
           {
            $Color["BorderAlpha"] = $BorderAlpha;
 
-           if ( $Surrounding != NULL )
-            { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; }
+           if ($Surrounding != NULL)
+            { $Color["BorderR"] = $Palette[$Key]["R"] + $Surrounding; $Color["BorderG"] = $Palette[$Key]["G"] + $Surrounding; $Color["BorderB"] = $Palette[$Key]["B"] + $Surrounding; }
            else
             { $Color["BorderR"] = $BorderR; $Color["BorderG"] = $BorderG; $Color["BorderB"] = $BorderB; }
-           if ( $ForceAlpha != VOID ) { $Color["BorderAlpha"] = $ForceAlpha/2; }
+           if ($ForceAlpha != VOID) { $Color["BorderAlpha"] = $ForceAlpha/2; }
           }
         }
 
-       foreach($Data["Series"][$SerieName]["Data"] as $iKey => $Point)
+       foreach ($Data["Series"][$SerieName]["Data"] as $iKey => $Point)
         {
          $Weight = $Point + $Data["Series"][$WeightSeries[$Key]]["Data"][$iKey];
 
-         $PosArray    = $this->pChartObject->scaleComputeY($Point,array("AxisID"=>$AxisID));
-         $WeightArray = $this->pChartObject->scaleComputeY($Weight,array("AxisID"=>$AxisID));
+         $PosArray    = $this->pChartObject->scaleComputeY($Point, array("AxisID"=>$AxisID));
+         $WeightArray = $this->pChartObject->scaleComputeY($Weight, array("AxisID"=>$AxisID));
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+         if ($Data["Orientation"] == SCALE_POS_LEFTRIGHT)
           {
-           if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
+           if ($XDivs == 0) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2)/$XDivs; }
            $Y = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
 
-           if ( $Shape == BUBBLE_SHAPE_SQUARE )
+           if ($Shape == BUBBLE_SHAPE_SQUARE)
             {
-             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+             if ($RecordImageMap) { $this->pChartObject->addToImageMap("RECT", floor($X - $CircleRadius).",".floor($Y - $CircleRadius).",".floor($X + $CircleRadius).",".floor($Y + $CircleRadius), $this->pChartObject->toHTMLColor($Palette[$Key]["R"], $Palette[$Key]["G"], $Palette[$Key]["B"]), $SerieDescription, $Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
+             if ($BorderWidth != 1)
               {
-               $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
-               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+               $this->pChartObject->drawFilledRectangle($X - $CircleRadius - $BorderWidth, $Y - $CircleRadius - $BorderWidth, $X + $CircleRadius + $BorderWidth, $Y + $CircleRadius + $BorderWidth, $BorderColor);
+               $this->pChartObject->drawFilledRectangle($X - $CircleRadius, $Y - $CircleRadius, $X + $CircleRadius, $Y + $CircleRadius, $Color);
               }
              else
-              $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+              $this->pChartObject->drawFilledRectangle($X - $CircleRadius, $Y - $CircleRadius, $X + $CircleRadius, $Y + $CircleRadius, $Color);
             }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
+           elseif ($Shape == BUBBLE_SHAPE_ROUND)
             {
-             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+             if ($RecordImageMap) { $this->pChartObject->addToImageMap("CIRCLE", floor($X).",".floor($Y).",".floor($CircleRadius), $this->pChartObject->toHTMLColor($Palette[$Key]["R"], $Palette[$Key]["G"], $Palette[$Key]["B"]), $SerieDescription, $Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
+             if ($BorderWidth != 1)
               {
-               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
-               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+               $this->pChartObject->drawFilledCircle($X, $Y, $CircleRadius + $BorderWidth, $BorderColor);
+               $this->pChartObject->drawFilledCircle($X, $Y, $CircleRadius, $Color);
               }
              else
-              $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+              $this->pChartObject->drawFilledCircle($X, $Y, $CircleRadius, $Color);
             }
 
            $X = $X + $XStep;
           }
-         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+         elseif ($Data["Orientation"] == SCALE_POS_TOPBOTTOM)
           {
-           if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
+           if ($XDivs == 0) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1 - $XMargin*2)/$XDivs; }
            $X = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
 
-           if ( $Shape == BUBBLE_SHAPE_SQUARE )
+           if ($Shape == BUBBLE_SHAPE_SQUARE)
             {
-             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+             if ($RecordImageMap) { $this->pChartObject->addToImageMap("RECT", floor($X - $CircleRadius).",".floor($Y - $CircleRadius).",".floor($X + $CircleRadius).",".floor($Y + $CircleRadius), $this->pChartObject->toHTMLColor($Palette[$Key]["R"], $Palette[$Key]["G"], $Palette[$Key]["B"]), $SerieDescription, $Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
+             if ($BorderWidth != 1)
               {
-               $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
-               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+               $this->pChartObject->drawFilledRectangle($X - $CircleRadius - $BorderWidth, $Y - $CircleRadius - $BorderWidth, $X + $CircleRadius + $BorderWidth, $Y + $CircleRadius + $BorderWidth, $BorderColor);
+               $this->pChartObject->drawFilledRectangle($X - $CircleRadius, $Y - $CircleRadius, $X + $CircleRadius, $Y + $CircleRadius, $Color);
               }
              else
-              $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+              $this->pChartObject->drawFilledRectangle($X - $CircleRadius, $Y - $CircleRadius, $X + $CircleRadius, $Y + $CircleRadius, $Color);
             }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
+           elseif ($Shape == BUBBLE_SHAPE_ROUND)
             {
-             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+             if ($RecordImageMap) { $this->pChartObject->addToImageMap("CIRCLE", floor($X).",".floor($Y).",".floor($CircleRadius), $this->pChartObject->toHTMLColor($Palette[$Key]["R"], $Palette[$Key]["G"], $Palette[$Key]["B"]), $SerieDescription, $Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
+             if ($BorderWidth != 1)
               {
-               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
-               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+               $this->pChartObject->drawFilledCircle($X, $Y, $CircleRadius + $BorderWidth, $BorderColor);
+               $this->pChartObject->drawFilledCircle($X, $Y, $CircleRadius, $Color);
               }
              else
-              $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+              $this->pChartObject->drawFilledCircle($X, $Y, $CircleRadius, $Color);
             }
 
            $Y = $Y + $XStep;
@@ -251,75 +251,75 @@ 
       }
     }
 
-   function writeBubbleLabel($SerieName,$SerieWeightName,$Points,$Format="")
+   function writeBubbleLabel($SerieName, $SerieWeightName, $Points, $Format = "")
     {
-     $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
-     $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
+     $OverrideTitle = isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
+     $DrawPoint = isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
 
-     if ( !is_array($Points) ) { $Point = $Points; $Points = ""; $Points[] = $Point; }
+     if (!is_array($Points)) { $Point = $Points; $Points = ""; $Points[] = $Point; }
 
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
-     if ( !isset($Data["Series"][$SerieName]) || !isset($Data["Series"][$SerieWeightName]) )
+     if (!isset($Data["Series"][$SerieName]) || !isset($Data["Series"][$SerieWeightName]))
       return(0);
 
-     list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
+     list($XMargin, $XDivs) = $this->pChartObject->scaleGetXSettings();
 
-     $AxisID	 = $Data["Series"][$SerieName]["Axis"];
+     $AxisID = $Data["Series"][$SerieName]["Axis"];
      $AxisMode	 = $Data["Axis"][$AxisID]["Display"];
      $AxisFormat = $Data["Axis"][$AxisID]["Format"];
      $AxisUnit	 = $Data["Axis"][$AxisID]["Unit"];
-     $XStep	 = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
+     $XStep = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2)/$XDivs;
 
      $X = $this->pChartObject->GraphAreaX1 + $XMargin;
      $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
 
-     $Color = array("R"=>$Data["Series"][$SerieName]["Color"]["R"],"G"=>$Data["Series"][$SerieName]["Color"]["G"],"B"=>$Data["Series"][$SerieName]["Color"]["B"],"Alpha"=>$Data["Series"][$SerieName]["Color"]["Alpha"]);
+     $Color = array("R"=>$Data["Series"][$SerieName]["Color"]["R"], "G"=>$Data["Series"][$SerieName]["Color"]["G"], "B"=>$Data["Series"][$SerieName]["Color"]["B"], "Alpha"=>$Data["Series"][$SerieName]["Color"]["Alpha"]);
 
-     foreach($Points as $Key => $Point)
+     foreach ($Points as $Key => $Point)
       {
        $Value    = $Data["Series"][$SerieName]["Data"][$Point];
-       $PosArray = $this->pChartObject->scaleComputeY($Value,array("AxisID"=>$AxisID));
+       $PosArray = $this->pChartObject->scaleComputeY($Value, array("AxisID"=>$AxisID));
 
-       if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Point]) )
+       if (isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Point]))
         $Abscissa = $Data["Series"][$Data["Abscissa"]]["Data"][$Point]." : ";
        else
         $Abscissa = "";
 
-       $Value   = $this->pChartObject->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+       $Value   = $this->pChartObject->scaleFormat($Value, $AxisMode, $AxisFormat, $AxisUnit);
        $Weight  = $Data["Series"][$SerieWeightName]["Data"][$Point];
        $Caption = $Abscissa.$Value." / ".$Weight;
 
-       if ( isset($Data["Series"][$SerieName]["Description"]) )
+       if (isset($Data["Series"][$SerieName]["Description"]))
         $Description = $Data["Series"][$SerieName]["Description"];
        else
         $Description = "No description";
 
        $Series = "";
-       $Series[] = array("Format"=>$Color,"Caption"=>$Caption);
+       $Series[] = array("Format"=>$Color, "Caption"=>$Caption);
 
-       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+       if ($Data["Orientation"] == SCALE_POS_LEFTRIGHT)
         {
-         if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
+         if ($XDivs == 0) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2)/$XDivs; }
 
-         $X = floor($X + $Point * $XStep);
+         $X = floor($X + $Point*$XStep);
          $Y = floor($PosArray);
         }
        else
         {
-         if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
+         if ($XDivs == 0) { $YStep = 0; } else { $YStep = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1 - $XMargin*2)/$XDivs; }
 
          $X = floor($PosArray);
-         $Y = floor($Y + $Point * $YStep);
+         $Y = floor($Y + $Point*$YStep);
         }
 
-       if ( $DrawPoint == LABEL_POINT_CIRCLE )
-        $this->pChartObject->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
-       elseif ( $DrawPoint == LABEL_POINT_BOX )
-        $this->pChartObject->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+       if ($DrawPoint == LABEL_POINT_CIRCLE)
+        $this->pChartObject->drawFilledCircle($X, $Y, 3, array("R"=>255, "G"=>255, "B"=>255, "BorderR"=>0, "BorderG"=>0, "BorderB"=>0));
+       elseif ($DrawPoint == LABEL_POINT_BOX)
+        $this->pChartObject->drawFilledRectangle($X - 2, $Y - 2, $X + 2, $Y + 2, array("R"=>255, "G"=>255, "B"=>255, "BorderR"=>0, "BorderG"=>0, "BorderB"=>0));
 
-       $this->pChartObject->drawLabelBox($X,$Y-3,$Description,$Series,$Format);
+       $this->pChartObject->drawLabelBox($X, $Y - 3, $Description, $Series, $Format);
       }
     }
   }

Braces +40 added lines, -86 removed lines

@@ -17,54 +17,44 @@ 
  define("BUBBLE_SHAPE_SQUARE"		, 700002);
 
  /* pBubble class definition */
- class pBubble
-  {
+ class pBubble {
    var $pChartObject;
    var $pDataObject;
 
    /* Class creator */
-   function pBubble($pChartObject,$pDataObject)
-    {
+   function pBubble($pChartObject,$pDataObject) {
      $this->pChartObject = $pChartObject;
      $this->pDataObject  = $pDataObject;
     }
 
    /* Prepare the scale */
-   function bubbleScale($DataSeries,$WeightSeries)
-    {
+   function bubbleScale($DataSeries,$WeightSeries) {
      if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
      if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
 
      /* Parse each data series to find the new min & max boundaries to scale */
      $NewPositiveSerie = ""; $NewNegativeSerie = ""; $MaxValues = 0; $LastPositive = 0; $LastNegative = 0;
-     foreach($DataSeries as $Key => $SerieName)
-      {
+     foreach($DataSeries as $Key => $SerieName) {
        $SerieWeightName = $WeightSeries[$Key];
 
        $this->pDataObject->setSerieDrawable($SerieWeightName,FALSE);
 
        if ( count($this->pDataObject->Data["Series"][$SerieName]["Data"]) > $MaxValues ) { $MaxValues = count($this->pDataObject->Data["Series"][$SerieName]["Data"]); }
 
-       foreach($this->pDataObject->Data["Series"][$SerieName]["Data"] as $Key => $Value)
-        {
-         if ( $Value >= 0 )
-          {
+       foreach($this->pDataObject->Data["Series"][$SerieName]["Data"] as $Key => $Value) {
+         if ( $Value >= 0 ) {
            $BubbleBounds = $Value + $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
            if ( !isset($NewPositiveSerie[$Key]) )
-            { $NewPositiveSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
+            { $NewPositiveSerie[$Key] = $BubbleBounds; } elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
             { $NewPositiveSerie[$Key] = $BubbleBounds; }
 
            $LastPositive = $BubbleBounds;
-          }
-         else
-          {
+          } else {
            $BubbleBounds = $Value - $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
            if ( !isset($NewNegativeSerie[$Key]) )
-            { $NewNegativeSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
+            { $NewNegativeSerie[$Key] = $BubbleBounds; } elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
             { $NewNegativeSerie[$Key] = $BubbleBounds; }
 
            $LastNegative = $BubbleBounds;
@@ -73,32 +63,27 @@ 
       }
 
      /* Check for missing values and all the fake positive serie */
-     if ( $NewPositiveSerie != "" )
-      {
+     if ( $NewPositiveSerie != "" ) {
        for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewPositiveSerie[$i])) { $NewPositiveSerie[$i] = $LastPositive; } }
 
        $this->pDataObject->addPoints($NewPositiveSerie,"BubbleFakePositiveSerie");
       }
 
      /* Check for missing values and all the fake negative serie */
-     if ( $NewNegativeSerie != "" )
-      {
+     if ( $NewNegativeSerie != "" ) {
        for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewNegativeSerie[$i])) { $NewNegativeSerie[$i] = $LastNegative; } }
 
        $this->pDataObject->addPoints($NewNegativeSerie,"BubbleFakeNegativeSerie");
       }
     }
 
-   function resetSeriesColors()
-    {
+   function resetSeriesColors() {
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
      $ID = 0;
-     foreach($Data["Series"] as $SerieName => $SeriesParameters)
-      {
-       if ( $SeriesParameters["isDrawable"] )
-        {
+     foreach($Data["Series"] as $SerieName => $SeriesParameters) {
+       if ( $SeriesParameters["isDrawable"] ) {
          $this->pDataObject->Data["Series"][$SerieName]["Color"]["R"]     = $Palette[$ID]["R"];
          $this->pDataObject->Data["Series"][$SerieName]["Color"]["G"]     = $Palette[$ID]["G"];
          $this->pDataObject->Data["Series"][$SerieName]["Color"]["B"]     = $Palette[$ID]["B"];
@@ -109,8 +94,7 @@ 
     }
 
    /* Prepare the scale */
-   function drawBubbleChart($DataSeries,$WeightSeries,$Format="")
-    {
+   function drawBubbleChart($DataSeries,$WeightSeries,$Format="") {
      $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : VOID;
      $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
      $BorderWidth	= isset($Format["BorderWidth"]) ? $Format["BorderWidth"] : 1;
@@ -135,8 +119,7 @@ 
 
      list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
 
-     foreach($DataSeries as $Key => $SerieName)
-      {
+     foreach($DataSeries as $Key => $SerieName) {
        $AxisID	= $Data["Series"][$SerieName]["Axis"];
        $Mode	= $Data["Axis"][$AxisID]["Display"];
        $Format	= $Data["Axis"][$AxisID]["Format"];
@@ -153,95 +136,71 @@ 
 
        if ( $ForceAlpha != VOID ) { $Color["Alpha"]=$ForceAlpha; }
 
-       if ( $DrawBorder )
-        {
-         if ( $BorderWidth != 1 )
-          {
+       if ( $DrawBorder ) {
+         if ( $BorderWidth != 1 ) {
            if ( $Surrounding != NULL )
-            { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; }
-           else
+            { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; } else
             { $BorderR = $BorderR; $BorderG = $BorderG; $BorderB = $BorderB; }
            if ( $ForceAlpha != VOID ) { $BorderAlpha = $ForceAlpha/2; }
            $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
-          }
-         else
-          {
+          } else {
            $Color["BorderAlpha"] = $BorderAlpha;
 
            if ( $Surrounding != NULL )
-            { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; }
-           else
+            { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; } else
             { $Color["BorderR"] = $BorderR; $Color["BorderG"] = $BorderG; $Color["BorderB"] = $BorderB; }
            if ( $ForceAlpha != VOID ) { $Color["BorderAlpha"] = $ForceAlpha/2; }
           }
         }
 
-       foreach($Data["Series"][$SerieName]["Data"] as $iKey => $Point)
-        {
+       foreach($Data["Series"][$SerieName]["Data"] as $iKey => $Point) {
          $Weight = $Point + $Data["Series"][$WeightSeries[$Key]]["Data"][$iKey];
 
          $PosArray    = $this->pChartObject->scaleComputeY($Point,array("AxisID"=>$AxisID));
          $WeightArray = $this->pChartObject->scaleComputeY($Weight,array("AxisID"=>$AxisID));
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
            $Y = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
 
-           if ( $Shape == BUBBLE_SHAPE_SQUARE )
-            {
+           if ( $Shape == BUBBLE_SHAPE_SQUARE ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-            }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
-            {
+            } elseif ( $Shape == BUBBLE_SHAPE_ROUND ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
             }
 
            $X = $X + $XStep;
-          }
-         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-          {
+          } elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM ) {
            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
            $X = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
 
-           if ( $Shape == BUBBLE_SHAPE_SQUARE )
-            {
+           if ( $Shape == BUBBLE_SHAPE_SQUARE ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-            }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
-            {
+            } elseif ( $Shape == BUBBLE_SHAPE_ROUND ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
             }
 
@@ -251,8 +210,7 @@ 
       }
     }
 
-   function writeBubbleLabel($SerieName,$SerieWeightName,$Points,$Format="")
-    {
+   function writeBubbleLabel($SerieName,$SerieWeightName,$Points,$Format="") {
      $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
      $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
 
@@ -277,8 +235,7 @@ 
 
      $Color = array("R"=>$Data["Series"][$SerieName]["Color"]["R"],"G"=>$Data["Series"][$SerieName]["Color"]["G"],"B"=>$Data["Series"][$SerieName]["Color"]["B"],"Alpha"=>$Data["Series"][$SerieName]["Color"]["Alpha"]);
 
-     foreach($Points as $Key => $Point)
-      {
+     foreach($Points as $Key => $Point) {
        $Value    = $Data["Series"][$SerieName]["Data"][$Point];
        $PosArray = $this->pChartObject->scaleComputeY($Value,array("AxisID"=>$AxisID));
 
@@ -299,15 +256,12 @@ 
        $Series = "";
        $Series[] = array("Format"=>$Color,"Caption"=>$Caption);
 
-       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-        {
+       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
          if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
 
          $X = floor($X + $Point * $XStep);
          $Y = floor($PosArray);
-        }
-       else
-        {
+        } else {
          if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
 
          $X = floor($PosArray);

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

@@ -41,7 +41,7 @@ 
       {
        $SerieWeightName = $WeightSeries[$Key];
 
-       $this->pDataObject->setSerieDrawable($SerieWeightName,FALSE);
+       $this->pDataObject->setSerieDrawable($SerieWeightName,false);
 
        if ( count($this->pDataObject->Data["Series"][$SerieName]["Data"]) > $MaxValues ) { $MaxValues = count($this->pDataObject->Data["Series"][$SerieName]["Data"]); }
 
@@ -112,15 +112,15 @@ 
    function drawBubbleChart($DataSeries,$WeightSeries,$Format="")
     {
      $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : VOID;
-     $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
+     $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : true;
      $BorderWidth	= isset($Format["BorderWidth"]) ? $Format["BorderWidth"] : 1;
      $Shape		= isset($Format["Shape"]) ? $Format["Shape"] : BUBBLE_SHAPE_ROUND;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : null;
      $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
      $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
      $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
      $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : false;
 
      if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
      if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
@@ -128,8 +128,8 @@ 
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
-     if ( isset($Data["Series"]["BubbleFakePositiveSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakePositiveSerie",FALSE); }
-     if ( isset($Data["Series"]["BubbleFakeNegativeSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakeNegativeSerie",FALSE); }
+     if ( isset($Data["Series"]["BubbleFakePositiveSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakePositiveSerie",false); }
+     if ( isset($Data["Series"]["BubbleFakeNegativeSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakeNegativeSerie",false); }
 
      $this->resetSeriesColors();
 
@@ -157,7 +157,7 @@ 
         {
          if ( $BorderWidth != 1 )
           {
-           if ( $Surrounding != NULL )
+           if ( $Surrounding != null )
             { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; }
            else
             { $BorderR = $BorderR; $BorderG = $BorderG; $BorderB = $BorderB; }
@@ -168,7 +168,7 @@ 
           {
            $Color["BorderAlpha"] = $BorderAlpha;
 
-           if ( $Surrounding != NULL )
+           if ( $Surrounding != null )
             { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; }
            else
             { $Color["BorderR"] = $BorderR; $Color["BorderG"] = $BorderG; $Color["BorderB"] = $BorderB; }
@@ -253,7 +253,7 @@ 
 
    function writeBubbleLabel($SerieName,$SerieWeightName,$Points,$Format="")
     {
-     $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
+     $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : null;
      $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
 
      if ( !is_array($Points) ) { $Point = $Points; $Points = ""; $Points[] = $Point; }