BOINC / boinc

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

Indentation +8 added lines, -8 removed lines

@@ -8,29 +8,29 @@
  * System settings form page callback.
  */
 function mobile_menu_toggle_form() {
-  $form = array();
+    $form = array();
 
-  $form['mobile_menu_menu'] = array(
+    $form['mobile_menu_menu'] = array(
     '#title' => t('Menu selection'),
     '#description' => t('Which menu should the toggle open?'),
     '#type' => 'select',
     '#options' => menu_get_menus(),
     '#default_value' => variable_get('mobile_menu_menu', 'main-menu'),
-  );
+    );
 
-  $form['mobile_menu_block'] = array(
+    $form['mobile_menu_block'] = array(
     '#title' => t('Menu loaded in block?'),
     '#description' => t('Will this menu be loaded via a block? Check this box if you are loading your menu on the page via context or blocks.'),
     '#type' => 'checkbox',
     '#default_value' => variable_get('mobile_menu_block', FALSE),
-  );
+    );
 
-  $form['mobile_menu_css'] = array(
+    $form['mobile_menu_css'] = array(
     '#title' => t('(optional) CSS Selector'),
     '#description' => t('Enter an optional CSS selector. If this option is used the menu selected above will be ignored'),
     '#type' => 'textfield',
     '#default_value' => variable_get('mobile_menu_css', ''),
-  );
+    );
 
-  return system_settings_form($form);
+    return system_settings_form($form);
 }

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

Indentation +24 added lines, -24 removed lines

