BOINC / boinc

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

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
     $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.

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

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
     }
     $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();
     }
 
 
@@ -79,7 +79,7 @@ 
           $items = array();
           $title = t(ucwords($type));
           foreach ($options[$type] as $key => $value) {
-            $items[] = $key .' == '. $value;
+            $items[] = $key.' == '.$value;
           }
           $output .= theme('item_list', $items, $title);
         }
@@ -89,7 +89,7 @@ 
     $form['help'] = array(
       '#type' => 'markup',
       '#id' => 'views-tokens-help',
-      '#value' => '<div><fieldset id="views-tokens-help"><legend>' . t('Replacement patterns') . '</legend>' . $output . '</fieldset></div>',
+      '#value' => '<div><fieldset id="views-tokens-help"><legend>'.t('Replacement patterns').'</legend>'.$output.'</fieldset></div>',
     );
 
     $form['return'] = array(

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

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 function privatemsg_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'privatemsg') . '/views',
+      'path' => drupal_get_path('module', 'privatemsg').'/views',
     ),
     'handlers' => array(
       // field handlers

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

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

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

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

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

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.

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

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

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

Spacing +62 added lines, -62 removed lines

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

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

Spacing +9 added lines, -9 removed lines

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