@@ -8,69 +8,69 @@
  * Implements hook_menu().
  */
 function mobile_menu_toggle_menu() {
-  $items = array();
+    $items = array();
 
-  $items['admin/settings/mobile-menu-toggle'] = array(
+    $items['admin/settings/mobile-menu-toggle'] = array(
     'title' => 'Mobile Menu Toggle',
     'description' => t('Select menu and zones for mobile menu toggle'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('mobile_menu_toggle_form'),
     'access arguments' => array('administer menu'),
     'file' => 'mobile_menu_toggle.admin.inc',
-  );
+    );
 
-  return $items;
+    return $items;
 }
 
 /**
  * Implements hook_init().
  */
 function mobile_menu_toggle_init() {
-  // Set JS settings based on menu selected.
-  $menu_default = check_plain(variable_get('mobile_menu_menu', 'main-menu'));
-  $css_class = check_plain(variable_get('mobile_menu_css', ''));
-  $menu_block = variable_get('mobile_menu_block', FALSE);
-  $js_settings['mobile_menu_toggle'] = array(
+    // Set JS settings based on menu selected.
+    $menu_default = check_plain(variable_get('mobile_menu_menu', 'main-menu'));
+    $css_class = check_plain(variable_get('mobile_menu_css', ''));
+    $menu_block = variable_get('mobile_menu_block', FALSE);
+    $js_settings['mobile_menu_toggle'] = array(
     'default_menu' => $menu_default,
     'css_class' => '#' . $menu_default,
-  );
+    );
 
-  // Add #block-menu as a prefix to class if the menu will be loaded via block.
-  if ($menu_block) {
+    // Add #block-menu as a prefix to class if the menu will be loaded via block.
+    if ($menu_block) {
     $js_settings['mobile_menu_toggle']['css_class'] = '#block-menu-' . $menu_default;
-  }
+    }
 
-  if (!empty($css_class)) {
+    if (!empty($css_class)) {
     $js_settings['mobile_menu_toggle']['css_class'] = $css_class;
-  }
-  drupal_add_js($js_settings, 'setting');
+    }
+    drupal_add_js($js_settings, 'setting');
 
 }
 
 function mobile_menu_toggle_block($op = 'list', $delta = 0, $edit = array()) {
-  if ($op == 'list') {
+    if ($op == 'list') {
     $blocks[0]['info'] = t('Mobile Menu Toggle');
     return $blocks;
-  }
-  elseif ($op == 'view') {
+    }
+    elseif ($op == 'view') {
     $block = array();
     switch ($delta) {
-      case 0:
+        case 0:
         drupal_add_js(drupal_get_path('module', 'mobile_menu_toggle') . '/mobile_menu_toggle.js');
         $block['content'] = theme('mobile_menu_toggle');
         break;
     }
     return $block;
-  }
+    }
 }
 
 /**
  * Implements hook_theme().
  */
 function mobile_menu_toggle_theme($existing, $type, $theme, $path) {
-  return array(
+    return array(
     'mobile_menu_toggle' => array(
-      'template' => 'mobile_menu_toggle',
+        'template' => 'mobile_menu_toggle',
     ),
-  );
+    );
 }

drupal/sites/default/boinc/modules/contrib/privatemsg/privatemsg.author-pane.inc

Indentation +17 added lines, -17 removed lines

@@ -9,45 +9,45 @@
  * Implements hook_preprocess_author_pane().
  */
 function privatemsg_preprocess_author_pane(&$variables) {
-  global $user;
-  $account = $variables['account'];
-  $account_id = $account->uid;
-  $account_name = $account->name;
+    global $user;
+    $account = $variables['account'];
+    $account_id = $account->uid;
+    $account_name = $account->name;
 
-  if (function_exists('author_pane_api') && author_pane_api() == "2") {
+    if (function_exists('author_pane_api') && author_pane_api() == "2") {
     // Author Pane 2.x
 
     // Check if this preprocess needs to be run given who's calling it.
     if (!author_pane_run_preprocess('privatemsg', $variables['caller'])) {
-      return;
+        return;
     }
 
     $url = privatemsg_get_link($account);
     if (!empty($url)) {
-      $variables['privatemsg'] = l('<span>' . t('Send PM') . '</span>', $url, array('attributes' => array('class' => 'author-pane-link', 'title' => t('Send @name a private message', array('@name' => $account_name))), 'html' => TRUE));
+        $variables['privatemsg'] = l('<span>' . t('Send PM') . '</span>', $url, array('attributes' => array('class' => 'author-pane-link', 'title' => t('Send @name a private message', array('@name' => $account_name))), 'html' => TRUE));
 
-      // Early versions of the template used this variable so fill it for
-      // backwards compatability.
-      $variables['privatemsg_link'] = $variables['privatemsg'];
+        // Early versions of the template used this variable so fill it for
+        // backwards compatability.
+        $variables['privatemsg_link'] = $variables['privatemsg'];
     }
-  }
-  else {
+    }
+    else {
     // Author Pane 1.x
 
     $image_path = $variables['image_path'];
 
     // Send private message
     if ($url = privatemsg_get_link($account)) {
-      $img = theme('image', "$image_path/private-message.png", t('Send private message'), t('Send private message'), NULL, TRUE);
-      $variables['privatemsg'] = l($img, $url, array('absolute' => TRUE, 'html' => TRUE));
-      $variables['privatemsg_link'] = l(t('Send private message'), $url, array('attributes' => array('class' => 'author-privatemsg-icon'), 'html' => TRUE));
+        $img = theme('image', "$image_path/private-message.png", t('Send private message'), t('Send private message'), NULL, TRUE);
+        $variables['privatemsg'] = l($img, $url, array('absolute' => TRUE, 'html' => TRUE));
+        $variables['privatemsg_link'] = l(t('Send private message'), $url, array('attributes' => array('class' => 'author-privatemsg-icon'), 'html' => TRUE));
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_author_pane_allow_preprocess_disable().
  */
 function privatemsg_author_pane_allow_preprocess_disable() {
-  return array('privatemsg' => 'Privatemsg');
+    return array('privatemsg' => 'Privatemsg');
 }

drupal/sites/default/boinc/modules/contrib/privatemsg/views/views_handler_field_privatemsg_link.inc

Indentation +73 added lines, -73 removed lines

@@ -10,62 +10,62 @@ 
  */
 class views_handler_field_privatemsg_link extends views_handler_field {
 
-  /**
-   * Add uid as a additional field.
-   */
-  function construct() {
+    /**
+     * Add uid as a additional field.
+     */
+    function construct() {
     parent::construct();
     $this->additional_fields['uid'] = 'uid';
-  }
+    }
 
-  /**
-   * Define our additional configuration setting.
-   */
-  function option_definition() {
+    /**
+     * Define our additional configuration setting.
+     */
+    function option_definition() {
     $options = parent::option_definition();
     $options['text'] = array('default' => '', 'translatable' => TRUE);
     $options['subject'] = array('default' => '', 'translatable' => TRUE);
     $options['return'] = array('default' => TRUE, 'translatable' => FALSE);
     return $options;
-  }
-
-  /**
-   * Define the configuration form for our textfield.
-   */
-  function options_form(&$form, &$form_state) {
-     $form['label'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Label'),
-      '#default_value' => isset($this->options['label']) ? $this->options['label'] : '',
-      '#description' => t('The label for this field that will be displayed to end users if the style requires it.'),
+    }
+
+    /**
+     * Define the configuration form for our textfield.
+     */
+    function options_form(&$form, &$form_state) {
+        $form['label'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Label'),
+        '#default_value' => isset($this->options['label']) ? $this->options['label'] : '',
+        '#description' => t('The label for this field that will be displayed to end users if the style requires it.'),
     );
 
     $form['text'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Text to display'),
-      '#default_value' => $this->options['text'],
-      '#description' => t('Define the text to use for the link title. You can use replacement tokens to insert any existing field output.'),
+        '#type' => 'textfield',
+        '#title' => t('Text to display'),
+        '#default_value' => $this->options['text'],
+        '#description' => t('Define the text to use for the link title. You can use replacement tokens to insert any existing field output.'),
     );
 
     $form['subject'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Pre-filled subject'),
-      '#default_value' => $this->options['subject'],
-      '#description' => t('Define the subject that will be pre-filled in the send message form. You can use replacement tokens to insert any existing field output.'),
+        '#type' => 'textfield',
+        '#title' => t('Pre-filled subject'),
+        '#default_value' => $this->options['subject'],
+        '#description' => t('Define the subject that will be pre-filled in the send message form. You can use replacement tokens to insert any existing field output.'),
     );
 
     // Get a list of the available fields and arguments for token replacement.
     $options = array();
     foreach ($this->view->display_handler->get_handlers('field') as $field => $handler) {
-      $options[t('Fields')]["[$field]"] = $handler->ui_name();
-      // We only use fields up to (and including) this one.
-      if ($field == $this->options['id']) {
+        $options[t('Fields')]["[$field]"] = $handler->ui_name();
+        // We only use fields up to (and including) this one.
+        if ($field == $this->options['id']) {
         break;
-      }
+        }
     }
     $count = 0; // This lets us prepare the key as we want it printed.
     foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
-      $options[t('Arguments')]['%' . ++$count] = $handler->ui_name();
+        $options[t('Arguments')]['%' . ++$count] = $handler->ui_name();
     }
 
 
@@ -73,81 +73,81 @@ 
     $output = t('<p>You must add some additional fields to this display before using this field. These fields may be marked as <em>Exclude from display</em> if you prefer. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.</p>');
     // We have some options, so make a list.
     if (!empty($options)) {
-      $output = t('<p>The following substitution patterns are available for this display. Use the pattern shown on the left to display the value indicated on the right. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.</p>');
-      foreach (array_keys($options) as $type) {
+        $output = t('<p>The following substitution patterns are available for this display. Use the pattern shown on the left to display the value indicated on the right. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.</p>');
+        foreach (array_keys($options) as $type) {
         if (!empty($options[$type])) {
-          $items = array();
-          $title = t(ucwords($type));
-          foreach ($options[$type] as $key => $value) {
+            $items = array();
+            $title = t(ucwords($type));
+            foreach ($options[$type] as $key => $value) {
             $items[] = $key .' == '. $value;
-          }
-          $output .= theme('item_list', $items, $title);
+            }
+            $output .= theme('item_list', $items, $title);
+        }
         }
-      }
     }
 
     $form['help'] = array(
-      '#type' => 'markup',
-      '#id' => 'views-tokens-help',
-      '#value' => '<div><fieldset id="views-tokens-help"><legend>' . t('Replacement patterns') . '</legend>' . $output . '</fieldset></div>',
+        '#type' => 'markup',
+        '#id' => 'views-tokens-help',
+        '#value' => '<div><fieldset id="views-tokens-help"><legend>' . t('Replacement patterns') . '</legend>' . $output . '</fieldset></div>',
     );
 
     $form['return'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Return to view after message was sent.'),
-      '#default_value' => $this->options['return'],
-      '#description' => t('Should the user be redirected back to the current view when the message was sent.'),
+        '#type' => 'checkbox',
+        '#title' => t('Return to view after message was sent.'),
+        '#default_value' => $this->options['return'],
+        '#description' => t('Should the user be redirected back to the current view when the message was sent.'),
     );
-  }
+    }
 
-  /**
-   * Renders our field, displays a link if the user is allowed to.
-   */
-  function render($values) {
+    /**
+     * Renders our field, displays a link if the user is allowed to.
+     */
+    function render($values) {
     if (isset($values->uid)) {
-      $uid = $values->uid;
+        $uid = $values->uid;
     }
     elseif (isset($values->users_uid)) {
-      $uid = $values->users_uid;
+        $uid = $values->users_uid;
     }
     else {
-      return '';
+        return '';
     }
     $text = t('Write private message');
     if (!empty($this->options['text'])) {
-      $tokens = $this->get_render_tokens($this);
-      $text = strip_tags(strtr($this->options['text'], $tokens));
+        $tokens = $this->get_render_tokens($this);
+        $text = strip_tags(strtr($this->options['text'], $tokens));
     }
     $subject = NULL;
     if (!empty($this->options['subject'])) {
-      $tokens = $this->get_render_tokens($this);
-      $subject = strip_tags(strtr($this->options['subject'], $tokens));
+        $tokens = $this->get_render_tokens($this);
+        $subject = strip_tags(strtr($this->options['subject'], $tokens));
     }
 
     $options = array();
     if ($this->options['return']) {
-      $options['query'] = drupal_get_destination();
+        $options['query'] = drupal_get_destination();
     }
 
     $data = '';
     if (($recipient = user_load($uid)) && ($url = privatemsg_get_link(array($recipient), NULL, $subject))) {
-      $data = l($text, $url, $options);
+        $data = l($text, $url, $options);
     }
     return $data;
-  }
+    }
 
-  /**
-   * Only display the column for users with the appropriate permission.
-   */
-  function access() {
+    /**
+     * Only display the column for users with the appropriate permission.
+     */
+    function access() {
     return privatemsg_user_access('write privatemsg');
-  }
+    }
 
-  /**
-   * Just do some basic checks, don't add "privatemsg_link" as field.
-   */
-  function query() {
+    /**
+     * Just do some basic checks, don't add "privatemsg_link" as field.
+     */
+    function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
-  }
+    }
 }
\ No newline at end of file

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

Indentation +12 added lines, -12 removed lines

@@ -5,16 +5,16 @@ 
  */
 
 function privatemsg_views_data() {
-  $data['users']['privatemsg_link'] = array(
+    $data['users']['privatemsg_link'] = array(
     'group' => t('Privatemsg'),
     'title' => t('Send message'),
     'field' => array(
-      'title' => t('Send Privatemsg link'),
-      'help' => t('Displays a link to send a private message to a user.'),
-      'handler' => 'views_handler_field_privatemsg_link',
+        'title' => t('Send Privatemsg link'),
+        'help' => t('Displays a link to send a private message to a user.'),
+        'handler' => 'views_handler_field_privatemsg_link',
     ),
-  );
-  return $data;
+    );
+    return $data;
 }
 
 
@@ -22,17 +22,17 @@ 
  * Implementation of hook_views_handlers().
  */
 function privatemsg_views_handlers() {
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'privatemsg') . '/views',
+        'path' => drupal_get_path('module', 'privatemsg') . '/views',
     ),
     'handlers' => array(
-      // field handlers
-      'views_handler_field_privatemsg_link' => array(
+        // field handlers
+        'views_handler_field_privatemsg_link' => array(
         'parent' => 'views_handler_field',
-      ),
+        ),
     ),
-  );
+    );
 }
 
 

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

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

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

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